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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutObject.h

Issue 1410833004: Revert "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutObject.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
index b05e5a6c709c96c38e40bf50cc26d365df6c44cc..c2026d489a066a7a3d6707e03acdfd3403134a39 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.h
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
@@ -442,6 +442,8 @@ public:
bool isProgress() const { return isOfType(LayoutObjectProgress); }
bool isQuote() const { return isOfType(LayoutObjectQuote); }
bool isLayoutButton() const { return isOfType(LayoutObjectLayoutButton); }
+ bool isLayoutFullScreen() const { return isOfType(LayoutObjectLayoutFullScreen); }
+ bool isLayoutFullScreenPlaceholder() const { return isOfType(LayoutObjectLayoutFullScreenPlaceholder); }
bool isLayoutGrid() const { return isOfType(LayoutObjectLayoutGrid); }
bool isLayoutIFrame() const { return isOfType(LayoutObjectLayoutIFrame); }
bool isLayoutImage() const { return isOfType(LayoutObjectLayoutImage); }
@@ -588,7 +590,9 @@ public:
// LayoutBlock::createAnonymousBlock(). This includes creating an anonymous
// LayoutBlock having a BLOCK or BOX display. Other classes such as LayoutTextFragment
// are not LayoutBlocks and will return false. See https://bugs.webkit.org/show_bug.cgi?id=56709.
- return isAnonymous() && (style()->display() == BLOCK || style()->display() == BOX) && style()->styleType() == NOPSEUDO && isLayoutBlock() && !isListMarker() && !isLayoutFlowThread() && !isLayoutMultiColumnSet();
+ return isAnonymous() && (style()->display() == BLOCK || style()->display() == BOX) && style()->styleType() == NOPSEUDO && isLayoutBlock() && !isListMarker() && !isLayoutFlowThread() && !isLayoutMultiColumnSet()
+ && !isLayoutFullScreen()
+ && !isLayoutFullScreenPlaceholder();
}
bool isElementContinuation() const { return node() && node()->layoutObject() != this; }
bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); }
@@ -1304,6 +1308,8 @@ protected:
LayoutObjectQuote,
LayoutObjectLayoutButton,
LayoutObjectLayoutFlowThread,
+ LayoutObjectLayoutFullScreen,
+ LayoutObjectLayoutFullScreenPlaceholder,
LayoutObjectLayoutGrid,
LayoutObjectLayoutIFrame,
LayoutObjectLayoutImage,
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutMenuList.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