Fix the build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 May 2015 21:36:02 +0000 (21:36 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 May 2015 21:36:02 +0000 (21:36 +0000)
* UIProcess/mac/WKViewLayoutStrategy.mm:
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm

index f83ff35428ef85fc7fabfc0b0d457434266d40e1..994ca8d6f7304d264237d635a9b4c6dcace7193c 100644 (file)
@@ -1,3 +1,10 @@
+2015-05-06  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
+        * UIProcess/mac/WKViewLayoutStrategy.mm:
+        (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):
+
 2015-05-06  Dan Bernstein  <mitz@apple.com>
 
         No way to get a WKWebProcessPlugInFrame’s parent frame
index 0a354e68c68f8dd78f9930876a9f43cb41a7b817..72ac3b4b47448addf0568c9edf75aea768618d73 100644 (file)
@@ -292,8 +292,8 @@ using namespace WebKit;
 
         _wkView._rootLayer.transform = transform;
     } else if (scale != _page->viewScaleFactor()) {
-        CAContext *context = [_wkView.layer context];
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+        CAContext *context = [_wkView.layer context];
         MachSendRight fencePort = MachSendRight::adopt([context createFencePort]);
         _page->scaleViewAndUpdateGeometryFenced(scale, IntSize(_wkView.frame.size), fencePort);
         [context setFencePort:fencePort.sendRight() commitHandler:^{