summaryrefslogtreecommitdiffstats
path: root/cc/LayerChromium.h
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-08 01:45:24 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-08 01:45:24 +0000
commit0f077a5f3e29d65a06794f44c31703421e1099b5 (patch)
treee03e164915723038aae056b913078d5ece62679b /cc/LayerChromium.h
parent495972babd62847cc623537adfadefe95bb728f7 (diff)
downloadchromium_src-0f077a5f3e29d65a06794f44c31703421e1099b5.zip
chromium_src-0f077a5f3e29d65a06794f44c31703421e1099b5.tar.gz
chromium_src-0f077a5f3e29d65a06794f44c31703421e1099b5.tar.bz2
Update cc snapshot to r127918
TBR=nduca@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/10917153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/LayerChromium.h')
-rw-r--r--cc/LayerChromium.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h
index aad1fe2..7b06a6d 100644
--- a/cc/LayerChromium.h
+++ b/cc/LayerChromium.h
@@ -224,6 +224,10 @@ public:
float contentsScale() const { return m_contentsScale; }
void setContentsScale(float);
+ // When true, the layer's contents are not scaled by the current page scale factor.
+ void setBoundsContainPageScale(bool);
+ bool boundsContainPageScale() const { return m_boundsContainPageScale; }
+
// Returns true if any of the layer's descendants has content to draw.
bool descendantDrawsContent();
@@ -359,6 +363,7 @@ private:
// Uses target surface space.
IntRect m_drawableContentRect;
float m_contentsScale;
+ bool m_boundsContainPageScale;
WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
WebKit::WebLayerScrollClient* m_layerScrollClient;