Diff
Modified: trunk/Source/WebCore/ChangeLog (164363 => 164364)
--- trunk/Source/WebCore/ChangeLog 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 17:05:07 UTC (rev 164364)
@@ -1,3 +1,18 @@
+2014-02-19 Brady Eidson <[email protected]>
+
+ Add settings/preferences for enabling image controls
+ https://bugs.webkit.org/show_bug.cgi?id=129027
+
+ Reviewed by Jer Noble.
+
+ * WebCore.exp.in:
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setImageControlsEnabled):
+ * page/Settings.h:
+ (WebCore::Settings::imageControlsEnabled):
+
2014-02-19 Bem Jones-Bey <[email protected]>
[CSS Shapes] shape-outside does not properly handle different writing modes
Modified: trunk/Source/WebCore/WebCore.exp.in (164363 => 164364)
--- trunk/Source/WebCore/WebCore.exp.in 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-19 17:05:07 UTC (rev 164364)
@@ -2786,6 +2786,10 @@
__ZNK7WebCore12IconDatabase9isEnabledEv
#endif
+#if ENABLE(IMAGE_CONTROLS)
+__ZN7WebCore8Settings23setImageControlsEnabledEb
+#endif
+
#if ENABLE(INPUT_TYPE_COLOR)
__ZN7WebCore5ColorC1EP7CGColor
__ZN7WebCore5ColorC1ERKN3WTF6StringE
Modified: trunk/Source/WebCore/page/Settings.cpp (164363 => 164364)
--- trunk/Source/WebCore/page/Settings.cpp 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-02-19 17:05:07 UTC (rev 164364)
@@ -186,6 +186,9 @@
#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)
@@ -635,6 +638,13 @@
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 (164363 => 164364)
--- trunk/Source/WebCore/page/Settings.h 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebCore/page/Settings.h 2014-02-19 17:05:07 UTC (rev 164364)
@@ -237,6 +237,11 @@
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();
@@ -315,6 +320,9 @@
#endif
bool m_scrollingPerformanceLoggingEnabled : 1;
bool m_aggressiveTileRetentionEnabled : 1;
+#if ENABLE(IMAGE_CONTROLS)
+ bool m_imageControlsEnabled : 1;
+#endif
double m_timeWithoutMouseMovementBeforeHidingControls;
Modified: trunk/Source/WebKit2/ChangeLog (164363 => 164364)
--- trunk/Source/WebKit2/ChangeLog 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-19 17:05:07 UTC (rev 164364)
@@ -1,3 +1,15 @@
+2014-02-19 Brady Eidson <[email protected]>
+
+ Add settings/preferences for enabling image controls
+ https://bugs.webkit.org/show_bug.cgi?id=129027
+
+ Reviewed by Jer Noble.
+
+ * Shared/WebPreferencesStore.h:
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2014-02-19 Dan Bernstein <[email protected]>
Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (164363 => 164364)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-19 17:05:07 UTC (rev 164364)
@@ -208,7 +208,8 @@
macro(AlwaysUseBaselineOfPrimaryFont, alwaysUseBaselineOfPrimaryFont, Bool, bool, false) \
macro(AllowMultiElementImplicitSubmission, allowMultiElementImplicitSubmission, Bool, bool, false) \
macro(AlwaysUseAcceleratedOverflowScroll, alwaysUseAcceleratedOverflowScroll, Bool, bool, false) \
- macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED)
+ macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED) \
+ macro(ImageControlsEnabled, imageControlsEnabled, Bool, bool, false) \
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164363 => 164364)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-19 15:20:01 UTC (rev 164363)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-19 17:05:07 UTC (rev 164364)
@@ -2522,6 +2522,10 @@
settings.setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
#endif
+#if ENABLE(IMAGE_CONTROLS)
+ settings.setImageControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::imageControlsEnabledKey()));
+#endif
+
settings.setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey()));
settings.setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey()));
settings.setIncrementalRenderingSuppressionTimeoutInSeconds(store.getDoubleValueForKey(WebPreferencesKey::incrementalRenderingSuppressionTimeoutKey()));
