summaryrefslogtreecommitdiff
path: root/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/LayerChromium.cpp')
-rw-r--r--Source/WebCore/platform/graphics/chromium/LayerChromium.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
index 76c065b52..3b9c36269 100644
--- a/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
+++ b/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
@@ -37,11 +37,12 @@
#include "cc/CCActiveAnimation.h"
#include "cc/CCAnimationEvents.h"
#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerAnimationDelegate.h"
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerTreeHost.h"
#include "cc/CCSettings.h"
+#include <public/WebAnimationDelegate.h>
+
using namespace std;
using WebKit::WebTransformationMatrix;
@@ -77,7 +78,7 @@ LayerChromium::LayerChromium()
, m_masksToBounds(false)
, m_opaque(false)
, m_doubleSided(true)
- , m_isNonCompositedContent(false)
+ , m_useLCDText(false)
, m_preserves3D(false)
, m_useParentBackfaceVisibility(false)
, m_alwaysReserveTextures(false)
@@ -109,9 +110,9 @@ LayerChromium::~LayerChromium()
removeAllChildren();
}
-void LayerChromium::setIsNonCompositedContent(bool isNonCompositedContent)
+void LayerChromium::setUseLCDText(bool useLCDText)
{
- m_isNonCompositedContent = isNonCompositedContent;
+ m_useLCDText = useLCDText;
}
void LayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
@@ -543,7 +544,7 @@ void LayerChromium::pushPropertiesTo(CCLayerImpl* layer)
layer->setDrawsContent(drawsContent());
layer->setFilters(filters());
layer->setBackgroundFilters(backgroundFilters());
- layer->setIsNonCompositedContent(m_isNonCompositedContent);
+ layer->setUseLCDText(m_useLCDText);
layer->setMasksToBounds(m_masksToBounds);
layer->setScrollable(m_scrollable);
layer->setShouldScrollOnMainThread(m_shouldScrollOnMainThread);