<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164364] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164364">164364</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-19 09:05:07 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add settings/preferences for enabling image controls
https://bugs.webkit.org/show_bug.cgi?id=129027
Reviewed by Jer Noble.
Source/WebCore:
* WebCore.exp.in:
* page/Settings.cpp:
(WebCore::Settings::Settings):
(WebCore::Settings::setImageControlsEnabled):
* page/Settings.h:
(WebCore::Settings::imageControlsEnabled):
Source/WebKit2:
* Shared/WebPreferencesStore.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-19 Brady Eidson <beidson@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2014-02-19 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] shape-outside does not properly handle different writing modes
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2786,6 +2786,10 @@
</span><span class="cx"> __ZNK7WebCore12IconDatabase9isEnabledEv
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+__ZN7WebCore8Settings23setImageControlsEnabledEb
+#endif
+
</ins><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> __ZN7WebCore5ColorC1EP7CGColor
</span><span class="cx"> __ZN7WebCore5ColorC1ERKN3WTF6StringE
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -186,6 +186,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_scrollingPerformanceLoggingEnabled(false)
</span><span class="cx"> , m_aggressiveTileRetentionEnabled(false)
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+ , m_imageControlsEnabled(false)
+#endif
</ins><span class="cx"> , m_timeWithoutMouseMovementBeforeHidingControls(3)
</span><span class="cx"> , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerFired)
</span><span class="cx"> #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
</span><span class="lines">@@ -635,6 +638,13 @@
</span><span class="cx"> m_aggressiveTileRetentionEnabled = enabled;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+void Settings::setImageControlsEnabled(bool enabled)
+{
+ m_imageControlsEnabled = enabled;
+}
+#endif
+
</ins><span class="cx"> void Settings::setMockScrollbarsEnabled(bool flag)
</span><span class="cx"> {
</span><span class="cx"> gMockScrollbarsEnabled = flag;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -237,6 +237,11 @@
</span><span class="cx"> void setAggressiveTileRetentionEnabled(bool);
</span><span class="cx"> bool aggressiveTileRetentionEnabled() { return m_aggressiveTileRetentionEnabled; }
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+ void setImageControlsEnabled(bool);
+ bool imageControlsEnabled() { return m_imageControlsEnabled; }
+#endif
+
</ins><span class="cx"> static void setShouldRespectPriorityInCSSAttributeSetters(bool);
</span><span class="cx"> static bool shouldRespectPriorityInCSSAttributeSetters();
</span><span class="cx">
</span><span class="lines">@@ -315,6 +320,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool m_scrollingPerformanceLoggingEnabled : 1;
</span><span class="cx"> bool m_aggressiveTileRetentionEnabled : 1;
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+ bool m_imageControlsEnabled : 1;
+#endif
</ins><span class="cx">
</span><span class="cx"> double m_timeWithoutMouseMovementBeforeHidingControls;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-19 Brady Eidson <beidson@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2014-02-19 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -208,7 +208,8 @@
</span><span class="cx"> macro(AlwaysUseBaselineOfPrimaryFont, alwaysUseBaselineOfPrimaryFont, Bool, bool, false) \
</span><span class="cx"> macro(AllowMultiElementImplicitSubmission, allowMultiElementImplicitSubmission, Bool, bool, false) \
</span><span class="cx"> macro(AlwaysUseAcceleratedOverflowScroll, alwaysUseAcceleratedOverflowScroll, Bool, bool, false) \
</span><del>- macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED)
</del><ins>+ macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED) \
+ macro(ImageControlsEnabled, imageControlsEnabled, Bool, bool, false) \
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="cx"> macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164363 => 164364)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2522,6 +2522,10 @@
</span><span class="cx"> settings.setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+ settings.setImageControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::imageControlsEnabledKey()));
+#endif
+
</ins><span class="cx"> settings.setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey()));
</span><span class="cx"> settings.setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey()));
</span><span class="cx"> settings.setIncrementalRenderingSuppressionTimeoutInSeconds(store.getDoubleValueForKey(WebPreferencesKey::incrementalRenderingSuppressionTimeoutKey()));
</span></span></pre>
</div>
</div>
</body>
</html>