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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp

Issue 2703673003: Revert of Work around one more callsite into PaintLayerClipper (Closed)
Patch Set: Created 3 years, 10 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@web.de> 10 * Christian Biesinger <cbiesinger@web.de>
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 // PaintLayer are in physical coordinates, so the overflow has to be 503 // PaintLayer are in physical coordinates, so the overflow has to be
504 // flipped. 504 // flipped.
505 layerBoundsWithVisualOverflow); 505 layerBoundsWithVisualOverflow);
506 mapLocalToRootWithGeometryMapper(context, layerBoundsWithVisualOverflow); 506 mapLocalToRootWithGeometryMapper(context, layerBoundsWithVisualOverflow);
507 clip.intersect(layerBoundsWithVisualOverflow); 507 clip.intersect(layerBoundsWithVisualOverflow);
508 } 508 }
509 509
510 ClipRect PaintLayerClipper::backgroundClipRect( 510 ClipRect PaintLayerClipper::backgroundClipRect(
511 const ClipRectsContext& context) const { 511 const ClipRectsContext& context) const {
512 if (m_geometryMapper) { 512 if (m_geometryMapper) {
513 // TODO(chrishtr): fix the underlying bug that causes this situation.
514 if (!m_layer.layoutObject()->paintProperties())
515 return ClipRect(LayoutRect(LayoutRect::infiniteIntRect()));
516
517 ClipRect backgroundClipRect = clipRectWithGeometryMapper(context, false); 513 ClipRect backgroundClipRect = clipRectWithGeometryMapper(context, false);
518 #ifdef CHECK_CLIP_RECTS 514 #ifdef CHECK_CLIP_RECTS
519 ClipRect testBackgroundClipRect = 515 ClipRect testBackgroundClipRect =
520 PaintLayerClipper(m_layer, nullptr).backgroundClipRect(context); 516 PaintLayerClipper(m_layer, nullptr).backgroundClipRect(context);
521 CHECK_RECTS_EQ(testBackgroundClipRect, backgroundClipRect); 517 CHECK_RECTS_EQ(testBackgroundClipRect, backgroundClipRect);
522 #endif 518 #endif
523 return backgroundClipRect; 519 return backgroundClipRect;
524 } 520 }
525 DCHECK(m_layer.parent()); 521 DCHECK(m_layer.parent());
526 LayoutView* layoutView = m_layer.layoutObject()->view(); 522 LayoutView* layoutView = m_layer.layoutObject()->view();
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 const LayoutSize& subpixelAccumulation) const { 586 const LayoutSize& subpixelAccumulation) const {
591 DCHECK(!m_geometryMapper); 587 DCHECK(!m_geometryMapper);
592 ClipRectsContext context(rootLayer, PaintingClipRects, 588 ClipRectsContext context(rootLayer, PaintingClipRects,
593 IgnoreOverlayScrollbarSize, subpixelAccumulation); 589 IgnoreOverlayScrollbarSize, subpixelAccumulation);
594 if (respectOverflowClip == IgnoreOverflowClip) 590 if (respectOverflowClip == IgnoreOverflowClip)
595 context.setIgnoreOverflowClip(); 591 context.setIgnoreOverflowClip();
596 return getClipRects(context); 592 return getClipRects(context);
597 } 593 }
598 594
599 } // namespace blink 595 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698