Chromium Code Reviews| Index: Source/core/rendering/RenderBlock.cpp |
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
| index dcfc9037449d93cf40bbe05936f79bd6f8ad1540..b88c976a3f1366a7edf188f6609cc8d38ac6c213 100644 |
| --- a/Source/core/rendering/RenderBlock.cpp |
| +++ b/Source/core/rendering/RenderBlock.cpp |
| @@ -3381,7 +3381,7 @@ int RenderBlock::baselinePosition(FontBaseline baselineType, bool firstLine, Lin |
| // (the content inside them moves). This matches WinIE as well, which just bottom-aligns them. |
| // We also give up on finding a baseline if we have a vertical scrollbar, or if we are scrolled |
| // vertically (e.g., an overflow:hidden block that has had scrollTop moved). |
| - bool ignoreBaseline = (layer() && layer()->scrollableArea() && (isMarquee() || (direction == HorizontalLine ? (layer()->scrollableArea()->verticalScrollbar() || layer()->scrollableArea()->scrollYOffset()) |
| + bool ignoreBaseline = (layer() && layer()->scrollableArea() && ((direction == HorizontalLine ? (layer()->scrollableArea()->verticalScrollbar() || layer()->scrollableArea()->scrollYOffset()) |
|
Mike West
2014/10/06 20:04:01
Nit: This is hard to parse. Perhaps you could move
Hajime Morrita
2014/10/06 20:22:10
Done.
|
| : (layer()->scrollableArea()->horizontalScrollbar() || layer()->scrollableArea()->scrollXOffset())))) || (isWritingModeRoot() && !isRubyRun()); |
| int baselinePos = ignoreBaseline ? -1 : inlineBlockBaseline(direction); |