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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 25373006: Correction to layoutOverflowRect in case of direction:rtl (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. 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
(...skipping 1528 matching lines...) Expand 10 before | Expand all | Expand 10 after
1539 TrackedRendererListHashSet* positionedDescendants = positionedObjects(); 1539 TrackedRendererListHashSet* positionedDescendants = positionedObjects();
1540 if (!positionedDescendants) 1540 if (!positionedDescendants)
1541 return; 1541 return;
1542 1542
1543 RenderBox* positionedObject; 1543 RenderBox* positionedObject;
1544 TrackedRendererListHashSet::iterator end = positionedDescendants->end(); 1544 TrackedRendererListHashSet::iterator end = positionedDescendants->end();
1545 for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin( ); it != end; ++it) { 1545 for (TrackedRendererListHashSet::iterator it = positionedDescendants->begin( ); it != end; ++it) {
1546 positionedObject = *it; 1546 positionedObject = *it;
1547 1547
1548 // Fixed positioned elements don't contribute to layout overflow, since they don't scroll with the content. 1548 // Fixed positioned elements don't contribute to layout overflow, since they don't scroll with the content.
1549 if (positionedObject->style()->position() != FixedPosition) { 1549 if (positionedObject->style()->position() != FixedPosition)
1550 LayoutUnit x = positionedObject->x(); 1550 addOverflowFromChild(positionedObject, LayoutSize(positionedObject-> x(), positionedObject->y()));
1551 if (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
1552 x -= verticalScrollbarWidth();
1553 addOverflowFromChild(positionedObject, LayoutSize(x, positionedObjec t->y()));
1554 }
1555 } 1551 }
1556 } 1552 }
1557 1553
1558 void RenderBlock::addVisualOverflowFromTheme() 1554 void RenderBlock::addVisualOverflowFromTheme()
1559 { 1555 {
1560 if (!style()->hasAppearance()) 1556 if (!style()->hasAppearance())
1561 return; 1557 return;
1562 1558
1563 IntRect inflatedRect = pixelSnappedBorderBoxRect(); 1559 IntRect inflatedRect = pixelSnappedBorderBoxRect();
1564 RenderTheme::theme().adjustRepaintRect(this, inflatedRect); 1560 RenderTheme::theme().adjustRepaintRect(this, inflatedRect);
(...skipping 4289 matching lines...) Expand 10 before | Expand all | Expand 10 after
5854 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5850 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5855 { 5851 {
5856 showRenderObject(); 5852 showRenderObject();
5857 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5853 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5858 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5854 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5859 } 5855 }
5860 5856
5861 #endif 5857 #endif
5862 5858
5863 } // namespace WebCore 5859 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/scrollbars/rtl/div-horizontal-with-vertical-scrollbar-expected.txt ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698