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

Side by Side Diff: Source/core/layout/Layer.cpp

Issue 944923004: rendering/RenderBoxModelObject -> layout/LayoutBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | Source/core/layout/LayoutBoxModelObject.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 /* 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 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 } 867 }
868 868
869 if (parent()->renderer()->hasOverflowClip()) { 869 if (parent()->renderer()->hasOverflowClip()) {
870 IntSize scrollOffset = parent()->renderBox()->scrolledContentOffset( ); 870 IntSize scrollOffset = parent()->renderBox()->scrolledContentOffset( );
871 localPoint -= scrollOffset; 871 localPoint -= scrollOffset;
872 } 872 }
873 } 873 }
874 874
875 bool positionOrOffsetChanged = false; 875 bool positionOrOffsetChanged = false;
876 if (renderer()->isRelPositioned()) { 876 if (renderer()->isRelPositioned()) {
877 LayoutSize newOffset = toRenderBoxModelObject(renderer())->offsetForInFl owPosition(); 877 LayoutSize newOffset = toLayoutBoxModelObject(renderer())->offsetForInFl owPosition();
878 positionOrOffsetChanged = newOffset != m_offsetForInFlowPosition; 878 positionOrOffsetChanged = newOffset != m_offsetForInFlowPosition;
879 m_offsetForInFlowPosition = newOffset; 879 m_offsetForInFlowPosition = newOffset;
880 localPoint.move(m_offsetForInFlowPosition); 880 localPoint.move(m_offsetForInFlowPosition);
881 } else { 881 } else {
882 m_offsetForInFlowPosition = LayoutSize(); 882 m_offsetForInFlowPosition = LayoutSize();
883 } 883 }
884 884
885 // FIXME: We'd really like to just get rid of the concept of a layer rectang le and rely on the renderers. 885 // FIXME: We'd really like to just get rid of the concept of a layer rectang le and rely on the renderers.
886 localPoint.moveBy(-inlineBoundingBoxOffset); 886 localPoint.moveBy(-inlineBoundingBoxOffset);
887 887
(...skipping 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after
2950 } 2950 }
2951 } 2951 }
2952 2952
2953 void showLayerTree(const blink::LayoutObject* renderer) 2953 void showLayerTree(const blink::LayoutObject* renderer)
2954 { 2954 {
2955 if (!renderer) 2955 if (!renderer)
2956 return; 2956 return;
2957 showLayerTree(renderer->enclosingLayer()); 2957 showLayerTree(renderer->enclosingLayer());
2958 } 2958 }
2959 #endif 2959 #endif
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | Source/core/layout/LayoutBoxModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698