Title: [230077] trunk/Source
- Revision
- 230077
- Author
- cdu...@apple.com
- Date
- 2018-03-29 09:52:33 -0700 (Thu, 29 Mar 2018)
Log Message
Drop DOMWindow::frames() / DOMWindow::window() methods
https://bugs.webkit.org/show_bug.cgi?id=184112
Reviewed by Daniel Bates.
Drop DOMWindow::frames() / DOMWindow::window() methods as they are just aliases for DOMWindow::self().
* page/DOMWindow.h:
* page/DOMWindow.idl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230076 => 230077)
--- trunk/Source/WebCore/ChangeLog 2018-03-29 16:28:03 UTC (rev 230076)
+++ trunk/Source/WebCore/ChangeLog 2018-03-29 16:52:33 UTC (rev 230077)
@@ -1,3 +1,15 @@
+2018-03-29 Chris Dumez <cdu...@apple.com>
+
+ Drop DOMWindow::frames() / DOMWindow::window() methods
+ https://bugs.webkit.org/show_bug.cgi?id=184112
+
+ Reviewed by Daniel Bates.
+
+ Drop DOMWindow::frames() / DOMWindow::window() methods as they are just aliases for DOMWindow::self().
+
+ * page/DOMWindow.h:
+ * page/DOMWindow.idl:
+
2018-03-29 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r230062.
Modified: trunk/Source/WebCore/page/DOMWindow.h (230076 => 230077)
--- trunk/Source/WebCore/page/DOMWindow.h 2018-03-29 16:28:03 UTC (rev 230076)
+++ trunk/Source/WebCore/page/DOMWindow.h 2018-03-29 16:52:33 UTC (rev 230077)
@@ -191,11 +191,7 @@
String defaultStatus() const;
void setDefaultStatus(const String&);
- // Self-referential attributes
-
DOMWindow* self() const;
- DOMWindow* window() const { return self(); }
- DOMWindow* frames() const { return self(); }
DOMWindow* opener() const;
void disownOpener();
Modified: trunk/Source/WebCore/page/DOMWindow.idl (230076 => 230077)
--- trunk/Source/WebCore/page/DOMWindow.idl 2018-03-29 16:28:03 UTC (rev 230076)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2018-03-29 16:52:33 UTC (rev 230077)
@@ -49,7 +49,7 @@
PrimaryGlobal,
] interface DOMWindow : EventTarget {
// The current browsing context.
- [DoNotCheckSecurity, Unforgeable] readonly attribute DOMWindow window;
+ [DoNotCheckSecurity, Unforgeable, ImplementedAs=self] readonly attribute DOMWindow window;
[Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow self;
[Unforgeable] readonly attribute Document document;
attribute DOMString name;
@@ -70,7 +70,7 @@
[DoNotCheckSecurity, ForwardDeclareInHeader] void blur();
// Other browsing contexts.
- [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow frames;
+ [Replaceable, DoNotCheckSecurityOnGetter, ImplementedAs=self] readonly attribute DOMWindow frames;
[Replaceable, DoNotCheckSecurityOnGetter] readonly attribute unsigned long length;
[DoNotCheckSecurityOnGetter, Unforgeable] readonly attribute DOMWindow? top;
[DoNotCheckSecurityOnGetter, CustomSetter] attribute DOMWindow? opener;
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp (230076 => 230077)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp 2018-03-29 16:28:03 UTC (rev 230076)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp 2018-03-29 16:52:33 UTC (rev 230077)
@@ -962,7 +962,7 @@
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_DOM_WINDOW(self), 0);
WebCore::DOMWindow* item = WebKit::core(self);
- RefPtr<WebCore::DOMWindow> gobjectResult = WTF::getPtr(item->window());
+ RefPtr<WebCore::DOMWindow> gobjectResult = WTF::getPtr(item->self());
return WebKit::kit(gobjectResult.get());
}
@@ -971,7 +971,7 @@
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_DOM_WINDOW(self), 0);
WebCore::DOMWindow* item = WebKit::core(self);
- RefPtr<WebCore::DOMWindow> gobjectResult = WTF::getPtr(item->frames());
+ RefPtr<WebCore::DOMWindow> gobjectResult = WTF::getPtr(item->self());
return WebKit::kit(gobjectResult.get());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
