Title: [187091] branches/safari-601.1-branch/Source
- Revision
- 187091
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 22:27:45 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r187039. rdar://problem/21474317
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187090 => 187091)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 05:27:42 UTC (rev 187090)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 05:27:45 UTC (rev 187091)
@@ -1,5 +1,22 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r187039. rdar://problem/21474317
+
+ 2015-07-20 Tim Horton <timothy_hor...@apple.com>
+
+ REGRESSION (r174287): Flash of black when opening a new web view or navigating to a new page
+ https://bugs.webkit.org/show_bug.cgi?id=147127
+ <rdar://problem/21474317>
+
+ Reviewed by Simon Fraser.
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::paintBoxDecorations):
+ Avoid using an invalid documentBackgroundColor, fall back to baseBackgroundColor
+ like we did before r174287.
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186910. rdar://problem/21863296
2015-07-16 Benjamin Poulain <bpoul...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderView.cpp (187090 => 187091)
--- branches/safari-601.1-branch/Source/WebCore/rendering/RenderView.cpp 2015-07-21 05:27:42 UTC (rev 187090)
+++ branches/safari-601.1-branch/Source/WebCore/rendering/RenderView.cpp 2015-07-21 05:27:45 UTC (rev 187091)
@@ -611,7 +611,8 @@
if (frameView().isTransparent()) // FIXME: This needs to be dynamic. We should be able to go back to blitting if we ever stop being transparent.
frameView().setCannotBlitToWindow(); // The parent must show behind the child.
else {
- Color backgroundColor = backgroundShouldExtendBeyondPage ? frameView().documentBackgroundColor() : frameView().baseBackgroundColor();
+ Color documentBackgroundColor = frameView().documentBackgroundColor();
+ Color backgroundColor = (backgroundShouldExtendBeyondPage && documentBackgroundColor.isValid()) ? documentBackgroundColor : frameView().baseBackgroundColor();
if (backgroundColor.alpha()) {
CompositeOperator previousOperator = paintInfo.context->compositeOperation();
paintInfo.context->setCompositeOperation(CompositeCopy);
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187090 => 187091)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-21 05:27:42 UTC (rev 187090)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-21 05:27:45 UTC (rev 187091)
@@ -1,5 +1,22 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r187039. rdar://problem/21474317
+
+ 2015-07-20 Tim Horton <timothy_hor...@apple.com>
+
+ REGRESSION (r174287): Flash of black when opening a new web view or navigating to a new page
+ https://bugs.webkit.org/show_bug.cgi?id=147127
+ <rdar://problem/21474317>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::snapshotAtSize):
+ Avoid using an invalid documentBackgroundColor, fall back to baseBackgroundColor
+ like we did before r174287.
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r187047. rdar://problem/20860410
2015-07-20 Gordon Sheridan <gordon_sheri...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (187090 => 187091)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-21 05:27:42 UTC (rev 187090)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-21 05:27:45 UTC (rev 187091)
@@ -1732,7 +1732,8 @@
auto graphicsContext = snapshot->bitmap()->createGraphicsContext();
- Color backgroundColor = coreFrame->settings().backgroundShouldExtendBeyondPage() ? frameView->documentBackgroundColor() : frameView->baseBackgroundColor();
+ Color documentBackgroundColor = frameView->documentBackgroundColor();
+ Color backgroundColor = (coreFrame->settings().backgroundShouldExtendBeyondPage() && documentBackgroundColor.isValid()) ? documentBackgroundColor : frameView->baseBackgroundColor();
graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), backgroundColor, ColorSpaceDeviceRGB);
if (!(options & SnapshotOptionsExcludeDeviceScaleFactor)) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
