Title: [194575] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 194575
- Author
- [email protected]
- Date
- 2016-01-04 22:41:42 -0800 (Mon, 04 Jan 2016)
Log Message
Merge patch for rdar://problem/23893894.
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (194574 => 194575)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-05 06:35:41 UTC (rev 194574)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-05 06:41:42 UTC (rev 194575)
@@ -1,3 +1,7 @@
+2016-01-04 Babak Shafiei <[email protected]>
+
+ Merge patch for rdar://problem/23893894.
+
2015-12-18 Matthew Hanson <[email protected]>
Merge r194246. rdar://problem/23824469
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (194574 => 194575)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-05 06:35:41 UTC (rev 194574)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-05 06:41:42 UTC (rev 194575)
@@ -1131,12 +1131,7 @@
auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(snapshotSize), WebCore::ColorSpaceSRGB);
CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
- RefPtr<WebKit::ViewSnapshot> viewSnapshot = WebKit::ViewSnapshot::create(nullptr);
- WebCore::IOSurface::convertToFormat(WTF::move(surface), WebCore::IOSurface::Format::YUV422, [viewSnapshot](std::unique_ptr<WebCore::IOSurface> convertedSurface) {
- viewSnapshot->setSurface(WTF::move(convertedSurface));
- });
-
- return viewSnapshot;
+ return WebKit::ViewSnapshot::create(WTF::move(surface));
#else
uint32_t slotID = [WebKit::ViewSnapshotStore::snapshottingContext() createImageSlot:snapshotSize hasAlpha:YES];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
