summaryrefslogtreecommitdiffstats
path: root/dom/html
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-23 09:16:50 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-23 09:16:50 +0200
commit0a9acadccafe04aa5bc3335523bb55fe52ca8e50 (patch)
treeab49c5db5979719019b24c9086aa3701655702d5 /dom/html
parentc30ebdac27c93b57e368c69e9c13055a17229992 (diff)
downloadUXP-0a9acadccafe04aa5bc3335523bb55fe52ca8e50.tar
UXP-0a9acadccafe04aa5bc3335523bb55fe52ca8e50.tar.gz
UXP-0a9acadccafe04aa5bc3335523bb55fe52ca8e50.tar.lz
UXP-0a9acadccafe04aa5bc3335523bb55fe52ca8e50.tar.xz
UXP-0a9acadccafe04aa5bc3335523bb55fe52ca8e50.zip
moebius#121: DOM - Selection API - getSelection() should exist on XMLDocument / Selection.type
https://github.com/MoonchildProductions/moebius/pull/121
Diffstat (limited to 'dom/html')
-rw-r--r--dom/html/nsHTMLDocument.cpp18
-rw-r--r--dom/html/nsHTMLDocument.h1
2 files changed, 1 insertions, 18 deletions
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index be5a34d41..69e710242 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -2149,26 +2149,10 @@ NS_IMETHODIMP
nsHTMLDocument::GetSelection(nsISelection** aReturn)
{
ErrorResult rv;
- NS_IF_ADDREF(*aReturn = GetSelection(rv));
+ NS_IF_ADDREF(*aReturn = nsDocument::GetSelection(rv));
return rv.StealNSResult();
}
-Selection*
-nsHTMLDocument::GetSelection(ErrorResult& aRv)
-{
- nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(GetScopeObject());
- if (!window) {
- return nullptr;
- }
-
- NS_ASSERTION(window->IsInnerWindow(), "Should have inner window here!");
- if (!window->IsCurrentInnerWindow()) {
- return nullptr;
- }
-
- return nsGlobalWindow::Cast(window)->GetSelection(aRv);
-}
-
NS_IMETHODIMP
nsHTMLDocument::CaptureEvents()
{
diff --git a/dom/html/nsHTMLDocument.h b/dom/html/nsHTMLDocument.h
index 426ebddc5..1fa81f6cd 100644
--- a/dom/html/nsHTMLDocument.h
+++ b/dom/html/nsHTMLDocument.h
@@ -242,7 +242,6 @@ public:
{
// Deprecated
}
- mozilla::dom::Selection* GetSelection(mozilla::ErrorResult& aRv);
// The XPCOM CaptureEvents works fine for us.
// The XPCOM ReleaseEvents works fine for us.
// We're picking up GetLocation from Document