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

Side by Side Diff: Source/WebCore/rendering/RenderBox.cpp

Issue 11428168: Merge 136253 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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
« no previous file with comments | « LayoutTests/fast/block/float/intruding-float-not-removed-writing-mode-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 if (viewStyle->direction() != newStyle->direction() && (isRootRenderer | | !document()->directionSetOnDocumentElement())) { 251 if (viewStyle->direction() != newStyle->direction() && (isRootRenderer | | !document()->directionSetOnDocumentElement())) {
252 viewStyle->setDirection(newStyle->direction()); 252 viewStyle->setDirection(newStyle->direction());
253 if (isBodyRenderer) 253 if (isBodyRenderer)
254 document()->documentElement()->renderer()->style()->setDirection (newStyle->direction()); 254 document()->documentElement()->renderer()->style()->setDirection (newStyle->direction());
255 setNeedsLayoutAndPrefWidthsRecalc(); 255 setNeedsLayoutAndPrefWidthsRecalc();
256 } 256 }
257 257
258 if (viewStyle->writingMode() != newStyle->writingMode() && (isRootRender er || !document()->writingModeSetOnDocumentElement())) { 258 if (viewStyle->writingMode() != newStyle->writingMode() && (isRootRender er || !document()->writingModeSetOnDocumentElement())) {
259 viewStyle->setWritingMode(newStyle->writingMode()); 259 viewStyle->setWritingMode(newStyle->writingMode());
260 viewRenderer->setHorizontalWritingMode(newStyle->isHorizontalWriting Mode()); 260 viewRenderer->setHorizontalWritingMode(newStyle->isHorizontalWriting Mode());
261 viewRenderer->markAllDescendantsWithFloatsForLayout();
261 if (isBodyRenderer) { 262 if (isBodyRenderer) {
262 document()->documentElement()->renderer()->style()->setWritingMo de(newStyle->writingMode()); 263 document()->documentElement()->renderer()->style()->setWritingMo de(newStyle->writingMode());
263 document()->documentElement()->renderer()->setHorizontalWritingM ode(newStyle->isHorizontalWritingMode()); 264 document()->documentElement()->renderer()->setHorizontalWritingM ode(newStyle->isHorizontalWritingMode());
264 } 265 }
265 setNeedsLayoutAndPrefWidthsRecalc(); 266 setNeedsLayoutAndPrefWidthsRecalc();
266 } 267 }
267 268
268 frame()->view()->recalculateScrollbarOverlayStyle(); 269 frame()->view()->recalculateScrollbarOverlayStyle();
269 } 270 }
270 } 271 }
(...skipping 3815 matching lines...) Expand 10 before | Expand all | Expand 10 after
4086 } 4087 }
4087 4088
4088 if (didSplitParentAnonymousBoxes) 4089 if (didSplitParentAnonymousBoxes)
4089 markBoxForRelayoutAfterSplit(this); 4090 markBoxForRelayoutAfterSplit(this);
4090 4091
4091 ASSERT(beforeChild->parent() == this); 4092 ASSERT(beforeChild->parent() == this);
4092 return beforeChild; 4093 return beforeChild;
4093 } 4094 }
4094 4095
4095 } // namespace WebCore 4096 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/block/float/intruding-float-not-removed-writing-mode-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698