Title: [183886] trunk/Source
- Revision
- 183886
- Author
- timothy_hor...@apple.com
- Date
- 2015-05-06 13:52:15 -0700 (Wed, 06 May 2015)
Log Message
Fix the build.
* UIProcess/mac/WKViewLayoutStrategy.mm:
(-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):
* platform/spi/cocoa/QuartzCoreSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183885 => 183886)
--- trunk/Source/WebCore/ChangeLog 2015-05-06 20:40:53 UTC (rev 183885)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 20:52:15 UTC (rev 183886)
@@ -1,3 +1,9 @@
+2015-05-06 Timothy Horton <timothy_hor...@apple.com>
+
+ Fix the build.
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+
2015-05-06 David Hyatt <hy...@apple.com>
Optimize topLeftLocationOffset() addition in updateLayerPosition
Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (183885 => 183886)
--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-05-06 20:40:53 UTC (rev 183885)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-05-06 20:52:15 UTC (rev 183886)
@@ -64,9 +64,11 @@
- (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;
Modified: trunk/Source/WebKit2/ChangeLog (183885 => 183886)
--- trunk/Source/WebKit2/ChangeLog 2015-05-06 20:40:53 UTC (rev 183885)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-06 20:52:15 UTC (rev 183886)
@@ -1,3 +1,10 @@
+2015-05-06 Timothy Horton <timothy_hor...@apple.com>
+
+ Fix the build.
+
+ * UIProcess/mac/WKViewLayoutStrategy.mm:
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):
+
2015-04-02 Myles C. Maxfield <mmaxfi...@apple.com>
Introducing the Platform Abstraction Layer (PAL)
Modified: trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm (183885 => 183886)
--- trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-06 20:40:53 UTC (rev 183885)
+++ trunk/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-06 20:52:15 UTC (rev 183886)
@@ -293,11 +293,16 @@
_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
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
