From 85eecc9a509f16c13f848afe4b0d4fbe5ed86db7 Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Wed, 6 May 2015 21:36:02 +0000 Subject: [PATCH] Fix the build. * 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 | 7 +++++++ Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index f83ff35428ef..994ca8d6f730 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,10 @@ +2015-05-06 Timothy Horton + + Fix the build. + + * UIProcess/mac/WKViewLayoutStrategy.mm: + (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]): + 2015-05-06 Dan Bernstein No way to get a WKWebProcessPlugInFrame’s parent frame diff --git a/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm b/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm index 0a354e68c68f..72ac3b4b4744 100644 --- a/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm +++ b/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm @@ -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:^{ -- 2.36.0