WIP - compositor worker mega patch.

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 42 matching lines @@
 #include "core/paint/PaintLayerStackingNodeIterator.h"
 #include "core/paint/PaintTiming.h"
 #include "core/paint/ScrollableAreaPainter.h"
 #include "core/paint/TransformRecorder.h"
 #include "core/plugins/PluginView.h"
 #include "platform/LengthFunctions.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/TransformState.h"
 #include "platform/graphics/BitmapImage.h"
+#include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipDisplayItem.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "platform/graphics/paint/TransformDisplayItem.h"
-#include "public/platform/WebCompositorMutableProperties.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 static IntRect clipBox(LayoutBox* layoutObject);
 
 static IntRect contentsRect(const LayoutObject* layoutObject)
@@ skipping 132 matching lines @@
 
 PassOwnPtr<GraphicsLayer> CompositedLayerMapping::createGraphicsLayer(CompositingReasons reasons)
 {
     GraphicsLayerFactory* graphicsLayerFactory = nullptr;
     if (Page* page = layoutObject()->frame()->page())
         graphicsLayerFactory = page->chromeClient().graphicsLayerFactory();
 
     OwnPtr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFactory, this);
 
     graphicsLayer->setCompositingReasons(reasons);
-    if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode())
-        graphicsLayer->setOwnerNodeId(DOMNodeIds::idForNode(owningNode));
-
     return graphicsLayer.release();
 }
 
 void CompositedLayerMapping::createPrimaryGraphicsLayer()
 {
     m_graphicsLayer = createGraphicsLayer(m_owningLayer.compositingReasons());
 
     updateOpacity(layoutObject()->styleRef());
     updateTransform(layoutObject()->styleRef());
     updateFilters(layoutObject()->styleRef());
@@ skipping 1287 matching lines @@
 }
 
 void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties()
 {
     if (!RuntimeEnabledFeatures::compositorWorkerEnabled())
         return;
 
     TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositedLayerMapping::updateElementId()");
 
     uint64_t elementId = 0;
-    uint32_t mainMutableProperties = WebCompositorMutablePropertyNone;
-    uint32_t scrollMutableProperties = WebCompositorMutablePropertyNone;
+    uint32_t mainMutableProperties = CompositorMutablePropertyNone;
+    uint32_t scrollMutableProperties = CompositorMutablePropertyNone;
 
     if (m_owningLayer.layoutObject()->style()->hasCompositorProxy()) {
         if (Node* owningNode = m_owningLayer.layoutObject()->generatingNode()) {
             if (owningNode->isElementNode()) {
                 Element* owningElement = toElement(owningNode);
                 uint32_t compositorMutableProperties = owningElement->compositorMutableProperties();
                 elementId = DOMNodeIds::idForNode(owningNode);
-                mainMutableProperties = (WebCompositorMutablePropertyOpacity | WebCompositorMutablePropertyTransform) & compositorMutableProperties;
-                scrollMutableProperties = (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop) & compositorMutableProperties;
+                mainMutableProperties = (CompositorMutablePropertyOpacity | CompositorMutablePropertyTransform) & compositorMutableProperties;
+                scrollMutableProperties = (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop) & compositorMutableProperties;
             }
         }
     }
 
     m_graphicsLayer->setElementId(elementId);
     m_graphicsLayer->setCompositorMutableProperties(mainMutableProperties);
 
     if (m_scrollingContentsLayer.get()) {
         m_scrollingContentsLayer->setElementId(elementId);
         m_scrollingContentsLayer->setCompositorMutableProperties(scrollMutableProperties);
@@ skipping 1030 matching lines @@
     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
         name = "Scrolling Block Selection Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink