Changeset 76143 in webkit

Timestamp:

Jan 19, 2011 11:26:55 AM (13 years ago)

Author:

andersca@apple.com

Message:

2011-01-19 Chris Marrin <​cmarrin@apple.com>

Reviewed by Simon Fraser.

WK2 - Multiple crashes in PlatformCALayer::replaceSublayer
​https://bugs.webkit.org/show_bug.cgi?id=52695

Added a hostingLayer as the parent of the existing drawingLayer.
The hostingLayer is now the root which is passed to the
remote context. It never changes except to track the size
of the window. The backingLayer is now a child of the
hostingLayer, which allow it to switch between tiled and
non-tiled.

I also now give back accurate settings for debug borders and
repaint counters.

• WebProcess/WebPage/LayerBackedDrawingArea.cpp: (WebKit::LayerBackedDrawingArea::LayerBackedDrawingArea): (WebKit::LayerBackedDrawingArea::setSize): (WebKit::LayerBackedDrawingArea::showDebugBorders): (WebKit::LayerBackedDrawingArea::showRepaintCounter):
• WebProcess/WebPage/LayerBackedDrawingArea.h:
• WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm: (WebKit::LayerBackedDrawingArea::platformInit): (WebKit::LayerBackedDrawingArea::attachCompositingContext): (WebKit::LayerBackedDrawingArea::syncCompositingLayers):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/DrawingAreaProxy.h (modified) (1 diff)
• UIProcess/DrawingAreaProxy.messages.in (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.cpp (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.h (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ -26 +26 @@
         (WebKit::LayerBackedDrawingArea::attachCompositingContext):
         (WebKit::LayerBackedDrawingArea::syncCompositingLayers):
+
+2011-01-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Send a new SetSize message if the size differs from the current size
+        https://bugs.webkit.org/show_bug.cgi?id=52728
+
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::didSetSize):
+        Add UpdateInfo parameter.
+
+        * UIProcess/DrawingAreaProxy.messages.in:
+        Add UpdateInfo parameter to the DidSetSize message.
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::didSetSize):
+        If the view size differs from the current size send another SetSize message.
+
+        * UIProcess/DrawingAreaProxyImpl.h:
+        Add UpdateInfo parameter to didSetSize.
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::setSize):
+        The DidSetSize message now takes an UpdateInfo parameter.
 
 2011-01-19  Anders Carlsson  <andersca@apple.com>

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

@@ -90 +90 @@
     // FIXME: These should be pure virtual.
     virtual void update(const UpdateInfo&) { }
-    virtual void didSetSize() { }
+    virtual void didSetSize(const UpdateInfo&) { }
 };
 

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in

@@ -23 +23 @@
 messages -> DrawingAreaProxy {
     Update(WebKit::UpdateInfo updateInfo)
-    DidSetSize()
+    DidSetSize(WebKit::UpdateInfo updateInfo)
 }

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

@@ -106 +106 @@
 }
 
-void DrawingAreaProxyImpl::didSetSize()
+void DrawingAreaProxyImpl::didSetSize(const UpdateInfo& updateInfo)
 {
     ASSERT(m_isWaitingForDidSetSize);
     m_isWaitingForDidSetSize = false;
 
-    // FIXME: Send a new SetSize message if needed.
+    if (m_size != updateInfo.viewSize)
+        sendSetSize();
 
     m_backingStore = nullptr;

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h

@@ -53 +53 @@
     // CoreIPC message handlers
     virtual void update(const UpdateInfo&);
-    virtual void didSetSize();
+    virtual void didSetSize(const UpdateInfo&);
     
     void incorporateUpdate(const UpdateInfo&);

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -141 +141 @@
     m_webPage->layoutIfNeeded();
 
+    UpdateInfo updateInfo;
+    updateInfo.viewSize = m_webPage->size();
+
     // FIXME: Repaint.
 
-    m_webPage->send(Messages::DrawingAreaProxy::DidSetSize());
+    m_webPage->send(Messages::DrawingAreaProxy::DidSetSize(updateInfo));
 }