Changeset 192166 in webkit

Timestamp:

Nov 9, 2015, 10:54:03 AM (11 years ago)

Author:

Brent Fulgham

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-09  Brent Fulgham  <bfulgham@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-11-09  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp

@@ -155 +155 @@
 void WKCACFViewLayerTreeHost::flushContext()
 {
+    m_viewNeedsUpdate = true;
     WKCACFViewFlushContext(m_view.get());
 }

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -2261 +2261 @@
 {
     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.