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

* platform/spi/cocoa/QuartzCoreSPI.h:

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

Source/WebCore/ChangeLog
Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm

index ad93c4f..84c0fbb 100644 (file)
@@ -1,3 +1,9 @@
+2015-05-06  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
+        * platform/spi/cocoa/QuartzCoreSPI.h:
+
 2015-05-06  David Hyatt  <hyatt@apple.com>
 
         Optimize topLeftLocationOffset() addition in updateLayerPosition
index 6248791..572fffc 100644 (file)
@@ -64,9 +64,11 @@ extern "C" {
 - (uint32_t)createImageSlot:(CGSize)size hasAlpha:(BOOL)flag;
 - (void)deleteSlot:(uint32_t)name;
 - (void)invalidate;
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 - (mach_port_t)createFencePort;
 - (void)setFencePort:(mach_port_t)port;
 - (void)setFencePort:(mach_port_t)port commitHandler:(void(^)(void))block;
+#endif
 @property (readonly) uint32_t contextId;
 @property (strong) CALayer *layer;
 @property CGColorSpaceRef colorSpace;
index f0a9616..40c50c1 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-04-02  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Introducing the Platform Abstraction Layer (PAL)
index fe46efc..0a354e6 100644 (file)
@@ -293,11 +293,16 @@ 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
         MachSendRight fencePort = MachSendRight::adopt([context createFencePort]);
         _page->scaleViewAndUpdateGeometryFenced(scale, IntSize(_wkView.frame.size), fencePort);
         [context setFencePort:fencePort.sendRight() commitHandler:^{
             _wkView._rootLayer.transform = CATransform3DIdentity;
         }];
+#else
+        _page->scaleView(scale);
+        _wkView._rootLayer.transform = CATransform3DIdentity;
+#endif
     }
 }