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

Side by Side Diff: Source/core/rendering/RenderLayer.cpp

Issue 454643002: Route selection bounds updates through WebLayerTreeView (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tests added Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 RenderLayerModelObject* transformedAncestor = paintInvalidationContainer->la yer()->enclosingTransformedAncestor()->renderer(); 537 RenderLayerModelObject* transformedAncestor = paintInvalidationContainer->la yer()->enclosingTransformedAncestor()->renderer();
538 LayoutPoint point = renderObject->positionFromPaintInvalidationContainer(pai ntInvalidationContainer, paintInvalidationState); 538 LayoutPoint point = renderObject->positionFromPaintInvalidationContainer(pai ntInvalidationContainer, paintInvalidationState);
539 if (!transformedAncestor) 539 if (!transformedAncestor)
540 return point; 540 return point;
541 541
542 point = LayoutPoint(paintInvalidationContainer->localToContainerPoint(point, transformedAncestor)); 542 point = LayoutPoint(paintInvalidationContainer->localToContainerPoint(point, transformedAncestor));
543 point.moveBy(-paintInvalidationContainer->layer()->groupedMapping()->squashi ngOffsetFromTransformedAncestor()); 543 point.moveBy(-paintInvalidationContainer->layer()->groupedMapping()->squashi ngOffsetFromTransformedAncestor());
544 return point; 544 return point;
545 } 545 }
546 546
547 void RenderLayer::mapPointToPaintBackingCoordinates(const RenderLayerModelObject * paintInvalidationContainer, FloatPoint& point)
chrishtr 2014/09/05 22:14:56 Almost all of this method is already present in Re
trchen 2014/09/06 00:06:26 Yep, this method maps from invalidation container
chrishtr 2014/09/06 00:12:19 No, you should use RenderLayer::positionFromPaintI
548 {
549 RenderLayer* paintInvalidationLayer = paintInvalidationContainer->layer();
550 if (!paintInvalidationLayer->groupedMapping()) {
551 point.move(paintInvalidationLayer->compositedLayerMapping()->contentOffs etInCompositingLayer());
552 return;
553 }
554
555 RenderLayerModelObject* transformedAncestor = paintInvalidationLayer->enclos ingTransformedAncestor()->renderer();
556 if (!transformedAncestor)
557 return;
558
559 // |paintInvalidationContainer| may have a local 2D transform on it, so take that into account when mapping into the space of the
560 // transformed ancestor.
561 point = paintInvalidationContainer->localToContainerPoint(point, transformed Ancestor);
562
563 point.moveBy(-paintInvalidationLayer->groupedMapping()->squashingOffsetFromT ransformedAncestor());
564 }
565
547 void RenderLayer::mapRectToPaintBackingCoordinates(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect) 566 void RenderLayer::mapRectToPaintBackingCoordinates(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect)
548 { 567 {
549 RenderLayer* paintInvalidationLayer = paintInvalidationContainer->layer(); 568 RenderLayer* paintInvalidationLayer = paintInvalidationContainer->layer();
550 if (!paintInvalidationLayer->groupedMapping()) { 569 if (!paintInvalidationLayer->groupedMapping()) {
551 rect.move(paintInvalidationLayer->compositedLayerMapping()->contentOffse tInCompositingLayer()); 570 rect.move(paintInvalidationLayer->compositedLayerMapping()->contentOffse tInCompositingLayer());
552 return; 571 return;
553 } 572 }
554 573
555 RenderLayerModelObject* transformedAncestor = paintInvalidationLayer->enclos ingTransformedAncestor()->renderer(); 574 RenderLayerModelObject* transformedAncestor = paintInvalidationLayer->enclos ingTransformedAncestor()->renderer();
556 if (!transformedAncestor) 575 if (!transformedAncestor)
(...skipping 3152 matching lines...) Expand 10 before | Expand all | Expand 10 after
3709 } 3728 }
3710 } 3729 }
3711 3730
3712 void showLayerTree(const blink::RenderObject* renderer) 3731 void showLayerTree(const blink::RenderObject* renderer)
3713 { 3732 {
3714 if (!renderer) 3733 if (!renderer)
3715 return; 3734 return;
3716 showLayerTree(renderer->enclosingLayer()); 3735 showLayerTree(renderer->enclosingLayer());
3717 } 3736 }
3718 #endif 3737 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698