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

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

Issue 2168373002: Revert of Reland "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve WebFrameTest.cpp conflict and appease presubmit Created 4 years, 5 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/LayoutBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
index c1571cbdf8195fff29c4c6def26801d7cb8284e6..6f9dac6712d3592836b663bea590e22b5362b6a2 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
@@ -422,8 +422,8 @@ public:
// IE extensions. Used to calculate offsetWidth/Height. Overridden by inlines (LayoutFlow)
// to return the remaining width on a given line (and the height of a single line).
- LayoutUnit offsetWidth() const final { return m_frameRect.width(); }
- LayoutUnit offsetHeight() const final { return m_frameRect.height(); }
+ LayoutUnit offsetWidth() const override { return m_frameRect.width(); }
+ LayoutUnit offsetHeight() const override { return m_frameRect.height(); }
int pixelSnappedOffsetWidth(const Element*) const final;
int pixelSnappedOffsetHeight(const Element*) const final;
@@ -840,8 +840,8 @@ public:
LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
- LayoutUnit offsetLeft(const Element*) const final;
- LayoutUnit offsetTop(const Element*) const final;
+ LayoutUnit offsetLeft(const Element*) const override;
+ LayoutUnit offsetTop(const Element*) const override;
LayoutPoint flipForWritingModeForChild(const LayoutBox* child, const LayoutPoint&) const;
LayoutUnit flipForWritingMode(LayoutUnit position) const WARN_UNUSED_RETURN {
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698