Initial scroll-blocks-on compositor integration

Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 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 62 matching lines @@
 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient* client)
 {
     return factory->createGraphicsLayer(client);
 }
 
 GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
     : m_client(client)
     , m_backgroundColor(Color::transparent)
     , m_opacity(1)
     , m_blendMode(WebBlendModeNormal)
+    , m_scrollBlocksOn(WebScrollBlocksOnNone)
     , m_hasTransformOrigin(false)
     , m_contentsOpaque(false)
     , m_shouldFlattenTransform(true)
     , m_backfaceVisibility(true)
     , m_masksToBounds(false)
     , m_drawsContent(false)
     , m_contentsVisible(true)
     , m_isRootForIsolatedGroup(false)
     , m_hasScrollParent(false)
     , m_hasClipParent(false)
@@ skipping 474 matching lines @@
 
     if (m_size != IntSize())
         json->setArray("bounds", sizeAsJSONArray(m_size));
 
     if (m_opacity != 1)
         json->setNumber("opacity", m_opacity);
 
     if (m_blendMode != WebBlendModeNormal)
         json->setString("blendMode", compositeOperatorName(CompositeSourceOver, m_blendMode));
 
+    if ((flags & LayerTreeIncludesScrollBlocksOn) && m_scrollBlocksOn) {
+        RefPtr<JSONArray> scrollBlocksOnJSON = adoptRef(new JSONArray);
+        if (m_scrollBlocksOn & WebScrollBlocksOnStartTouch)
+            scrollBlocksOnJSON->pushString("StartTouch");
+        if (m_scrollBlocksOn & WebScrollBlocksOnWheelEvent)
+            scrollBlocksOnJSON->pushString("WheelEvent");
+        if (m_scrollBlocksOn & WebScrollBlocksOnScrollEvent)
+            scrollBlocksOnJSON->pushString("ScrollEvent");
+        json->setArray("scrollBlocksOn", scrollBlocksOnJSON);
+    }
+
     if (m_isRootForIsolatedGroup)
         json->setBoolean("isolate", m_isRootForIsolatedGroup);
 
     if (m_contentsOpaque)
         json->setBoolean("contentsOpaque", m_contentsOpaque);
 
     if (!m_shouldFlattenTransform)
         json->setBoolean("shouldFlattenTransform", m_shouldFlattenTransform);
 
     if (m_3dRenderingContext) {
@@ skipping 282 matching lines @@
     float clampedOpacity = std::max(std::min(opacity, 1.0f), 0.0f);
     m_opacity = clampedOpacity;
     platformLayer()->setOpacity(opacity);
 }
 
 void GraphicsLayer::setBlendMode(WebBlendMode blendMode)
 {
     if (m_blendMode == blendMode)
         return;
     m_blendMode = blendMode;
-    platformLayer()->setBlendMode(WebBlendMode(blendMode));
+    platformLayer()->setBlendMode(blendMode);
+}
+
+void GraphicsLayer::setScrollBlocksOn(WebScrollBlocksOn scrollBlocksOn)
+{
+    if (m_scrollBlocksOn == scrollBlocksOn)
+        return;
+    m_scrollBlocksOn = scrollBlocksOn;
+    platformLayer()->setScrollBlocksOn(scrollBlocksOn);
 }
 
 void GraphicsLayer::setIsRootForIsolatedGroup(bool isolated)
 {
     if (m_isRootForIsolatedGroup == isolated)
         return;
     m_isRootForIsolatedGroup = isolated;
     platformLayer()->setIsRootForIsolatedGroup(isolated);
 }
 
@@ skipping 202 matching lines @@
 #ifndef NDEBUG
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif