Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

1 files changed, 15 insertions, 9 deletions

diff --git a/Source/WebKit/chromium/src/WebContentLayerImpl.cpp b/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
index fa21e8974..862b19be6 100644
--- a/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
+++ b/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "WebContentLayerImpl.h"
 
+#include "ContentLayerChromium.h"
 #include "SkMatrix44.h"
 #include <public/WebContentLayerClient.h>
 #include <public/WebFloatPoint.h>
@@ -43,40 +44,45 @@ WebContentLayer* WebContentLayer::create(WebContentLayerClient* client)
 }
 
 WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client)
-    : m_webLayerImpl(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this))))
+    : m_layer(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this))))
     , m_client(client)
 {
-    m_webLayerImpl->layer()->setIsDrawable(true);
+    m_layer->layer()->setIsDrawable(true);
 }
 
 WebContentLayerImpl::~WebContentLayerImpl()
 {
-    static_cast<ContentLayerChromium*>(m_webLayerImpl->layer())->clearDelegate();
+    static_cast<ContentLayerChromium*>(m_layer->layer())->clearClient();
 }
 
 WebLayer* WebContentLayerImpl::layer()
 {
-    return m_webLayerImpl.get();
+    return m_layer.get();
 }
 
 void WebContentLayerImpl::setDoubleSided(bool doubleSided)
 {
-    m_webLayerImpl->layer()->setDoubleSided(doubleSided);
+    m_layer->layer()->setDoubleSided(doubleSided);
 }
 
-void WebContentLayerImpl::setContentsScale(float scale)
+void WebContentLayerImpl::setBoundsContainPageScale(bool boundsContainPageScale)
 {
-    m_webLayerImpl->layer()->setContentsScale(scale);
+    return m_layer->layer()->setBoundsContainPageScale(boundsContainPageScale);
+}
+
+bool WebContentLayerImpl::boundsContainPageScale() const
+{
+    return m_layer->layer()->boundsContainPageScale();
 }
 
 void WebContentLayerImpl::setUseLCDText(bool enable)
 {
-    m_webLayerImpl->layer()->setUseLCDText(enable);
+    m_layer->layer()->setUseLCDText(enable);
 }
 
 void WebContentLayerImpl::setDrawCheckerboardForMissingTiles(bool enable)
 {
-    m_webLayerImpl->layer()->setDrawCheckerboardForMissingTiles(enable);
+    m_layer->layer()->setDrawCheckerboardForMissingTiles(enable);
 }