Title: [87975] branches/safari-534-branch/Source
- Revision
- 87975
- Author
- lforsch...@apple.com
- Date
- 2011-06-02 17:50:33 -0700 (Thu, 02 Jun 2011)
Log Message
Merge r87768.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87974 => 87975)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-03 00:48:16 UTC (rev 87974)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-03 00:50:33 UTC (rev 87975)
@@ -1,5 +1,20 @@
2011-06-02 Lucas Forschler <lforsch...@apple.com>
+ Merged 87768.
+
+ 2011-05-31 Jer Noble <jer.no...@apple.com>
+
+ Reviewed by Darin Adler.
+
+ Flash of black at the end of full screen transition at apple.com product videos
+ https://bugs.webkit.org/show_bug.cgi?id=61756
+
+ Added two new entries to the WebCore exports list.
+
+ * WebCore.exp.in:
+
+2011-06-02 Lucas Forschler <lforsch...@apple.com>
+
Merged 87704.
2011-05-30 Eric Carlson <eric.carl...@apple.com>
Modified: branches/safari-534-branch/Source/WebCore/WebCore.exp.in (87974 => 87975)
--- branches/safari-534-branch/Source/WebCore/WebCore.exp.in 2011-06-03 00:48:16 UTC (rev 87974)
+++ branches/safari-534-branch/Source/WebCore/WebCore.exp.in 2011-06-03 00:50:33 UTC (rev 87975)
@@ -932,6 +932,7 @@
__ZN7WebCore9FrameView14setMarginWidthEi
__ZN7WebCore9FrameView14setNeedsLayoutEv
__ZN7WebCore9FrameView14setTransparentEb
+__ZNK7WebCore9FrameView13isTransparentEv
__ZN7WebCore9FrameView15setMarginHeightEi
__ZN7WebCore9FrameView16setPaintBehaviorEj
__ZN7WebCore9FrameView17setScrollPositionERKNS_8IntPointE
@@ -939,6 +940,7 @@
__ZN7WebCore9FrameView20enterCompositingModeEv
__ZN7WebCore9FrameView21flushDeferredRepaintsEv
__ZN7WebCore9FrameView22setBaseBackgroundColorERKNS_5ColorE
+__ZNK7WebCore9FrameView19baseBackgroundColorEv
__ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
__ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeEfNS_19AdjustViewSizeOrNotE
__ZN7WebCore9FrameView26adjustPageHeightDeprecatedEPffff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87974 => 87975)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-03 00:48:16 UTC (rev 87974)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-03 00:50:33 UTC (rev 87975)
@@ -1,5 +1,25 @@
2011-06-02 Lucas Forschler <lforsch...@apple.com>
+ Merged 87768.
+
+ 2011-05-31 Jer Noble <jer.no...@apple.com>
+
+ Reviewed by Darin Adler.
+
+ Flash of black at the end of full screen transition at apple.com product videos
+ https://bugs.webkit.org/show_bug.cgi?id=61756
+
+ The @"WebKitLayerHostChanged" notification is causing the QTMovie to tear down its layer
+ (which is good) at the wrong time (which is bad). Send this notification only after
+ the dragImage snapshot is taken. This exposed another problem, that the snapshot has
+ a white background. Set the default background color and transparency for the view (making
+ sure to reset them afterwards) to transparent.
+
+ * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
+ (WebKit::WebFullScreenManagerMac::setRootFullScreenLayer):
+
+2011-06-02 Lucas Forschler <lforsch...@apple.com>
+
Merged 87804.
2011-06-01 Adam Roben <aro...@apple.com>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm (87974 => 87975)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm 2011-06-03 00:48:16 UTC (rev 87974)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm 2011-06-03 00:50:33 UTC (rev 87975)
@@ -139,20 +139,29 @@
if (!layer) {
m_page->send(Messages::WebFullScreenManagerProxy::ExitAcceleratedCompositingMode());
- [[NSNotificationCenter defaultCenter] postNotificationName:@"WebKitLayerHostChanged" object:m_rootLayer->platformLayer() userInfo:nil];
Frame* frame = m_element->document()->frame();
- DragImageRef dragImage = frame ? frame->nodeImage(m_element.get()) : 0;
+ FrameView* view = frame ? frame->view() : 0;
+ DragImageRef dragImage = 0;
+ if (view) {
+ Color savedBackgroundColor = view->baseBackgroundColor();
+ bool savedIsTransparent = view->isTransparent();
+ view->setBaseBackgroundColor(Color::transparent);
+ view->setTransparent(true);
+ dragImage = frame->nodeImage(m_element.get());
+ view->setBaseBackgroundColor(savedBackgroundColor);
+ view->setTransparent(savedIsTransparent);
+ }
- if (m_rootLayer) {
- [CATransaction begin];
- PlatformLayer* rootPlatformLayer = m_rootLayer->platformLayer();
- m_rootLayer->removeAllChildren();
- m_rootLayer->syncCompositingStateForThisLayerOnly();
- m_rootLayer = nullptr;
- [rootPlatformLayer setContents:dragImage.get()];
- [CATransaction commit];
- }
+ [CATransaction begin];
+ PlatformLayer* rootPlatformLayer = m_rootLayer->platformLayer();
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"WebKitLayerHostChanged" object:rootPlatformLayer userInfo:nil];
+
+ m_rootLayer->removeAllChildren();
+ m_rootLayer->syncCompositingStateForThisLayerOnly();
+ m_rootLayer = nullptr;
+ [rootPlatformLayer setContents:dragImage.get()];
+ [CATransaction commit];
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes