Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(865)

Side by Side Diff: Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.h

Issue 9958025: Merge 112436 - [chromium] layer->clipRect() is not initialized for layers that create a renderSurfa… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 const TransformationMatrix& replicaOriginTransform() const { return m_replic aOriginTransform; } 96 const TransformationMatrix& replicaOriginTransform() const { return m_replic aOriginTransform; }
97 97
98 void setReplicaScreenSpaceTransform(const TransformationMatrix& replicaScree nSpaceTransform) { m_replicaScreenSpaceTransform = replicaScreenSpaceTransform; } 98 void setReplicaScreenSpaceTransform(const TransformationMatrix& replicaScree nSpaceTransform) { m_replicaScreenSpaceTransform = replicaScreenSpaceTransform; }
99 const TransformationMatrix& replicaScreenSpaceTransform() const { return m_r eplicaScreenSpaceTransform; } 99 const TransformationMatrix& replicaScreenSpaceTransform() const { return m_r eplicaScreenSpaceTransform; }
100 100
101 bool targetSurfaceTransformsAreAnimating() const { return m_targetSurfaceTra nsformsAreAnimating; } 101 bool targetSurfaceTransformsAreAnimating() const { return m_targetSurfaceTra nsformsAreAnimating; }
102 void setTargetSurfaceTransformsAreAnimating(bool animating) { m_targetSurfac eTransformsAreAnimating = animating; } 102 void setTargetSurfaceTransformsAreAnimating(bool animating) { m_targetSurfac eTransformsAreAnimating = animating; }
103 bool screenSpaceTransformsAreAnimating() const { return m_screenSpaceTransfo rmsAreAnimating; } 103 bool screenSpaceTransformsAreAnimating() const { return m_screenSpaceTransfo rmsAreAnimating; }
104 void setScreenSpaceTransformsAreAnimating(bool animating) { m_screenSpaceTra nsformsAreAnimating = animating; } 104 void setScreenSpaceTransformsAreAnimating(bool animating) { m_screenSpaceTra nsformsAreAnimating = animating; }
105 105
106 // Usage: this clipRect should not be used if one of the two conditions is t rue: (a) clipRect() is empty, or (b) owningLayer->parent()->usesLayerClipping() is false.
106 void setClipRect(const IntRect&); 107 void setClipRect(const IntRect&);
107 const IntRect& clipRect() const { return m_clipRect; } 108 const IntRect& clipRect() const { return m_clipRect; }
108 109
109 void setContentRect(const IntRect&); 110 void setContentRect(const IntRect&);
110 const IntRect& contentRect() const { return m_contentRect; } 111 const IntRect& contentRect() const { return m_contentRect; }
111 112
112 void setSkipsDraw(bool skipsDraw) { m_skipsDraw = skipsDraw; } 113 void setSkipsDraw(bool skipsDraw) { m_skipsDraw = skipsDraw; }
113 bool skipsDraw() const { return m_skipsDraw; } 114 bool skipsDraw() const { return m_skipsDraw; }
114 115
115 void clearLayerList() { m_layerList.clear(); } 116 void clearLayerList() { m_layerList.clear(); }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // For CCLayerIteratorActions 177 // For CCLayerIteratorActions
177 int m_targetRenderSurfaceLayerIndexHistory; 178 int m_targetRenderSurfaceLayerIndexHistory;
178 int m_currentLayerIndexHistory; 179 int m_currentLayerIndexHistory;
179 friend struct CCLayerIteratorActions; 180 friend struct CCLayerIteratorActions;
180 }; 181 };
181 182
182 } 183 }
183 #endif // USE(ACCELERATED_COMPOSITING) 184 #endif // USE(ACCELERATED_COMPOSITING)
184 185
185 #endif 186 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698