Changeset 181587 in webkit

Timestamp:

Mar 16, 2015, 4:01:21 PM (11 years ago)

Author:

Brent Fulgham

Message:

WebKit1 Clients Are Not Reliably Repainted
​https://bugs.webkit.org/show_bug.cgi?id=142750
<rdar://problem/20042453>

Reviewed by Simon Fraser.

Source/WebCore:

• page/FrameView.cpp:

(WebCore::FrameView::paintContents): Move "Red Rect" debug painting before
the early return so we can see when this happening in debug builds.

• page/FrameView.h:

(WebCore::FrameView::inPaintableState): Added.

Source/WebKit/mac:

Check with the FrameView to see if we are in an immediately paintable state. If we are not,
mark the view as dirty once the _immediateScrollToPoint operation is complete so that the
region will be painted properly.

• WebView/WebClipView.mm:

(-[WebClipView _immediateScrollToPoint:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (2 diffs)
• WebCore/page/FrameView.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebClipView.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-16  Brent Fulgham  <bfulgham@apple.com>
+
+        WebKit1 Clients Are Not Reliably Repainted
+        https://bugs.webkit.org/show_bug.cgi?id=142750
+        <rdar://problem/20042453>
+
+        Reviewed by Simon Fraser.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::paintContents): Move "Red Rect" debug painting before
+        the early return so we can see when this happening in debug builds.
+        * page/FrameView.h:
+        (WebCore::FrameView::inPaintableState): Added.
+
 2015-03-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -3850 +3850 @@
 void FrameView::paintContents(GraphicsContext* context, const IntRect& dirtyRect)
 {
-    if (m_layoutPhase == InViewSizeAdjust)
-        return;
-
-    ASSERT(m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout);
-
 #ifndef NDEBUG
     bool fillWithRed;
@@ -3874 +3869 @@
 #endif
 
+    if (m_layoutPhase == InViewSizeAdjust)
+        return;
+    
+    ASSERT(m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout);
+    
     RenderView* renderView = this->renderView();
     if (!renderView) {

trunk/Source/WebCore/page/FrameView.h

@@ -114 +114 @@
     bool layoutPending() const;
     bool isInLayout() const { return m_layoutPhase == InLayout; }
+    WEBCORE_EXPORT bool inPaintableState() { return m_layoutPhase != InLayout && m_layoutPhase != InViewSizeAdjust && m_layoutPhase != InPostLayout; }
 
     RenderObject* layoutRoot(bool onlyDuringLayout = false) const;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-03-16  Brent Fulgham  <bfulgham@apple.com>
+
+        WebKit1 Clients Are Not Reliably Repainted
+        https://bugs.webkit.org/show_bug.cgi?id=142750
+        <rdar://problem/20042453>
+
+        Reviewed by Simon Fraser.
+
+        Check with the FrameView to see if we are in an immediately paintable state. If we are not,
+        mark the view as dirty once the _immediateScrollToPoint operation is complete so that the
+        region will be painted properly.
+
+        * WebView/WebClipView.mm:
+        (-[WebClipView _immediateScrollToPoint:]): 
+
 2015-03-16  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebClipView.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Apple Inc.  All rights reserved.
+ * Copyright (C) 2005, 2015 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112 +112 @@
     [[self window] _enableDelayedWindowDisplay];
 
+    // We may hit this immediate scrolling code during a layout operation trigged by an AppKit call. When
+    // this happens, WebCore will not paint. So, we need to mark this region dirty so that it paints properly.
+    WebFrameView *webFrameView = (WebFrameView *)[[self superview] superview];
+    if ([webFrameView isKindOfClass:[WebFrameView class]]) {
+        if (Frame* coreFrame = core([webFrameView webFrame])) {
+            if (FrameView* frameView = coreFrame->view()) {
+                if (!frameView->inPaintableState())
+                    [self setNeedsDisplay:YES];
+            }
+        }
+    }
+
     _isScrolling = NO;
 }