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

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

Issue 2524903003: EDisplay enum class: Rename [Inline]Box to Webkit[Inline]Box. (Closed)
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 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) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 // End of SVG-specific methods. 702 // End of SVG-specific methods.
703 703
704 bool isAnonymous() const { return m_bitfields.isAnonymous(); } 704 bool isAnonymous() const { return m_bitfields.isAnonymous(); }
705 bool isAnonymousBlock() const { 705 bool isAnonymousBlock() const {
706 // This function is kept in sync with anonymous block creation conditions in 706 // This function is kept in sync with anonymous block creation conditions in
707 // LayoutBlock::createAnonymousBlock(). This includes creating an anonymous 707 // LayoutBlock::createAnonymousBlock(). This includes creating an anonymous
708 // LayoutBlock having a BLOCK or BOX display. Other classes such as 708 // LayoutBlock having a BLOCK or BOX display. Other classes such as
709 // LayoutTextFragment are not LayoutBlocks and will return false. 709 // LayoutTextFragment are not LayoutBlocks and will return false.
710 // See https://bugs.webkit.org/show_bug.cgi?id=56709. 710 // See https://bugs.webkit.org/show_bug.cgi?id=56709.
711 return isAnonymous() && (style()->display() == EDisplay::Block || 711 return isAnonymous() && (style()->display() == EDisplay::Block ||
712 style()->display() == EDisplay::Box) && 712 style()->display() == EDisplay::WebkitBox) &&
713 style()->styleType() == PseudoIdNone && isLayoutBlock() && 713 style()->styleType() == PseudoIdNone && isLayoutBlock() &&
714 !isListMarker() && !isLayoutFlowThread() && 714 !isListMarker() && !isLayoutFlowThread() &&
715 !isLayoutMultiColumnSet() && !isLayoutFullScreen() && 715 !isLayoutMultiColumnSet() && !isLayoutFullScreen() &&
716 !isLayoutFullScreenPlaceholder(); 716 !isLayoutFullScreenPlaceholder();
717 } 717 }
718 bool isElementContinuation() const { 718 bool isElementContinuation() const {
719 return node() && node()->layoutObject() != this; 719 return node() && node()->layoutObject() != this;
720 } 720 }
721 bool isInlineElementContinuation() const { 721 bool isInlineElementContinuation() const {
722 return isElementContinuation() && isInline(); 722 return isElementContinuation() && isInline();
(...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after
2645 CORE_EXPORT void showLineTree(const blink::LayoutObject*); 2645 CORE_EXPORT void showLineTree(const blink::LayoutObject*);
2646 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1); 2646 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1);
2647 // We don't make object2 an optional parameter so that showLayoutTree 2647 // We don't make object2 an optional parameter so that showLayoutTree
2648 // can be called from gdb easily. 2648 // can be called from gdb easily.
2649 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1, 2649 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1,
2650 const blink::LayoutObject* object2); 2650 const blink::LayoutObject* object2);
2651 2651
2652 #endif 2652 #endif
2653 2653
2654 #endif // LayoutObject_h 2654 #endif // LayoutObject_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698