Fix the build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jul 2014 21:57:59 +0000 (21:57 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jul 2014 21:57:59 +0000 (21:57 +0000)
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _frameOrBoundsChanged]):
(-[WKWebView _beginAnimatedResizeWithUpdates:]):
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView _frameOrBoundsChanged]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm

index 3eab3bec318d9ae43ab335a4b6e1be8775d7894d..afb2e3f2550c631fbded34f7439713565375d9da 100644 (file)
@@ -1,3 +1,13 @@
+2014-07-14  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _frameOrBoundsChanged]):
+        (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+        * UIProcess/API/ios/WKViewIOS.mm:
+        (-[WKView _frameOrBoundsChanged]):
+
 2014-07-14  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 
         [UNIX] Log error description when failing to create shared memory file.
index 58d2191ff90db22db6b052fee02a9ad3752139bd..23cbed7f3ddeab33f1581dbea20f53d25574ff27 100644 (file)
@@ -1318,7 +1318,7 @@ static WebCore::FloatPoint constrainContentOffset(WebCore::FloatPoint contentOff
             _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(bounds.size));
         if (!_overridesMaximumUnobscuredSize)
             _page->setMaximumUnobscuredSize(WebCore::FloatSize(bounds.size));
-        _page->drawingArea()->setSize(IntSize(size), IntSize(), IntSize());
+        _page->drawingArea()->setSize(WebCore::IntSize(bounds.size), WebCore::IntSize(), WebCore::IntSize());
     }
 
     [_customContentView web_setMinimumSize:bounds.size];
@@ -2199,7 +2199,7 @@ static inline WebKit::FindOptions toFindOptions(_WKFindOptions wkFindOptions)
     CGRect unobscuredRectInContentCoordinates = [self convertRect:futureUnobscuredRectInSelfCoordinates toView:_contentView.get()];
 
     _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMinimumLayoutSizeForMinimalUI, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, targetScale, newOrientation);
-    _page->drawingArea()->setSize(IntSize(newBounds.size), IntSize(), IntSize());
+    _page->drawingArea()->setSize(WebCore::IntSize(newBounds.size), WebCore::IntSize(), WebCore::IntSize());
 }
 
 - (void)_endAnimatedResize
index 3946864d08551889a4b3de56b51e7e6bbfde90b9..f6f0c9571f11e3672dcdfc02805d95a2a5373401 100644 (file)
@@ -251,7 +251,7 @@ using namespace WebKit;
     webPageProxy->setMaximumUnobscuredSize(size);
 
     [_scrollView setFrame:bounds];
-    webPageProxy->drawingArea()->setSize(IntSize(bounds.size), IntSize(), IntSize());
+    webPageProxy->drawingArea()->setSize(WebCore::IntSize(bounds.size), WebCore::IntSize(), WebCore::IntSize());
     [self _updateVisibleContentRects];
 }