зеркало из https://github.com/mozilla/gecko-dev.git
Bug 832014 part 3. Start using nsLocation for the Location interface in bindings. r=peterv
This commit is contained in:
Родитель
e620338f1a
Коммит
ef4d83b2a3
|
@ -66,6 +66,7 @@ class nsIStyleRule;
|
|||
class nsIStyleSheet;
|
||||
class nsIURI;
|
||||
class nsIVariant;
|
||||
class nsLocation;
|
||||
class nsViewManager;
|
||||
class nsPresContext;
|
||||
class nsRange;
|
||||
|
@ -2184,7 +2185,7 @@ public:
|
|||
const nsAString& aQualifiedName,
|
||||
mozilla::ErrorResult& rv);
|
||||
void GetInputEncoding(nsAString& aInputEncoding);
|
||||
already_AddRefed<nsIDOMLocation> GetLocation() const;
|
||||
already_AddRefed<nsLocation> GetLocation() const;
|
||||
void GetReferrer(nsAString& aReferrer) const;
|
||||
void GetLastModified(nsAString& aLastModified) const;
|
||||
void GetReadyState(nsAString& aReadyState) const;
|
||||
|
|
|
@ -223,6 +223,7 @@
|
|||
#include "nsContentPermissionHelper.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsWindowMemoryReporter.h"
|
||||
#include "nsLocation.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::dom;
|
||||
|
@ -6546,7 +6547,7 @@ nsDocument::GetLocation(nsIDOMLocation **_retval)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
already_AddRefed<nsIDOMLocation>
|
||||
already_AddRefed<nsLocation>
|
||||
nsIDocument::GetLocation() const
|
||||
{
|
||||
nsCOMPtr<nsIDOMWindow> w = do_QueryInterface(mScriptGlobalObject);
|
||||
|
@ -6557,7 +6558,7 @@ nsIDocument::GetLocation() const
|
|||
|
||||
nsCOMPtr<nsIDOMLocation> loc;
|
||||
w->GetLocation(getter_AddRefs(loc));
|
||||
return loc.forget();
|
||||
return loc.forget().downcast<nsLocation>();
|
||||
}
|
||||
|
||||
Element*
|
||||
|
|
|
@ -240,7 +240,7 @@ public:
|
|||
// The XPCOM CaptureEvents works fine for us.
|
||||
// The XPCOM ReleaseEvents works fine for us.
|
||||
// We're picking up GetLocation from Document
|
||||
already_AddRefed<nsIDOMLocation> GetLocation() const {
|
||||
already_AddRefed<nsLocation> GetLocation() const {
|
||||
return nsIDocument::GetLocation();
|
||||
}
|
||||
|
||||
|
|
|
@ -9649,7 +9649,7 @@ nsGlobalWindow::GetPrivateRoot()
|
|||
}
|
||||
|
||||
|
||||
nsIDOMLocation*
|
||||
nsLocation*
|
||||
nsGlobalWindow::GetLocation(ErrorResult& aError)
|
||||
{
|
||||
FORWARD_TO_INNER_OR_THROW(GetLocation, (aError), aError, nullptr);
|
||||
|
|
|
@ -827,7 +827,7 @@ public:
|
|||
}
|
||||
void GetName(nsAString& aName, mozilla::ErrorResult& aError);
|
||||
void SetName(const nsAString& aName, mozilla::ErrorResult& aError);
|
||||
nsIDOMLocation* GetLocation(mozilla::ErrorResult& aError);
|
||||
nsLocation* GetLocation(mozilla::ErrorResult& aError);
|
||||
nsHistory* GetHistory(mozilla::ErrorResult& aError);
|
||||
mozilla::dom::BarProp* GetLocationbar(mozilla::ErrorResult& aError);
|
||||
mozilla::dom::BarProp* GetMenubar(mozilla::ErrorResult& aError);
|
||||
|
|
|
@ -744,7 +744,7 @@ DOMInterfaces = {
|
|||
'Location': {
|
||||
# NOTE: Before you turn on codegen for Location, make sure all the
|
||||
# Unforgeable stuff is dealt with.
|
||||
'nativeType': 'nsIDOMLocation',
|
||||
'nativeType': 'nsLocation',
|
||||
'skipGen': True,
|
||||
'register': False
|
||||
},
|
||||
|
|
Загрузка…
Ссылка в новой задаче