Title: [230879] trunk/Source/WebKit
Revision
230879
Author
cdu...@apple.com
Date
2018-04-20 19:35:09 -0700 (Fri, 20 Apr 2018)

Log Message

Unreviewed attempt to fix GTK build after r230867.

* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp:
(webkit_dom_dom_window_get_self):
(webkit_dom_dom_window_get_window):
(webkit_dom_dom_window_get_frames):
(webkit_dom_dom_window_get_opener):
(webkit_dom_dom_window_get_parent):
(webkit_dom_dom_window_get_top):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (230878 => 230879)


--- trunk/Source/WebKit/ChangeLog	2018-04-21 02:26:23 UTC (rev 230878)
+++ trunk/Source/WebKit/ChangeLog	2018-04-21 02:35:09 UTC (rev 230879)
@@ -1,3 +1,15 @@
+2018-04-20  Chris Dumez  <cdu...@apple.com>
+
+        Unreviewed attempt to fix GTK build after r230867.
+
+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp:
+        (webkit_dom_dom_window_get_self):
+        (webkit_dom_dom_window_get_window):
+        (webkit_dom_dom_window_get_frames):
+        (webkit_dom_dom_window_get_opener):
+        (webkit_dom_dom_window_get_parent):
+        (webkit_dom_dom_window_get_top):
+
 2018-04-20  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r230873.

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp (230878 => 230879)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp	2018-04-21 02:26:23 UTC (rev 230878)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDOMWindow.cpp	2018-04-21 02:35:09 UTC (rev 230879)
@@ -29,6 +29,7 @@
 #include <WebCore/SerializedScriptValue.h>
 #include <WebCore/UserMessageHandlersNamespace.h>
 #include <WebCore/WebKitNamespace.h>
+#include <WebCore/WindowProxy.h>
 #include "WebKitDOMCSSStyleDeclarationPrivate.h"
 #include "WebKitDOMDOMSelectionPrivate.h"
 #include "WebKitDOMDOMWindowPrivate.h"
@@ -953,7 +954,8 @@
     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->self());
+    auto* selfWindowProxy = item->self();
+    RefPtr<WebCore::DOMWindow> gobjectResult = downcast<WebCore::DOMWindow>(selfWindowProxy->window());
     return WebKit::kit(gobjectResult.get());
 }
 
@@ -962,7 +964,8 @@
     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->self());
+    auto* selfWindowProxy = item->self();
+    RefPtr<WebCore::DOMWindow> gobjectResult = downcast<WebCore::DOMWindow>(selfWindowProxy->window());
     return WebKit::kit(gobjectResult.get());
 }
 
@@ -971,7 +974,8 @@
     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->self());
+    auto* selfWindowProxy = item->self();
+    RefPtr<WebCore::DOMWindow> gobjectResult = downcast<WebCore::DOMWindow>(selfWindowProxy->window());
     return WebKit::kit(gobjectResult.get());
 }
 
@@ -980,7 +984,8 @@
     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->opener());
+    auto* openerWindowProxy = item->opener();
+    RefPtr<WebCore::DOMWindow> gobjectResult = downcast<WebCore::DOMWindow>(openerWindowProxy->window());
     return WebKit::kit(gobjectResult.get());
 }
 
@@ -989,7 +994,8 @@
     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->parent());
+    auto* parentWindowProxy = item->parent();
+    RefPtr<WebCore::DOMWindow> gobjectResult = downcast<WebCore::DOMWindow>(parentWindowProxy->window());
     return WebKit::kit(gobjectResult.get());
 }
 
@@ -998,7 +1004,8 @@
     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->top());
+    auto* topWindowProxy = item->top();
+    RefPtr<WebCore::DOMWindow> gobjectResult = downcast<WebCore::DOMWindow>(topWindowProxy->window());
     return WebKit::kit(gobjectResult.get());
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to