[webkit-changes] [192480] branches/safari-601.2.7.2-branch/Source/WebCore

Mon, 16 Nov 2015 12:43:14 -0800

Title: [192480] branches/safari-601.2.7.2-branch/Source/WebCore

Diff

Modified: branches/safari-601.2.7.2-branch/Source/WebCore/ChangeLog (192479 => 192480)


--- branches/safari-601.2.7.2-branch/Source/WebCore/ChangeLog	2015-11-16 19:45:15 UTC (rev 192479)
+++ branches/safari-601.2.7.2-branch/Source/WebCore/ChangeLog	2015-11-16 20:42:29 UTC (rev 192480)
@@ -1,3 +1,22 @@
+2015-11-16  Babak Shafiei  <bshaf...@apple.com>
+
+        Merge r192166.
+
+    2015-11-09  Brent Fulgham  <bfulg...@apple.com>
+
+            [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.
+
 2015-09-25  Brent Fulgham  <bfulg...@apple.com>
 
         Merge r190235. rdar://problem/22852382

Modified: branches/safari-601.2.7.2-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp (192479 => 192480)


--- branches/safari-601.2.7.2-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp	2015-11-16 19:45:15 UTC (rev 192479)
+++ branches/safari-601.2.7.2-branch/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp	2015-11-16 20:42:29 UTC (rev 192480)
@@ -154,6 +154,7 @@
 
 void WKCACFViewLayerTreeHost::flushContext()
 {
+    m_viewNeedsUpdate = true;
     WKCACFViewFlushContext(m_view.get());
 }

Modified: branches/safari-601.2.7.2-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (192479 => 192480)


--- branches/safari-601.2.7.2-branch/Source/WebCore/rendering/RenderLayerBacking.cpp	2015-11-16 19:45:15 UTC (rev 192479)
+++ branches/safari-601.2.7.2-branch/Source/WebCore/rendering/RenderLayerBacking.cpp	2015-11-16 20:42:29 UTC (rev 192480)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to