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

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

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase Created 4 years, 9 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) 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 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // FIXME: Ideally we shouldn't need this setter but we can't easily infe r an overflow-only layer 232 // FIXME: Ideally we shouldn't need this setter but we can't easily infe r an overflow-only layer
233 // from the style. 233 // from the style.
234 layer()->setLayerType(type); 234 layer()->setLayerType(type);
235 235
236 layer()->styleChanged(diff, oldStyle); 236 layer()->styleChanged(diff, oldStyle);
237 if (hadLayer && layer()->isSelfPaintingLayer() != layerWasSelfPainting) 237 if (hadLayer && layer()->isSelfPaintingLayer() != layerWasSelfPainting)
238 setChildNeedsLayout(); 238 setChildNeedsLayout();
239 } 239 }
240 240
241 if (oldStyle && wasHorizontalWritingMode != isHorizontalWritingMode()) { 241 if (oldStyle && wasHorizontalWritingMode != isHorizontalWritingMode()) {
242 // Changing the writingMode() may change isOrthogonalWritingModeRoot() 242 // Changing the getWritingMode() may change isOrthogonalWritingModeRoot( )
243 // of children. Make sure all children are marked/unmarked as orthogonal 243 // of children. Make sure all children are marked/unmarked as orthogonal
244 // writing-mode roots. 244 // writing-mode roots.
245 bool newHorizontalWritingMode = isHorizontalWritingMode(); 245 bool newHorizontalWritingMode = isHorizontalWritingMode();
246 for (LayoutObject* child = slowFirstChild(); child; child = child->nextS ibling()) { 246 for (LayoutObject* child = slowFirstChild(); child; child = child->nextS ibling()) {
247 if (!child->isBox()) 247 if (!child->isBox())
248 continue; 248 continue;
249 if (newHorizontalWritingMode != child->isHorizontalWritingMode()) 249 if (newHorizontalWritingMode != child->isHorizontalWritingMode())
250 toLayoutBox(child)->markOrthogonalWritingModeRoot(); 250 toLayoutBox(child)->markOrthogonalWritingModeRoot();
251 else 251 else
252 toLayoutBox(child)->unmarkOrthogonalWritingModeRoot(); 252 toLayoutBox(child)->unmarkOrthogonalWritingModeRoot();
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 if (rootElementStyle->hasBackground()) 1047 if (rootElementStyle->hasBackground())
1048 return false; 1048 return false;
1049 1049
1050 if (node() != document().firstBodyElement()) 1050 if (node() != document().firstBodyElement())
1051 return false; 1051 return false;
1052 1052
1053 return true; 1053 return true;
1054 } 1054 }
1055 1055
1056 } // namespace blink 1056 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutDetailsMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698