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

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

Issue 2893833004: When moving past a left-hand scrollbar, don't jump way outside the content box. (Closed)
Patch Set: 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All right reserved. 4 * All right reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 UpdateLogicalWidthForRightAlignedBlock( 747 UpdateLogicalWidthForRightAlignedBlock(
748 Style()->IsLeftToRightDirection(), trailing_space_run, logical_left, 748 Style()->IsLeftToRightDirection(), trailing_space_run, logical_left,
749 total_logical_width, available_logical_width); 749 total_logical_width, available_logical_width);
750 else 750 else
751 UpdateLogicalWidthForLeftAlignedBlock( 751 UpdateLogicalWidthForLeftAlignedBlock(
752 Style()->IsLeftToRightDirection(), trailing_space_run, logical_left, 752 Style()->IsLeftToRightDirection(), trailing_space_run, logical_left,
753 total_logical_width, available_logical_width); 753 total_logical_width, available_logical_width);
754 break; 754 break;
755 } 755 }
756 if (ShouldPlaceBlockDirectionScrollbarOnLogicalLeft()) 756 if (ShouldPlaceBlockDirectionScrollbarOnLogicalLeft())
757 logical_left += VerticalScrollbarWidth(); 757 logical_left += VerticalScrollbarWidthClampedToContentBox();
758 } 758 }
759 759
760 static void UpdateLogicalInlinePositions(LayoutBlockFlow* block, 760 static void UpdateLogicalInlinePositions(LayoutBlockFlow* block,
761 LayoutUnit& line_logical_left, 761 LayoutUnit& line_logical_left,
762 LayoutUnit& line_logical_right, 762 LayoutUnit& line_logical_right,
763 LayoutUnit& available_logical_width, 763 LayoutUnit& available_logical_width,
764 bool first_line, 764 bool first_line,
765 IndentTextOrNot indent_text, 765 IndentTextOrNot indent_text,
766 LayoutUnit box_logical_height) { 766 LayoutUnit box_logical_height) {
767 LayoutUnit line_logical_height = 767 LayoutUnit line_logical_height =
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after
2651 2651
2652 bool LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const { 2652 bool LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
2653 // LayoutBlockFlow is in charge of paint invalidation of the first line. 2653 // LayoutBlockFlow is in charge of paint invalidation of the first line.
2654 if (FirstLineBox()) 2654 if (FirstLineBox())
2655 return false; 2655 return false;
2656 2656
2657 return LayoutBlock::PaintedOutputOfObjectHasNoEffectRegardlessOfSize(); 2657 return LayoutBlock::PaintedOutputOfObjectHasNoEffectRegardlessOfSize();
2658 } 2658 }
2659 2659
2660 } // namespace blink 2660 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698