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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.h

Issue 2316533004: Don't include headers from the layout API from other headers needlessly. (Closed)
Patch Set: The runway sure is slippery today. Created 4 years, 3 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
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.cpp ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index 55f071cafc334489d06d45c50113a5303dd18096..62d8defcdf6fd3d991dca25df241567051ff4e2e 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -30,8 +30,8 @@
#include "core/frame/FrameViewAutoSizeInfo.h"
#include "core/frame/LayoutSubtreeRootList.h"
#include "core/frame/RootFrameViewport.h"
+#include "core/layout/LayoutObject.h"
#include "core/layout/ScrollAnchor.h"
-#include "core/layout/api/LayoutViewItem.h"
#include "core/paint/FirstMeaningfulPaintDetector.h"
#include "core/paint/PaintInvalidationCapableScrollableArea.h"
#include "core/paint/PaintPhase.h"
@@ -66,6 +66,7 @@ class Element;
class FloatSize;
class HTMLFrameOwnerElement;
class JSONArray;
+class LayoutViewItem;
class LayoutPart;
class LocalFrame;
class KURL;
@@ -113,10 +114,7 @@ public:
// TODO(pilgrim) replace all instances of layoutView() with layoutViewItem()
// https://crbug.com/499321
LayoutView* layoutView() const;
- LayoutViewItem layoutViewItem() const
- {
- return LayoutViewItem(this->layoutView());
- }
+ LayoutViewItem layoutViewItem() const;
void setCanHaveScrollbars(bool);
@@ -395,7 +393,7 @@ public:
bool shouldPlaceVerticalScrollbarOnLeft() const override;
Widget* getWidget() override;
CompositorAnimationTimeline* compositorAnimationTimeline() const override;
- LayoutBox* layoutBox() const override { return layoutView(); }
+ LayoutBox* layoutBox() const override;
LayoutRect scrollIntoView(
const LayoutRect& rectInContent,
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.cpp ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698