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

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

Issue 497153003: Fix squashing to treat perspective and preserve3d elements as transform ancestors. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed. Created 6 years, 4 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 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 RenderLayer* curr = parent(); 900 RenderLayer* curr = parent();
901 while (curr && !curr->isPositionedContainer()) 901 while (curr && !curr->isPositionedContainer())
902 curr = curr->parent(); 902 curr = curr->parent();
903 903
904 return curr; 904 return curr;
905 } 905 }
906 906
907 RenderLayer* RenderLayer::enclosingTransformedAncestor() const 907 RenderLayer* RenderLayer::enclosingTransformedAncestor() const
908 { 908 {
909 RenderLayer* curr = parent(); 909 RenderLayer* curr = parent();
910 while (curr && !curr->isRootLayer() && !curr->transform()) 910 while (curr && !curr->isRootLayer() && !curr->renderer()->hasTransform())
911 curr = curr->parent(); 911 curr = curr->parent();
912 912
913 return curr; 913 return curr;
914 } 914 }
915 915
916 LayoutPoint RenderLayer::computeOffsetFromTransformedAncestor() const 916 LayoutPoint RenderLayer::computeOffsetFromTransformedAncestor() const
917 { 917 {
918 const AncestorDependentCompositingInputs& properties = ancestorDependentComp ositingInputs(); 918 const AncestorDependentCompositingInputs& properties = ancestorDependentComp ositingInputs();
919 919
920 TransformState transformState(TransformState::ApplyTransformDirection, Float Point()); 920 TransformState transformState(TransformState::ApplyTransformDirection, Float Point());
(...skipping 2787 matching lines...) Expand 10 before | Expand all | Expand 10 after
3708 } 3708 }
3709 } 3709 }
3710 3710
3711 void showLayerTree(const blink::RenderObject* renderer) 3711 void showLayerTree(const blink::RenderObject* renderer)
3712 { 3712 {
3713 if (!renderer) 3713 if (!renderer)
3714 return; 3714 return;
3715 showLayerTree(renderer->enclosingLayer()); 3715 showLayerTree(renderer->enclosingLayer());
3716 } 3716 }
3717 #endif 3717 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698