Changeset 69997 in webkit

Timestamp:

Oct 18, 2010 2:55:21 PM (14 years ago)

Author:

andersca@apple.com

Message:

Don't try to change accelerated compositing mode if the web page is closed
​https://bugs.webkit.org/show_bug.cgi?id=47852

Reviewed by Simon Fraser.

changeAcceleratedCompositingMode ends up sending a sync message to the UI process which is unnecessary if
the UI process is being torn down.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):
(WebKit::WebPage::changeAcceleratedCompositingMode):
(WebKit::WebPage::close):

• WebProcess/WebPage/WebPage.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Don't try to change accelerated compositing mode if the web page is closed
+        https://bugs.webkit.org/show_bug.cgi?id=47852
+
+        changeAcceleratedCompositingMode ends up sending a sync message to the UI process which is unnecessary if
+        the UI process is being torn down.
+        
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        (WebKit::WebPage::changeAcceleratedCompositingMode):
+        (WebKit::WebPage::close):
+        * WebProcess/WebPage/WebPage.h:
+
 2010-10-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -102 +102 @@
     , m_drawingArea(DrawingArea::create(parameters.drawingAreaInfo.type, parameters.drawingAreaInfo.id, this))
     , m_isInRedo(false)
+    , m_isClosed(false)
 #if PLATFORM(MAC)
     , m_windowIsVisible(false)
@@ -228 +229 @@
 void WebPage::changeAcceleratedCompositingMode(WebCore::GraphicsLayer* layer)
 {
+    if (m_isClosed)
+        return;
+
     bool compositing = layer;
     
@@ -261 +265 @@
 void WebPage::close()
 {
+    if (m_isClosed)
+        return;
+
+    m_isClosed = true;
+
     if (WebProcess::shared().injectedBundle())
         WebProcess::shared().injectedBundle()->willDestroyPage(this);

trunk/WebKit2/WebProcess/WebPage/WebPage.h

@@ -242 +242 @@
 
     bool m_isInRedo;
+    bool m_isClosed;
 
 #if PLATFORM(MAC)