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

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

Issue 2258973002: Avoid LayoutFullScreen to be orthogonal writing-mode roots when reattached (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaseline Created 4 years, 4 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1882 // they contain block descendants of relative positioned inlines. 1882 // they contain block descendants of relative positioned inlines.
1883 if (child->isInFlowPositioned() && child->isLayoutBlockFlow() && toLayou tBlockFlow(child)->isAnonymousBlockContinuation()) 1883 if (child->isInFlowPositioned() && child->isLayoutBlockFlow() && toLayou tBlockFlow(child)->isAnonymousBlockContinuation())
1884 newStyle->setPosition(child->style()->position()); 1884 newStyle->setPosition(child->style()->position());
1885 1885
1886 updateAnonymousChildStyle(*child, *newStyle); 1886 updateAnonymousChildStyle(*child, *newStyle);
1887 1887
1888 child->setStyle(newStyle.release()); 1888 child->setStyle(newStyle.release());
1889 } 1889 }
1890 } 1890 }
1891 1891
1892 void LayoutObject::setStyleWithWritingModeOf(PassRefPtr<ComputedStyle> style, La youtObject* parent)
1893 {
1894 if (parent)
1895 style->setWritingMode(parent->styleRef().getWritingMode());
1896 setStyle(style);
1897 }
1898
1892 void LayoutObject::setStyleWithWritingModeOfParent(PassRefPtr<ComputedStyle> sty le) 1899 void LayoutObject::setStyleWithWritingModeOfParent(PassRefPtr<ComputedStyle> sty le)
1893 { 1900 {
1894 if (parent()) 1901 setStyleWithWritingModeOf(style, parent());
1895 style->setWritingMode(parent()->styleRef().getWritingMode());
1896 setStyle(style);
1897 } 1902 }
1898 1903
1899 void LayoutObject::addChildWithWritingModeOfParent(LayoutObject* newChild, Layou tObject* beforeChild) 1904 void LayoutObject::addChildWithWritingModeOfParent(LayoutObject* newChild, Layou tObject* beforeChild)
1900 { 1905 {
1901 if (newChild->mutableStyleRef().setWritingMode(styleRef().getWritingMode()) 1906 if (newChild->mutableStyleRef().setWritingMode(styleRef().getWritingMode())
1902 && newChild->isBoxModelObject()) { 1907 && newChild->isBoxModelObject()) {
1903 newChild->setHorizontalWritingMode(isHorizontalWritingMode()); 1908 newChild->setHorizontalWritingMode(isHorizontalWritingMode());
1904 } 1909 }
1905 addChild(newChild, beforeChild); 1910 addChild(newChild, beforeChild);
1906 } 1911 }
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after
3468 const blink::LayoutObject* root = object1; 3473 const blink::LayoutObject* root = object1;
3469 while (root->parent()) 3474 while (root->parent())
3470 root = root->parent(); 3475 root = root->parent();
3471 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3476 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3472 } else { 3477 } else {
3473 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3478 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3474 } 3479 }
3475 } 3480 }
3476 3481
3477 #endif 3482 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698