Changeset 29415 in webkit

Timestamp:

Jan 11, 2008 12:50:52 PM (16 years ago)

Author:

Adam Roben

Message:

Fix Bug 16828: WebView never paints if first page load is canceled after being committed but before layout

<​http://bugs.webkit.org/show_bug.cgi?id=16828>
<rdar://5682402>

Now that we have 1) a real loader and 2) multiple FrameViews per
Frame, we no longer need the hackery we had in our WM_PAINT handler
that decided whether or not to paint. We now always want to paint,
letting the swapping of FrameViews that happens in
transitionToCommittedForNewPage handle which document gets painted.

Reviewed by Hyatt.

• WebView.cpp: (WebViewWndProc): Removed hackery that decided sometimes not to paint.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-01-11  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 16828: WebView never paints if first page load is canceled after being committed but before layout
+
+        <http://bugs.webkit.org/show_bug.cgi?id=16828>
+        <rdar://5682402>
+
+        Now that we have 1) a real loader and 2) multiple FrameViews per
+        Frame, we no longer need the hackery we had in our WM_PAINT handler
+        that decided whether or not to paint. We now always want to paint,
+        letting the swapping of FrameViews that happens in
+        transitionToCommittedForNewPage handle which document gets painted.
+
+        Reviewed by Hyatt.
+
+        * WebView.cpp:
+        (WebViewWndProc): Removed hackery that decided sometimes not to paint.
+
 2008-01-11  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/win/WebView.cpp

@@ -1585 +1585 @@
     switch (message) {
         case WM_PAINT: {
-            COMPtr<IWebDataSource> dataSource;
-            mainFrameImpl->dataSource(&dataSource);
-            Frame* coreFrame = core(mainFrameImpl);
-            if (!webView->isPainting() && (!dataSource || coreFrame && (coreFrame->view()->didFirstLayout() || !coreFrame->loader()->committedFirstRealDocumentLoad())))
-                webView->paint(0, 0);
-            else
-                ValidateRect(hWnd, 0);
+            webView->paint(0, 0);
             break;
         }