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

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6
Patch Set: get-names-7: 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) 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 2552 matching lines...) Expand 10 before | Expand all | Expand 10 after
2563 return o; 2563 return o;
2564 } 2564 }
2565 2565
2566 LayoutObject* LayoutObject::containerCrossingFrameBoundaries() const 2566 LayoutObject* LayoutObject::containerCrossingFrameBoundaries() const
2567 { 2567 {
2568 return isLayoutView() ? frame()->ownerLayoutObject() : container(); 2568 return isLayoutView() ? frame()->ownerLayoutObject() : container();
2569 } 2569 }
2570 2570
2571 bool LayoutObject::isSelectionBorder() const 2571 bool LayoutObject::isSelectionBorder() const
2572 { 2572 {
2573 SelectionState st = selectionState(); 2573 SelectionState st = getSelectionState();
2574 return st == SelectionStart || st == SelectionEnd || st == SelectionBoth; 2574 return st == SelectionStart || st == SelectionEnd || st == SelectionBoth;
2575 } 2575 }
2576 2576
2577 inline void LayoutObject::clearLayoutRootIfNeeded() const 2577 inline void LayoutObject::clearLayoutRootIfNeeded() const
2578 { 2578 {
2579 if (FrameView* view = frameView()) { 2579 if (FrameView* view = frameView()) {
2580 if (!documentBeingDestroyed()) 2580 if (!documentBeingDestroyed())
2581 view->clearLayoutSubtreeRoot(*this); 2581 view->clearLayoutSubtreeRoot(*this);
2582 } 2582 }
2583 } 2583 }
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
3666 const blink::LayoutObject* root = object1; 3666 const blink::LayoutObject* root = object1;
3667 while (root->parent()) 3667 while (root->parent())
3668 root = root->parent(); 3668 root = root->parent();
3669 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3669 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3670 } else { 3670 } else {
3671 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3671 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3672 } 3672 }
3673 } 3673 }
3674 3674
3675 #endif 3675 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698