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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp

Issue 2835153002: Fix percent height calc for svg docs. (Closed)
Patch Set: Split percent height test into percent-height.svg Created 3 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. 5 * Copyright (C) 2009 Google, Inc.
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "core/layout/svg/LayoutSVGRoot.h" 24 #include "core/layout/svg/LayoutSVGRoot.h"
25 25
26 #include "core/frame/LocalFrame.h" 26 #include "core/frame/LocalFrame.h"
27 #include "core/layout/HitTestResult.h" 27 #include "core/layout/HitTestResult.h"
28 #include "core/layout/LayoutAnalyzer.h" 28 #include "core/layout/LayoutAnalyzer.h"
29 #include "core/layout/LayoutView.h"
29 #include "core/layout/api/LayoutPartItem.h" 30 #include "core/layout/api/LayoutPartItem.h"
30 #include "core/layout/svg/LayoutSVGText.h" 31 #include "core/layout/svg/LayoutSVGText.h"
31 #include "core/layout/svg/SVGLayoutSupport.h" 32 #include "core/layout/svg/SVGLayoutSupport.h"
32 #include "core/layout/svg/SVGResourcesCache.h" 33 #include "core/layout/svg/SVGResourcesCache.h"
33 #include "core/paint/PaintLayer.h" 34 #include "core/paint/PaintLayer.h"
34 #include "core/paint/SVGRootPainter.h" 35 #include "core/paint/SVGRootPainter.h"
35 #include "core/svg/SVGElement.h" 36 #include "core/svg/SVGElement.h"
36 #include "core/svg/SVGSVGElement.h" 37 #include "core/svg/SVGSVGElement.h"
37 #include "core/svg/graphics/SVGImage.h" 38 #include "core/svg/graphics/SVGImage.h"
38 #include "platform/LengthFunctions.h" 39 #include "platform/LengthFunctions.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // When we're embedded through SVGImage 128 // When we're embedded through SVGImage
128 // (border-image/background-image/<html:img>/...) we're forced to resize to a 129 // (border-image/background-image/<html:img>/...) we're forced to resize to a
129 // specific size. 130 // specific size.
130 if (!container_size_.IsEmpty()) 131 if (!container_size_.IsEmpty())
131 return LayoutUnit(container_size_.Height()); 132 return LayoutUnit(container_size_.Height());
132 133
133 if (IsEmbeddedThroughFrameContainingSVGDocument()) 134 if (IsEmbeddedThroughFrameContainingSVGDocument())
134 return ContainingBlock()->AvailableLogicalHeight( 135 return ContainingBlock()->AvailableLogicalHeight(
135 kIncludeMarginBorderPadding); 136 kIncludeMarginBorderPadding);
136 137
138 const Length& logical_height = Style()->LogicalHeight();
139 if (IsDocumentElement() && logical_height.IsPercentOrCalc()) {
140 return ValueForLength(
141 logical_height,
142 GetDocument().GetLayoutView()->ViewLogicalHeightForPercentages());
143 }
144
137 return LayoutReplaced::ComputeReplacedLogicalHeight(estimated_used_width); 145 return LayoutReplaced::ComputeReplacedLogicalHeight(estimated_used_width);
138 } 146 }
139 147
140 void LayoutSVGRoot::UpdateLayout() { 148 void LayoutSVGRoot::UpdateLayout() {
141 DCHECK(NeedsLayout()); 149 DCHECK(NeedsLayout());
142 LayoutAnalyzer::Scope analyzer(*this); 150 LayoutAnalyzer::Scope analyzer(*this);
143 151
144 LayoutSize old_size = Size(); 152 LayoutSize old_size = Size();
145 UpdateLogicalWidth(); 153 UpdateLogicalWidth();
146 UpdateLogicalHeight(); 154 UpdateLogicalHeight();
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 if (result.AddNodeToListBasedTestResult(GetNode(), location_in_container, 494 if (result.AddNodeToListBasedTestResult(GetNode(), location_in_container,
487 bounds_rect) == kStopHitTesting) 495 bounds_rect) == kStopHitTesting)
488 return true; 496 return true;
489 } 497 }
490 } 498 }
491 499
492 return false; 500 return false;
493 } 501 }
494 502
495 } // namespace blink 503 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698