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

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

Issue 2575423003: Fix geometry mapping issues for float under inline (Closed)
Patch Set: SVG floating Created 3 years, 11 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) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // This code path should never be taken for SVG, as we're assuming 63 // This code path should never be taken for SVG, as we're assuming
64 // useTransforms=true everywhere, absoluteQuads should be used. 64 // useTransforms=true everywhere, absoluteQuads should be used.
65 ASSERT_NOT_REACHED(); 65 ASSERT_NOT_REACHED();
66 } 66 }
67 67
68 void LayoutSVGBlock::willBeDestroyed() { 68 void LayoutSVGBlock::willBeDestroyed() {
69 SVGResourcesCache::clientDestroyed(this); 69 SVGResourcesCache::clientDestroyed(this);
70 LayoutBlockFlow::willBeDestroyed(); 70 LayoutBlockFlow::willBeDestroyed();
71 } 71 }
72 72
73 void LayoutSVGBlock::updateFromStyle() {
74 LayoutBlockFlow::updateFromStyle();
75 setFloating(false);
wkorman 2017/01/04 22:27:08 What was causing floating to be set to true in som
Xianzhu 2017/01/04 22:49:59 isFloating() is set in LayoutBox::updateFromStyle(
76 }
77
73 void LayoutSVGBlock::styleDidChange(StyleDifference diff, 78 void LayoutSVGBlock::styleDidChange(StyleDifference diff,
74 const ComputedStyle* oldStyle) { 79 const ComputedStyle* oldStyle) {
75 if (diff.needsFullLayout()) { 80 if (diff.needsFullLayout()) {
76 setNeedsBoundariesUpdate(); 81 setNeedsBoundariesUpdate();
77 if (diff.transformChanged()) 82 if (diff.transformChanged())
78 setNeedsTransformUpdate(); 83 setNeedsTransformUpdate();
79 } 84 }
80 85
81 if (isBlendingAllowed()) { 86 if (isBlendingAllowed()) {
82 bool hasBlendModeChanged = 87 bool hasBlendModeChanged =
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 144
140 bool LayoutSVGBlock::nodeAtPoint(HitTestResult&, 145 bool LayoutSVGBlock::nodeAtPoint(HitTestResult&,
141 const HitTestLocation&, 146 const HitTestLocation&,
142 const LayoutPoint&, 147 const LayoutPoint&,
143 HitTestAction) { 148 HitTestAction) {
144 ASSERT_NOT_REACHED(); 149 ASSERT_NOT_REACHED();
145 return false; 150 return false;
146 } 151 }
147 152
148 } // namespace blink 153 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698