Source/core/rendering/RenderLayerBacking.h - Issue 24409003: Re-land r158052 after removing ASSERT_NOT_REACHED that caused crash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderLayerBacking.h

Issue 24409003: Re-land r158052 after removing ASSERT_NOT_REACHED that caused crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Return AnimatedPropertyInvalid if it is not supported. Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/core/platform/graphics/chromium/AnimationTranslationUtilTest.cpp ('k') | Source/core/rendering/RenderLayerBacking.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderLayerBacking.h

diff --git a/Source/core/rendering/RenderLayerBacking.h b/Source/core/rendering/RenderLayerBacking.h

index 6e388527935ebc964226463326cdc4174acf50c6..0a17874cec6d3c9a59fa3ab3c2cebe18df0422f5 100644

--- a/Source/core/rendering/RenderLayerBacking.h

+++ b/Source/core/rendering/RenderLayerBacking.h

@@ -37,6 +37,7 @@ namespace WebCore {

class KeyframeList;

class RenderLayerCompositor;

+class WebAnimationProvider;

enum CompositingLayerType {

NormalCompositingLayer, // non-tiled layer with backing store

@@ -244,9 +245,6 @@ private:

void doPaintTask(GraphicsLayerPaintInfo&, GraphicsContext*, const IntRect& clip);

- static CSSPropertyID graphicsLayerToCSSProperty(AnimatedPropertyID);

- static AnimatedPropertyID cssToGraphicsLayerProperty(CSSPropertyID);

RenderLayer* m_owningLayer;

// The hierarchy of layers that is maintained by the RenderLayerBacking looks like this:

@@ -316,6 +314,8 @@ private:

OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar;

OwnPtr<GraphicsLayer> m_layerForScrollCorner;

+ OwnPtr<WebAnimationProvider> m_animationProvider;

IntRect m_compositedBounds;

bool m_artificiallyInflatedBounds; // bounds had to be made non-zero to make transform-origin work