Changeset 247245 in webkit

Timestamp:

Jul 8, 2019 6:07:18 PM (5 years ago)

Author:

Fujii Hironori

Message:

[WinCairo] ASSERTION FAILED: info.bmBitsPixel == 32 in createCairoContextWithHDC
​https://bugs.webkit.org/show_bug.cgi?id=198323

Reviewed by Per Arne Vollan.

WebView::paint binds m_backingStoreBitmap to a DC by using
SelectObject. WebView::paint can be called recursively, but
m_backingStoreBitmap can't be bound to multiple DCs at the same
time. Then, SelectObject was failing in such case.

Call WebCore::Page::updateRendering before binding
m_backingStoreBitmap instead of after it.

Reverted r202744 change which won't be needed since this change.

• WebView.cpp:

(WebView::scrollBackingStore): Removed r202744's change.
(WebView::updateBackingStore): Removed m_page->updateRendering().
(WebView::paint): Do m_page->updateRendering() before binding m_backingStoreBitmap.

• WebView.h: Removed unused WebView::isPainting.

Location:

trunk/Source/WebKitLegacy/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (6 diffs)
• WebView.h (modified) (2 diffs)

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2019-07-08  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] ASSERTION FAILED: info.bmBitsPixel == 32 in createCairoContextWithHDC
+        https://bugs.webkit.org/show_bug.cgi?id=198323
+
+        Reviewed by Per Arne Vollan.
+
+        WebView::paint binds m_backingStoreBitmap to a DC by using
+        SelectObject. WebView::paint can be called recursively, but
+        m_backingStoreBitmap can't be bound to multiple DCs at the same
+        time. Then, SelectObject was failing in such case.
+
+        Call WebCore::Page::updateRendering before binding
+        m_backingStoreBitmap instead of after it.
+
+        Reverted r202744 change which won't be needed since this change.
+
+        * WebView.cpp:
+        (WebView::scrollBackingStore): Removed r202744's change.
+        (WebView::updateBackingStore): Removed m_page->updateRendering().
+        (WebView::paint): Do m_page->updateRendering() before binding m_backingStoreBitmap.
+        * WebView.h: Removed unused WebView::isPainting.
+
 2019-07-02  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKitLegacy/win/WebView.cpp

@@ -1016 +1016 @@
     auto bitmapDC = adoptGDIObject(::CreateCompatibleDC(windowDC));
     HGDIOBJ oldBitmap = ::SelectObject(bitmapDC.get(), m_backingStoreBitmap->get());
-    if (!oldBitmap) {
-        // The ::SelectObject call will fail if m_backingStoreBitmap is already selected into a device context.
-        // This happens when this method is called indirectly from WebView::updateBackingStore during normal WM_PAINT handling.
-        // There is no point continuing, since we would just be scrolling a 1x1 bitmap which is selected into the device context by default.
-        // We can just scroll by repainting the scroll rectangle.
-        RECT scrollRect(scrollViewRect);
-        ::InvalidateRect(m_viewWindow, &scrollRect, FALSE);
-        return;
-    }
+    ASSERT(oldBitmap);
 
     // Scroll the bitmap.
@@ -1165 +1157 @@
         bitmapDC = bitmapDCObject.get();
         oldBitmap = ::SelectObject(bitmapDC, m_backingStoreBitmap->get());
+        ASSERT(oldBitmap);
 #if USE(DIRECT2D)
         HRESULT hr = m_backingStoreGdiInterop->GetDC(D2D1_DC_INITIALIZE_MODE_COPY, &bitmapDC);
@@ -1172 +1165 @@
 
     if (m_backingStoreBitmap && (m_backingStoreDirtyRegion || backingStoreCompletelyDirty)) {
-        // Do a layout first so that everything we render to the backing store is always current.
-        m_page->updateRendering();
-
         Vector<IntRect> paintRects;
         if (!backingStoreCompletelyDirty && m_backingStoreDirtyRegion) {
@@ -1305 +1295 @@
         return;
     }
+
+    m_page->updateRendering();
 
     Frame* coreFrame = core(m_mainFrame);
@@ -1342 +1334 @@
     }
 
-    m_paintCount++;
-
     auto bitmapDC = adoptGDIObject(::CreateCompatibleDC(hdc));
     HGDIOBJ oldBitmap = ::SelectObject(bitmapDC.get(), m_backingStoreBitmap->get());
@@ -1377 +1367 @@
     m_backingStoreGdiInterop->ReleaseDC(nullptr);
 #endif
-
-    m_paintCount--;
 
     if (active())

trunk/Source/WebKitLegacy/win/WebView.h

@@ -476 +476 @@
     bool handleEditingKeyboardEvent(WebCore::KeyboardEvent&);
 
-    bool isPainting() const { return m_paintCount > 0; }
-
     void setToolTip(const WTF::String&);
 
@@ -671 +669 @@
     UChar m_currentCharacterCode { 0 };
     bool m_isBeingDestroyed { false };
-    unsigned m_paintCount { 0 };
     bool m_hasSpellCheckerDocumentTag { false };
     bool m_didClose { false };