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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

Issue 2604083002: Remove infinite clip in PaintArtifactCompositor. (Closed)
Patch Set: none Created 3 years, 11 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/graphics/compositing/PaintArtifactCompositor.h" 5 #include "platform/graphics/compositing/PaintArtifactCompositor.h"
6 6
7 #include "cc/layers/content_layer_client.h" 7 #include "cc/layers/content_layer_client.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/layers/picture_layer.h" 9 #include "cc/layers/picture_layer.h"
10 #include "cc/playback/compositing_display_item.h" 10 #include "cc/playback/compositing_display_item.h"
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 success); 290 success);
291 DCHECK(success); 291 DCHECK(success);
292 // Clips are only in descendant spaces that are transformed by one 292 // Clips are only in descendant spaces that are transformed by one
293 // or more scrolls. 293 // or more scrolls.
294 DCHECK(localToAncestorMatrix.isIdentityOrTranslation()); 294 DCHECK(localToAncestorMatrix.isIdentityOrTranslation());
295 } 295 }
296 #endif 296 #endif
297 297
298 FloatRect combinedClip; 298 FloatRect combinedClip;
299 bool success = false; 299 bool success = false;
300 // TODO(chrishtr) :get rid of infiniteIntRect here. 300 combinedClip = geometryMapper.localToAncestorClipRect(localState,
301 combinedClip = geometryMapper.localToVisualRectInAncestorSpace( 301 ancestorState, success);
302 FloatRect(LayoutRect::infiniteIntRect()), localState, ancestorState,
303 success);
304
305 DCHECK(success); 302 DCHECK(success);
306 303
307 ccList.CreateAndAppendPairedBeginItem<cc::FloatClipDisplayItem>( 304 ccList.CreateAndAppendPairedBeginItem<cc::FloatClipDisplayItem>(
308 gfx::RectF(combinedClip)); 305 gfx::RectF(combinedClip));
309 endDisplayItems.push_back(EndClip); 306 endDisplayItems.push_back(EndClip);
310 } 307 }
311 308
312 static void recordPairedBeginDisplayItems( 309 static void recordPairedBeginDisplayItems(
313 const Vector<PropertyTreeState>& pairedStates, 310 const Vector<PropertyTreeState>& pairedStates,
314 const PropertyTreeState& pendingLayerState, 311 const PropertyTreeState& pendingLayerState,
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 #ifndef NDEBUG 1180 #ifndef NDEBUG
1184 void PaintArtifactCompositor::showDebugData() { 1181 void PaintArtifactCompositor::showDebugData() {
1185 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo) 1182 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo)
1186 ->toPrettyJSONString() 1183 ->toPrettyJSONString()
1187 .utf8() 1184 .utf8()
1188 .data(); 1185 .data();
1189 } 1186 }
1190 #endif 1187 #endif
1191 1188
1192 } // namespace blink 1189 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698