Title: [117856] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117855 => 117856)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 00:24:49 UTC (rev 117855)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 00:24:53 UTC (rev 117856)
@@ -1,5 +1,21 @@
2012-05-21 Lucas Forschler <[email protected]>
+ Merge 117623
+
+ 2012-05-18 Anders Carlsson <[email protected]>
+
+ PDF page does not show up when opened in the background
+ https://bugs.webkit.org/show_bug.cgi?id=86890
+ <rdar://problem/11259951>
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _updateAcceleratedCompositingMode:WebKit::]):
+ Just set the new render layer if we're already in accelerated compositing mode.
+
+2012-05-21 Lucas Forschler <[email protected]>
+
Merge 117516
2012-05-17 Anders Carlsson <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (117855 => 117856)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-22 00:24:49 UTC (rev 117855)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-22 00:24:53 UTC (rev 117856)
@@ -2511,8 +2511,13 @@
- (void)_updateAcceleratedCompositingMode:(const WebKit::LayerTreeContext&)layerTreeContext
{
- [self _exitAcceleratedCompositingMode];
- [self _enterAcceleratedCompositingMode:layerTreeContext];
+ if (_data->_layerHostingView) {
+ CALayer *renderLayer = WKMakeRenderLayer(layerTreeContext.contextID);
+ [[_data->_layerHostingView.get() layer] setSublayers:[NSArray arrayWithObject:renderLayer]];
+ } else {
+ [self _exitAcceleratedCompositingMode];
+ [self _enterAcceleratedCompositingMode:layerTreeContext];
+ }
}
- (void)_setAccessibilityWebProcessToken:(NSData *)data
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
