Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot

1 files changed, 35 insertions, 4 deletions

diff --git a/Source/WebKit/chromium/src/WebLayer.cpp b/Source/WebKit/chromium/src/WebLayer.cpp
index ecf7452fc..3e6db47f5 100644
--- a/Source/WebKit/chromium/src/WebLayer.cpp
+++ b/Source/WebKit/chromium/src/WebLayer.cpp
@@ -35,6 +35,7 @@
 #include <public/WebFloatPoint.h>
 #include <public/WebFloatRect.h>
 #include <public/WebSize.h>
+#include <public/WebTransformationMatrix.h>
 
 using namespace WebCore;
 
@@ -228,6 +229,11 @@ void WebLayer::setSublayerTransform(const SkMatrix44& matrix)
     m_private->setSublayerTransform(transformationMatrixFromSkMatrix44(matrix));
 }
 
+void WebLayer::setSublayerTransform(const WebTransformationMatrix& matrix)
+{
+    m_private->setSublayerTransform(matrix.toWebCoreTransform());
+}
+
 SkMatrix44 WebLayer::sublayerTransform() const
 {
     return skMatrix44FromTransformationMatrix(m_private->sublayerTransform());
@@ -238,19 +244,34 @@ void WebLayer::setTransform(const SkMatrix44& matrix)
     m_private->setTransform(transformationMatrixFromSkMatrix44(matrix));
 }
 
+void WebLayer::setTransform(const WebTransformationMatrix& matrix)
+{
+    m_private->setTransform(matrix.toWebCoreTransform());
+}
+
 SkMatrix44 WebLayer::transform() const
 {
     return skMatrix44FromTransformationMatrix(m_private->transform());
 }
 
-void WebLayer::setDebugBorderColor(const WebColor& color)
+void WebLayer::setDrawsContent(bool drawsContent)
 {
-    m_private->setDebugBorderColor(color);
+    m_private->setIsDrawable(drawsContent);
 }
 
-void WebLayer::setDebugBorderWidth(float width)
+bool WebLayer::drawsContent() const
 {
-    m_private->setDebugBorderWidth(width);
+    return m_private->drawsContent();
+}
+
+void WebLayer::setPreserves3D(bool preserve3D)
+{
+    m_private->setPreserves3D(preserve3D);
+}
+
+void WebLayer::setBackgroundColor(WebColor color)
+{
+    m_private->setBackgroundColor(color);
 }
 
 void WebLayer::setFilters(const WebFilterOperations& filters)
@@ -263,6 +284,16 @@ void WebLayer::setBackgroundFilters(const WebFilterOperations& filters)
     m_private->setBackgroundFilters(filters.toFilterOperations());
 }
 
+void WebLayer::setDebugBorderColor(const WebColor& color)
+{
+    m_private->setDebugBorderColor(color);
+}
+
+void WebLayer::setDebugBorderWidth(float width)
+{
+    m_private->setDebugBorderWidth(width);
+}
+
 WebLayer::WebLayer(const PassRefPtr<LayerChromium>& node)
     : m_private(node)
 {