<!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>[167786] 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/167786">167786</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 17:53:01 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"
https://bugs.webkit.org/show_bug.cgi?id=132155
Reviewed by Tim Horton.
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
No new tests (No change in behavior).
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.make:
* WebCore.exp.in:
* css/CSSDefaultStyleSheets.cpp:
(WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* css/CSSValueKeywords.in:
* dom/Node.h:
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::HTMLImageElement):
(WebCore::HTMLImageElement::parseAttribute):
(WebCore::HTMLImageElement::didAttachRenderers):
* html/HTMLImageElement.h:
* html/shadow/ImageControlsRootElement.cpp:
* html/shadow/ImageControlsRootElement.h:
* html/shadow/mac/ImageControlsButtonElementMac.cpp:
* html/shadow/mac/ImageControlsButtonElementMac.h:
* html/shadow/mac/ImageControlsRootElementMac.cpp:
* html/shadow/mac/ImageControlsRootElementMac.h:
* page/ContextMenuContext.cpp:
(WebCore::ContextMenuContext::ContextMenuContext):
* page/ContextMenuContext.h:
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::maybeCreateContextMenu):
(WebCore::ContextMenuController::populate):
* page/ContextMenuController.h:
* page/Settings.in:
* platform/ThemeTypes.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::canHaveChildren):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::adjustStyle):
(WebCore::RenderTheme::paint):
(WebCore::RenderTheme::paintBorderOnly):
(WebCore::RenderTheme::paintDecorations):
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::servicesRolloverButtonCell):
(WebCore::RenderThemeMac::paintImageControlsButton):
(WebCore::RenderThemeMac::imageControlsButtonSize):
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* Misc/WebSharingServicePickerController.h:
* Misc/WebSharingServicePickerController.mm:
* WebCoreSupport/WebContextMenuClient.h:
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::contextMenuForEvent):
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::operator=):
(WebKit::ContextMenuContextData::encode):
(WebKit::ContextMenuContextData::decode):
* Shared/ContextMenuContextData.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
(WebKit::WebContextMenuProxyMac::populate):
(WebKit::WebContextMenuProxyMac::showContextMenu):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
* WebProcess/WebPage/WebContextMenu.cpp:
* WebProcess/WebPage/WebContextMenu.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSDefaultStyleSheetscpp">trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementh">trunk/Source/WebCore/html/HTMLImageElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowImageControlsRootElementcpp">trunk/Source/WebCore/html/shadow/ImageControlsRootElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowImageControlsRootElementh">trunk/Source/WebCore/html/shadow/ImageControlsRootElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMach">trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsRootElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsRootElementMach">trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.h</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuContextcpp">trunk/Source/WebCore/page/ContextMenuContext.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuContexth">trunk/Source/WebCore/page/ContextMenuContext.h</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllerh">trunk/Source/WebCore/page/ContextMenuController.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoreplatformThemeTypesh">trunk/Source/WebCore/platform/ThemeTypes.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllerh">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllermm">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatacpp">trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatah">trunk/Source/WebKit2/Shared/ContextMenuContextData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenuh">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-24 Brady Eidson <beidson@apple.com>
+
+ Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"
+ https://bugs.webkit.org/show_bug.cgi?id=132155
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-04-24 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Apparent hang of PCE.js Mac OS System 7.0.1 on ARM64 devices
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx"> ENABLE_HIGH_DPI_CANVAS = $(ENABLE_HIGH_DPI_CANVAS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
</span><del>-ENABLE_IMAGE_CONTROLS = $(ENABLE_IMAGE_CONTROLS_$(PLATFORM_NAME));
-ENABLE_IMAGE_CONTROLS_macosx = $(ENABLE_IMAGE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_IMAGE_CONTROLS_macosx_1080 = ;
-ENABLE_IMAGE_CONTROLS_macosx_1090 = ;
-ENABLE_IMAGE_CONTROLS_macosx_101000 = ENABLE_IMAGE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS_macosx = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
+ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
+ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -244,4 +244,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/ChangeLog 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2014-04-24 Brady Eidson <beidson@apple.com>
+
+ Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"
+ https://bugs.webkit.org/show_bug.cgi?id=132155
+
+ Reviewed by Tim Horton.
+
+ No new tests (No change in behavior).
+
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.make:
+ * WebCore.exp.in:
+ * css/CSSDefaultStyleSheets.cpp:
+ (WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ * css/CSSValueKeywords.in:
+ * dom/Node.h:
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::HTMLImageElement):
+ (WebCore::HTMLImageElement::parseAttribute):
+ (WebCore::HTMLImageElement::didAttachRenderers):
+ * html/HTMLImageElement.h:
+ * html/shadow/ImageControlsRootElement.cpp:
+ * html/shadow/ImageControlsRootElement.h:
+ * html/shadow/mac/ImageControlsButtonElementMac.cpp:
+ * html/shadow/mac/ImageControlsButtonElementMac.h:
+ * html/shadow/mac/ImageControlsRootElementMac.cpp:
+ * html/shadow/mac/ImageControlsRootElementMac.h:
+ * page/ContextMenuContext.cpp:
+ (WebCore::ContextMenuContext::ContextMenuContext):
+ * page/ContextMenuContext.h:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::maybeCreateContextMenu):
+ (WebCore::ContextMenuController::populate):
+ * page/ContextMenuController.h:
+ * page/Settings.in:
+ * platform/ThemeTypes.h:
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::canHaveChildren):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::adjustStyle):
+ (WebCore::RenderTheme::paint):
+ (WebCore::RenderTheme::paintBorderOnly):
+ (WebCore::RenderTheme::paintDecorations):
+ * rendering/RenderTheme.h:
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::servicesRolloverButtonCell):
+ (WebCore::RenderThemeMac::paintImageControlsButton):
+ (WebCore::RenderThemeMac::imageControlsButtonSize):
+
</ins><span class="cx"> 2014-04-24 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Restore PageDebuggerAgent::enable / disable
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx"> ENABLE_HIGH_DPI_CANVAS = $(ENABLE_HIGH_DPI_CANVAS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
</span><del>-ENABLE_IMAGE_CONTROLS = $(ENABLE_IMAGE_CONTROLS_$(PLATFORM_NAME));
-ENABLE_IMAGE_CONTROLS_macosx = $(ENABLE_IMAGE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_IMAGE_CONTROLS_macosx_1080 = ;
-ENABLE_IMAGE_CONTROLS_macosx_1090 = ;
-ENABLE_IMAGE_CONTROLS_macosx_101000 = ENABLE_IMAGE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS_macosx = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
+ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
+ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -244,4 +244,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/DerivedSources.make 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/fullscreen.css
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-ifeq ($(findstring ENABLE_IMAGE_CONTROLS,$(FEATURE_DEFINES)), ENABLE_IMAGE_CONTROLS)
</del><ins>+ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_DEFINES)), ENABLE_SERVICE_CONTROLS)
</ins><span class="cx"> USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/html/shadow/mac/imageControlsMac.css
</span><span class="cx"> endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -2989,7 +2989,7 @@
</span><span class="cx"> __ZNK7WebCore12IconDatabase9isEnabledEv
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> __ZN7WebCore21ContextMenuController22replaceControlledImageEN3WTF10PassRefPtrINS_5ImageEEE
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSDefaultStyleSheetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (!imageControlsStyleSheet && element->isImageControlsRootElement()) {
</span><span class="cx"> String imageControlsRules = RenderTheme::themeForPage(element->document().page())->imageControlsStyleSheet();
</span><span class="cx"> imageControlsStyleSheet = parseUASheet(imageControlsRules);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> case CapsLockIndicatorPart:
</span><span class="cx"> m_value.valueID = CSSValueCapsLockIndicator;
</span><span class="cx"> break;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> case ImageControlsButtonPart:
</span><span class="cx"> m_value.valueID = CSSValueImageControlsButton;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> continuous-capacity-level-indicator
</span><span class="cx"> discrete-capacity-level-indicator
</span><span class="cx"> rating-level-indicator
</span><del>-#if defined(ENABLE_IMAGE_CONTROLS) && ENABLE_IMAGE_CONTROLS
</del><ins>+#if defined(ENABLE_SERVICE_CONTROLS) && ENABLE_SERVICE_CONTROLS
</ins><span class="cx"> image-controls-button
</span><span class="cx"> #endif
</span><span class="cx"> textarea
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/dom/Node.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> virtual bool isFrameOwnerElement() const { return false; }
</span><span class="cx"> virtual bool isPluginElement() const { return false; }
</span><span class="cx"> virtual bool isInsertionPointNode() const { return false; }
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> virtual bool isImageControlsRootElement() const { return false; }
</span><span class="cx"> virtual bool isImageControlsButtonElement() const { return false; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> #include "ImageControlsRootElement.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> , m_form(form)
</span><span class="cx"> , m_compositeOperator(CompositeSourceOver)
</span><span class="cx"> , m_imageDevicePixelRatio(1.0f)
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> , m_experimentalImageMenuEnabled(false)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> BlendMode blendOp = BlendModeNormal;
</span><span class="cx"> if (!parseCompositeAndBlendOperator(value, m_compositeOperator, blendOp))
</span><span class="cx"> m_compositeOperator = CompositeSourceOver;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> } else if (name == webkitimagemenuAttr) {
</span><span class="cx"> m_experimentalImageMenuEnabled = !value.isNull();
</span><span class="cx"> updateImageControls();
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> if (m_imageLoader.hasPendingBeforeLoadEvent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> updateImageControls();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> return document().completeURL(stripLeadingAndTrailingHTMLSpaces(usemap)).isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void HTMLImageElement::updateImageControls()
</span><span class="cx"> {
</span><span class="cx"> // If this image element is inside a shadow tree then it is part of an image control.
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> {
</span><span class="cx"> return hasShadowRootParent(child) && HTMLElement::childShouldCreateRenderer(child);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: This is a workaround for <rdar://problem/7725158>. We should find a better place for the touchCalloutEnabled() logic.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/HTMLImageElement.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> float m_imageDevicePixelRatio;
</span><span class="cx"> bool m_experimentalImageMenuEnabled;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void updateImageControls();
</span><span class="cx"> void createImageControls();
</span><span class="cx"> void destroyImageControls();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowImageControlsRootElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/ImageControlsRootElement.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/ImageControlsRootElement.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/shadow/ImageControlsRootElement.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ImageControlsRootElement.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -48,4 +48,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowImageControlsRootElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/ImageControlsRootElement.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/ImageControlsRootElement.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/shadow/ImageControlsRootElement.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ImageControlsRootElement_h
</span><span class="cx"> #define ImageControlsRootElement_h
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #include "HTMLDivElement.h"
</span><span class="cx">
</span><span class="lines">@@ -49,5 +49,5 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> #endif // ImageControlsRootElement_h
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ImageControlsButtonElementMac.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #include "ContextMenuController.h"
</span><span class="cx"> #include "Event.h"
</span><span class="lines">@@ -115,4 +115,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "HTMLDivElement.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -49,6 +49,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #endif // ImageControlsButtonElementMac_h
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsRootElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ImageControlsRootElementMac.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "ImageControlsButtonElementMac.h"
</span><span class="lines">@@ -109,4 +109,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsRootElementMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ImageControlsRootElement.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -45,5 +45,5 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> #endif // ImageControlsRootElementMac_h
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuContext.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuContext.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/page/ContextMenuContext.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> ContextMenuContext::ContextMenuContext(const HitTestResult& hitTestResult)
</span><span class="cx"> : m_hitTestResult(hitTestResult)
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> , m_controlledImage(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuContext.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuContext.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/page/ContextMenuContext.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> const HitTestResult& hitTestResult() const { return m_hitTestResult; }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void setControlledImage(Image* controlledImage) { m_controlledImage = controlledImage; }
</span><span class="cx"> Image* controlledImage() const { return m_controlledImage.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> HitTestResult m_hitTestResult;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> RefPtr<Image> m_controlledImage;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> showContextMenu(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> static Image* imageFromImageElementNode(Node& node)
</span><span class="cx"> {
</span><span class="cx"> RenderObject* renderer = node.renderer();
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> m_context = ContextMenuContext(result);
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (node->isImageControlsButtonElement()) {
</span><span class="cx"> if (Image* image = imageFromImageElementNode(*result.innerNonSharedNode()))
</span><span class="cx"> m_context.setControlledImage(image);
</span><span class="lines">@@ -843,7 +843,7 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> // The default image control menu gets populated solely by the platform.
</span><span class="cx"> if (m_context.controlledImage())
</span><span class="cx"> return;
</span><span class="lines">@@ -1445,7 +1445,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void ContextMenuController::showImageControlsMenu(Event* event)
</span><span class="cx"> {
</span><span class="cx"> clearContextMenu();
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/page/ContextMenuController.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> void showContextMenuAt(Frame*, const IntPoint& clickPoint);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void showImageControlsMenu(Event*);
</span><span class="cx"> void replaceControlledImage(PassRefPtr<Image>);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/page/Settings.in 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> shouldTransformsAffectOverflow initial=true
</span><span class="cx"> shouldDispatchJavaScriptWindowOnErrorEvents initial=false
</span><span class="cx"> alwaysUseAcceleratedOverflowScroll initial=false
</span><del>-imageControlsEnabled initial=false, conditional=IMAGE_CONTROLS
</del><ins>+imageControlsEnabled initial=false, conditional=SERVICE_CONTROLS
</ins><span class="cx">
</span><span class="cx"> # FIXME: This is unneeded and should be removed.
</span><span class="cx"> alwaysUseBaselineOfPrimaryFont initial=false
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThemeTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThemeTypes.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThemeTypes.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/platform/ThemeTypes.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> SearchFieldResultsDecorationPart, SearchFieldResultsButtonPart,
</span><span class="cx"> SearchFieldCancelButtonPart, SnapshottedPluginOverlayPart, TextFieldPart,
</span><span class="cx"> RelevancyLevelIndicatorPart, ContinuousCapacityLevelIndicatorPart, DiscreteCapacityLevelIndicatorPart, RatingLevelIndicatorPart,
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> ImageControlsButtonPart,
</span><span class="cx"> #endif
</span><span class="cx"> TextAreaPart, CapsLockIndicatorPart
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderImage::canHaveChildren() const
</span><span class="cx"> {
</span><del>-#if !ENABLE(IMAGE_CONTROLS)
</del><ins>+#if !ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="cx"> return m_hasShadowControls;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> case InputSpeechButtonPart:
</span><span class="cx"> return adjustInputFieldSpeechButtonStyle(&styleResolver, &style, e);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> case ImageControlsButtonPart:
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> case InputSpeechButtonPart:
</span><span class="cx"> return paintInputFieldSpeechButton(o, paintInfo, integralSnappedRect);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> case ImageControlsButtonPart:
</span><span class="cx"> return paintImageControlsButton(o, paintInfo, integralSnappedRect);
</span><span class="cx"> #endif
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> #if ENABLE(INPUT_SPEECH)
</span><span class="cx"> case InputSpeechButtonPart:
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> case ImageControlsButtonPart:
</span><span class="cx"> #endif
</span><span class="cx"> default:
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> #if ENABLE(INPUT_SPEECH)
</span><span class="cx"> case InputSpeechButtonPart:
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> case ImageControlsButtonPart:
</span><span class="cx"> #endif
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> virtual String extraFullScreenStyleSheet() { return String(); }
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> virtual String imageControlsStyleSheet() const { return String(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> enum FileUploadDecorations { SingleFile, MultipleFiles };
</span><span class="cx"> virtual bool paintFileUploadIconDecorations(const RenderObject& /*inputRenderer*/, const RenderObject& /*buttonRenderer*/, const PaintInfo&, const IntRect&, Icon*, FileUploadDecorations) { return true; }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> virtual IntSize imageControlsButtonSize(const RenderObject&) const { return IntSize(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool paintSnapshottedPluginOverlay(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> virtual bool paintImageControlsButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> OBJC_CLASS NSServicesRolloverButtonCell;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> virtual String mediaControlsScript() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> virtual String imageControlsStyleSheet() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> const int* progressBarMargins(NSControlSize) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> virtual bool paintImageControlsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual IntSize imageControlsButtonSize(const RenderObject&) const override;
</span><span class="cx"> NSServicesRolloverButtonCell *servicesRolloverButtonCell() const;
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> mutable RetainPtr<NSSliderCell> m_sliderThumbVertical;
</span><span class="cx"> mutable RetainPtr<NSLevelIndicatorCell> m_levelIndicator;
</span><span class="cx"> mutable RetainPtr<NSTextFieldCell> m_textField;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> mutable RetainPtr<NSServicesRolloverButtonCell> m_servicesRolloverButton;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -76,12 +76,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(__LP64__) && __LP64__
</span><del>-#define HAVE_APPKIT_IMAGE_CONTROLS_SUPPORT 1
</del><ins>+#define HAVE_APPKIT_SERVICE_CONTROLS_SUPPORT 1
</ins><span class="cx"> #else
</span><del>-#define HAVE_APPKIT_IMAGE_CONTROLS_SUPPORT 0
</del><ins>+#define HAVE_APPKIT_SERVICE_CONTROLS_SUPPORT 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS) && HAVE(APPKIT_IMAGE_CONTROLS_SUPPORT)
</del><ins>+#if ENABLE(SERVICE_CONTROLS) && HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
</ins><span class="cx">
</span><span class="cx"> #if __has_include(<AppKit/AppKitDefines_Private.h>)
</span><span class="cx"> #import <AppKit/AppKitDefines_Private.h>
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> } NSSharingServicePickerStyle;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // ENABLE(IMAGE_CONTROLS)
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> // The methods in this file are specific to the Mac OS X platform.
</span><span class="cx">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> #endif // ENABLE(VIDEO)
</span><span class="cx">
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> String RenderThemeMac::imageControlsStyleSheet() const
</span><span class="cx"> {
</span><span class="cx"> return String(imageControlsMacUserAgentStyleSheet, sizeof(imageControlsMacUserAgentStyleSheet));
</span><span class="lines">@@ -1990,10 +1990,10 @@
</span><span class="cx"> return StringTruncator::centerTruncate(strToTruncate, width, font, StringTruncator::EnableRoundingHacks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> NSServicesRolloverButtonCell* RenderThemeMac::servicesRolloverButtonCell() const
</span><span class="cx"> {
</span><del>-#if HAVE(APPKIT_IMAGE_CONTROLS_SUPPORT)
</del><ins>+#if HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
</ins><span class="cx"> if (!m_servicesRolloverButton) {
</span><span class="cx"> m_servicesRolloverButton = [NSServicesRolloverButtonCell serviceRolloverButtonCellForStyle:NSSharingServicePickerStyleRollover];
</span><span class="cx"> [m_servicesRolloverButton setBordered:NO];
</span><span class="lines">@@ -2010,7 +2010,7 @@
</span><span class="cx"> if (paintInfo.phase != PaintPhaseBlockBackground)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-#if HAVE(APPKIT_IMAGE_CONTROLS_SUPPORT)
</del><ins>+#if HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
</ins><span class="cx"> NSServicesRolloverButtonCell *cell = servicesRolloverButtonCell();
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="lines">@@ -2032,7 +2032,7 @@
</span><span class="cx">
</span><span class="cx"> IntSize RenderThemeMac::imageControlsButtonSize(const RenderObject&) const
</span><span class="cx"> {
</span><del>-#if HAVE(APPKIT_IMAGE_CONTROLS_SUPPORT)
</del><ins>+#if HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
</ins><span class="cx"> return IntSize(servicesRolloverButtonCell().cellSize);
</span><span class="cx"> #else
</span><span class="cx"> return IntSize();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-24 Brady Eidson <beidson@apple.com>
+
+ Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"
+ https://bugs.webkit.org/show_bug.cgi?id=132155
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Misc/WebSharingServicePickerController.h:
+ * Misc/WebSharingServicePickerController.mm:
+ * WebCoreSupport/WebContextMenuClient.h:
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::contextMenuForEvent):
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2014-04-24 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Text caret disappears in Mail after returning from another application
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx"> ENABLE_HIGH_DPI_CANVAS = $(ENABLE_HIGH_DPI_CANVAS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
</span><del>-ENABLE_IMAGE_CONTROLS = $(ENABLE_IMAGE_CONTROLS_$(PLATFORM_NAME));
-ENABLE_IMAGE_CONTROLS_macosx = $(ENABLE_IMAGE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_IMAGE_CONTROLS_macosx_1080 = ;
-ENABLE_IMAGE_CONTROLS_macosx_1090 = ;
-ENABLE_IMAGE_CONTROLS_macosx_101000 = ENABLE_IMAGE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS_macosx = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
+ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
+ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -244,4 +244,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebSharingServicePickerController.h"
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx">
</span><span class="cx"> #import "WebContextMenuClient.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual void searchWithSpotlight() override;
</span><span class="cx"> virtual void showContextMenu() override;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void clearSharingServicePickerController();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> NSMenu *contextMenuForEvent(NSEvent *, NSView *);
</span><span class="cx">
</span><span class="cx"> WebView *m_webView;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> RetainPtr<WebSharingServicePickerController> m_sharingServicePickerController;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (Image* image = page->contextMenuController().context().controlledImage()) {
</span><span class="cx"> ASSERT(page->contextMenuController().context().hitTestResult().innerNode());
</span><span class="cx"> bool isContentEditable = page->contextMenuController().context().hitTestResult().innerNode()->isContentEditable();
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> [NSMenu popUpContextMenu:menu withEvent:event forView:view];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void WebContextMenuClient::clearSharingServicePickerController()
</span><span class="cx"> {
</span><span class="cx"> m_sharingServicePickerController = nil;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitMediaSourceEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitImageControlsEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -2389,7 +2389,7 @@
</span><span class="cx"> settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> settings.setImageControlsEnabled([preferences imageControlsEnabled]);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-04-24 Brady Eidson <beidson@apple.com>
+
+ Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"
+ https://bugs.webkit.org/show_bug.cgi?id=132155
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/ContextMenuContextData.cpp:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ (WebKit::ContextMenuContextData::operator=):
+ (WebKit::ContextMenuContextData::encode):
+ (WebKit::ContextMenuContextData::decode):
+ * Shared/ContextMenuContextData.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
+ (WebKit::WebContextMenuProxyMac::populate):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ * WebProcess/WebPage/WebContextMenu.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2014-04-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add some missing overrides and remove unnecessary virtuals
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx"> ENABLE_HIGH_DPI_CANVAS = $(ENABLE_HIGH_DPI_CANVAS_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
</span><del>-ENABLE_IMAGE_CONTROLS = $(ENABLE_IMAGE_CONTROLS_$(PLATFORM_NAME));
-ENABLE_IMAGE_CONTROLS_macosx = $(ENABLE_IMAGE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_IMAGE_CONTROLS_macosx_1080 = ;
-ENABLE_IMAGE_CONTROLS_macosx_1090 = ;
-ENABLE_IMAGE_CONTROLS_macosx_101000 = ENABLE_IMAGE_CONTROLS;
</del><ins>+ENABLE_SERVICE_CONTROLS = $(ENABLE_SERVICE_CONTROLS_$(PLATFORM_NAME));
+ENABLE_SERVICE_CONTROLS_macosx = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_SERVICE_CONTROLS_macosx_1080 = ;
+ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
+ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
</ins><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
</span><span class="cx"> ENABLE_INDIE_UI = ENABLE_INDIE_UI;
</span><span class="lines">@@ -244,4 +244,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
</span><span class="cx"> : m_webHitTestResultData(WebHitTestResult::Data(context.hitTestResult()))
</span><span class="cx"> {
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> Image* image = context.controlledImage();
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> ContextMenuContextData& ContextMenuContextData::operator=(const ContextMenuContextData& other)
</span><span class="cx"> {
</span><span class="cx"> m_webHitTestResultData = other.m_webHitTestResultData;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> m_controlledImageHandle.clear();
</span><span class="cx">
</span><span class="cx"> if (!other.m_controlledImageHandle.isNull()) {
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void ContextMenuContextData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << m_webHitTestResultData;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> encoder << m_controlledImageHandle;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (!decoder.decode(contextMenuContextData.m_controlledImageHandle))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> const WebHitTestResult::Data& webHitTestResultData() const { return m_webHitTestResultData; }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> const ShareableBitmap::Handle& controlledImageHandle() const { return m_controlledImageHandle; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> WebHitTestResult::Data m_webHitTestResultData;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> ShareableBitmap::Handle m_controlledImageHandle;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -3458,7 +3458,7 @@
</span><span class="cx"> Vector<WebContextMenuItemData> items;
</span><span class="cx"> bool useProposedItems = true;
</span><span class="cx"> bool askClientToChangeMenu = clientEligibility == ContextMenuClientEligibility::EligibleForClient;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (!contextMenuContextData.controlledImageHandle().isNull())
</span><span class="cx"> askClientToChangeMenu = false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -3473,7 +3473,7 @@
</span><span class="cx"> m_contextMenuClient.contextMenuDismissed(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void WebPageProxy::replaceControlledImage(PassRefPtr<ShareableBitmap> newBitmap)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = newBitmap;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -1060,7 +1060,7 @@
</span><span class="cx">
</span><span class="cx"> void takeSnapshot(WebCore::IntRect, WebCore::IntSize bitmapSize, SnapshotOptions, ImageCallback::CallbackFunction);
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void replaceControlledImage(PassRefPtr<ShareableBitmap>);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> void contextMenuItemSelected(const WebContextMenuItemData&);
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void clearImageServicesMenu();
</span><span class="cx"> void replaceControlledImage(CGImageRef newImage);
</span><span class="cx"> #endif
</span><span class="lines">@@ -65,12 +65,12 @@
</span><span class="cx">
</span><span class="cx"> void populate(const Vector<WebContextMenuItemData>&, const ContextMenuContextData&);
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void setupImageServicesMenu(ShareableBitmap&, bool includeEditorServices);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSPopUpButtonCell> m_popup;
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> RetainPtr<NSMenu> m_servicesMenu;
</span><span class="cx"> #endif
</span><span class="cx"> WKView* m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> #import <AppKit/NSSharingService.h>
</span><span class="cx">
</span><span class="cx"> #if __has_include(<AppKit/NSSharingService_Private.h>)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> @interface WKSharingServicePickerDelegate : NSObject <NSSharingServiceDelegate, NSSharingServicePickerDelegate> {
</span><span class="cx"> WebKit::WebContextMenuProxyMac* _menuProxy;
</span><span class="cx"> RetainPtr<NSSharingServicePicker> _picker;
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="cx"> {
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> clearImageServicesMenu();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void WebContextMenuProxyMac::setupImageServicesMenu(ShareableBitmap& image, bool includeEditorServices)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CGImageRef> cgImage = image.makeCGImage();
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItemData>& items, const ContextMenuContextData& context)
</span><span class="cx"> {
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (RefPtr<ShareableBitmap> image = ShareableBitmap::create(context.controlledImageHandle())) {
</span><span class="cx"> setupImageServicesMenu(*image, context.webHitTestResultData().isContentEditable);
</span><span class="cx"> return;
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector<WebContextMenuItemData>& items, const ContextMenuContextData& context)
</span><span class="cx"> {
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (items.isEmpty() && context.controlledImageHandle().isNull())
</span><span class="cx"> return;
</span><span class="cx"> #else
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx">
</span><span class="cx"> NSRect menuRect = NSMakeRect(menuLocation.x(), menuLocation.y(), 0, 0);
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (!context.controlledImageHandle().isNull())
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
</span><span class="cx">
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> return [m_webView window];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void WebContextMenuProxyMac::replaceControlledImage(CGImageRef newImage)
</span><span class="cx"> {
</span><span class="cx"> FloatSize newImageSize(CGImageGetWidth(newImage), CGImageGetHeight(newImage));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> WebPage::fromCorePage(page)->setArtificialPluginInitializationDelayEnabled(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (preference == "WebKitImageControlsEnabled") {
</span><span class="cx"> WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::imageControlsEnabledKey(), enabled);
</span><span class="cx"> for (auto* page : pages)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> m_page->corePage()->contextMenuController().contextMenuItemSelected(&coreItem);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void WebContextMenu::replaceControlledImage(PassRefPtr<Image> newImage)
</span><span class="cx"> {
</span><span class="cx"> m_page->corePage()->contextMenuController().replaceControlledImage(newImage);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> void itemSelected(const WebContextMenuItemData&);
</span><span class="cx"> Vector<WebContextMenuItemData> items() const;
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void replaceControlledImage(PassRefPtr<WebCore::Image>);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -2616,7 +2616,7 @@
</span><span class="cx"> settings.setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> settings.setImageControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::imageControlsEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -3146,7 +3146,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void WebPage::replaceControlledImage(const ShareableBitmap::Handle& bitmapHandle)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(bitmapHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx">
</span><span class="cx"> void getBytecodeProfile(uint64_t callbackID);
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> void replaceControlledImage(const ShareableBitmap::Handle&);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (167785 => 167786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-25 00:51:14 UTC (rev 167785)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-25 00:53:01 UTC (rev 167786)
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx">
</span><span class="cx"> TakeSnapshot(WebCore::IntRect snapshotRect, WebCore::IntSize bitmapSize, uint32_t options, uint64_t callbackID)
</span><span class="cx">
</span><del>-#if ENABLE(IMAGE_CONTROLS)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> ReplaceControlledImage(WebKit::ShareableBitmap::Handle newBitmapHandle)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>