Title: [195775] branches/safari-601-branch/Source/WebCore
- Revision
- 195775
- Author
- [email protected]
- Date
- 2016-01-28 12:16:15 -0800 (Thu, 28 Jan 2016)
Log Message
Merged r192166. rdar://problem/22956040
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195774 => 195775)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 20:13:27 UTC (rev 195774)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 20:16:15 UTC (rev 195775)
@@ -1,3 +1,22 @@
+2016-01-28 Babak Shafiei <[email protected]>
+
+ Merge r192166.
+
+ 2015-11-09 Brent Fulgham <[email protected]>
+
+ [Win] Recognize context flush as an event that requires an update
+ https://bugs.webkit.org/show_bug.cgi?id=151001
+ <rdar://problem/22956040>
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
+ (WebCore::WKCACFViewLayerTreeHost::flushContext): Mark view as needing an update
+ when flushing so internal drawing code will do the paint.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintIntoLayer): Skip WK2 assert that does
+ not apply to Windows drawing path.
+
2016-01-28 Matthew Hanson <[email protected]>
Merge r195710. rdar://problem/24337780
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp (195774 => 195775)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp 2016-01-28 20:13:27 UTC (rev 195774)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp 2016-01-28 20:16:15 UTC (rev 195775)
@@ -154,6 +154,7 @@
void WKCACFViewLayerTreeHost::flushContext()
{
+ m_viewNeedsUpdate = true;
WKCACFViewFlushContext(m_view.get());
}
Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (195774 => 195775)
--- branches/safari-601-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-01-28 20:13:27 UTC (rev 195774)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-01-28 20:16:15 UTC (rev 195775)
@@ -2269,7 +2269,7 @@
PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase)
{
if ((paintsIntoWindow() || paintsIntoCompositedAncestor()) && paintingPhase != GraphicsLayerPaintChildClippingMask) {
-#if !PLATFORM(IOS)
+#if !PLATFORM(IOS) && !OS(WINDOWS)
// FIXME: Looks like the CALayer tree is out of sync with the GraphicsLayer heirarchy
// when pages are restored from the PageCache.
// <rdar://problem/8712587> ASSERT: When Going Back to Page with Plugins in PageCache
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
