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

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

Issue 16646002: Move the CSS Device Adaptation @viewport rule support behind a runtime flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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/features.gypi ('k') | Source/core/page/RuntimeEnabledFeatures.in » ('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 4ba0c386f7e5ed36b9b14e8796fd7c63ea1e0d8a..52ccf39bc63f9847875ed49c72e21d931d09de62 100644
--- a/Source/core/page/FrameView.h
+++ b/Source/core/page/FrameView.h
@@ -328,16 +328,12 @@ public:
// distinguish between the two.
const Pagination& pagination() const;
void setPagination(const Pagination&);
-
+
bool inProgrammaticScroll() const { return m_inProgrammaticScroll; }
void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScroll = programmaticScroll; }
void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
-#if ENABLE(CSS_DEVICE_ADAPTATION)
- IntSize initialViewportSize() const { return m_initialViewportSize; }
- void setInitialViewportSize(const IntSize& size) { m_initialViewportSize = size; }
-#endif
virtual bool isActive() const OVERRIDE;
@@ -537,11 +533,9 @@ private:
static double s_deferredRepaintDelayIncrementDuringLoading;
bool m_hasSoftwareFilters;
-#if ENABLE(CSS_DEVICE_ADAPTATION)
// Size of viewport before any UA or author styles have overridden
// the viewport given by the window or viewing area of the UA.
IntSize m_initialViewportSize;
-#endif
rune 2013/06/10 07:35:18 Is m_initialViewportSize used anymore?
float m_visibleContentScaleFactor;
};
« no previous file with comments | « Source/core/features.gypi ('k') | Source/core/page/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698