Title: [162950] trunk/Source/WebKit2
- Revision
- 162950
- Author
- timothy_hor...@apple.com
- Date
- 2014-01-28 12:49:49 -0800 (Tue, 28 Jan 2014)
Log Message
Fix the Mountain Lion build.
* UIProcess/mac/ViewGestureController.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::removeSwipeSnapshot):
* UIProcess/mac/ViewSnapshotStore.mm:
(WebKit::ViewSnapshotStore::recordSnapshot):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (162949 => 162950)
--- trunk/Source/WebKit2/ChangeLog 2014-01-28 20:25:24 UTC (rev 162949)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-28 20:49:49 UTC (rev 162950)
@@ -1,5 +1,15 @@
2014-01-28 Tim Horton <timothy_hor...@apple.com>
+ Fix the Mountain Lion build.
+
+ * UIProcess/mac/ViewGestureController.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ * UIProcess/mac/ViewSnapshotStore.mm:
+ (WebKit::ViewSnapshotStore::recordSnapshot):
+
+2014-01-28 Tim Horton <timothy_hor...@apple.com>
+
Fix the iOS build.
* UIProcess/WebPageProxy.cpp:
Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm (162949 => 162950)
--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm 2014-01-28 20:25:24 UTC (rev 162949)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm 2014-01-28 20:49:49 UTC (rev 162950)
@@ -51,7 +51,9 @@
};
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
extern "C" IOReturn IOSurfaceSetPurgeable(IOSurfaceRef buffer, uint32_t newState, uint32_t *oldState);
+#endif
#if defined(__has_include) && __has_include(<QuartzCore/QuartzCorePrivate.h>)
#import <QuartzCore/QuartzCorePrivate.h>
@@ -294,8 +296,10 @@
RetainPtr<IOSurfaceRef> snapshot = ViewSnapshotStore::shared().snapshotAndRenderTreeSize(targetItem).first;
if (snapshot) {
- uint32_t purgeabilityState;
+ uint32_t purgeabilityState = kIOSurfacePurgeableNonVolatile;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
IOSurfaceSetPurgeable(snapshot.get(), kIOSurfacePurgeableNonVolatile, &purgeabilityState);
+#endif
if (purgeabilityState != kIOSurfacePurgeableEmpty)
[m_swipeSnapshotLayer setContents:(id)snapshot.get()];
@@ -403,9 +407,11 @@
if (m_activeGestureType != ViewGestureType::Swipe)
return;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
IOSurfaceRef snapshotSurface = (IOSurfaceRef)[m_swipeSnapshotLayer contents];
if (snapshotSurface)
IOSurfaceSetPurgeable(snapshotSurface, kIOSurfacePurgeableVolatile, nullptr);
+#endif
[m_webPageProxy.acceleratedCompositingRootLayer() setPosition:CGPointZero];
[m_swipeSnapshotLayer removeFromSuperlayer];
Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm (162949 => 162950)
--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2014-01-28 20:25:24 UTC (rev 162949)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2014-01-28 20:49:49 UTC (rev 162950)
@@ -48,7 +48,9 @@
};
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
extern "C" IOReturn IOSurfaceSetPurgeable(IOSurfaceRef buffer, uint32_t newState, uint32_t *oldState);
+#endif
using namespace WebCore;
@@ -179,7 +181,9 @@
snapshot.surfaceContext = surfaceAndContext.second;
snapshot.creationTime = std::chrono::steady_clock::now();
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
IOSurfaceSetPurgeable(snapshot.surface.get(), kIOSurfacePurgeableVolatile, nullptr);
+#endif
m_snapshotMap.add(item->snapshotUUID(), snapshot);
m_renderTreeSizeMap.add(item->snapshotUUID(), webPageProxy.renderTreeSize());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
