Changeset 151804 in webkit

Timestamp:

Jun 20, 2013, 2:28:20 PM (12 years ago)

Author:

Simon Fraser

Message:

FrameView needs to initialize paintsEntireContents on creation
​https://bugs.webkit.org/show_bug.cgi?id=117844

Source/WebCore:

Reviewed by Anders Carlsson.

In WebKit1, if the WebView is layer-backed, WebHTMLView gets a layer.
In this mode, FrameView::paintsEntireContents() is true. However,
we would only call setPaintsEntireContents(true) on the FrameView
when the view's layer-backed status changes. FrameView also needs
to fetch this state when it is initialized, because we may be creating
a new FrameView for an already layer-backed WebHTMLView.

• page/ChromeClient.h:

(WebCore::ChromeClient::shouldPaintEntireContents):

• page/FrameView.cpp:

(WebCore::FrameView::init):

Source/WebKit/mac:

Reviewed by Anders Carlsson.

In WebKit1, if the WebView is layer-backed, WebHTMLView gets a layer.
In this mode, FrameView::paintsEntireContents() is true. However,
we would only call setPaintsEntireContents(true) on the FrameView
when the view's layer-backed status changes. FrameView also needs
to fetch this state when it is initialized, because we may be creating
a new FrameView for an already layer-backed WebHTMLView.

• WebCoreSupport/WebChromeClient.h:
• WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::shouldPaintEntireContents):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebChromeClient.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        FrameView needs to initialize paintsEntireContents on creation
+        https://bugs.webkit.org/show_bug.cgi?id=117844
+
+        Reviewed by Anders Carlsson.
+
+        In WebKit1, if the WebView is layer-backed, WebHTMLView gets a layer.
+        In this mode, FrameView::paintsEntireContents() is true. However,
+        we would only call setPaintsEntireContents(true) on the FrameView
+        when the view's layer-backed status changes. FrameView also needs
+        to fetch this state when it is initialized, because we may be creating
+        a new FrameView for an already layer-backed WebHTMLView.
+
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::shouldPaintEntireContents):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::init):
+
 2013-06-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/ChromeClient.h

@@ -239 +239 @@
     virtual void elementDidFocus(const Node*) { };
     virtual void elementDidBlur(const Node*) { };
+    
+    virtual bool shouldPaintEntireContents() const { return false; }
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/Source/WebCore/page/FrameView.cpp

@@ -357 +357 @@
             setMarginHeight(marginHeight);
     }
+
+    Page* page = frame() ? frame()->page() : 0;
+    if (page && page->chrome().client()->shouldPaintEntireContents())
+        setPaintsEntireContents(true);
 }
     

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        FrameView needs to initialize paintsEntireContents on creation
+        https://bugs.webkit.org/show_bug.cgi?id=117844
+
+        Reviewed by Anders Carlsson.
+        
+        In WebKit1, if the WebView is layer-backed, WebHTMLView gets a layer.
+        In this mode, FrameView::paintsEntireContents() is true. However,
+        we would only call setPaintsEntireContents(true) on the FrameView
+        when the view's layer-backed status changes. FrameView also needs
+        to fetch this state when it is initialized, because we may be creating
+        a new FrameView for an already layer-backed WebHTMLView.
+
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::shouldPaintEntireContents):
+
 2013-06-19  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h

@@ -146 +146 @@
     virtual void elementDidBlur(const WebCore::Node*) OVERRIDE;
 
+    virtual bool shouldPaintEntireContents() const OVERRIDE;
+
 #if USE(ACCELERATED_COMPOSITING)
     virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) OVERRIDE;

trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

@@ -844 +844 @@
 }
 
+bool WebChromeClient::shouldPaintEntireContents() const
+{
+    NSView *documentView = [[[m_webView mainFrame] frameView] documentView];
+    return [documentView layer];
+}
+
 #if USE(ACCELERATED_COMPOSITING)