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

Unified Diff: Source/core/page/FrameView.h

Issue 23819041: Include Frame.h in fewer translation units. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 7 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 | « Source/core/accessibility/AccessibilityScrollView.cpp ('k') | Source/core/page/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/FrameView.h
diff --git a/Source/core/page/FrameView.h b/Source/core/page/FrameView.h
index 8ccf1c36e6323bc632df68f45236a1099f467e16..84eba22f3079557ac0175d6c23c13fb852f8f5e3 100644
--- a/Source/core/page/FrameView.h
+++ b/Source/core/page/FrameView.h
@@ -26,7 +26,6 @@
#define FrameView_h
#include "core/page/AdjustViewSizeOrNot.h"
-#include "core/page/Frame.h"
#include "core/platform/ScrollView.h"
#include "core/platform/graphics/Color.h"
#include "core/platform/graphics/LayoutRect.h"
@@ -42,6 +41,7 @@ namespace WebCore {
class Element;
class Event;
class FloatSize;
+class Frame;
class FrameActionScheduler;
class KURL;
class Node;
@@ -76,10 +76,10 @@ public:
Frame& frame() const { return *m_frame; }
- RenderView* renderView() const { return m_frame->contentRenderer(); }
+ RenderView* renderView() const;
- int mapFromLayoutToCSSUnits(LayoutUnit);
- LayoutUnit mapFromCSSToLayoutUnits(int);
+ int mapFromLayoutToCSSUnits(LayoutUnit) const;
+ LayoutUnit mapFromCSSToLayoutUnits(int) const;
LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means default
LayoutUnit marginHeight() const { return m_margins.height(); } // -1 means default
@@ -561,16 +561,6 @@ inline void FrameView::incrementVisuallyNonEmptyPixelCount(const IntSize& size)
setIsVisuallyNonEmpty();
}
-inline int FrameView::mapFromLayoutToCSSUnits(LayoutUnit value)
-{
- return value / m_frame->pageZoomFactor();
-}
-
-inline LayoutUnit FrameView::mapFromCSSToLayoutUnits(int value)
-{
- return value * m_frame->pageZoomFactor();
-}
-
inline FrameView* toFrameView(Widget* widget)
{
ASSERT(!widget || widget->isFrameView());
« no previous file with comments | « Source/core/accessibility/AccessibilityScrollView.cpp ('k') | Source/core/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698