[webkit-changes] [170373] trunk/Source

Tue, 24 Jun 2014 10:45:06 -0700

Title: [170373] trunk/Source
Revision
170373
Author
[email protected]
Date
2014-06-24 10:44:48 -0700 (Tue, 24 Jun 2014)

Log Message

[iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
Also, revert r169281.
https://bugs.webkit.org/show_bug.cgi?id=134233
<rdar://problem/17060183>

Reviewed by Benjamin Poulain.

Source/WebCore:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::outerHeight):
(WebCore::DOMWindow::outerWidth):

Source/WebKit2:
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::windowFrame): Deleted.
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::convertToUserSpace):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (170372 => 170373)


--- trunk/Source/WebCore/ChangeLog	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 17:44:48 UTC (rev 170373)
@@ -1,3 +1,16 @@
+2014-06-24  Martin Hock  <[email protected]>
+
+        [iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
+        Also, revert r169281.
+        https://bugs.webkit.org/show_bug.cgi?id=134233
+        <rdar://problem/17060183>
+
+        Reviewed by Benjamin Poulain.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::outerHeight):
+        (WebCore::DOMWindow::outerWidth):
+
 2014-06-24  Jeremy Jones  <[email protected]>
 
         Don't set AudioSession active while interrupted.

Modified: trunk/Source/WebCore/page/DOMWindow.cpp (170372 => 170373)


--- trunk/Source/WebCore/page/DOMWindow.cpp	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebCore/page/DOMWindow.cpp	2014-06-24 17:44:48 UTC (rev 170373)
@@ -1156,6 +1156,9 @@
 
 int DOMWindow::outerHeight() const
 {
+#if PLATFORM(IOS)
+    return 0;
+#else
     if (!m_frame)
         return 0;
 
@@ -1164,10 +1167,14 @@
         return 0;
 
     return static_cast<int>(page->chrome().windowRect().height());
+#endif
 }
 
 int DOMWindow::outerWidth() const
 {
+#if PLATFORM(IOS)
+    return 0;
+#else
     if (!m_frame)
         return 0;
 
@@ -1176,6 +1183,7 @@
         return 0;
 
     return static_cast<int>(page->chrome().windowRect().width());
+#endif
 }
 
 int DOMWindow::innerHeight() const

Modified: trunk/Source/WebKit2/ChangeLog (170372 => 170373)


--- trunk/Source/WebKit2/ChangeLog	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 17:44:48 UTC (rev 170373)
@@ -1,3 +1,18 @@
+2014-06-24  Martin Hock  <[email protected]>
+
+        [iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
+        Also, revert r169281.
+        https://bugs.webkit.org/show_bug.cgi?id=134233
+        <rdar://problem/17060183>
+
+        Reviewed by Benjamin Poulain.
+
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::UIClient::windowFrame): Deleted.
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::convertToUserSpace):
+
 2014-06-24  Jeremy Jones  <[email protected]>
 
         Initialize WKWebViewConfiguration properties to their default values.

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (170372 => 170373)


--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h	2014-06-24 17:44:48 UTC (rev 170373)
@@ -68,7 +68,6 @@
     #if PLATFORM(IOS)
         virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
         virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) override;
-        virtual WebCore::FloatRect windowFrame(WebKit::WebPageProxy*) override;
     #endif
 
         UIDelegate& m_uiDelegate;

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (170372 => 170373)


--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm	2014-06-24 17:44:48 UTC (rev 170373)
@@ -252,17 +252,6 @@
 
     [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate.m_webView didNotHandleTapAsClickAtPoint:point];
 }
-
-WebCore::FloatRect UIDelegate::UIClient::windowFrame(WebKit::WebPageProxy*)
-{
-    if (!m_uiDelegate.m_webView)
-        return WebCore::FloatRect();
-
-    if (UIWindow* window = m_uiDelegate.m_webView.window)
-        return WebCore::enclosingIntRect(window.frame);
-
-    return WebCore::enclosingIntRect(m_uiDelegate.m_webView.bounds);
-}
 #endif
 
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (170372 => 170373)


--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm	2014-06-24 17:44:48 UTC (rev 170373)
@@ -317,7 +317,8 @@
 
 FloatRect PageClientImpl::convertToUserSpace(const FloatRect& rect)
 {
-    return rect;
+    notImplemented();
+    return FloatRect();
 }
 
 IntPoint PageClientImpl::screenToRootView(const IntPoint& point)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to