Title: [195763] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 195763
- Author
- [email protected]
- Date
- 2016-01-28 11:07:40 -0800 (Thu, 28 Jan 2016)
Log Message
Merge follow-up fix for r194750.
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (195762 => 195763)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-28 19:04:06 UTC (rev 195762)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-28 19:07:40 UTC (rev 195763)
@@ -1,3 +1,7 @@
+2016-01-28 Babak Shafiei <[email protected]>
+
+ Follow-up fix for r194750.
+
2016-01-27 Babak Shafiei <[email protected]>
Merge r195651.
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (195762 => 195763)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-28 19:04:06 UTC (rev 195762)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-28 19:07:40 UTC (rev 195763)
@@ -1162,17 +1162,6 @@
WebCore::IOSurface::Format snapshotFormat = WebKit::bufferFormat(true /* is opaque */);
auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(snapshotSize), WebCore::ColorSpaceSRGB, snapshotFormat);
CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
-
- WebCore::IOSurface::Format compressedFormat = WebCore::IOSurface::Format::YUV422;
- if (WebCore::IOSurface::allowConversionFromFormatToFormat(snapshotFormat, compressedFormat)) {
- 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
