Changeset 139252 in webkit

Timestamp:

Jan 9, 2013 4:18:15 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Add a notification when a WebWidget's WebLayerTreeView is about to go away
​https://bugs.webkit.org/show_bug.cgi?id=106495

Patch by James Robinson <​jamesr@chromium.org> on 2013-01-09
Reviewed by Adrienne Walker.

The WebWidget / WebLayerTreeView ownership is in a slightly awkward place. I'm moving the ownership
of the WebLayerTreeView to the WebWidgetClient, but to stage things sanely the WebLayerTreeView's
client is sill owned by the WebWidget implementation. Thus to shut down cleanly we need an explicit
notification to the WebWidget that the WebLayerTreeView is going to go away.

This API can go away once the WebWidget implementation does not provide the WebLayerTreeViewClient,
which will take a bit more refactoring.

• public/WebWidget.h:

(WebWidget):
(WebKit::WebWidget::willCloseLayerTreeView):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::willCloseLayerTreeView):
(WebKit):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebWidget.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)
• src/WebViewImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-09  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Add a notification when a WebWidget's WebLayerTreeView is about to go away
+        https://bugs.webkit.org/show_bug.cgi?id=106495
+
+        Reviewed by Adrienne Walker.
+
+        The WebWidget / WebLayerTreeView ownership is in a slightly awkward place. I'm moving the ownership
+        of the WebLayerTreeView to the WebWidgetClient, but to stage things sanely the WebLayerTreeView's
+        client is sill owned by the WebWidget implementation. Thus to shut down cleanly we need an explicit
+        notification to the WebWidget that the WebLayerTreeView is going to go away.
+
+        This API can go away once the WebWidget implementation does not provide the WebLayerTreeViewClient,
+        which will take a bit more refactoring.
+
+        * public/WebWidget.h:
+        (WebWidget):
+        (WebKit::WebWidget::willCloseLayerTreeView):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::willCloseLayerTreeView):
+        (WebKit):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2013-01-09  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebWidget.h

@@ -221 +221 @@
     virtual bool isAcceleratedCompositingActive() const { return false; }
 
+    // The WebLayerTreeView initialized on this WebWidgetClient will be going away and
+    // is no longer safe to access.
+    virtual void willCloseLayerTreeView() { }
+
     // Calling WebWidgetClient::requestPointerLock() will result in one
     // return call to didAcquirePointerLock() or didNotAcquirePointerLock().

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -2515 +2515 @@
 }
 
+void WebViewImpl::willCloseLayerTreeView()
+{
+    setIsAcceleratedCompositingActive(false);
+    m_layerTreeView = 0;
+}
+
 void WebViewImpl::didAcquirePointerLock()
 {

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -177 +177 @@
     virtual void setTextDirection(WebTextDirection direction);
     virtual bool isAcceleratedCompositingActive() const;
+    virtual void willCloseLayerTreeView();
     virtual void didAcquirePointerLock();
     virtual void didNotAcquirePointerLock();