Title: [164458] trunk/Source/WebCore
- Revision
- 164458
- Author
- [email protected]
- Date
- 2014-02-20 17:14:35 -0800 (Thu, 20 Feb 2014)
Log Message
Move the image controls setting to Settings.in
https://bugs.webkit.org/show_bug.cgi?id=129126
Reviewed by Tim Horton.
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:
* page/Settings.in:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164457 => 164458)
--- trunk/Source/WebCore/ChangeLog 2014-02-21 00:39:35 UTC (rev 164457)
+++ trunk/Source/WebCore/ChangeLog 2014-02-21 01:14:35 UTC (rev 164458)
@@ -1,5 +1,17 @@
2014-02-20 Brady Eidson <[email protected]>
+ Move the image controls setting to Settings.in
+ https://bugs.webkit.org/show_bug.cgi?id=129126
+
+ Reviewed by Tim Horton.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ * page/Settings.in:
+
+2014-02-20 Brady Eidson <[email protected]>
+
Add very basic image control rendering
https://bugs.webkit.org/show_bug.cgi?id=129080
Modified: trunk/Source/WebCore/page/Settings.cpp (164457 => 164458)
--- trunk/Source/WebCore/page/Settings.cpp 2014-02-21 00:39:35 UTC (rev 164457)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-02-21 01:14:35 UTC (rev 164458)
@@ -186,9 +186,6 @@
#endif
, m_scrollingPerformanceLoggingEnabled(false)
, m_aggressiveTileRetentionEnabled(false)
-#if ENABLE(IMAGE_CONTROLS)
- , m_imageControlsEnabled(false)
-#endif
, m_timeWithoutMouseMovementBeforeHidingControls(3)
, m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerFired)
#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
@@ -638,13 +635,6 @@
m_aggressiveTileRetentionEnabled = enabled;
}
-#if ENABLE(IMAGE_CONTROLS)
-void Settings::setImageControlsEnabled(bool enabled)
-{
- m_imageControlsEnabled = enabled;
-}
-#endif
-
void Settings::setMockScrollbarsEnabled(bool flag)
{
gMockScrollbarsEnabled = flag;
Modified: trunk/Source/WebCore/page/Settings.h (164457 => 164458)
--- trunk/Source/WebCore/page/Settings.h 2014-02-21 00:39:35 UTC (rev 164457)
+++ trunk/Source/WebCore/page/Settings.h 2014-02-21 01:14:35 UTC (rev 164458)
@@ -237,11 +237,6 @@
void setAggressiveTileRetentionEnabled(bool);
bool aggressiveTileRetentionEnabled() { return m_aggressiveTileRetentionEnabled; }
-#if ENABLE(IMAGE_CONTROLS)
- void setImageControlsEnabled(bool);
- bool imageControlsEnabled() { return m_imageControlsEnabled; }
-#endif
-
static void setShouldRespectPriorityInCSSAttributeSetters(bool);
static bool shouldRespectPriorityInCSSAttributeSetters();
@@ -320,9 +315,6 @@
#endif
bool m_scrollingPerformanceLoggingEnabled : 1;
bool m_aggressiveTileRetentionEnabled : 1;
-#if ENABLE(IMAGE_CONTROLS)
- bool m_imageControlsEnabled : 1;
-#endif
double m_timeWithoutMouseMovementBeforeHidingControls;
Modified: trunk/Source/WebCore/page/Settings.in (164457 => 164458)
--- trunk/Source/WebCore/page/Settings.in 2014-02-21 00:39:35 UTC (rev 164457)
+++ trunk/Source/WebCore/page/Settings.in 2014-02-21 01:14:35 UTC (rev 164458)
@@ -214,6 +214,7 @@
shouldTransformsAffectOverflow initial=true
shouldDispatchJavaScriptWindowOnErrorEvents initial=false
alwaysUseAcceleratedOverflowScroll initial=false
+imageControlsEnabled initial=false, conditional=IMAGE_CONTROLS
# FIXME: This is unneeded and should be removed.
alwaysUseBaselineOfPrimaryFont initial=false
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
