Unreviewed, rolling out r97549.

http://trac.webkit.org/changeset/97549 https://bugs.webkit.org/show_bug.cgi?id=70174 It broke the SL build (Requested by Ossy_weekend on #webkit). Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-10-15 * DerivedSources.pro: * Platform/CoreIPC/MessageID.h: * Scripts/webkit2/messages.py: * Shared/LayerTreeContext.h: * Shared/WebLayerTreeInfo.cpp: (WebKit::WebLayerInfo::encode): (WebKit::WebLayerInfo::decode): * Shared/WebLayerTreeInfo.h: * Shared/qt/LayerTreeContextQt.cpp: (WebKit::LayerTreeContext::LayerTreeContext): (WebKit::LayerTreeContext::~LayerTreeContext): (WebKit::LayerTreeContext::encode): (WebKit::LayerTreeContext::decode): (WebKit::LayerTreeContext::isEmpty): (WebKit::operator==): * UIProcess/DrawingAreaProxy.cpp: * UIProcess/DrawingAreaProxy.h: * UIProcess/DrawingAreaProxyImpl.cpp: (WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode): * UIProcess/DrawingAreaProxyImpl.h: * UIProcess/LayerTreeHostProxy.h: Removed. * UIProcess/LayerTreeHostProxy.messages.in: Removed. * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didReceiveMessage): * UIProcess/qt/LayerTreeHostProxyQt.cpp: Removed. * WebKit2.pro: * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp: (WebCore::deletedLayerIDs): (WebCore::WebGraphicsLayer::WebGraphicsLayer): (WebCore::WebGraphicsLayer::~WebGraphicsLayer): (WebCore::WebGraphicsLayer::setChildren): (WebCore::WebGraphicsLayer::addChild): (WebCore::WebGraphicsLayer::addChildAtIndex): (WebCore::WebGraphicsLayer::addChildAbove): (WebCore::WebGraphicsLayer::addChildBelow): (WebCore::WebGraphicsLayer::replaceChild): (WebCore::WebGraphicsLayer::removeFromParent): (WebCore::WebGraphicsLayer::setContentsRect): (WebCore::WebGraphicsLayer::setContentsToImage): (WebCore::WebGraphicsLayer::setNeedsDisplay): (WebCore::WebGraphicsLayer::setNeedsDisplayInRect): (WebCore::WebGraphicsLayer::setContentsNeedsDisplay): (WebCore::WebGraphicsLayer::didSynchronize): (WebCore::WebGraphicsLayer::layerInfo): (WebCore::WebGraphicsLayer::syncCompositingState): (WebCore::WebGraphicsLayer::needsDisplayRect): (WebCore::WebGraphicsLayer::takeLayersToDelete): (WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly): (WebCore::divideIntoTiles): (WebCore::collectCompositingInfoForThisLayer): (WebCore::collectCompositingInfoRecursively): (WebCore::WebGraphicsLayer::sendLayersToUIProcess): * WebProcess/WebCoreSupport/WebGraphicsLayer.h: * WebProcess/WebPage/DrawingArea.h: * WebProcess/WebPage/DrawingAreaImpl.cpp: * WebProcess/WebPage/DrawingAreaImpl.h: * WebProcess/WebPage/LayerTreeHost.cpp: (WebKit::LayerTreeHost::create): * WebProcess/WebPage/LayerTreeHost.h: * WebProcess/WebPage/LayerTreeHost.messages.in: Removed. * WebProcess/WebPage/TiledDrawingArea.cpp: * WebProcess/WebPage/TiledDrawingArea.h: * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didReceiveMessage): * WebProcess/WebPage/qt/LayerTreeHostQt.cpp: * WebProcess/WebPage/qt/LayerTreeHostQt.h: Removed. Canonical link: https://commits.webkit.org/86282@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97554 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Oct 15, 2011 · 8bb0db6 · 8bb0db6
1 parent 24b8cd4
commit 8bb0db6
Show file tree

Hide file tree

Showing 30 changed files with 282 additions and 1,774 deletions.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,78 @@
+2011-10-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r97549.
+        http://trac.webkit.org/changeset/97549
+        https://bugs.webkit.org/show_bug.cgi?id=70174
+
+        It broke the SL build (Requested by Ossy_weekend on #webkit).
+
+        * DerivedSources.pro:
+        * Platform/CoreIPC/MessageID.h:
+        * Scripts/webkit2/messages.py:
+        * Shared/LayerTreeContext.h:
+        * Shared/WebLayerTreeInfo.cpp:
+        (WebKit::WebLayerInfo::encode):
+        (WebKit::WebLayerInfo::decode):
+        * Shared/WebLayerTreeInfo.h:
+        * Shared/qt/LayerTreeContextQt.cpp:
+        (WebKit::LayerTreeContext::LayerTreeContext):
+        (WebKit::LayerTreeContext::~LayerTreeContext):
+        (WebKit::LayerTreeContext::encode):
+        (WebKit::LayerTreeContext::decode):
+        (WebKit::LayerTreeContext::isEmpty):
+        (WebKit::operator==):
+        * UIProcess/DrawingAreaProxy.cpp:
+        * UIProcess/DrawingAreaProxy.h:
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
+        * UIProcess/DrawingAreaProxyImpl.h:
+        * UIProcess/LayerTreeHostProxy.h: Removed.
+        * UIProcess/LayerTreeHostProxy.messages.in: Removed.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didReceiveMessage):
+        * UIProcess/qt/LayerTreeHostProxyQt.cpp: Removed.
+        * WebKit2.pro:
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::deletedLayerIDs):
+        (WebCore::WebGraphicsLayer::WebGraphicsLayer):
+        (WebCore::WebGraphicsLayer::~WebGraphicsLayer):
+        (WebCore::WebGraphicsLayer::setChildren):
+        (WebCore::WebGraphicsLayer::addChild):
+        (WebCore::WebGraphicsLayer::addChildAtIndex):
+        (WebCore::WebGraphicsLayer::addChildAbove):
+        (WebCore::WebGraphicsLayer::addChildBelow):
+        (WebCore::WebGraphicsLayer::replaceChild):
+        (WebCore::WebGraphicsLayer::removeFromParent):
+        (WebCore::WebGraphicsLayer::setContentsRect):
+        (WebCore::WebGraphicsLayer::setContentsToImage):
+        (WebCore::WebGraphicsLayer::setNeedsDisplay):
+        (WebCore::WebGraphicsLayer::setNeedsDisplayInRect):
+        (WebCore::WebGraphicsLayer::setContentsNeedsDisplay):
+        (WebCore::WebGraphicsLayer::didSynchronize):
+        (WebCore::WebGraphicsLayer::layerInfo):
+        (WebCore::WebGraphicsLayer::syncCompositingState):
+        (WebCore::WebGraphicsLayer::needsDisplayRect):
+        (WebCore::WebGraphicsLayer::takeLayersToDelete):
+        (WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
+        (WebCore::divideIntoTiles):
+        (WebCore::collectCompositingInfoForThisLayer):
+        (WebCore::collectCompositingInfoRecursively):
+        (WebCore::WebGraphicsLayer::sendLayersToUIProcess):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+        * WebProcess/WebPage/DrawingArea.h:
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        * WebProcess/WebPage/LayerTreeHost.cpp:
+        (WebKit::LayerTreeHost::create):
+        * WebProcess/WebPage/LayerTreeHost.h:
+        * WebProcess/WebPage/LayerTreeHost.messages.in: Removed.
+        * WebProcess/WebPage/TiledDrawingArea.cpp:
+        * WebProcess/WebPage/TiledDrawingArea.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didReceiveMessage):
+        * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+        * WebProcess/WebPage/qt/LayerTreeHostQt.h: Removed.
+
 2011-10-15  No'am Rosenthal  <noam.rosenthal@nokia.com>
 
         [Qt][WK2] Synchronize tiling with accelerated compositing

diff --git a/Source/WebKit2/DerivedSources.pro b/Source/WebKit2/DerivedSources.pro
@@ -92,7 +92,6 @@ MESSAGE_RECEIVERS = \
     AuthenticationManager.messages.in \
     DownloadProxy.messages.in \
     DrawingAreaProxy.messages.in \
-    LayerTreeHostProxy.messages.in \
     PluginControllerProxy.messages.in \
     PluginProcess.messages.in \
     PluginProcessConnection.messages.in \
@@ -117,7 +116,6 @@ MESSAGE_RECEIVERS = \
     WebFullScreenManager.messages.in \
     WebFullScreenManagerProxy.messages.in \
     WebPage/DrawingArea.messages.in \
-    WebPage/LayerTreeHost.messages.in \
     WebPage/WebInspector.messages.in \
     WebPage/WebPage.messages.in \
     WebPageProxy.messages.in \

diff --git a/Source/WebKit2/Platform/CoreIPC/MessageID.h b/Source/WebKit2/Platform/CoreIPC/MessageID.h
@@ -38,7 +38,6 @@ enum MessageClass {
     MessageClassAuthenticationManager,
     MessageClassDrawingArea,
     MessageClassInjectedBundle,
-    MessageClassLayerTreeHost,
     MessageClassWebApplicationCacheManager,
     MessageClassWebCookieManager,
     MessageClassWebDatabaseManager,
@@ -55,7 +54,6 @@ enum MessageClass {
     // Messages sent by the web process to the UI process.
     MessageClassDownloadProxy,
     MessageClassDrawingAreaProxy,
-    MessageClassLayerTreeHostProxy,
     MessageClassWebApplicationCacheManagerProxy,
     MessageClassWebContext,
     MessageClassWebContextLegacy,

diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py
@@ -382,8 +382,6 @@ def headers_for_type(type):
         'WebKit::InjectedBundleUserMessageEncoder': [],
         'WebKit::WebContextUserMessageEncoder': [],
         'WebKit::WebGestureEvent': ['"WebEvent.h"'],
-        'WebKit::WebLayerID': ['"WebLayerTreeInfo.h"'],
-        'WebKit::WebLayerInfo': ['"WebLayerTreeInfo.h"'],
         'WebKit::WebKeyboardEvent': ['"WebEvent.h"'],
         'WebKit::WebMouseEvent': ['"WebEvent.h"'],
         'WebKit::WebTouchEvent': ['"WebEvent.h"'],

diff --git a/Source/WebKit2/Shared/LayerTreeContext.h b/Source/WebKit2/Shared/LayerTreeContext.h
@@ -47,8 +47,6 @@ class LayerTreeContext {
     uint32_t contextID;
 #elif PLATFORM(WIN)
     HWND window;
-#elif PLATFORM(QT)
-    uint32_t webLayerID;
 #endif
 };
 

diff --git a/Source/WebKit2/Shared/WebLayerTreeInfo.cpp b/Source/WebKit2/Shared/WebLayerTreeInfo.cpp
@@ -23,7 +23,6 @@
 
 #include "WebLayerTreeInfo.h"
 
-#include "Arguments.h"
 #include "SharedMemory.h"
 #include "WebCoreArgumentCoders.h"
 
@@ -34,17 +33,35 @@ namespace WebKit {
 void WebLayerInfo::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
     // We have to divide it to several lines, because CoreIPC::In/Out takes a maximum of 10 arguments.
-    encoder->encode(CoreIPC::In(id, name, parent, children, flags, replica, mask, imageBackingStoreID));
+    encoder->encode(CoreIPC::In(id, name, parent, children, flags, replica, mask));
     encoder->encode(CoreIPC::In(pos, size, transform, opacity, anchorPoint, childrenTransform, contentsRect));
+    encoder->encode(imageBackingStore ? imageBackingStore->size() : IntSize());
+
+    if (!imageBackingStore)
+        return;
+
+    ShareableBitmap::Handle imageHandle;
+    if (imageBackingStore->createHandle(imageHandle))
+        imageHandle.encode(encoder);
 }
 
 bool WebLayerInfo::decode(CoreIPC::ArgumentDecoder* decoder, WebLayerInfo& info)
 {
     // We have to divide it to several lines, because CoreIPC::In/Out takes a maximum of 10 arguments.
-    if (!decoder->decode(CoreIPC::Out(info.id, info.name, info.parent, info.children, info.flags, info.replica, info.mask, info.imageBackingStoreID)))
+    if (!decoder->decode(CoreIPC::Out(info.id, info.name, info.parent, info.children, info.flags, info.replica, info.mask)))
         return false;
     if (!decoder->decode(CoreIPC::Out(info.pos, info.size, info.transform, info.opacity, info.anchorPoint, info.childrenTransform, info.contentsRect)))
         return false;
+
+    IntSize imageBackingStoreSize;
+    if (!decoder->decode(imageBackingStoreSize))
+        return false;
+    if (imageBackingStoreSize.isEmpty())
+        return true;
+
+    ShareableBitmap::Handle imageHandle;
+    if (ShareableBitmap::Handle::decode(decoder, imageHandle))
+        info.imageBackingStore = ShareableBitmap::create(imageHandle);
     return true;
 }
 

diff --git a/Source/WebKit2/Shared/WebLayerTreeInfo.h b/Source/WebKit2/Shared/WebLayerTreeInfo.h
@@ -34,7 +34,6 @@ using namespace WebCore;
 namespace WebKit {
 
 typedef uint32_t WebLayerID;
-enum { InvalidWebLayerID = 0 };
 
 struct WebLayerUpdateInfo {
     WebLayerUpdateInfo() { }
@@ -55,7 +54,6 @@ struct WebLayerInfo {
     WebLayerID parent;
     WebLayerID replica;
     WebLayerID mask;
-    int64_t imageBackingStoreID;
 
     FloatPoint pos;
     FloatPoint3D anchorPoint;
@@ -73,8 +71,6 @@ struct WebLayerInfo {
             bool masksToBounds : 1;
             bool preserves3D : 1;
             bool contentNeedsDisplay : 1;
-            bool imageIsUpdated: 1;
-            bool isRootLayer: 1;
         };
         unsigned int flags;
     };

diff --git a/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp b/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp
@@ -26,38 +26,41 @@
 #include "config.h"
 #include "LayerTreeContext.h"
 
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
+#include "NotImplemented.h"
 
 namespace WebKit {
 
 LayerTreeContext::LayerTreeContext()
-    : webLayerID(0)
 {
+    notImplemented();
 }
 
 LayerTreeContext::~LayerTreeContext()
 {
+    notImplemented();
 }
 
-void LayerTreeContext::encode(CoreIPC::ArgumentEncoder* encoder) const
+void LayerTreeContext::encode(CoreIPC::ArgumentEncoder*) const
 {
-    encoder->encode(webLayerID);
+    notImplemented();
 }
 
-bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder* decoder, LayerTreeContext& context)
+bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder*, LayerTreeContext&)
 {
-    return decoder->decode(context.webLayerID);
+    notImplemented();
+    return true;
 }
 
 bool LayerTreeContext::isEmpty() const
 {
-    return !webLayerID;
+    notImplemented();
+    return true;
 }
 
-bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
+bool operator==(const LayerTreeContext&, const LayerTreeContext&)
 {
-    return a.webLayerID == b.webLayerID;
+    notImplemented();
+    return true;
 }
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp
@@ -28,10 +28,6 @@
 
 #include "WebPageProxy.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-#include "LayerTreeHostProxy.h"
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -57,16 +53,4 @@ void DrawingAreaProxy::setSize(const IntSize& size, const IntSize& scrollOffset)
     sizeDidChange();
 }
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-void DrawingAreaProxy::updateViewport()
-{
-    m_webPageProxy->setViewNeedsDisplay(viewportVisibleRect());
-}
-
-WebCore::IntRect DrawingAreaProxy::contentsRect() const
-{
-    return IntRect(IntPoint::zero(), m_webPageProxy->viewSize());
-}
-#endif
-
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.h b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -27,11 +27,9 @@
 #ifndef DrawingAreaProxy_h
 #define DrawingAreaProxy_h
 
-#include <CoreIPC/MessageID.h>
 #include "DrawingAreaInfo.h"
-#include <WebCore/IntRect.h>
-#include <WebCore/IntSize.h>
 #include <stdint.h>
+#include <WebCore/IntSize.h>
 #include <wtf/Noncopyable.h>
 
 #if PLATFORM(QT)
@@ -47,17 +45,13 @@ namespace CoreIPC {
 }
 
 namespace WebCore {
-    class FloatPoint;
-    class TransformationMatrix;
+    class IntRect;
 }
 
 namespace WebKit {
 
 class LayerTreeContext;
-class LayerTreeHostProxy;
 class UpdateInfo;
-class WebLayerTreeInfo;
-class WebLayerUpdateInfo;
 class WebPageProxy;
 
 class DrawingAreaProxy {
@@ -83,24 +77,6 @@ class DrawingAreaProxy {
     const WebCore::IntSize& size() const { return m_size; }
     void setSize(const WebCore::IntSize&, const WebCore::IntSize& scrollOffset);
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-    virtual void updateViewport();
-    virtual WebCore::IntRect viewportVisibleRect() const { return contentsRect(); }
-    virtual WebCore::IntRect contentsRect() const;
-    virtual bool isBackingStoreReady() const { return true; }
-    virtual void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float opacity) { }
-
-#if ENABLE(TILED_BACKING_STORE)
-    virtual void setVisibleContentsRectAndScale(const WebCore::IntRect& visibleContentsRect, float scale) { }
-    virtual void setVisibleContentRectTrajectoryVector(const WebCore::FloatPoint&) { }
-    virtual void createTileForLayer(int layerID, int tileID, const WebKit::UpdateInfo&) { }
-    virtual void updateTileForLayer(int layerID, int tileID, const WebKit::UpdateInfo&) { }
-    virtual void removeTileForLayer(int layerID, int tileID) { }
-    virtual void didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments) { }
-
-    WebPageProxy* page() { return m_webPageProxy; }
-#endif
-#endif
 protected:
     explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy*);
 
@@ -110,10 +86,6 @@ class DrawingAreaProxy {
     WebCore::IntSize m_size;
     WebCore::IntSize m_scrollOffset;
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-    OwnPtr<LayerTreeHostProxy> m_layerTreeHostProxy;
-#endif
-
 private:
     virtual void sizeDidChange() = 0;
 

diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -34,10 +34,6 @@
 #include "WebProcessProxy.h"
 #include <WebCore/Region.h>
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-#include "LayerTreeHostProxy.h"
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -332,38 +328,8 @@ void DrawingAreaProxyImpl::enterAcceleratedCompositingMode(const LayerTreeContex
     m_backingStore = nullptr;
     m_layerTreeContext = layerTreeContext;
     m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
-#if USE(TEXTURE_MAPPER)
-    if (!m_layerTreeHostProxy)
-        m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this));
-#endif
-}
-
-#if ENABLE(TILED_BACKING_STORE)
-void DrawingAreaProxyImpl::didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
-{
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->didReceiveLayerTreeHostProxyMessage(connection, messageID, arguments);
-}
-
-void DrawingAreaProxyImpl::setVisibleContentsRectAndScale(const WebCore::IntRect& visibleContentsRect, float scale)
-{
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->setVisibleContentsRectAndScale(visibleContentsRect, scale);
-}
-
-void DrawingAreaProxyImpl::setVisibleContentRectTrajectoryVector(const WebCore::FloatPoint& trajectoryVector)
-{
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->setVisibleContentRectTrajectoryVector(trajectoryVector);
 }
 
-void DrawingAreaProxyImpl::paintToCurrentGLContext(const TransformationMatrix& matrix, float opacity)
-{
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->paintToCurrentGLContext(matrix, opacity);
-}
-#endif
-
 void DrawingAreaProxyImpl::exitAcceleratedCompositingMode()
 {
     ASSERT(isInAcceleratedCompositingMode());