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

Unified Diff: Source/core/layout/line/InlineBox.h

Issue 1178473003: Vertical-aligned of LayoutText should not contribute to a layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add tables/mozilla/bugs/bug14323.html to TestExpectation for rebasing. Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/inline/vertical-align-text-inherit-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/InlineBox.h
diff --git a/Source/core/layout/line/InlineBox.h b/Source/core/layout/line/InlineBox.h
index 545c51c7b5c4604ce498fbdf06546b286a14e536..5662c9de8f0fce34b5e9d4d0eddfa196930ba5d3 100644
--- a/Source/core/layout/line/InlineBox.h
+++ b/Source/core/layout/line/InlineBox.h
@@ -279,7 +279,7 @@ public:
bool visibleToHitTestRequest(const HitTestRequest& request) const { return layoutObject().visibleToHitTestRequest(request); }
- EVerticalAlign verticalAlign() const { return layoutObject().style(m_bitfields.firstLine())->verticalAlign(); }
+ EVerticalAlign verticalAlign() const { return layoutObject().isText() ? ComputedStyle::initialVerticalAlign() : layoutObject().style(m_bitfields.firstLine())->verticalAlign(); }
// Use with caution! The type is not checked!
LayoutBoxModelObject* boxModelObject() const
« no previous file with comments | « LayoutTests/fast/inline/vertical-align-text-inherit-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698