<!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>[179409] trunk</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/179409">179409</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-30 12:49:33 -0800 (Fri, 30 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename shared() static member functions to singleton() for singleton classes.
https://bugs.webkit.org/show_bug.cgi?id=141088
Reviewed by Ryosuke Niwa and Benjamin Poulain.
Rename shared() static member functions to singleton() for singleton
classes as per the recent coding style change.
Source/JavaScriptCore:
* inspector/remote/RemoteInspector.h:
* inspector/remote/RemoteInspector.mm:
(Inspector::RemoteInspector::singleton):
(Inspector::RemoteInspector::start):
(Inspector::RemoteInspector::shared): Deleted.
* inspector/remote/RemoteInspectorDebuggable.cpp:
(Inspector::RemoteInspectorDebuggable::~RemoteInspectorDebuggable):
(Inspector::RemoteInspectorDebuggable::init):
(Inspector::RemoteInspectorDebuggable::update):
(Inspector::RemoteInspectorDebuggable::setRemoteDebuggingAllowed):
(Inspector::RemoteInspectorDebuggable::pauseWaitingForAutomaticInspection):
(Inspector::RemoteInspectorDebuggable::unpauseForInitializedInspector):
* inspector/remote/RemoteInspectorDebuggableConnection.mm:
(Inspector::RemoteInspectorDebuggableConnection::setup):
(Inspector::RemoteInspectorDebuggableConnection::sendMessageToFrontend):
Source/WebKit:
* Storage/WebDatabaseProvider.cpp:
(WebDatabaseProvider::singleton):
(WebDatabaseProvider::shared): Deleted.
* Storage/WebDatabaseProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggablecpp">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggableConnectionmm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.mm</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagercpp">trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagerh">trunk/Source/WebCore/Modules/gamepad/GamepadManager.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoAlgorithmDictionarycpp">trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp">trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoAlgorithmRegistryh">trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h</a></li>
<li><a href="#trunkSourceWebCorecryptoCryptoKeycpp">trunk/Source/WebCore/crypto/CryptoKey.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyHMACcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp">trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryBackForwardListcpp">trunk/Source/WebCore/history/BackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemcpp">trunk/Source/WebCore/history/HistoryItem.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCacheh">trunk/Source/WebCore/history/PageCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightResultCachecpp">trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightResultCacheh">trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlayscpp">trunk/Source/WebCore/page/DebugPageOverlays.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlaysh">trunk/Source/WebCore/page/DebugPageOverlays.h</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadcpp">trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadh">trunk/Source/WebCore/page/scrolling/ScrollingThread.h</a></li>
<li><a href="#trunkSourceWebCoreplatformGamepadProvidercpp">trunk/Source/WebCore/platform/GamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformGamepadProviderh">trunk/Source/WebCore/platform/GamepadProvider.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinCACFLayerTreeHostcpp">trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinLayerChangesFlushercpp">trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinLayerChangesFlusherh">trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakFloatingPointEnvironmentcpp">trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakFloatingPointEnvironmenth">trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWebCoreThreadmm">trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProvidercpp">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProviderh">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamCentercpp">trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamCenterh">trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacMediaStreamCenterMaccpp">trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp">trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueueh">trunk/Source/WebCore/platform/network/DNSResolveQueue.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfDNSCFNetcpp">trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupDNSSoupcpp">trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockPageOverlayClientcpp">trunk/Source/WebCore/testing/MockPageOverlayClient.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockPageOverlayClienth">trunk/Source/WebCore/testing/MockPageOverlayClient.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageWebDatabaseProvidercpp">trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageWebDatabaseProviderh">trunk/Source/WebKit/Storage/WebDatabaseProvider.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListmm">trunk/Source/WebKit/mac/History/WebBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCoreStatisticsmm">trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagerh">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagermm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedWebHostedNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginPackagemm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoremm">trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCachecpp">trunk/Source/WebKit/win/WebCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreStatisticscpp">trunk/Source/WebKit/win/WebCoreStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebVisitedLinkStorecpp">trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebVisitedLinkStoreh">trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm">trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacRemoteNetworkingContextmm">trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxycpp">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcesscpp">trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcessh">trunk/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessWebProcessConnectioncpp">trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginControllerProxyMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginProcessMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedConnectionStackcpp">trunk/Source/WebKit2/Shared/ConnectionStack.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedConnectionStackh">trunk/Source/WebKit2/Shared/ConnectionStack.h</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacLegacyProcessChildProcessEntryPointh">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebMemorySamplercpp">trunk/Source/WebKit2/Shared/WebMemorySampler.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebMemorySamplerh">trunk/Source/WebKit2/Shared/WebMemorySampler.h</a></li>
<li><a href="#trunkSourceWebKit2SharediosChildProcessIOSmm">trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedlinuxSeccompFiltersSeccompBrokercpp">trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimh">trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimmm">trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimh">trunk/Source/WebKit2/Shared/mac/SecItemShim.h</a></li>
<li><a href="#trunkSourceWebKit2SharedunixChildProcessMainh">trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKTextCheckercpp">trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_maincpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_main_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_main_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_viewcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebInspectorServercpp">trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebInspectorServerh">trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCachecpp">trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCacheh">trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsunixPluginInfoStoreUnixcpp">trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxycpp">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxyh">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebTextCheckercpp">trunk/Source/WebKit2/UIProcess/WebTextChecker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebTextCheckerh">trunk/Source/WebKit2/UIProcess/WebTextChecker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflEwkDebugh">trunk/Source/WebKit2/UIProcess/efl/EwkDebug.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflTextCheckerEflcpp">trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebContextEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebMemoryPressureHandlerIOSh">trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebMemoryPressureHandlerIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxycpp">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxyh">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacServicesControllerh">trunk/Source/WebKit2/UIProcess/mac/ServicesController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacServicesControllermm">trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewSnapshotStoreh">trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewSnapshotStoremm">trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWindowServerConnectionh">trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWindowServerConnectionmm">trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesWebToDatabaseProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramemm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNotificationsNotificationPermissionRequestManagercpp">trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxycpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageAreaMapcpp">trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp">trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebBatteryClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebColorChoosercpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebGeolocationClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGeolocationClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebNotificationClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPopupMenucpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebSearchPopupMenucpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebVibrationClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebVibrationClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportgtkWebEditorClientGtkcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebQuickLookHandleClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebEditorClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewUpdateDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebBackForwardListProxycpp">trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageGroupProxycpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteCustommm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesseflExtensionManagerEflcpp">trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesseflExtensionManagerEflh">trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesseflWebInjectedBundleMainEflcpp">trunk/Source/WebKit2/WebProcess/efl/WebInjectedBundleMainEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkInjectedBundleMaincpp">trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagermm">trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeWorkQueuecpp">trunk/Tools/DumpRenderTree/WorkQueue.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeWorkQueueh">trunk/Tools/DumpRenderTree/WorkQueue.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacFrameLoadDelegatemm">trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinFrameLoadDelegatecpp">trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpp_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py</a></li>
<li><a href="#trunkToolsTestWebKitAPIInjectedBundleControllercpp">trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIInjectedBundleControllerh">trunk/Tools/TestWebKitAPI/InjectedBundleController.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIInjectedBundleMaincpp">trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIInjectedBundleTesth">trunk/Tools/TestWebKitAPI/InjectedBundleTest.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControls_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2HitTestResultNodeHandle_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PasteboardNotifications_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillLoad_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillSendSubmitEvent_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsControllercpp">trunk/Tools/TestWebKitAPI/TestsController.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsControllerh">trunk/Tools/TestWebKitAPI/TestsController.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIeflmaincpp">trunk/Tools/TestWebKitAPI/efl/main.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkmaincpp">trunk/Tools/TestWebKitAPI/gtk/main.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIiosmainIOSmm">trunk/Tools/TestWebKitAPI/ios/mainIOS.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacmainMacmm">trunk/Tools/TestWebKitAPI/mac/mainMac.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPIwinmaincpp">trunk/Tools/TestWebKitAPI/win/main.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleGCControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/GCController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleMaincpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTextInputControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlecocoaInjectedBundlePageCocoamm">trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleeflTestRunnerEflcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityControllerIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityControllerMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityNotificationHandlermm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacTestRunnerMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerWorkQueueManagercpp">trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnercairoTestInvocationCairocpp">trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnercgTestInvocationCGcpp">trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacWebKitTestRunnerDraggingInfomm">trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacWebKitTestRunnerEventmm">trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerEvent.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
+ * inspector/remote/RemoteInspector.h:
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::singleton):
+ (Inspector::RemoteInspector::start):
+ (Inspector::RemoteInspector::shared): Deleted.
+ * inspector/remote/RemoteInspectorDebuggable.cpp:
+ (Inspector::RemoteInspectorDebuggable::~RemoteInspectorDebuggable):
+ (Inspector::RemoteInspectorDebuggable::init):
+ (Inspector::RemoteInspectorDebuggable::update):
+ (Inspector::RemoteInspectorDebuggable::setRemoteDebuggingAllowed):
+ (Inspector::RemoteInspectorDebuggable::pauseWaitingForAutomaticInspection):
+ (Inspector::RemoteInspectorDebuggable::unpauseForInitializedInspector):
+ * inspector/remote/RemoteInspectorDebuggableConnection.mm:
+ (Inspector::RemoteInspectorDebuggableConnection::setup):
+ (Inspector::RemoteInspectorDebuggableConnection::sendMessageToFrontend):
+
</ins><span class="cx"> 2015-01-30 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> class JS_EXPORT_PRIVATE RemoteInspector final : public RemoteInspectorXPCConnection::Client {
</span><span class="cx"> public:
</span><span class="cx"> static void startDisabled();
</span><del>- static RemoteInspector& shared();
</del><ins>+ static RemoteInspector& singleton();
</ins><span class="cx"> friend class NeverDestroyed<RemoteInspector>;
</span><span class="cx">
</span><span class="cx"> void registerDebuggable(RemoteInspectorDebuggable*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> RemoteInspector::startEnabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RemoteInspector& RemoteInspector::shared()
</del><ins>+RemoteInspector& RemoteInspector::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<RemoteInspector> shared;
</span><span class="cx">
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> notify_register_dispatch(WIRServiceAvailableNotification, &m_notifyToken, m_xpcQueue, ^(int) {
</span><del>- RemoteInspector::shared().setupXPCConnectionIfNeeded();
</del><ins>+ RemoteInspector::singleton().setupXPCConnectionIfNeeded();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> notify_post(WIRServiceAvailabilityCheckNotification);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -42,17 +42,17 @@
</span><span class="cx">
</span><span class="cx"> RemoteInspectorDebuggable::~RemoteInspectorDebuggable()
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().unregisterDebuggable(this);
</del><ins>+ RemoteInspector::singleton().unregisterDebuggable(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteInspectorDebuggable::init()
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().registerDebuggable(this);
</del><ins>+ RemoteInspector::singleton().registerDebuggable(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteInspectorDebuggable::update()
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().updateDebuggable(this);
</del><ins>+ RemoteInspector::singleton().updateDebuggable(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteInspectorDebuggable::setRemoteDebuggingAllowed(bool allowed)
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx"> m_allowed = allowed;
</span><span class="cx">
</span><span class="cx"> if (m_allowed && automaticInspectionAllowed())
</span><del>- RemoteInspector::shared().updateDebuggableAutomaticInspectCandidate(this);
</del><ins>+ RemoteInspector::singleton().updateDebuggableAutomaticInspectCandidate(this);
</ins><span class="cx"> else
</span><del>- RemoteInspector::shared().updateDebuggable(this);
</del><ins>+ RemoteInspector::singleton().updateDebuggable(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteInspectorDebuggableInfo RemoteInspectorDebuggable::info() const
</span><span class="lines">@@ -87,13 +87,13 @@
</span><span class="cx"> ASSERT(automaticInspectionAllowed());
</span><span class="cx">
</span><span class="cx"> EventLoop loop;
</span><del>- while (RemoteInspector::shared().waitingForAutomaticInspection(identifier()) && !loop.ended())
</del><ins>+ while (RemoteInspector::singleton().waitingForAutomaticInspection(identifier()) && !loop.ended())
</ins><span class="cx"> loop.cycle();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteInspectorDebuggable::unpauseForInitializedInspector()
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().setupCompleted(identifier());
</del><ins>+ RemoteInspector::singleton().setupCompleted(identifier());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggableConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> lock(m_debuggableMutex);
</span><span class="cx"> if (!m_debuggable || !m_debuggable->remoteDebuggingAllowed() || m_debuggable->hasLocalDebugger()) {
</span><del>- RemoteInspector::shared().setupFailed(identifier());
</del><ins>+ RemoteInspector::singleton().setupFailed(identifier());
</ins><span class="cx"> m_debuggable = nullptr;
</span><span class="cx"> } else {
</span><span class="cx"> m_debuggable->connect(this, isAutomaticInspection);
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> bool RemoteInspectorDebuggableConnection::sendMessageToFrontend(const String& message)
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().sendMessageToRemoteFrontend(identifier(), message);
</del><ins>+ RemoteInspector::singleton().sendMessageToRemoteFrontend(identifier(), message);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
</ins><span class="cx"> 2015-01-30 Matthew Mirman <mmirman@apple.com>
</span><span class="cx">
</span><span class="cx"> Added ClientRect as an interface that requires attributes
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> return NavigatorGamepad::from(navigator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GamepadManager& GamepadManager::shared()
</del><ins>+GamepadManager& GamepadManager::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<GamepadManager> sharedManager;
</span><span class="cx"> return sharedManager;
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> void GamepadManager::platformGamepadConnected(PlatformGamepad& platformGamepad)
</span><span class="cx"> {
</span><span class="cx"> // Notify blind Navigators and Windows about all gamepads except for this one.
</span><del>- for (auto* gamepad : GamepadProvider::shared().platformGamepads()) {
</del><ins>+ for (auto* gamepad : GamepadProvider::singleton().platformGamepads()) {
</ins><span class="cx"> if (!gamepad || gamepad == &platformGamepad)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> if (m_gamepadBlindNavigators.isEmpty() && m_gamepadBlindDOMWindows.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto* gamepad : GamepadProvider::shared().platformGamepads())
</del><ins>+ for (auto* gamepad : GamepadProvider::singleton().platformGamepads())
</ins><span class="cx"> makeGamepadVisible(*gamepad, m_gamepadBlindNavigators, m_gamepadBlindDOMWindows);
</span><span class="cx">
</span><span class="cx"> m_gamepadBlindNavigators.clear();
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> if (!m_navigators.isEmpty() || !m_domWindows.isEmpty()) {
</span><span class="cx"> LOG(Gamepad, "GamepadManager has %i NavigatorGamepads and %i DOMWindows registered, is starting gamepad monitoring", m_navigators.size(), m_domWindows.size());
</span><span class="cx"> m_isMonitoringGamepads = true;
</span><del>- GamepadProvider::shared().startMonitoringGamepads(this);
</del><ins>+ GamepadProvider::singleton().startMonitoringGamepads(this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> if (m_navigators.isEmpty() && m_domWindows.isEmpty()) {
</span><span class="cx"> LOG(Gamepad, "GamepadManager has no NavigatorGamepads or DOMWindows registered, is stopping gamepad monitoring");
</span><span class="cx"> m_isMonitoringGamepads = false;
</span><del>- GamepadProvider::shared().stopMonitoringGamepads(this);
</del><ins>+ GamepadProvider::singleton().stopMonitoringGamepads(this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GamepadManager);
</span><span class="cx"> friend class NeverDestroyed<GamepadManager>;
</span><span class="cx"> public:
</span><del>- static GamepadManager& shared();
</del><ins>+ static GamepadManager& singleton();
</ins><span class="cx">
</span><span class="cx"> virtual void platformGamepadConnected(PlatformGamepad&) override final;
</span><span class="cx"> virtual void platformGamepadDisconnected(PlatformGamepad&) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> NavigatorGamepad::NavigatorGamepad()
</span><span class="cx"> : m_navigationStart(std::numeric_limits<double>::infinity())
</span><span class="cx"> {
</span><del>- GamepadManager::shared().registerNavigator(this);
</del><ins>+ GamepadManager::singleton().registerNavigator(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NavigatorGamepad::~NavigatorGamepad()
</span><span class="cx"> {
</span><del>- GamepadManager::shared().unregisterNavigator(this);
</del><ins>+ GamepadManager::singleton().unregisterNavigator(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* NavigatorGamepad::supplementName()
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> if (m_gamepads.isEmpty())
</span><span class="cx"> return m_gamepads;
</span><span class="cx">
</span><del>- const Vector<PlatformGamepad*>& platformGamepads = GamepadProvider::shared().platformGamepads();
</del><ins>+ const Vector<PlatformGamepad*>& platformGamepads = GamepadProvider::singleton().platformGamepads();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < platformGamepads.size(); ++i) {
</span><span class="cx"> if (!platformGamepads[i]) {
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> void NavigatorGamepad::gamepadsBecameVisible()
</span><span class="cx"> {
</span><del>- const Vector<PlatformGamepad*>& platformGamepads = GamepadProvider::shared().platformGamepads();
</del><ins>+ const Vector<PlatformGamepad*>& platformGamepads = GamepadProvider::singleton().platformGamepads();
</ins><span class="cx"> m_gamepads.resize(platformGamepads.size());
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < platformGamepads.size(); ++i) {
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned index = platformGamepad.index();
</span><del>- ASSERT(GamepadProvider::shared().platformGamepads()[index] == &platformGamepad);
</del><ins>+ ASSERT(GamepadProvider::singleton().platformGamepads()[index] == &platformGamepad);
</ins><span class="cx">
</span><span class="cx"> // The new index should already fit in the existing array, or should be exactly one past-the-end of the existing array.
</span><span class="cx"> ASSERT(index <= m_gamepads.size());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequest::create(context, callback);
</span><del>- if (!MediaStreamCenter::shared().getMediaStreamTrackSources(request.release()))
</del><ins>+ if (!MediaStreamCenter::singleton().getMediaStreamTrackSources(request.release()))
</ins><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> {
</span><span class="cx"> // 1 - make sure the system is capable of supporting the audio and video constraints. We don't want to ask for
</span><span class="cx"> // user permission if the constraints can not be suported.
</span><del>- MediaStreamCenter::shared().validateRequestConstraints(this, m_audioConstraints, m_videoConstraints);
</del><ins>+ MediaStreamCenter::singleton().validateRequestConstraints(this, m_audioConstraints, m_videoConstraints);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> RefPtr<UserMediaRequest> protectedThis(this);
</span><span class="cx"> callOnMainThread([protectedThis] {
</span><span class="cx"> // 3 - the user granted access, ask platform to create the media stream descriptors.
</span><del>- MediaStreamCenter::shared().createMediaStream(protectedThis.get(), protectedThis->m_audioConstraints, protectedThis->m_videoConstraints);
</del><ins>+ MediaStreamCenter::singleton().createMediaStream(protectedThis.get(), protectedThis->m_audioConstraints, protectedThis->m_videoConstraints);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1163,7 +1163,7 @@
</span><span class="cx"> __ZN7WebCore30hostNameNeedsEncodingWithRangeEP8NSString8_NSRange
</span><span class="cx"> __ZN7WebCore30overrideUserPreferredLanguagesERKN3WTF6VectorINS0_6StringELm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore31CrossOriginPreflightResultCache5emptyEv
</span><del>-__ZN7WebCore31CrossOriginPreflightResultCache6sharedEv
</del><ins>+__ZN7WebCore31CrossOriginPreflightResultCache9singletonEv
</ins><span class="cx"> __ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
</span><span class="cx"> __ZN7WebCore33stripLeadingAndTrailingHTMLSpacesERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore36largestRectWithAspectRatioInsideRectEfRKNS_9FloatRectE
</span><span class="lines">@@ -1613,7 +1613,7 @@
</span><span class="cx"> __ZN7WebCore9PageCache14pruneToSizeNowEjNS_13PruningReasonE
</span><span class="cx"> __ZN7WebCore9PageCache34markPagesForVisitedLinkStyleRecalcEv
</span><span class="cx"> __ZN7WebCore9PageCache6removeERNS_11HistoryItemE
</span><del>-__ZN7WebCore9PageCache6sharedEv
</del><ins>+__ZN7WebCore9PageCache9singletonEv
</ins><span class="cx"> __ZN7WebCore9PageGroup9pageGroupERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore9Scrollbar11mouseExitedEv
</span><span class="cx"> __ZN7WebCore9Scrollbar12mouseEnteredEv
</span><span class="lines">@@ -2760,7 +2760,7 @@
</span><span class="cx"> __ZN7WebCore24DocumentMarkerController14markersInRangeEPNS_5RangeENS_14DocumentMarker11MarkerTypesE
</span><span class="cx"> __ZN7WebCore24FloatingPointEnvironment21enableDenormalSupportEv
</span><span class="cx"> __ZN7WebCore24FloatingPointEnvironment25saveMainThreadEnvironmentEv
</span><del>-__ZN7WebCore24FloatingPointEnvironment6sharedEv
</del><ins>+__ZN7WebCore24FloatingPointEnvironment9singletonEv
</ins><span class="cx"> __ZN7WebCore24acquireLineBreakIteratorEN3WTF10StringViewERKNS0_12AtomicStringEPKtjNS_21LineBreakIteratorModeEb
</span><span class="cx"> __ZN7WebCore24charactersAroundPositionERKNS_15VisiblePositionERiS3_S3_
</span><span class="cx"> __ZN7WebCore24createTemporaryDirectoryEP8NSString
</span><span class="lines">@@ -3137,8 +3137,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> __ZN7WebCore15GamepadProvider17setSharedProviderERS0_
</span><del>-__ZN7WebCore15GamepadProvider6sharedEv
-__ZN7WebCore18HIDGamepadProvider6sharedEv
</del><ins>+__ZN7WebCore15GamepadProvider9singletonEv
+__ZN7WebCore18HIDGamepadProvider9singletonEv
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoAlgorithmDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!CryptoAlgorithmRegistry::shared().getIdentifierForName(algorithmName, algorithmIdentifier)) {
</del><ins>+ if (!CryptoAlgorithmRegistry::singleton().getIdentifierForName(algorithmName, algorithmIdentifier)) {
</ins><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -170,49 +170,50 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ auto& algorithmRegisty = CryptoAlgorithmRegistry::singleton();
</ins><span class="cx"> std::unique_ptr<CryptoAlgorithm> algorithm;
</span><span class="cx"> std::unique_ptr<CryptoAlgorithmParameters> parameters;
</span><span class="cx"> if (m_jwkAlgorithmName == "HS256") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::HMAC);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::HMAC);
</ins><span class="cx"> parameters = createHMACParameters(CryptoAlgorithmIdentifier::SHA_256);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "HS384") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::HMAC);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::HMAC);
</ins><span class="cx"> parameters = createHMACParameters(CryptoAlgorithmIdentifier::SHA_384);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "HS512") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::HMAC);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::HMAC);
</ins><span class="cx"> parameters = createHMACParameters(CryptoAlgorithmIdentifier::SHA_512);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "RS256") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5);
</ins><span class="cx"> parameters = createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier::SHA_256);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "RS384") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5);
</ins><span class="cx"> parameters = createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier::SHA_384);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "RS512") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5);
</ins><span class="cx"> parameters = createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier::SHA_512);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "RSA1_5") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else if (m_jwkAlgorithmName == "RSA-OAEP") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::RSA_OAEP);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSA_OAEP);
</ins><span class="cx"> parameters = createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier::SHA_1);
</span><span class="cx"> } else if (m_jwkAlgorithmName == "A128CBC") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::AES_CBC);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_CBC);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else if (m_jwkAlgorithmName == "A192CBC") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::AES_CBC);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_CBC);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else if (m_jwkAlgorithmName == "A256CBC") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::AES_CBC);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_CBC);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else if (m_jwkAlgorithmName == "A128KW") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::AES_KW);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_KW);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else if (m_jwkAlgorithmName == "A192KW") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::AES_KW);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_KW);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else if (m_jwkAlgorithmName == "A256KW") {
</span><del>- algorithm = CryptoAlgorithmRegistry::shared().create(CryptoAlgorithmIdentifier::AES_KW);
</del><ins>+ algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_KW);
</ins><span class="cx"> parameters = std::make_unique<CryptoAlgorithmParameters>();
</span><span class="cx"> } else {
</span><span class="cx"> throwTypeError(m_exec, "Unsupported JWK algorithm " + m_jwkAlgorithmName);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto result = CryptoAlgorithmRegistry::shared().create(algorithmIdentifier);
</del><ins>+ auto result = CryptoAlgorithmRegistry::singleton().create(algorithmIdentifier);
</ins><span class="cx"> if (!result)
</span><span class="cx"> setDOMException(exec, NOT_SUPPORTED_ERR);
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CryptoAlgorithmRegistry& CryptoAlgorithmRegistry::shared()
</del><ins>+CryptoAlgorithmRegistry& CryptoAlgorithmRegistry::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<CryptoAlgorithmRegistry> registry;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoAlgorithmRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmRegistry.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> friend class NeverDestroyed<CryptoAlgorithmRegistry>;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static CryptoAlgorithmRegistry& shared();
</del><ins>+ static CryptoAlgorithmRegistry& singleton();
</ins><span class="cx">
</span><span class="cx"> bool getIdentifierForName(const String&, CryptoAlgorithmIdentifier&);
</span><span class="cx"> String nameForIdentifier(CryptoAlgorithmIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoCryptoKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/CryptoKey.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/CryptoKey.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/crypto/CryptoKey.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> void CryptoKey::buildAlgorithmDescription(CryptoAlgorithmDescriptionBuilder& builder) const
</span><span class="cx"> {
</span><del>- builder.add("name", CryptoAlgorithmRegistry::shared().nameForIdentifier(m_algorithm));
</del><ins>+ builder.add("name", CryptoAlgorithmRegistry::singleton().nameForIdentifier(m_algorithm));
</ins><span class="cx"> // Subclasses will add other keys.
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyHMACcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> CryptoKey::buildAlgorithmDescription(builder);
</span><span class="cx">
</span><span class="cx"> auto hashDescriptionBuilder = builder.createEmptyClone();
</span><del>- hashDescriptionBuilder->add("name", CryptoAlgorithmRegistry::shared().nameForIdentifier(m_hash));
</del><ins>+ hashDescriptionBuilder->add("name", CryptoAlgorithmRegistry::singleton().nameForIdentifier(m_hash));
</ins><span class="cx"> builder.add("hash", *hashDescriptionBuilder);
</span><span class="cx">
</span><span class="cx"> builder.add("length", m_key.size());
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_restrictedToSpecificHash) {
</span><span class="cx"> auto hashDescriptionBuilder = builder.createEmptyClone();
</span><del>- hashDescriptionBuilder->add("name", CryptoAlgorithmRegistry::shared().nameForIdentifier(m_hash));
</del><ins>+ hashDescriptionBuilder->add("name", CryptoAlgorithmRegistry::singleton().nameForIdentifier(m_hash));
</ins><span class="cx"> builder.add("hash", *hashDescriptionBuilder);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/BackForwardList.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/BackForwardList.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/history/BackForwardList.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> RefPtr<HistoryItem> item = m_entries.last();
</span><span class="cx"> m_entries.removeLast();
</span><span class="cx"> m_entryHash.remove(item);
</span><del>- PageCache::shared().remove(*item);
</del><ins>+ PageCache::singleton().remove(*item);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> RefPtr<HistoryItem> item = m_entries[0];
</span><span class="cx"> m_entries.remove(0);
</span><span class="cx"> m_entryHash.remove(item);
</span><del>- PageCache::shared().remove(*item);
</del><ins>+ PageCache::singleton().remove(*item);
</ins><span class="cx"> m_current--;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> RefPtr<HistoryItem> item = m_entries.last();
</span><span class="cx"> m_entries.removeLast();
</span><span class="cx"> m_entryHash.remove(item);
</span><del>- PageCache::shared().remove(*item);
</del><ins>+ PageCache::singleton().remove(*item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!size)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> for (auto& item : m_entries) {
</span><span class="cx"> if (item->isInPageCache()) {
</span><span class="cx"> didRemoveAtLeastOneItem = true;
</span><del>- PageCache::shared().remove(*item);
</del><ins>+ PageCache::singleton().remove(*item);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return didRemoveAtLeastOneItem;
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> void BackForwardList::close()
</span><span class="cx"> {
</span><span class="cx"> for (auto& item : m_entries)
</span><del>- PageCache::shared().remove(*item);
</del><ins>+ PageCache::singleton().remove(*item);
</ins><span class="cx"> m_entries.clear();
</span><span class="cx"> m_entryHash.clear();
</span><span class="cx"> m_page = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> frame.loader().client().savePlatformDataToCachedFrame(this);
</span><span class="cx">
</span><del>- if (m_isComposited && PageCache::shared().shouldClearBackingStores())
</del><ins>+ if (m_isComposited && PageCache::singleton().shouldClearBackingStores())
</ins><span class="cx"> frame.view()->clearBackingStores();
</span><span class="cx">
</span><span class="cx"> // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryItem::setURL(const URL& url)
</span><span class="cx"> {
</span><del>- PageCache::shared().remove(*this);
</del><ins>+ PageCache::singleton().remove(*this);
</ins><span class="cx"> setURLString(url.string());
</span><span class="cx"> clearDocumentState();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> diagnosticLoggingClient.logDiagnosticMessageWithResult(DiagnosticLoggingKeys::pageCacheKey(), emptyString(), rejectReasons ? DiagnosticLoggingResultFail : DiagnosticLoggingResultPass);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PageCache& PageCache::shared()
</del><ins>+PageCache& PageCache::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<PageCache> globalPageCache;
</span><span class="cx"> return globalPageCache;
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> if (cachedPage->hasExpired()) {
</span><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
</span><del>- PageCache::shared().remove(item);
</del><ins>+ PageCache::singleton().remove(item);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return cachedPage;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/history/PageCache.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PageCache); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> // Function to obtain the global page cache.
</span><del>- WEBCORE_EXPORT static PageCache& shared();
</del><ins>+ WEBCORE_EXPORT static PageCache& singleton();
</ins><span class="cx">
</span><span class="cx"> bool canCache(Page*) const;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void setShouldClearBackingStores(bool flag) { m_shouldClearBackingStores = flag; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- PageCache() = default; // Use shared() instead.
</del><ins>+ PageCache() = default; // Use singleton() instead.
</ins><span class="cx"> ~PageCache() = delete; // Make sure nobody accidentally calls delete -- WebCore does not delete singletons.
</span><span class="cx">
</span><span class="cx"> static bool canCachePageContainingThisFrame(Frame&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightResultCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CrossOriginPreflightResultCache& CrossOriginPreflightResultCache::shared()
</del><ins>+CrossOriginPreflightResultCache& CrossOriginPreflightResultCache::singleton()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightResultCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CrossOriginPreflightResultCache); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static CrossOriginPreflightResultCache& shared();
</del><ins>+ WEBCORE_EXPORT static CrossOriginPreflightResultCache& singleton();
</ins><span class="cx">
</span><span class="cx"> void appendEntry(const String& origin, const URL&, std::unique_ptr<CrossOriginPreflightResultCacheItem>);
</span><span class="cx"> bool canSkipPreflight(const String& origin, const URL&, StoredCredentials, const String& method, const HTTPHeaderMap& requestHeaders);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> m_simpleRequest = false;
</span><span class="cx"> m_actualRequest = WTF::move(crossOriginRequest);
</span><span class="cx">
</span><del>- if (CrossOriginPreflightResultCache::shared().canSkipPreflight(securityOrigin()->toString(), m_actualRequest->url(), m_options.allowCredentials(), m_actualRequest->httpMethod(), m_actualRequest->httpHeaderFields()))
</del><ins>+ if (CrossOriginPreflightResultCache::singleton().canSkipPreflight(securityOrigin()->toString(), m_actualRequest->url(), m_options.allowCredentials(), m_actualRequest->httpMethod(), m_actualRequest->httpHeaderFields()))
</ins><span class="cx"> preflightSuccess();
</span><span class="cx"> else
</span><span class="cx"> makeCrossOriginAccessRequestWithPreflight(*m_actualRequest);
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CrossOriginPreflightResultCache::shared().appendEntry(securityOrigin()->toString(), m_actualRequest->url(), WTF::move(preflightResult));
</del><ins>+ CrossOriginPreflightResultCache::singleton().appendEntry(securityOrigin()->toString(), m_actualRequest->url(), WTF::move(preflightResult));
</ins><span class="cx"> } else {
</span><span class="cx"> if (!m_sameOriginRequest && m_options.crossOriginRequestPolicy == UseAccessControl) {
</span><span class="cx"> if (!passesAccessControlCheck(response, m_options.allowCredentials(), securityOrigin(), accessControlErrorDescription)) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1741,7 +1741,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CachedPage> cachedPage;
</span><span class="cx"> if (m_loadingFromCachedPage && history().provisionalItem())
</span><del>- cachedPage = PageCache::shared().take(*history().provisionalItem(), m_frame.page());
</del><ins>+ cachedPage = PageCache::singleton().take(*history().provisionalItem(), m_frame.page());
</ins><span class="cx">
</span><span class="cx"> LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame.tree().uniqueName().string().utf8().data(),
</span><span class="cx"> m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "",
</span><span class="lines">@@ -1758,11 +1758,12 @@
</span><span class="cx"> LOG(MemoryPressure, "Pruning page cache because under memory pressure at: %s", __PRETTY_FUNCTION__);
</span><span class="cx"> LOG(PageCache, "Pruning page cache to 0 due to memory pressure");
</span><span class="cx"> // Don't cache any page if we are under memory pressure.
</span><del>- PageCache::shared().pruneToSizeNow(0, PruningReason::MemoryPressure);
</del><ins>+ PageCache::singleton().pruneToSizeNow(0, PruningReason::MemoryPressure);
</ins><span class="cx"> } else if (systemMemoryLevel() <= memoryLevelThresholdToPrunePageCache) {
</span><span class="cx"> LOG(MemoryPressure, "Pruning page cache because system memory level is %d at: %s", systemMemoryLevel(), __PRETTY_FUNCTION__);
</span><del>- LOG(PageCache, "Pruning page cache to %d due to low memory (level %d less or equal to %d threshold)", PageCache::shared().maxSize() / 2, systemMemoryLevel(), memoryLevelThresholdToPrunePageCache);
- PageCache::shared().pruneToSizeNow(PageCache::shared().maxSize() / 2, PruningReason::MemoryPressure);
</del><ins>+ auto& pageCache = PageCache::singleton();
+ LOG(PageCache, "Pruning page cache to %d due to low memory (level %d less or equal to %d threshold)", pageCache.maxSize() / 2, systemMemoryLevel(), memoryLevelThresholdToPrunePageCache);
+ pageCache.pruneToSizeNow(pageCache.maxSize() / 2, PruningReason::MemoryPressure);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1772,8 +1773,8 @@
</span><span class="cx"> // Check to see if we need to cache the page we are navigating away from into the back/forward cache.
</span><span class="cx"> // We are doing this here because we know for sure that a new page is about to be loaded.
</span><span class="cx"> HistoryItem& item = *history().currentItem();
</span><del>- if (!m_frame.tree().parent() && PageCache::shared().canCache(m_frame.page()) && !item.isInPageCache())
- PageCache::shared().add(item, *m_frame.page());
</del><ins>+ if (!m_frame.tree().parent() && PageCache::singleton().canCache(m_frame.page()) && !item.isInPageCache())
+ PageCache::singleton().add(item, *m_frame.page());
</ins><span class="cx">
</span><span class="cx"> if (m_loadType != FrameLoadType::Replace)
</span><span class="cx"> closeOldDataSources();
</span><span class="lines">@@ -3159,7 +3160,7 @@
</span><span class="cx"> // Remember this item so we can traverse any child items as child frames load
</span><span class="cx"> history().setProvisionalItem(&item);
</span><span class="cx">
</span><del>- if (CachedPage* cachedPage = PageCache::shared().get(item, m_frame.page())) {
</del><ins>+ if (CachedPage* cachedPage = PageCache::singleton().get(item, m_frame.page())) {
</ins><span class="cx"> auto documentLoader = cachedPage->documentLoader();
</span><span class="cx"> documentLoader->setTriggeringAction(NavigationAction(documentLoader->request(), loadType, false));
</span><span class="cx"> documentLoader->setLastCheckedRequest(ResourceRequest());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // When we are pre-commit, the currentItem is where any page cache data resides.
</span><del>- std::unique_ptr<CachedPage> cachedPage = PageCache::shared().take(*currentItem(), m_frame.page());
</del><ins>+ std::unique_ptr<CachedPage> cachedPage = PageCache::singleton().take(*currentItem(), m_frame.page());
</ins><span class="cx"> if (!cachedPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_currentItem) {
</span><del>- PageCache::shared().remove(*m_currentItem);
</del><ins>+ PageCache::singleton().remove(*m_currentItem);
</ins><span class="cx">
</span><span class="cx"> if (m_frame.loader().loadType() == FrameLoadType::Reload || m_frame.loader().loadType() == FrameLoadType::ReloadFromOrigin)
</span><span class="cx"> saveScrollPositionAndViewStateToItem(m_currentItem.get());
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> if (m_gamepadEventListenerCount)
</span><del>- GamepadManager::shared().unregisterDOMWindow(this);
</del><ins>+ GamepadManager::singleton().unregisterDOMWindow(this);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> void DOMWindow::incrementGamepadEventListenerCount()
</span><span class="cx"> {
</span><span class="cx"> if (++m_gamepadEventListenerCount == 1)
</span><del>- GamepadManager::shared().registerDOMWindow(this);
</del><ins>+ GamepadManager::singleton().registerDOMWindow(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindow::decrementGamepadEventListenerCount()
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> ASSERT(m_gamepadEventListenerCount);
</span><span class="cx">
</span><span class="cx"> if (!--m_gamepadEventListenerCount)
</span><del>- GamepadManager::shared().unregisterDOMWindow(this);
</del><ins>+ GamepadManager::singleton().unregisterDOMWindow(this);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> m_overlay->setNeedsDisplay();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DebugPageOverlays& DebugPageOverlays::shared()
</del><ins>+DebugPageOverlays& DebugPageOverlays::singleton()
</ins><span class="cx"> {
</span><span class="cx"> if (!sharedDebugOverlays)
</span><span class="cx"> sharedDebugOverlays = new DebugPageOverlays;
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> if (!activeOverlayRegions && !hasOverlays(frame))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DebugPageOverlays::shared().updateOverlayRegionVisibility(frame, activeOverlayRegions);
</del><ins>+ DebugPageOverlays::singleton().updateOverlayRegionVisibility(frame, activeOverlayRegions);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlaysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/DebugPageOverlays.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class DebugPageOverlays {
</span><span class="cx"> public:
</span><del>- static DebugPageOverlays& shared();
</del><ins>+ static DebugPageOverlays& singleton();
</ins><span class="cx">
</span><span class="cx"> enum class RegionType {
</span><span class="cx"> WheelEventHandlers,
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -989,7 +989,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isMainFrame())
</span><del>- PageCache::shared().markPagesForFullStyleRecalc(*page);
</del><ins>+ PageCache::singleton().markPagesForFullStyleRecalc(*page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float Frame::frameScaleFactor() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/Page.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -839,9 +839,9 @@
</span><span class="cx"> setNeedsRecalcStyleInAllFrames();
</span><span class="cx">
</span><span class="cx"> mainFrame().deviceOrPageScaleFactorChanged();
</span><del>- PageCache::shared().markPagesForDeviceScaleChanged(*this);
</del><ins>+ PageCache::singleton().markPagesForDeviceScaleChanged(*this);
</ins><span class="cx">
</span><del>- PageCache::shared().markPagesForFullStyleRecalc(*this);
</del><ins>+ PageCache::singleton().markPagesForFullStyleRecalc(*this);
</ins><span class="cx"> GraphicsContext::updateDocumentMarkerResources();
</span><span class="cx">
</span><span class="cx"> mainFrame().pageOverlayController().didChangeDeviceScaleFactor();
</span><span class="lines">@@ -921,7 +921,7 @@
</span><span class="cx"> m_pagination = pagination;
</span><span class="cx">
</span><span class="cx"> setNeedsRecalcStyleInAllFrames();
</span><del>- PageCache::shared().markPagesForFullStyleRecalc(*this);
</del><ins>+ PageCache::singleton().markPagesForFullStyleRecalc(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned Page::pageCount() const
</span><span class="lines">@@ -1661,7 +1661,7 @@
</span><span class="cx"> m_visitedLinkStore->addPage(*this);
</span><span class="cx">
</span><span class="cx"> invalidateStylesForAllLinks();
</span><del>- PageCache::shared().markPagesForFullStyleRecalc(*this);
</del><ins>+ PageCache::singleton().markPagesForFullStyleRecalc(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SessionID Page::sessionID() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (auto it = m_pages.begin(), end = m_pages.end(); it != end; ++it)
</span><span class="cx"> (*it)->captionPreferencesChanged();
</span><del>- PageCache::shared().markPagesForCaptionPreferencesChanged();
</del><ins>+ PageCache::singleton().markPagesForCaptionPreferencesChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CaptionUserPreferences* PageGroup::captionPreferences()
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_usesPageCache)
</span><del>- PageCache::shared().pruneToSizeNow(0, PruningReason::None);
</del><ins>+ PageCache::singleton().pruneToSizeNow(0, PruningReason::None);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setFontRenderingMode(FontRenderingMode mode)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -40,22 +40,21 @@
</span><span class="cx">
</span><span class="cx"> bool ScrollingThread::isCurrentThread()
</span><span class="cx"> {
</span><del>- if (!shared().m_threadIdentifier)
- return false;
-
- return currentThread() == shared().m_threadIdentifier;
</del><ins>+ auto threadIdentifier = ScrollingThread::singleton().m_threadIdentifier;
+ return threadIdentifier && currentThread() == threadIdentifier;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingThread::dispatch(std::function<void ()> function)
</span><span class="cx"> {
</span><del>- shared().createThreadIfNeeded();
</del><ins>+ auto& scrollingThread = ScrollingThread::singleton();
+ scrollingThread.createThreadIfNeeded();
</ins><span class="cx">
</span><span class="cx"> {
</span><del>- std::lock_guard<std::mutex> lock(shared().m_functionsMutex);
- shared().m_functions.append(function);
</del><ins>+ std::lock_guard<std::mutex> lock(singleton().m_functionsMutex);
+ scrollingThread.m_functions.append(function);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- shared().wakeUpRunLoop();
</del><ins>+ scrollingThread.wakeUpRunLoop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingThread::dispatchBarrier(std::function<void ()> function)
</span><span class="lines">@@ -65,7 +64,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ScrollingThread& ScrollingThread::shared()
</del><ins>+ScrollingThread& ScrollingThread::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<ScrollingThread> scrollingThread;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingThread();
</span><span class="cx">
</span><del>- static ScrollingThread& shared();
</del><ins>+ static ScrollingThread& singleton();
</ins><span class="cx">
</span><span class="cx"> void createThreadIfNeeded();
</span><span class="cx"> static void threadCallback(void* scrollingThread);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GamepadProvider.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GamepadProvider.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/GamepadProvider.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> static GamepadProvider* sharedProvider = nullptr;
</span><span class="cx">
</span><del>-GamepadProvider& GamepadProvider::shared()
</del><ins>+GamepadProvider& GamepadProvider::singleton()
</ins><span class="cx"> {
</span><span class="cx"> if (!sharedProvider) {
</span><span class="cx"> static NeverDestroyed<GamepadProvider> defaultProvider;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GamepadProvider.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GamepadProvider.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/GamepadProvider.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~GamepadProvider() { }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static GamepadProvider& shared();
</del><ins>+ WEBCORE_EXPORT static GamepadProvider& singleton();
</ins><span class="cx"> WEBCORE_EXPORT static void setSharedProvider(GamepadProvider&);
</span><span class="cx">
</span><span class="cx"> virtual void startMonitoringGamepads(GamepadProviderClient*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> ReliefLogger log("Empty the PageCache");
</span><span class="cx"> // Right now, the only reason we call release critical memory while not under memory pressure is if the process is about to be suspended.
</span><span class="cx"> PruningReason pruningReason = memoryPressureHandler().isUnderMemoryPressure() ? PruningReason::MemoryPressure : PruningReason::ProcessSuspended;
</span><del>- PageCache::shared().pruneToSizeNow(0, pruningReason);
</del><ins>+ PageCache::singleton().pruneToSizeNow(0, pruningReason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> m_purgeTimer.startOneShot(scratchBufferPurgeInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static ScratchBuffer& shared();
</del><ins>+ static ScratchBuffer& singleton();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void timerFired()
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ScratchBuffer& ScratchBuffer::shared()
</del><ins>+ScratchBuffer& ScratchBuffer::singleton()
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(ScratchBuffer, scratchBuffer, ());
</span><span class="cx"> return scratchBuffer;
</span><span class="lines">@@ -567,7 +567,7 @@
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRoundedRect& shadowedRect, const IntRect& layerRect)
</span><span class="cx"> {
</span><del>- m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
</del><ins>+ m_layerImage = ScratchBuffer::singleton().getScratchBuffer(layerRect.size());
</ins><span class="cx"> if (!m_layerImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> bufferRelativeShadowedRect.move(m_layerContextTranslation);
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::shared().setCachedShadowValues(m_blurRadius, Color::black, ColorSpaceDeviceRGB, bufferRelativeShadowedRect, shadowedRect.radii(), m_layerSize);
</del><ins>+ bool redrawNeeded = ScratchBuffer::singleton().setCachedShadowValues(m_blurRadius, Color::black, ColorSpaceDeviceRGB, bufferRelativeShadowedRect, shadowedRect.radii(), m_layerSize);
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> GraphicsContext* shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*shadowContext);
</span><span class="lines">@@ -597,12 +597,12 @@
</span><span class="cx">
</span><span class="cx"> drawShadowBuffer(graphicsContext);
</span><span class="cx"> m_layerImage = 0;
</span><del>- ScratchBuffer::shared().scheduleScratchBufferPurge();
</del><ins>+ ScratchBuffer::singleton().scheduleScratchBufferPurge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRoundedRect& holeRect, const IntRect& layerRect)
</span><span class="cx"> {
</span><del>- m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
</del><ins>+ m_layerImage = ScratchBuffer::singleton().getScratchBuffer(layerRect.size());
</ins><span class="cx"> if (!m_layerImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -613,7 +613,7 @@
</span><span class="cx"> bufferRelativeHoleRect.move(m_layerContextTranslation);
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::shared().setCachedInsetShadowValues(m_blurRadius, Color::black, ColorSpaceDeviceRGB, bufferRelativeRect, bufferRelativeHoleRect, holeRect.radii());
</del><ins>+ bool redrawNeeded = ScratchBuffer::singleton().setCachedInsetShadowValues(m_blurRadius, Color::black, ColorSpaceDeviceRGB, bufferRelativeRect, bufferRelativeHoleRect, holeRect.radii());
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> GraphicsContext* shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*shadowContext);
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx">
</span><span class="cx"> drawShadowBuffer(graphicsContext);
</span><span class="cx"> m_layerImage = 0;
</span><del>- ScratchBuffer::shared().scheduleScratchBufferPurge();
</del><ins>+ ScratchBuffer::singleton().scheduleScratchBufferPurge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRoundedRect& holeRect, const IntSize& templateSize, const IntSize& edgeSize)
</span><span class="cx"> {
</span><del>- m_layerImage = ScratchBuffer::shared().getScratchBuffer(templateSize);
</del><ins>+ m_layerImage = ScratchBuffer::singleton().getScratchBuffer(templateSize);
</ins><span class="cx"> if (!m_layerImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -684,7 +684,7 @@
</span><span class="cx"> FloatRect templateHole = FloatRect(edgeSize.width(), edgeSize.height(), templateSize.width() - 2 * edgeSize.width(), templateSize.height() - 2 * edgeSize.height());
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::shared().setCachedInsetShadowValues(m_blurRadius, m_color, m_colorSpace, templateBounds, templateHole, holeRect.radii());
</del><ins>+ bool redrawNeeded = ScratchBuffer::singleton().setCachedInsetShadowValues(m_blurRadius, m_color, m_colorSpace, templateBounds, templateHole, holeRect.radii());
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> // Draw shadow into a new ImageBuffer.
</span><span class="cx"> GraphicsContext* shadowContext = m_layerImage->context();
</span><span class="lines">@@ -735,19 +735,20 @@
</span><span class="cx"> drawLayerPieces(graphicsContext, destHoleBounds, holeRect.radii(), edgeSize, templateSize, InnerShadow);
</span><span class="cx">
</span><span class="cx"> m_layerImage = 0;
</span><del>- ScratchBuffer::shared().scheduleScratchBufferPurge();
</del><ins>+ ScratchBuffer::singleton().scheduleScratchBufferPurge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRoundedRect& shadowedRect, const IntSize& templateSize, const IntSize& edgeSize)
</span><span class="cx"> {
</span><del>- m_layerImage = ScratchBuffer::shared().getScratchBuffer(templateSize);
</del><ins>+ auto& scratchBuffer = ScratchBuffer::singleton();
+ m_layerImage = scratchBuffer.getScratchBuffer(templateSize);
</ins><span class="cx"> if (!m_layerImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FloatRect templateShadow = FloatRect(edgeSize.width(), edgeSize.height(), templateSize.width() - 2 * edgeSize.width(), templateSize.height() - 2 * edgeSize.height());
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::shared().setCachedShadowValues(m_blurRadius, m_color, m_colorSpace, templateShadow, shadowedRect.radii(), m_layerSize);
</del><ins>+ bool redrawNeeded = scratchBuffer.setCachedShadowValues(m_blurRadius, m_color, m_colorSpace, templateShadow, shadowedRect.radii(), m_layerSize);
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> // Draw shadow into the ImageBuffer.
</span><span class="cx"> GraphicsContext* shadowContext = m_layerImage->context();
</span><span class="lines">@@ -780,7 +781,7 @@
</span><span class="cx"> drawLayerPieces(graphicsContext, shadowBounds, shadowedRect.radii(), edgeSize, templateSize, OuterShadow);
</span><span class="cx">
</span><span class="cx"> m_layerImage = 0;
</span><del>- ScratchBuffer::shared().scheduleScratchBufferPurge();
</del><ins>+ ScratchBuffer::singleton().scheduleScratchBufferPurge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const FloatRoundedRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
</span><span class="lines">@@ -891,12 +892,13 @@
</span><span class="cx"> IntRect layerRect = calculateLayerBoundingRect(context, layerArea, context->clipBounds());
</span><span class="cx">
</span><span class="cx"> if (layerRect.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // We reset the scratch buffer values here, because the buffer will no longer contain
</span><span class="cx"> // data from any previous rectangle or inset shadows drawn via the tiling path.
</span><del>- ScratchBuffer::shared().setCachedShadowValues(FloatSize(), Color::black, ColorSpaceDeviceRGB, IntRect(), FloatRoundedRect::Radii(), m_layerSize);
- m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
</del><ins>+ auto& scratchBuffer = ScratchBuffer::singleton();
+ scratchBuffer.setCachedShadowValues(FloatSize(), Color::black, ColorSpaceDeviceRGB, IntRect(), FloatRoundedRect::Radii(), m_layerSize);
+ m_layerImage = scratchBuffer.getScratchBuffer(layerRect.size());
</ins><span class="cx">
</span><span class="cx"> GraphicsContext* shadowContext = m_layerImage->context();
</span><span class="cx"> shadowContext->save();
</span><span class="lines">@@ -919,7 +921,7 @@
</span><span class="cx"> context->drawImageBuffer(m_layerImage, ColorSpaceDeviceRGB, FloatRect(roundedIntPoint(m_layerOrigin), m_layerSize), FloatRect(FloatPoint(), m_layerSize), context->compositeOperation());
</span><span class="cx">
</span><span class="cx"> m_layerImage = 0;
</span><del>- ScratchBuffer::shared().scheduleScratchBufferPurge();
</del><ins>+ ScratchBuffer::singleton().scheduleScratchBufferPurge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinCACFLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -220,14 +220,14 @@
</span><span class="cx"> // The layer tree is changing as a result of someone modifying a PlatformCALayer that doesn't
</span><span class="cx"> // have a corresponding GraphicsLayer. Schedule a flush since we won't schedule one through the
</span><span class="cx"> // normal GraphicsLayer mechanisms.
</span><del>- LayerChangesFlusher::shared().flushPendingLayerChangesSoon(this);
</del><ins>+ LayerChangesFlusher::singleton().flushPendingLayerChangesSoon(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CACFLayerTreeHost::destroyRenderer()
</span><span class="cx"> {
</span><span class="cx"> m_rootLayer = 0;
</span><span class="cx"> m_rootChildLayer = 0;
</span><del>- LayerChangesFlusher::shared().cancelPendingFlush(this);
</del><ins>+ LayerChangesFlusher::singleton().cancelPendingFlush(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void getDirtyRects(HWND window, Vector<CGRect>& outRects)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> void CACFLayerTreeHost::flushPendingGraphicsLayerChangesSoon()
</span><span class="cx"> {
</span><span class="cx"> m_shouldFlushPendingGraphicsLayerChanges = true;
</span><del>- LayerChangesFlusher::shared().flushPendingLayerChangesSoon(this);
</del><ins>+ LayerChangesFlusher::singleton().flushPendingLayerChangesSoon(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CACFLayerTreeHost::setShouldInvertColors(bool)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinLayerChangesFlushercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-LayerChangesFlusher& LayerChangesFlusher::shared()
</del><ins>+LayerChangesFlusher& LayerChangesFlusher::singleton()
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(LayerChangesFlusher, flusher, ());
</span><span class="cx"> return flusher;
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> // crash for debugging purposes if an exception is hit.
</span><span class="cx"> ExceptionRegistration registrationStruct; // Note: must be stack allocated.
</span><span class="cx"> StructuredExceptionHandlerSuppressor supressor(registrationStruct);
</span><del>- return shared().hookFired(code, wParam, lParam);
</del><ins>+ return singleton().hookFired(code, wParam, lParam);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LRESULT LayerChangesFlusher::hookFired(int code, WPARAM wParam, LPARAM lParam)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinLayerChangesFlusherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> class LayerChangesFlusher {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(LayerChangesFlusher);
</span><span class="cx"> public:
</span><del>- static LayerChangesFlusher& shared();
</del><ins>+ static LayerChangesFlusher& singleton();
</ins><span class="cx">
</span><span class="cx"> void flushPendingLayerChangesSoon(AbstractCACFLayerTreeHost*);
</span><span class="cx"> void cancelPendingFlush(AbstractCACFLayerTreeHost*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakFloatingPointEnvironmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-FloatingPointEnvironment& FloatingPointEnvironment::shared()
</del><ins>+FloatingPointEnvironment& FloatingPointEnvironment::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<FloatingPointEnvironment> floatingPointEnvironment;
</span><span class="cx"> return floatingPointEnvironment;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakFloatingPointEnvironmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> WEBCORE_EXPORT void saveMainThreadEnvironment();
</span><span class="cx"> void propagateMainThreadEnvironment();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static FloatingPointEnvironment& shared();
</del><ins>+ WEBCORE_EXPORT static FloatingPointEnvironment& singleton();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWebCoreThreadmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> void *RunWebThread(void *arg)
</span><span class="cx"> {
</span><del>- FloatingPointEnvironment::shared().propagateMainThreadEnvironment();
</del><ins>+ FloatingPointEnvironment::singleton().propagateMainThreadEnvironment();
</ins><span class="cx">
</span><span class="cx"> UNUSED_PARAM(arg);
</span><span class="cx"> // WTF::initializeMainThread() needs to be called before JSC::initializeThreading() since the
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> ASSERT_WITH_MESSAGE(result == 0, "startup lock failed with code:%d", result);
</span><span class="cx">
</span><span class="cx"> // Propagate the mainThread's fenv to workers & the web thread.
</span><del>- FloatingPointEnvironment::shared().saveMainThreadEnvironment();
</del><ins>+ FloatingPointEnvironment::singleton().saveMainThreadEnvironment();
</ins><span class="cx">
</span><span class="cx"> pthread_create(&webThread, &tattr, RunWebThread, NULL);
</span><span class="cx"> pthread_attr_destroy(&tattr);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> listener->valuesChanged(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HIDGamepadProvider& HIDGamepadProvider::shared()
</del><ins>+HIDGamepadProvider& HIDGamepadProvider::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HIDGamepadProvider> sharedListener;
</span><span class="cx"> return sharedListener;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(HIDGamepadProvider);
</span><span class="cx"> friend class NeverDestroyed<HIDGamepadProvider>;
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static HIDGamepadProvider& shared();
</del><ins>+ WEBCORE_EXPORT static HIDGamepadProvider& singleton();
</ins><span class="cx">
</span><span class="cx"> virtual void startMonitoringGamepads(GamepadProviderClient*);
</span><span class="cx"> virtual void stopMonitoringGamepads(GamepadProviderClient*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> return override;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamCenter& MediaStreamCenter::shared()
</del><ins>+MediaStreamCenter& MediaStreamCenter::singleton()
</ins><span class="cx"> {
</span><span class="cx"> MediaStreamCenter* override = mediaStreamCenterOverride();
</span><span class="cx"> if (override)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamCenterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaStreamCenter();
</span><span class="cx">
</span><del>- static MediaStreamCenter& shared();
</del><ins>+ static MediaStreamCenter& singleton();
</ins><span class="cx"> static void setSharedStreamCenter(MediaStreamCenter*);
</span><span class="cx">
</span><span class="cx"> virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> class AVCaptureDeviceManager {
</span><span class="cx"> public:
</span><del>- static AVCaptureDeviceManager& shared();
</del><ins>+ static AVCaptureDeviceManager& singleton();
</ins><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<TrackSourceInfo>> getSourcesInfo(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> if (firstTime && !captureDeviceList.size()) {
</span><span class="cx"> firstTime = false;
</span><span class="cx"> refreshCaptureDeviceList();
</span><del>- AVCaptureDeviceManager::shared().registerForDeviceNotifications();
</del><ins>+ AVCaptureDeviceManager::singleton().registerForDeviceNotifications();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return captureDeviceList;
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> return AVFoundationLibrary();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AVCaptureDeviceManager& AVCaptureDeviceManager::shared()
</del><ins>+AVCaptureDeviceManager& AVCaptureDeviceManager::singleton()
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(AVCaptureDeviceManager, manager, ());
</span><span class="cx"> return manager;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacMediaStreamCenterMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> if (audioConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::shared().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->constraintsInvalid(invalidConstraint);
</span><span class="cx"> return;
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> if (videoConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::shared().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->constraintsInvalid(invalidConstraint);
</span><span class="cx"> return;
</span><span class="lines">@@ -95,13 +95,13 @@
</span><span class="cx">
</span><span class="cx"> if (audioConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::shared().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->failedToCreateStreamWithConstraintsError(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> audioSource = AVCaptureDeviceManager::shared().bestSourceForTypeAndConstraints(MediaStreamSource::Audio, audioConstraints.get());
</del><ins>+ RefPtr<MediaStreamSource> audioSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(MediaStreamSource::Audio, audioConstraints.get());
</ins><span class="cx"> ASSERT(audioSource);
</span><span class="cx">
</span><span class="cx"> audioSources.append(audioSource.release());
</span><span class="lines">@@ -109,13 +109,13 @@
</span><span class="cx">
</span><span class="cx"> if (videoConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::shared().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->failedToCreateStreamWithConstraintsError(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> videoSource = AVCaptureDeviceManager::shared().bestSourceForTypeAndConstraints(MediaStreamSource::Video, videoConstraints.get());
</del><ins>+ RefPtr<MediaStreamSource> videoSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(MediaStreamSource::Video, videoConstraints.get());
</ins><span class="cx"> ASSERT(videoSource);
</span><span class="cx">
</span><span class="cx"> videoSources.append(videoSource.release());
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamTrackSourcesRequestClient> requestClient = prpClient;
</span><span class="cx">
</span><del>- Vector<RefPtr<TrackSourceInfo>> sources = AVCaptureDeviceManager::shared().getSourcesInfo(requestClient->requestOrigin());
</del><ins>+ Vector<RefPtr<TrackSourceInfo>> sources = AVCaptureDeviceManager::singleton().getSourcesInfo(requestClient->requestOrigin());
</ins><span class="cx">
</span><span class="cx"> requestClient->didCompleteRequest(sources);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> // If there were queued names that couldn't be sent simultaneously, check the state of resolvers after this delay.
</span><span class="cx"> static const double gRetryResolvingInSeconds = 0.1;
</span><span class="cx">
</span><del>-DNSResolveQueue& DNSResolveQueue::shared()
</del><ins>+DNSResolveQueue& DNSResolveQueue::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<DNSResolveQueue> queue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> friend NeverDestroyed<DNSResolveQueue>;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static DNSResolveQueue& shared();
</del><ins>+ static DNSResolveQueue& singleton();
</ins><span class="cx">
</span><span class="cx"> void add(const String& hostname);
</span><span class="cx"> void decrementRequestCount()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfDNSCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> static void clientCallback(CFHostRef theHost, CFHostInfoType, const CFStreamError*, void*)
</span><span class="cx"> {
</span><del>- DNSResolveQueue::shared().decrementRequestCount(); // It's ok to call shared() from a secondary thread, the static variable has already been initialized by now.
</del><ins>+ DNSResolveQueue::singleton().decrementRequestCount(); // It's ok to call singleton() from a secondary thread, the static variable has already been initialized by now.
</ins><span class="cx"> CFRelease(theHost);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (hostname.isEmpty())
</span><span class="cx"> return;
</span><del>- DNSResolveQueue::shared().add(hostname);
</del><ins>+ DNSResolveQueue::singleton().add(hostname);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupDNSSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> static void resolvedCallback(SoupAddress*, guint, void*)
</span><span class="cx"> {
</span><del>- DNSResolveQueue::shared().decrementRequestCount();
</del><ins>+ DNSResolveQueue::singleton().decrementRequestCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DNSResolveQueue::platformResolve(const String& hostname)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> if (hostname.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DNSResolveQueue::shared().add(hostname);
</del><ins>+ DNSResolveQueue::singleton().add(hostname);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> AXObjectCache::disableAccessibility();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- MockPageOverlayClient::shared().uninstallAllOverlays();
</del><ins>+ MockPageOverlayClient::singleton().uninstallAllOverlays();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Internals::Internals(Document* document)
</span><span class="lines">@@ -2431,7 +2431,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- MockPageOverlayClient::shared().installOverlay(document->frame()->mainFrame(), overlayType == "view" ? PageOverlay::OverlayType::View : PageOverlay::OverlayType::Document);
</del><ins>+ MockPageOverlayClient::singleton().installOverlay(document->frame()->mainFrame(), overlayType == "view" ? PageOverlay::OverlayType::View : PageOverlay::OverlayType::Document);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Internals::pageOverlayLayerTreeAsText(ExceptionCode& ec) const
</span><span class="lines">@@ -2444,7 +2444,7 @@
</span><span class="cx">
</span><span class="cx"> document->updateLayout();
</span><span class="cx">
</span><del>- return MockPageOverlayClient::shared().layerTreeAsText(document->frame()->mainFrame());
</del><ins>+ return MockPageOverlayClient::singleton().layerTreeAsText(document->frame()->mainFrame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::setPageMuted(bool muted)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockPageOverlayClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockPageOverlayClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockPageOverlayClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/testing/MockPageOverlayClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-MockPageOverlayClient& MockPageOverlayClient::shared()
</del><ins>+MockPageOverlayClient& MockPageOverlayClient::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<MockPageOverlayClient> sharedClient;
</span><span class="cx"> return sharedClient.get();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockPageOverlayClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockPageOverlayClient.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockPageOverlayClient.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/testing/MockPageOverlayClient.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class MockPageOverlayClient final : public PageOverlay::Client {
</span><span class="cx"> friend class NeverDestroyed<MockPageOverlayClient>;
</span><span class="cx"> public:
</span><del>- static MockPageOverlayClient& shared();
</del><ins>+ static MockPageOverlayClient& singleton();
</ins><span class="cx">
</span><span class="cx"> explicit MockPageOverlayClient();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Propagate the mainThread's fenv to workers.
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- FloatingPointEnvironment::shared().propagateMainThreadEnvironment();
</del><ins>+ FloatingPointEnvironment::singleton().propagateMainThreadEnvironment();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
+ * Storage/WebDatabaseProvider.cpp:
+ (WebDatabaseProvider::singleton):
+ (WebDatabaseProvider::shared): Deleted.
+ * Storage/WebDatabaseProvider.h:
+
</ins><span class="cx"> 2015-01-29 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build fix after r179368.
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebDatabaseProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include <WebCore/IDBFactoryBackendInterface.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-WebDatabaseProvider& WebDatabaseProvider::shared()
</del><ins>+WebDatabaseProvider& WebDatabaseProvider::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WebDatabaseProvider& databaseProvider = adoptRef(*new WebDatabaseProvider).leakRef();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebDatabaseProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebDatabaseProvider.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebDatabaseProvider.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/Storage/WebDatabaseProvider.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> class WebDatabaseProvider final : public WebCore::DatabaseProvider {
</span><span class="cx"> friend class NeverDestroyed<WebDatabaseProvider>;
</span><span class="cx"> public:
</span><del>- static WebDatabaseProvider& shared();
</del><ins>+ static WebDatabaseProvider& singleton();
</ins><span class="cx"> virtual ~WebDatabaseProvider();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
</ins><span class="cx"> 2015-01-29 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove more Mountain Lion code from WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSUInteger)pageCacheSize
</span><span class="cx"> {
</span><del>- return [kit(core(self)->page()) usesPageCache] ? PageCache::shared().maxSize() : 0;
</del><ins>+ return [kit(core(self)->page()) usesPageCache] ? PageCache::singleton().maxSize() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (int)backListCount
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> WebCore::cacheStorage().empty();
</span><span class="cx">
</span><span class="cx"> // Empty the Cross-Origin Preflight cache
</span><del>- WebCore::CrossOriginPreflightResultCache::shared().empty();
</del><ins>+ WebCore::CrossOriginPreflightResultCache::singleton().empty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCoreStatisticsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -224,12 +224,12 @@
</span><span class="cx">
</span><span class="cx"> + (int)cachedPageCount
</span><span class="cx"> {
</span><del>- return PageCache::shared().pageCount();
</del><ins>+ return PageCache::singleton().pageCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (int)cachedFrameCount
</span><span class="cx"> {
</span><del>- return PageCache::shared().frameCount();
</del><ins>+ return PageCache::singleton().frameCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Deprecated
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class NetscapePluginHostManager {
</span><span class="cx"> public:
</span><del>- static NetscapePluginHostManager& shared();
</del><ins>+ static NetscapePluginHostManager& singleton();
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<NetscapePluginInstanceProxy> instantiatePlugin(const String& pluginPath, cpu_type_t pluginArchitecture, const String& bundleIdentifier, WebHostedNetscapePluginView *, NSString *mimeType, NSArray *attributeKeys, NSArray *attributeValues, NSString *userAgent, NSURL *sourceURL, bool fullFrame, bool isPrivateBrowsingEnabled, bool isAcceleratedCompositingEnabled, bool hostLayersInWindowServer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NetscapePluginHostManager& NetscapePluginHostManager::shared()
</del><ins>+NetscapePluginHostManager& NetscapePluginHostManager::singleton()
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(NetscapePluginHostManager, pluginHostManager, ());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> for (PluginInstanceMap::const_iterator it = instances.begin(); it != end; ++it)
</span><span class="cx"> it->value->pluginHostDied();
</span><span class="cx">
</span><del>- NetscapePluginHostManager::shared().pluginHostDied(this);
</del><ins>+ NetscapePluginHostManager::singleton().pluginHostDied(this);
</ins><span class="cx">
</span><span class="cx"> // The plug-in crashed while its menu bar was hidden. Make sure to show it.
</span><span class="cx"> if (!m_menuBarIsVisible)
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedWebHostedNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> acceleratedCompositingEnabled = [[[self webView] preferences] acceleratedCompositingEnabled];
</span><span class="cx"> _hostsLayersInWindowServer = [self windowHostsLayersInWindowServer];
</span><span class="cx">
</span><del>- _proxy = NetscapePluginHostManager::shared().instantiatePlugin([_pluginPackage.get() path], [_pluginPackage.get() pluginHostArchitecture], [_pluginPackage.get() bundleIdentifier], self, _MIMEType.get(), _attributeKeys.get(), _attributeValues.get(), userAgent, _sourceURL.get(),
</del><ins>+ _proxy = NetscapePluginHostManager::singleton().instantiatePlugin([_pluginPackage.get() path], [_pluginPackage.get() pluginHostArchitecture], [_pluginPackage.get() bundleIdentifier], self, _MIMEType.get(), _attributeKeys.get(), _attributeValues.get(), userAgent, _sourceURL.get(),
</ins><span class="cx"> _mode == NP_FULL, _isPrivateBrowsingEnabled, acceleratedCompositingEnabled, _hostsLayersInWindowServer);
</span><span class="cx"> if (!_proxy)
</span><span class="cx"> return NO;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginPackagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)createPropertyListFile
</span><span class="cx"> {
</span><del>- NetscapePluginHostManager::shared().createPropertyListFile(path, pluginHostArchitecture, [self bundleIdentifier]);
</del><ins>+ NetscapePluginHostManager::singleton().createPropertyListFile(path, pluginHostArchitecture, [self bundleIdentifier]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(PLUGIN_HOST_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (newWebView)
</span><del>- WebKit::NetscapePluginHostManager::shared().didCreateWindow();
</del><ins>+ WebKit::NetscapePluginHostManager::singleton().didCreateWindow();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return core(newWebView);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(PLUGIN_HOST_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (newWebView)
</span><del>- WebKit::NetscapePluginHostManager::shared().didCreateWindow();
</del><ins>+ WebKit::NetscapePluginHostManager::singleton().didCreateWindow();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return core([newWebView mainFrame]);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (auto& visitedLinkStore : visitedLinkStores())
</span><span class="cx"> visitedLinkStore->removeVisitedLinkHashes();
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVisitedLinkStore::addVisitedLink(NSString *urlString)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> m_visitedLinkHashes.remove(linkHash);
</span><span class="cx">
</span><span class="cx"> invalidateStylesForLink(linkHash);
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebVisitedLinkStore::isLinkVisited(Page& page, LinkHash linkHash, const URL& baseURL, const AtomicString& attributeURL)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> m_visitedLinkHashes.add(linkHash);
</span><span class="cx">
</span><span class="cx"> invalidateStylesForLink(linkHash);
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVisitedLinkStore::removeVisitedLinkHashes()
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -849,7 +849,7 @@
</span><span class="cx"> if (initialized)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GamepadProvider::shared().setSharedProvider(HIDGamepadProvider::shared());
</del><ins>+ GamepadProvider::singleton().setSharedProvider(HIDGamepadProvider::singleton());
</ins><span class="cx"> initialized = true;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx"> pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><del>- pageConfiguration.databaseProvider = &WebDatabaseProvider::shared();
</del><ins>+ pageConfiguration.databaseProvider = &WebDatabaseProvider::singleton();
</ins><span class="cx"> pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
</span><span class="cx"> pageConfiguration.userContentController = &_private->group->userContentController();
</span><span class="cx"> pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore();
</span><span class="lines">@@ -1190,7 +1190,7 @@
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><del>- pageConfiguration.databaseProvider = &WebDatabaseProvider::shared();
</del><ins>+ pageConfiguration.databaseProvider = &WebDatabaseProvider::singleton();
</ins><span class="cx"> pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
</span><span class="cx"> pageConfiguration.userContentController = &_private->group->userContentController();
</span><span class="cx"> pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore();
</span><span class="lines">@@ -1868,12 +1868,12 @@
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> + (void)_enableRemoteInspector
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().start();
</del><ins>+ RemoteInspector::singleton().start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)_disableRemoteInspector
</span><span class="cx"> {
</span><del>- RemoteInspector::shared().stop();
</del><ins>+ RemoteInspector::singleton().stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)_disableAutoStartRemoteInspector
</span><span class="lines">@@ -1883,12 +1883,12 @@
</span><span class="cx">
</span><span class="cx"> + (BOOL)_isRemoteInspectorEnabled
</span><span class="cx"> {
</span><del>- return RemoteInspector::shared().enabled();
</del><ins>+ return RemoteInspector::singleton().enabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (BOOL)_hasRemoteInspectorSession
</span><span class="cx"> {
</span><del>- return RemoteInspector::shared().hasActiveDebugSession();
</del><ins>+ return RemoteInspector::singleton().hasActiveDebugSession();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)allowsRemoteInspection
</span><span class="lines">@@ -1926,7 +1926,7 @@
</span><span class="cx"> - (void)_setHostApplicationProcessIdentifier:(pid_t)pid auditToken:(audit_token_t)auditToken
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> auditData = adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
</span><del>- RemoteInspector::shared().setParentProcessInformation(pid, auditData);
</del><ins>+ RemoteInspector::singleton().setParentProcessInformation(pid, auditData);
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> #endif // ENABLE(REMOTE_INSPECTOR)
</span><span class="lines">@@ -7915,9 +7915,11 @@
</span><span class="cx">
</span><span class="cx"> memoryCache().setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
</span><span class="cx"> memoryCache().setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><del>- PageCache::shared().setMaxSize(pageCacheSize);
</del><ins>+
+ auto& pageCache = PageCache::singleton();
+ pageCache.setMaxSize(pageCacheSize);
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- PageCache::shared().setShouldClearBackingStores(true);
</del><ins>+ pageCache.setShouldClearBackingStores(true);
</ins><span class="cx"> nsurlCacheMemoryCapacity = std::max(nsurlCacheMemoryCapacity, [nsurlCache memoryCapacity]);
</span><span class="cx"> CFURLCacheRef cfCache;
</span><span class="cx"> if ([nsurlCache respondsToSelector:@selector(_CFURLCache)] && (cfCache = [nsurlCache _CFURLCache]))
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
</ins><span class="cx"> 2015-01-29 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build fix after r179368.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCache.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCache.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/win/WebCache.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> WebCore::cacheStorage().empty();
</span><span class="cx">
</span><span class="cx"> // Empty the Cross-Origin Preflight cache
</span><del>- WebCore::CrossOriginPreflightResultCache::shared().empty();
</del><ins>+ WebCore::CrossOriginPreflightResultCache::singleton().empty();
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreStatistics.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreStatistics.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/win/WebCoreStatistics.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- *count = PageCache::shared().pageCount();
</del><ins>+ *count = PageCache::singleton().pageCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -336,6 +336,6 @@
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- *count = PageCache::shared().frameCount();
</del><ins>+ *count = PageCache::singleton().frameCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebVisitedLinkStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> static bool s_shouldTrackVisitedLinks;
</span><span class="cx">
</span><del>-WebVisitedLinkStore& WebVisitedLinkStore::shared()
</del><ins>+WebVisitedLinkStore& WebVisitedLinkStore::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WebVisitedLinkStore& visitedLinkStore = *adoptRef(new WebVisitedLinkStore).leakRef();
</span><span class="cx">
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx">
</span><span class="cx"> void WebVisitedLinkStore::removeAllVisitedLinks()
</span><span class="cx"> {
</span><del>- shared().removeVisitedLinkHashes();
- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ WebVisitedLinkStore::singleton().removeVisitedLinkHashes();
+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVisitedLinkStore::addVisitedLink(const String& urlString)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> m_visitedLinkHashes.add(linkHash);
</span><span class="cx">
</span><span class="cx"> invalidateStylesForLink(linkHash);
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVisitedLinkStore::removeVisitedLinkHashes()
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebVisitedLinkStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebVisitedLinkStore.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class WebVisitedLinkStore final : public WebCore::VisitedLinkStore {
</span><span class="cx"> public:
</span><del>- static WebVisitedLinkStore& shared();
</del><ins>+ static WebVisitedLinkStore& singleton();
</ins><span class="cx"> WebVisitedLinkStore();
</span><span class="cx"> virtual ~WebVisitedLinkStore();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx">
</span><span class="cx"> memoryCache().setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
</span><span class="cx"> memoryCache().setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><del>- PageCache::shared().setMaxSize(pageCacheSize);
</del><ins>+ PageCache::singleton().setMaxSize(pageCacheSize);
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> // Don't shrink a big disk cache, since that would cause churn.
</span><span class="lines">@@ -2805,10 +2805,10 @@
</span><span class="cx"> configuration.dragClient = new WebDragClient(this);
</span><span class="cx"> configuration.inspectorClient = m_inspectorClient;
</span><span class="cx"> configuration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><del>- configuration.databaseProvider = &WebDatabaseProvider::shared();
</del><ins>+ configuration.databaseProvider = &WebDatabaseProvider::singleton();
</ins><span class="cx"> configuration.storageNamespaceProvider = WebStorageNamespaceProvider::create(localStorageDatabasePath(m_preferences.get()));
</span><span class="cx"> configuration.progressTrackerClient = static_cast<WebFrameLoaderClient*>(configuration.loaderClientForMainFrame);
</span><del>- configuration.visitedLinkStore = &WebVisitedLinkStore::shared();
</del><ins>+ configuration.visitedLinkStore = &WebVisitedLinkStore::singleton();
</ins><span class="cx">
</span><span class="cx"> m_page = new Page(configuration);
</span><span class="cx"> provideGeolocationTo(m_page, new WebGeolocationClient(this));
</span><span class="lines">@@ -6464,7 +6464,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::addVisitedLinks(BSTR* visitedURLs, unsigned visitedURLCount)
</span><span class="cx"> {
</span><del>- auto& visitedLinkStore = WebVisitedLinkStore::shared();
</del><ins>+ auto& visitedLinkStore = WebVisitedLinkStore::singleton();
</ins><span class="cx"> PageGroup& group = core(this)->group();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < visitedURLCount; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
</ins><span class="cx"> 2015-01-30 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-DatabaseProcess& DatabaseProcess::shared()
</del><ins>+DatabaseProcess& DatabaseProcess::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<DatabaseProcess> databaseProcess;
</span><span class="cx"> return databaseProcess;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DatabaseProcess);
</span><span class="cx"> friend class NeverDestroyed<DatabaseProcess>;
</span><span class="cx"> public:
</span><del>- static DatabaseProcess& shared();
</del><ins>+ static DatabaseProcess& singleton();
</ins><span class="cx"> ~DatabaseProcess();
</span><span class="cx">
</span><span class="cx"> const String& indexedDatabaseDirectory() const { return m_indexedDatabaseDirectory; }
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessIDBConnection::establishConnection(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin)
</span><span class="cx"> {
</span><del>- m_uniqueIDBDatabase = DatabaseProcess::shared().getOrCreateUniqueIDBDatabase(UniqueIDBDatabaseIdentifier(databaseName, openingOrigin, mainFrameOrigin));
</del><ins>+ m_uniqueIDBDatabase = DatabaseProcess::singleton().getOrCreateUniqueIDBDatabase(UniqueIDBDatabaseIdentifier(databaseName, openingOrigin, mainFrameOrigin));
</ins><span class="cx"> m_uniqueIDBDatabase->registerConnection(*this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> // Each unique Indexed Database exists in a directory named for the database, which exists in a directory representing its opening origin.
</span><span class="cx"> m_databaseRelativeDirectory = pathByAppendingComponent(databaseFilenameIdentifier(identifier.openingOrigin()), filenameForDatabaseName());
</span><span class="cx">
</span><del>- DatabaseProcess::shared().ensureIndexedDatabaseRelativePathExists(m_databaseRelativeDirectory);
</del><ins>+ DatabaseProcess::singleton().ensureIndexedDatabaseRelativePathExists(m_databaseRelativeDirectory);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UniqueIDBDatabase::~UniqueIDBDatabase()
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_connections.isEmpty() && m_pendingTransactionRollbacks.isEmpty()) {
</span><span class="cx"> shutdown(UniqueIDBDatabaseShutdownType::NormalShutdown);
</span><del>- DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
</del><ins>+ DatabaseProcess::singleton().removeUniqueIDBDatabase(*this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx"> resetTransaction(transactionId, [this, transactionId](bool) {
</span><span class="cx"> if (m_acceptingNewRequests && m_connections.isEmpty() && m_pendingTransactionRollbacks.isEmpty()) {
</span><span class="cx"> shutdown(UniqueIDBDatabaseShutdownType::NormalShutdown);
</span><del>- DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
</del><ins>+ DatabaseProcess::singleton().removeUniqueIDBDatabase(*this);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> String UniqueIDBDatabase::absoluteDatabaseDirectory() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><del>- return DatabaseProcess::shared().absoluteIndexedDatabasePathFromDatabaseRelativePath(m_databaseRelativeDirectory);
</del><ins>+ return DatabaseProcess::singleton().absoluteIndexedDatabasePathFromDatabaseRelativePath(m_databaseRelativeDirectory);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::postMainThreadTask(std::unique_ptr<AsyncTask> task, DatabaseTaskType taskType)
</span><span class="lines">@@ -1189,7 +1189,7 @@
</span><span class="cx"> m_databaseTasks.append(WTF::move(task));
</span><span class="cx">
</span><span class="cx"> RefPtr<UniqueIDBDatabase> database(this);
</span><del>- DatabaseProcess::shared().queue().dispatch([database] {
</del><ins>+ DatabaseProcess::singleton().queue().dispatch([database] {
</ins><span class="cx"> database->performNextDatabaseTask();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NetworkBlobRegistry& NetworkBlobRegistry::shared()
</del><ins>+NetworkBlobRegistry& NetworkBlobRegistry::singleton()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> static NeverDestroyed<NetworkBlobRegistry> registry;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NetworkBlobRegistry);
</span><span class="cx"> public:
</span><span class="cx"> NetworkBlobRegistry();
</span><del>- static NetworkBlobRegistry& shared();
</del><ins>+ static NetworkBlobRegistry& singleton();
</ins><span class="cx">
</span><span class="cx"> void registerFileBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&, const String& path, PassRefPtr<SandboxExtension>, const String& contentType);
</span><span class="cx"> void registerBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx"> loader->abort();
</span><span class="cx"> ASSERT(m_networkResourceLoaders.isEmpty());
</span><span class="cx">
</span><del>- NetworkBlobRegistry::shared().connectionToWebProcessDidClose(this);
- NetworkProcess::shared().removeNetworkConnectionToWebProcess(this);
</del><ins>+ NetworkBlobRegistry::singleton().connectionToWebProcessDidClose(this);
+ NetworkProcess::singleton().removeNetworkConnectionToWebProcess(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
</span><span class="lines">@@ -118,14 +118,14 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetworkResourceLoader> loader = NetworkResourceLoader::create(loadParameters, this);
</span><span class="cx"> m_networkResourceLoaders.add(loadParameters.identifier, loader);
</span><del>- NetworkProcess::shared().networkResourceLoadScheduler().scheduleLoader(loader.get());
</del><ins>+ NetworkProcess::singleton().networkResourceLoadScheduler().scheduleLoader(loader.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::performSynchronousLoad(const NetworkResourceLoadParameters& loadParameters, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> reply)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetworkResourceLoader> loader = NetworkResourceLoader::create(loadParameters, this, reply);
</span><span class="cx"> m_networkResourceLoaders.add(loadParameters.identifier, loader);
</span><del>- NetworkProcess::shared().networkResourceLoadScheduler().scheduleLoader(loader.get());
</del><ins>+ NetworkProcess::singleton().networkResourceLoadScheduler().scheduleLoader(loader.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::removeLoadIdentifier(ResourceLoadIdentifier identifier)
</span><span class="lines">@@ -176,18 +176,19 @@
</span><span class="cx"> void NetworkConnectionToWebProcess::startDownload(SessionID, uint64_t downloadID, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Do something with the session ID.
</span><del>- NetworkProcess::shared().downloadManager().startDownload(downloadID, request);
</del><ins>+ NetworkProcess::singleton().downloadManager().startDownload(downloadID, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="cx"> {
</span><ins>+ auto& networkProcess = NetworkProcess::singleton();
</ins><span class="cx"> if (!mainResourceLoadIdentifier) {
</span><del>- NetworkProcess::shared().downloadManager().startDownload(downloadID, request);
</del><ins>+ networkProcess.downloadManager().startDownload(downloadID, request);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkResourceLoader* loader = m_networkResourceLoaders.get(mainResourceLoadIdentifier);
</span><del>- NetworkProcess::shared().downloadManager().convertHandleToDownload(downloadID, loader->handle(), request, response);
</del><ins>+ networkProcess.downloadManager().convertHandleToDownload(downloadID, loader->handle(), request, response);
</ins><span class="cx">
</span><span class="cx"> // Unblock the URL connection operation queue.
</span><span class="cx"> loader->handle()->continueDidReceiveResponse();
</span><span class="lines">@@ -229,32 +230,32 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SandboxExtension> extension = SandboxExtension::create(extensionHandle);
</span><span class="cx">
</span><del>- NetworkBlobRegistry::shared().registerFileBlobURL(this, url, path, extension.release(), contentType);
</del><ins>+ NetworkBlobRegistry::singleton().registerFileBlobURL(this, url, path, extension.release(), contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</span><span class="cx"> {
</span><del>- NetworkBlobRegistry::shared().registerBlobURL(this, url, WTF::move(blobParts), contentType);
</del><ins>+ NetworkBlobRegistry::singleton().registerBlobURL(this, url, WTF::move(blobParts), contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::registerBlobURLFromURL(const URL& url, const URL& srcURL)
</span><span class="cx"> {
</span><del>- NetworkBlobRegistry::shared().registerBlobURL(this, url, srcURL);
</del><ins>+ NetworkBlobRegistry::singleton().registerBlobURL(this, url, srcURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end)
</span><span class="cx"> {
</span><del>- NetworkBlobRegistry::shared().registerBlobURLForSlice(this, url, srcURL, start, end);
</del><ins>+ NetworkBlobRegistry::singleton().registerBlobURLForSlice(this, url, srcURL, start, end);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::unregisterBlobURL(const URL& url)
</span><span class="cx"> {
</span><del>- NetworkBlobRegistry::shared().unregisterBlobURL(this, url);
</del><ins>+ NetworkBlobRegistry::singleton().unregisterBlobURL(this, url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSize)
</span><span class="cx"> {
</span><del>- resultSize = NetworkBlobRegistry::shared().blobSize(this, url);
</del><ins>+ resultSize = NetworkBlobRegistry::singleton().blobSize(this, url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NetworkProcess& NetworkProcess::shared()
</del><ins>+NetworkProcess& NetworkProcess::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<NetworkProcess> networkProcess;
</span><span class="cx"> return networkProcess;
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> ChildProcess::initializeConnection(connection);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShim::shared().initializeConnection(connection);
</del><ins>+ SecItemShim::singleton().initializeConnection(connection);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NetworkProcessSupplementMap::const_iterator it = m_supplements.begin();
</span><span class="lines">@@ -288,14 +288,15 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::getNetworkProcessStatistics(uint64_t callbackID)
</span><span class="cx"> {
</span><del>- NetworkResourceLoadScheduler& scheduler = NetworkProcess::shared().networkResourceLoadScheduler();
</del><ins>+ NetworkResourceLoadScheduler& scheduler = NetworkProcess::singleton().networkResourceLoadScheduler();
</ins><span class="cx">
</span><span class="cx"> StatisticsData data;
</span><span class="cx">
</span><ins>+ auto& networkProcess = NetworkProcess::singleton();
</ins><span class="cx"> data.statisticsNumbers.set("LoadsPendingCount", scheduler.loadsPendingCount());
</span><span class="cx"> data.statisticsNumbers.set("LoadsActiveCount", scheduler.loadsActiveCount());
</span><del>- data.statisticsNumbers.set("DownloadsActiveCount", shared().downloadManager().activeDownloadCount());
- data.statisticsNumbers.set("OutstandingAuthenticationChallengesCount", shared().authenticationManager().outstandingAuthenticationChallengeCount());
</del><ins>+ data.statisticsNumbers.set("DownloadsActiveCount", networkProcess.downloadManager().activeDownloadCount());
+ data.statisticsNumbers.set("OutstandingAuthenticationChallengesCount", networkProcess.authenticationManager().outstandingAuthenticationChallengeCount());
</ins><span class="cx">
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessPool::DidGetStatistics(data, callbackID), 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> friend class NeverDestroyed<NetworkProcess>;
</span><span class="cx"> friend class NeverDestroyed<DownloadManager>;
</span><span class="cx"> public:
</span><del>- static NetworkProcess& shared();
</del><ins>+ static NetworkProcess& singleton();
</ins><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="cx"> T* supplement()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -100,13 +100,13 @@
</span><span class="cx"> if (originalRequest().httpBody()) {
</span><span class="cx"> for (const FormDataElement& element : originalRequest().httpBody()->elements()) {
</span><span class="cx"> if (element.m_type == FormDataElement::Type::EncodedBlob)
</span><del>- m_fileReferences.appendVector(NetworkBlobRegistry::shared().filesInBlob(connection, element.m_url));
</del><ins>+ m_fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(connection, element.m_url));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (originalRequest().url().protocolIs("blob")) {
</span><span class="cx"> ASSERT(!m_parameters.resourceSandboxExtension);
</span><del>- m_fileReferences.appendVector(NetworkBlobRegistry::shared().filesInBlob(connection, originalRequest().url()));
</del><ins>+ m_fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(connection, originalRequest().url()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (synchronousReply)
</span><span class="lines">@@ -135,13 +135,13 @@
</span><span class="cx"> m_currentRequest = originalRequest();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- if (!NetworkCache::shared().isEnabled() || sessionID().isEphemeral()) {
</del><ins>+ if (!NetworkCache::singleton().isEnabled() || sessionID().isEphemeral()) {
</ins><span class="cx"> startNetworkLoad();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<NetworkResourceLoader> loader(this);
</span><del>- NetworkCache::shared().retrieve(originalRequest(), [loader](std::unique_ptr<NetworkCache::Entry> entry) {
</del><ins>+ NetworkCache::singleton().retrieve(originalRequest(), [loader](std::unique_ptr<NetworkCache::Entry> entry) {
</ins><span class="cx"> if (loader->hasOneRef()) {
</span><span class="cx"> // The loader has been aborted and is only held alive by this lambda.
</span><span class="cx"> return;
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> m_bufferedData = WebCore::SharedBuffer::create();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- if (NetworkCache::shared().isEnabled())
</del><ins>+ if (NetworkCache::singleton().isEnabled())
</ins><span class="cx"> m_bufferedDataForCache = WebCore::SharedBuffer::create();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx">
</span><span class="cx"> invalidateSandboxExtensions();
</span><span class="cx">
</span><del>- NetworkProcess::shared().networkResourceLoadScheduler().removeLoader(this);
</del><ins>+ NetworkProcess::singleton().networkResourceLoadScheduler().removeLoader(this);
</ins><span class="cx">
</span><span class="cx"> m_handle = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> if (m_cacheEntryForValidation) {
</span><span class="cx"> bool validationSucceeded = m_response.httpStatusCode() == 304; // 304 Not Modified
</span><span class="cx"> if (validationSucceeded)
</span><del>- NetworkCache::shared().update(originalRequest(), *m_cacheEntryForValidation, m_response);
</del><ins>+ NetworkCache::singleton().update(originalRequest(), *m_cacheEntryForValidation, m_response);
</ins><span class="cx"> if (!validationSucceeded || isConditionalRequest(originalRequest()))
</span><span class="cx"> m_cacheEntryForValidation = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> ASSERT_UNUSED(handle, handle == m_handle);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- if (NetworkCache::shared().isEnabled()) {
</del><ins>+ if (NetworkCache::singleton().isEnabled()) {
</ins><span class="cx"> if (m_cacheEntryForValidation) {
</span><span class="cx"> // 304 Not Modified
</span><span class="cx"> ASSERT(m_response.httpStatusCode() == 304);
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPrivate = sessionID().isEphemeral();
</span><span class="cx"> if (hasCacheableRedirect && !isPrivate)
</span><del>- NetworkCache::shared().store(originalRequest(), m_response, m_bufferedDataForCache.release());
</del><ins>+ NetworkCache::singleton().store(originalRequest(), m_response, m_bufferedDataForCache.release());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NetworkProcess::shared().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge);
</del><ins>+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didCancelAuthenticationChallenge(ResourceHandle* handle, const AuthenticationChallenge&)
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx">
</span><span class="cx"> // Handle server trust evaluation at platform-level if requested, for performance reasons.
</span><span class="cx"> if (protectionSpace.authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
</span><del>- && !NetworkProcess::shared().canHandleHTTPSServerTrustEvaluation()) {
</del><ins>+ && !NetworkProcess::singleton().canHandleHTTPSServerTrustEvaluation()) {
</ins><span class="cx"> continueCanAuthenticateAgainstProtectionSpace(false);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NetworkCache& NetworkCache::shared()
</del><ins>+NetworkCache& NetworkCache::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<NetworkCache> instance;
</span><span class="cx"> return instance;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> class NetworkCache {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NetworkCache);
</span><span class="cx"> public:
</span><del>- static NetworkCache& shared();
</del><ins>+ static NetworkCache& singleton();
</ins><span class="cx">
</span><span class="cx"> NetworkCache();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> if (!m_diskCacheDirectory.isNull()) {
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- if (parameters.shouldEnableNetworkCache && NetworkCache::shared().initialize(m_diskCacheDirectory)) {
</del><ins>+ if (parameters.shouldEnableNetworkCache && NetworkCache::singleton().initialize(m_diskCacheDirectory)) {
</ins><span class="cx"> RetainPtr<NSURLCache> urlCache(adoptNS([[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil]));
</span><span class="cx"> [NSURLCache setSharedURLCache:urlCache.get()];
</span><span class="cx"> return;
</span><span class="lines">@@ -134,8 +134,9 @@
</span><span class="cx"> pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- if (NetworkCache::shared().isEnabled()) {
- NetworkCache::shared().setMaximumSize(urlCacheDiskCapacity);
</del><ins>+ auto& networkCache = NetworkCache::singleton();
+ if (networkCache.isEnabled()) {
+ networkCache.setMaximumSize(urlCacheDiskCapacity);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -148,7 +149,7 @@
</span><span class="cx"> void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- NetworkCache::shared().clear();
</del><ins>+ NetworkCache::singleton().clear();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!m_clearCacheDispatchGroup)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -82,14 +82,14 @@
</span><span class="cx"> if (resourceCachesToClear == InMemoryResourceCachesOnly)
</span><span class="cx"> return;
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><del>- NetworkCache::shared().clear();
</del><ins>+ NetworkCache::singleton().clear();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShim::shared().initialize(this);
</del><ins>+ SecItemShim::singleton().initialize(this);
</ins><span class="cx"> #endif
</span><span class="cx"> platformInitializeNetworkProcessCocoa(parameters);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> platformInitializeNetworkProcessCocoa(parameters);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShim::shared().initialize(this);
</del><ins>+ SecItemShim::singleton().initialize(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull())
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacRemoteNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> audit_token_t auditToken;
</span><del>- if (!NetworkProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
</del><ins>+ if (!NetworkProcess::singleton().parentProcessConnection()->getAuditToken(auditToken))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> ASSERT(!m_isInitializing);
</span><span class="cx"> m_isInitializing = true; // Cannot use TemporaryChange here, because this object can be deleted before the function returns.
</span><span class="cx">
</span><del>- m_plugin = NetscapePlugin::create(PluginProcess::shared().netscapePluginModule());
</del><ins>+ m_plugin = NetscapePlugin::create(PluginProcess::singleton().netscapePluginModule());
</ins><span class="cx"> if (!m_plugin) {
</span><span class="cx"> // This will delete the plug-in controller proxy object.
</span><span class="cx"> m_connection->removePluginControllerProxy(this, 0);
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PluginProcess& PluginProcess::shared()
</del><ins>+PluginProcess& PluginProcess::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<PluginProcess> pluginProcess;
</span><span class="cx"> return pluginProcess;
</span><span class="lines">@@ -70,8 +70,9 @@
</span><span class="cx"> void PluginProcess::lowMemoryHandler(bool critical)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(critical);
</span><del>- if (shared().shouldTerminate())
- shared().terminate();
</del><ins>+ auto& pluginProcess = PluginProcess::singleton();
+ if (pluginProcess.shouldTerminate())
+ pluginProcess.terminate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PluginProcess);
</span><span class="cx"> friend class NeverDestroyed<PluginProcess>;
</span><span class="cx"> public:
</span><del>- static PluginProcess& shared();
</del><ins>+ static PluginProcess& singleton();
</ins><span class="cx">
</span><span class="cx"> void removeWebProcessConnection(WebProcessConnection*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx"> m_connection = nullptr;
</span><span class="cx">
</span><span class="cx"> // This will cause us to be deleted.
</span><del>- PluginProcess::shared().removeWebProcessConnection(this);
</del><ins>+ PluginProcess::singleton().removeWebProcessConnection(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessConnection::setGlobalException(const String& exceptionString)
</span><span class="cx"> {
</span><del>- IPC::Connection* connection = ConnectionStack::shared().current();
</del><ins>+ IPC::Connection* connection = ConnectionStack::singleton().current();
</ins><span class="cx"> if (!connection)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><del>- ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), &connection);
</del><ins>+ ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::singleton(), &connection);
</ins><span class="cx">
</span><span class="cx"> if (decoder.messageReceiverName() == Messages::WebProcessConnection::messageReceiverName()) {
</span><span class="cx"> didReceiveWebProcessConnectionMessage(connection, decoder);
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
</span><span class="cx"> {
</span><del>- ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), &connection);
</del><ins>+ ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::singleton(), &connection);
</ins><span class="cx">
</span><span class="cx"> uint64_t destinationID = decoder.destinationID();
</span><span class="cx">
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> reply->send();
</span><span class="cx">
</span><span class="cx"> // Ensure we don't clamp any timers during destruction
</span><del>- ActivityAssertion activityAssertion(PluginProcess::shared().connectionActivity());
</del><ins>+ ActivityAssertion activityAssertion(PluginProcess::singleton().connectionActivity());
</ins><span class="cx">
</span><span class="cx"> PluginControllerProxy* pluginControllerProxy = m_pluginControllers.get(pluginInstanceID);
</span><span class="cx">
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> void WebProcessConnection::createPlugin(const PluginCreationParameters& creationParameters, PassRefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply> reply)
</span><span class="cx"> {
</span><span class="cx"> // Ensure we don't clamp any timers during initialization
</span><del>- ActivityAssertion activityAssertion(PluginProcess::shared().connectionActivity());
</del><ins>+ ActivityAssertion activityAssertion(PluginProcess::singleton().connectionActivity());
</ins><span class="cx">
</span><span class="cx"> PluginControllerProxy* pluginControllerProxy = m_pluginControllers.get(creationParameters.pluginInstanceID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginControllerProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -52,12 +52,12 @@
</span><span class="cx">
</span><span class="cx"> const MachSendRight& PluginControllerProxy::compositingRenderServerPort()
</span><span class="cx"> {
</span><del>- return PluginProcess::shared().compositingRenderServerPort();
</del><ins>+ return PluginProcess::singleton().compositingRenderServerPort();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginControllerProxy::openPluginPreferencePane()
</span><span class="cx"> {
</span><del>- PluginProcess::shared().parentProcessConnection()->send(Messages::PluginProcessProxy::OpenPluginPreferencePane(), 0);
</del><ins>+ PluginProcess::singleton().parentProcessConnection()->send(Messages::PluginProcessProxy::OpenPluginPreferencePane(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginControllerProxy::platformInitialize(const PluginCreationParameters& creationParameters)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> switch (layerHostingMode) {
</span><span class="cx"> case LayerHostingMode::InProcess:
</span><del>- m_layerHostingContext = LayerHostingContext::createForPort(PluginProcess::shared().compositingRenderServerPort());
</del><ins>+ m_layerHostingContext = LayerHostingContext::createForPort(PluginProcess::singleton().compositingRenderServerPort());
</ins><span class="cx"> break;
</span><span class="cx"> #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
</span><span class="cx"> case LayerHostingMode::OutOfProcess:
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> // If this is the first full screen window to be shown, notify the UI process.
</span><span class="cx"> if (windowSetWasEmpty)
</span><del>- PluginProcess::shared().setFullscreenWindowIsShowing(true);
</del><ins>+ PluginProcess::singleton().setFullscreenWindowIsShowing(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> void FullscreenWindowTracker::windowHidden(T window)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> // If this was the last full screen window that was visible, notify the UI process.
</span><span class="cx"> if (m_windows.isEmpty())
</span><del>- PluginProcess::shared().setFullscreenWindowIsShowing(false);
</del><ins>+ PluginProcess::singleton().setFullscreenWindowIsShowing(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FullscreenWindowTracker& fullscreenWindowTracker()
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> static bool openCFURLRef(CFURLRef url, int32_t& status, CFURLRef* launchedURL)
</span><span class="cx"> {
</span><span class="cx"> String launchedURLString;
</span><del>- if (!PluginProcess::shared().openURL(URL(url).string(), status, launchedURLString))
</del><ins>+ if (!PluginProcess::singleton().openURL(URL(url).string(), status, launchedURLString))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!launchedURLString.isNull() && launchedURL)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> static void setModal(bool modalWindowIsShowing)
</span><span class="cx"> {
</span><del>- PluginProcess::shared().setModalWindowIsShowing(modalWindowIsShowing);
</del><ins>+ PluginProcess::singleton().setModalWindowIsShowing(modalWindowIsShowing);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned modalCount = 0;
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> for (NSString *argument in self.arguments)
</span><span class="cx"> arguments.uncheckedAppend(argument);
</span><span class="cx">
</span><del>- if (PluginProcess::shared().launchProcess(launchPath, arguments))
</del><ins>+ if (PluginProcess::singleton().launchProcess(launchPath, arguments))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSConcreteTask_launch(self, _cmd);
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (PluginProcess::shared().launchApplicationAtURL(URL(url).string(), arguments)) {
</del><ins>+ if (PluginProcess::singleton().launchApplicationAtURL(URL(url).string(), arguments)) {
</ins><span class="cx"> if (error)
</span><span class="cx"> *error = nil;
</span><span class="cx"> return nil;
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx">
</span><span class="cx"> static BOOL replacedNSWorkspace_openFile(NSWorkspace *self, SEL _cmd, NSString *fullPath)
</span><span class="cx"> {
</span><del>- if (PluginProcess::shared().openFile(fullPath))
</del><ins>+ if (PluginProcess::singleton().openFile(fullPath))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return NSWorkspace_openFile(self, _cmd, fullPath);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedConnectionStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ConnectionStack.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ConnectionStack.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/ConnectionStack.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ConnectionStack& ConnectionStack::shared()
</del><ins>+ConnectionStack& ConnectionStack::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<ConnectionStack> connectionStack;
</span><span class="cx"> return connectionStack;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedConnectionStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ConnectionStack.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ConnectionStack.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/ConnectionStack.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class ConnectionStack {
</span><span class="cx"> public:
</span><del>- static ConnectionStack& shared();
</del><ins>+ static ConnectionStack& singleton();
</ins><span class="cx">
</span><span class="cx"> IPC::Connection* current()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacLegacyProcessChildProcessEntryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessEntryPoint.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if (!delegate.getExtraInitializationData(parameters.extraInitializationData))
</span><span class="cx"> return EXIT_FAILURE;
</span><span class="cx">
</span><del>- ChildProcessType::shared().initialize(parameters);
</del><ins>+ ChildProcessType::singleton().initialize(parameters);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> delegate.startRunLoop();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> voucher_replace_default_voucher();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- XPCServiceType::shared().initialize(parameters);
</del><ins>+ XPCServiceType::singleton().initialize(parameters);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMemorySamplercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebMemorySampler.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMemorySampler.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/WebMemorySampler.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> static const char separator = '\t';
</span><span class="cx">
</span><del>-WebMemorySampler* WebMemorySampler::shared()
</del><ins>+WebMemorySampler* WebMemorySampler::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WebMemorySampler* sharedMemorySampler;
</span><span class="cx"> if (!sharedMemorySampler)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMemorySamplerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebMemorySampler.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMemorySampler.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/WebMemorySampler.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> class WebMemorySampler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebMemorySampler);
</span><span class="cx"> public:
</span><del>- static WebMemorySampler* shared();
</del><ins>+ static WebMemorySampler* singleton();
</ins><span class="cx"> void start(const double interval = 0);
</span><span class="cx"> void start(const SandboxExtension::Handle&, const String&, const double interval = 0);
</span><span class="cx"> void stop();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosChildProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> void ChildProcess::platformInitialize()
</span><span class="cx"> {
</span><del>- FloatingPointEnvironment& floatingPointEnvironment = FloatingPointEnvironment::shared();
</del><ins>+ FloatingPointEnvironment& floatingPointEnvironment = FloatingPointEnvironment::singleton();
</ins><span class="cx"> floatingPointEnvironment.enableDenormalSupport();
</span><span class="cx"> floatingPointEnvironment.saveMainThreadEnvironment();
</span><span class="cx"> [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedlinuxSeccompFiltersSeccompBrokercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> if (!ucontext)
</span><span class="cx"> CRASH();
</span><span class="cx">
</span><del>- SeccompBrokerClient* client = &SeccompBrokerClient::shared();
</del><ins>+ SeccompBrokerClient* client = &SeccompBrokerClient::singleton();
</ins><span class="cx">
</span><span class="cx"> if (client->handleIfOpeningOnlineCPUCount(&ucontext->uc_mcontext))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CookieStorageShim);
</span><span class="cx"> friend class NeverDestroyed<CookieStorageShim>;
</span><span class="cx"> public:
</span><del>- static CookieStorageShim& shared();
</del><ins>+ static CookieStorageShim& singleton();
</ins><span class="cx">
</span><span class="cx"> void initialize();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> {
</span><span class="cx"> String cookies;
</span><span class="cx"> URL firstPartyForCookiesURL;
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionID::defaultSessionID(), firstPartyForCookiesURL, inRequestURL), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(cookies), 0))
</del><ins>+ if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionID::defaultSessionID(), firstPartyForCookiesURL, inRequestURL), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(cookies), 0))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (cookies.isNull())
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return CFDictionaryCreate(0, cookieKeys, cookieValues, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CookieStorageShim& CookieStorageShim::shared()
</del><ins>+CookieStorageShim& CookieStorageShim::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<CookieStorageShim> storage;
</span><span class="cx"> return storage;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> static ChildProcess* sharedProcess;
</span><span class="cx">
</span><del>-SecItemShim& SecItemShim::shared()
</del><ins>+SecItemShim& SecItemShim::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static SecItemShim* shim;
</span><span class="cx"> static dispatch_once_t once;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> class SecItemShim : public IPC::Connection::WorkQueueMessageReceiver {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SecItemShim);
</span><span class="cx"> public:
</span><del>- static SecItemShim& shared();
</del><ins>+ static SecItemShim& singleton();
</ins><span class="cx">
</span><span class="cx"> void initialize(ChildProcess*);
</span><span class="cx"> void initializeConnection(IPC::Connection*);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedunixChildProcessMainh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/Shared/unix/ChildProcessMain.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> if (!childMain.parseCommandLine(argc, argv))
</span><span class="cx"> return EXIT_FAILURE;
</span><span class="cx">
</span><del>- ChildProcessType::shared().initialize(childMain.initializationParameters());
</del><ins>+ ChildProcessType::singleton().initialize(childMain.initializationParameters());
</ins><span class="cx"> RunLoop::run();
</span><span class="cx"> childMain.platformFinalize();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKTextCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,25 +36,25 @@
</span><span class="cx"> {
</span><span class="cx"> if (wkClient && wkClient->version)
</span><span class="cx"> return;
</span><del>- WebTextChecker::shared()->setClient(wkClient);
</del><ins>+ WebTextChecker::singleton()->setClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKTextCheckerContinuousSpellCheckingEnabledStateChanged(bool enabled)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->continuousSpellCheckingEnabledStateChanged(enabled);
</del><ins>+ WebTextChecker::singleton()->continuousSpellCheckingEnabledStateChanged(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKTextCheckerGrammarCheckingEnabledStateChanged(bool enabled)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->grammarCheckingEnabledStateChanged(enabled);
</del><ins>+ WebTextChecker::singleton()->grammarCheckingEnabledStateChanged(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKTextCheckerCheckSpelling(WKPageRef page, bool startBeforeSelection)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->checkSpelling(toImpl(page), startBeforeSelection);
</del><ins>+ WebTextChecker::singleton()->checkSpelling(toImpl(page), startBeforeSelection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKTextCheckerChangeSpellingToWord(WKPageRef page, WKStringRef word)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->changeSpellingToWord(toImpl(page), toWTFString(word));
</del><ins>+ WebTextChecker::singleton()->changeSpellingToWord(toImpl(page), toWTFString(word));
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_maincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EwkMain& EwkMain::shared()
</del><ins>+EwkMain& EwkMain::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static EwkMain instance;
</span><span class="cx"> return instance;
</span><span class="lines">@@ -209,10 +209,10 @@
</span><span class="cx">
</span><span class="cx"> int ewk_init()
</span><span class="cx"> {
</span><del>- return EwkMain::shared().initialize();
</del><ins>+ return EwkMain::singleton().initialize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ewk_shutdown()
</span><span class="cx"> {
</span><del>- return EwkMain::shared().finalize();
</del><ins>+ return EwkMain::singleton().finalize();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_main_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_main_private.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_main_private.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_main_private.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class EwkMain {
</span><span class="cx"> public:
</span><del>- static EwkMain& shared();
</del><ins>+ static EwkMain& singleton();
</ins><span class="cx"> ~EwkMain();
</span><span class="cx"> int initialize();
</span><span class="cx"> int finalize();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> Evas_Object* EWKViewCreate(WKContextRef context, WKPageGroupRef pageGroup, Evas* canvas, Evas_Smart* smart)
</span><span class="cx"> {
</span><del>- if (!EwkMain::shared().isInitialized()) {
</del><ins>+ if (!EwkMain::singleton().isInitialized()) {
</ins><span class="cx"> EINA_LOG_CRIT("EWebKit has not been initialized. You must call ewk_init() before creating view.");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> if (!m_processSuppressionDisabledForPageCounter.value())
</span><span class="cx"> m_pluginProcessManagerProcessSuppressionDisabledToken = nullptr;
</span><span class="cx"> else if (!m_pluginProcessManagerProcessSuppressionDisabledToken)
</span><del>- m_pluginProcessManagerProcessSuppressionDisabledToken = PluginProcessManager::shared().processSuppressionDisabledToken();
</del><ins>+ m_pluginProcessManagerProcessSuppressionDisabledToken = PluginProcessManager::singleton().processSuppressionDisabledToken();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> registerNotificationObservers();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- WebKit::WebMemoryPressureHandler::shared();
</del><ins>+ WebKit::WebMemoryPressureHandler::singleton();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebInspectorServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> return number;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebInspectorServer& WebInspectorServer::shared()
</del><ins>+WebInspectorServer& WebInspectorServer::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WebInspectorServer& server = *new WebInspectorServer;
</span><span class="cx"> return server;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebInspectorServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class WebInspectorServer : public WebSocketServer, public WebSocketServerClient {
</span><span class="cx"> public:
</span><span class="cx"> typedef HashMap<unsigned, WebInspectorProxy*> ClientMap;
</span><del>- static WebInspectorServer& shared();
</del><ins>+ static WebInspectorServer& singleton();
</ins><span class="cx">
</span><span class="cx"> // Page registry to manage known pages.
</span><span class="cx"> int registerPage(WebInspectorProxy* client);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void NetworkProcessProxy::connectionWillOpen(IPC::Connection& connection)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShimProxy::shared().initializeConnection(connection);
</del><ins>+ SecItemShimProxy::singleton().initializeConnection(connection);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PluginProcessManager& PluginProcessManager::shared()
</del><ins>+PluginProcessManager& PluginProcessManager::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<PluginProcessManager> pluginProcessManager;
</span><span class="cx"> return pluginProcessManager;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PluginProcessManager);
</span><span class="cx"> friend class NeverDestroyed<PluginProcessManager>;
</span><span class="cx"> public:
</span><del>- static PluginProcessManager& shared();
</del><ins>+ static PluginProcessManager& singleton();
</ins><span class="cx">
</span><span class="cx"> uint64_t pluginProcessToken(const PluginModuleInfo&, PluginProcessType, PluginProcessSandboxPolicy);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> m_numPendingConnectionRequests = 0;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- if (!PluginProcessManager::shared().processSuppressionDisabled())
</del><ins>+ if (!PluginProcessManager::singleton().processSuppressionDisabled())
</ins><span class="cx"> setProcessSuppressionEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PluginProcessManager::shared().getSitesWithData(m_plugins.last(), m_webPluginSiteDataManager, m_callbackID);
</del><ins>+ PluginProcessManager::singleton().getSitesWithData(m_plugins.last(), m_webPluginSiteDataManager, m_callbackID);
</ins><span class="cx"> m_plugins.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PluginProcessManager::shared().clearSiteData(m_plugins.last(), m_webPluginSiteDataManager, m_sites, m_flags, m_maxAgeInSeconds, m_callbackID);
</del><ins>+ PluginProcessManager::singleton().clearSiteData(m_plugins.last(), m_webPluginSiteDataManager, m_sites, m_flags, m_maxAgeInSeconds, m_callbackID);
</ins><span class="cx"> m_plugins.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> static const unsigned gSchemaVersion = 2;
</span><span class="cx">
</span><del>-PluginInfoCache& PluginInfoCache::shared()
</del><ins>+PluginInfoCache& PluginInfoCache::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<PluginInfoCache> pluginInfoCache;
</span><span class="cx"> return pluginInfoCache;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PluginInfoCache);
</span><span class="cx"> friend class NeverDestroyed<PluginInfoCache>;
</span><span class="cx"> public:
</span><del>- static PluginInfoCache& shared();
</del><ins>+ static PluginInfoCache& singleton();
</ins><span class="cx">
</span><span class="cx"> bool getPluginInfo(const String& pluginPath, PluginModuleInfo&);
</span><span class="cx"> void updatePluginInfo(const String& pluginPath, const PluginModuleInfo&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsunixPluginInfoStoreUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -102,11 +102,11 @@
</span><span class="cx"> bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- if (PluginInfoCache::shared().getPluginInfo(pluginPath, plugin))
</del><ins>+ if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (NetscapePluginModule::getPluginInfo(pluginPath, plugin)) {
</span><del>- PluginInfoCache::shared().updatePluginInfo(pluginPath, plugin);
</del><ins>+ PluginInfoCache::singleton().updatePluginInfo(pluginPath, plugin);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> class WebInspectorPageGroups {
</span><span class="cx"> public:
</span><del>- static WebInspectorPageGroups& shared()
</del><ins>+ static WebInspectorPageGroups& singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebInspectorPageGroups> instance;
</span><span class="cx"> return instance;
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> , m_remoteInspectionPageId(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- m_level = WebInspectorPageGroups::shared().inspectorLevel(m_page->pageGroup());
</del><ins>+ m_level = WebInspectorPageGroups::singleton().inspectorLevel(m_page->pageGroup());
</ins><span class="cx"> m_page->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID(), *this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -155,14 +155,14 @@
</span><span class="cx">
</span><span class="cx"> WebPageGroup* WebInspectorProxy::inspectorPageGroup() const
</span><span class="cx"> {
</span><del>- return WebInspectorPageGroups::shared().inspectorPageGroupForLevel(m_level);
</del><ins>+ return WebInspectorPageGroups::singleton().inspectorPageGroupForLevel(m_level);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::invalidate()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx"> if (m_remoteInspectionPageId)
</span><del>- WebInspectorServer::shared().unregisterPage(m_remoteInspectionPageId);
</del><ins>+ WebInspectorServer::singleton().unregisterPage(m_remoteInspectionPageId);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_page->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID());
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebInspectorProxy::isInspectorPage(WebPageProxy& page)
</span><span class="cx"> {
</span><del>- return WebInspectorPageGroups::shared().isInspectorPageGroup(page.pageGroup());
</del><ins>+ return WebInspectorPageGroups::singleton().isInspectorPageGroup(page.pageGroup());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebProcessPool& WebInspectorProxy::inspectorProcessPool()
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> void WebInspectorProxy::enableRemoteInspection()
</span><span class="cx"> {
</span><span class="cx"> if (!m_remoteInspectionPageId)
</span><del>- m_remoteInspectionPageId = WebInspectorServer::shared().registerPage(this);
</del><ins>+ m_remoteInspectionPageId = WebInspectorServer::singleton().registerPage(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::remoteFrontendConnected()
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> void WebInspectorProxy::sendMessageToRemoteFrontend(const String& message)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_remoteInspectionPageId);
</span><del>- WebInspectorServer::shared().sendMessageOverConnection(m_remoteInspectionPageId, message);
</del><ins>+ WebInspectorServer::singleton().sendMessageOverConnection(m_remoteInspectionPageId, message);
</ins><span class="cx"> }
</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 (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> RefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply> reply;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static ExceededDatabaseQuotaRecords& shared();
</del><ins>+ static ExceededDatabaseQuotaRecords& singleton();
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<Record> createRecord(uint64_t frameID, String originIdentifier,
</span><span class="cx"> String databaseName, String displayName, uint64_t currentQuota,
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> std::unique_ptr<Record> m_currentRecord;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ExceededDatabaseQuotaRecords& ExceededDatabaseQuotaRecords::shared()
</del><ins>+ExceededDatabaseQuotaRecords& ExceededDatabaseQuotaRecords::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<ExceededDatabaseQuotaRecords> records;
</span><span class="cx"> return records;
</span><span class="lines">@@ -984,7 +984,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- ViewSnapshotStore::shared().recordSnapshot(*this, item);
</del><ins>+ ViewSnapshotStore::singleton().recordSnapshot(*this, item);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(item);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1753,7 +1753,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pluginProcessToken = PluginProcessManager::shared().pluginProcessToken(plugin, static_cast<PluginProcessType>(processType), pluginProcessSandboxPolicy);
</del><ins>+ pluginProcessToken = PluginProcessManager::singleton().pluginProcessToken(plugin, static_cast<PluginProcessType>(processType), pluginProcessSandboxPolicy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -4761,7 +4761,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::exceededDatabaseQuota(uint64_t frameID, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply> reply)
</span><span class="cx"> {
</span><del>- ExceededDatabaseQuotaRecords& records = ExceededDatabaseQuotaRecords::shared();
</del><ins>+ ExceededDatabaseQuotaRecords& records = ExceededDatabaseQuotaRecords::singleton();
</ins><span class="cx"> std::unique_ptr<ExceededDatabaseQuotaRecords::Record> newRecord = records.createRecord(frameID,
</span><span class="cx"> originIdentifier, databaseName, displayName, currentQuota, currentOriginUsage,
</span><span class="cx"> currentDatabaseUsage, expectedUsage, reply);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPasteboardProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebPasteboardProxy& WebPasteboardProxy::shared()
</del><ins>+WebPasteboardProxy& WebPasteboardProxy::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><span class="cx"> static LazyNeverDestroyed<WebPasteboardProxy> proxy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPasteboardProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebPasteboardProxy);
</span><span class="cx"> friend class LazyNeverDestroyed<WebPasteboardProxy>;
</span><span class="cx"> public:
</span><del>- static WebPasteboardProxy& shared();
</del><ins>+ static WebPasteboardProxy& singleton();
</ins><span class="cx">
</span><span class="cx"> void addWebProcessProxy(WebProcessProxy&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -675,10 +675,11 @@
</span><span class="cx"> parameters.memoryCacheDisabled = m_memoryCacheDisabled;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- parameters.hasImageServices = ServicesController::shared().hasImageServices();
- parameters.hasSelectionServices = ServicesController::shared().hasSelectionServices();
- parameters.hasRichContentServices = ServicesController::shared().hasRichContentServices();
- ServicesController::shared().refreshExistingServices();
</del><ins>+ auto& serviceController = ServicesController::singleton();
+ parameters.hasImageServices = serviceController.hasImageServices();
+ parameters.hasSelectionServices = serviceController.hasSelectionServices();
+ parameters.hasRichContentServices = serviceController.hasRichContentServices();
+ serviceController.refreshExistingServices();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Add any platform specific parameters
</span><span class="lines">@@ -715,7 +716,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> // Initialize remote inspector connection now that we have a sub-process that is hosting one of our web views.
</span><del>- Inspector::RemoteInspector::shared();
</del><ins>+ Inspector::RemoteInspector::singleton();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return process;
</span><span class="lines">@@ -1105,7 +1106,7 @@
</span><span class="cx">
</span><span class="cx"> // For UIProcess
</span><span class="cx"> #if ENABLE(MEMORY_SAMPLER)
</span><del>- WebMemorySampler::shared()->start(interval);
</del><ins>+ WebMemorySampler::singleton()->start(interval);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // For WebProcess
</span><span class="lines">@@ -1124,7 +1125,7 @@
</span><span class="cx">
</span><span class="cx"> // For UIProcess
</span><span class="cx"> #if ENABLE(MEMORY_SAMPLER)
</span><del>- WebMemorySampler::shared()->stop();
</del><ins>+ WebMemorySampler::singleton()->stop();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::StopMemorySampler());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> , m_numberOfTimesSuddenTerminationWasDisabled(0)
</span><span class="cx"> , m_throttler(std::make_unique<ProcessThrottler>(this))
</span><span class="cx"> {
</span><del>- WebPasteboardProxy::shared().addWebProcessProxy(*this);
</del><ins>+ WebPasteboardProxy::singleton().addWebProcessProxy(*this);
</ins><span class="cx">
</span><span class="cx"> connect();
</span><span class="cx"> }
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> ASSERT(this->connection() == &connection);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShimProxy::shared().initializeConnection(connection);
</del><ins>+ SecItemShimProxy::singleton().initializeConnection(connection);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (auto& page : m_pageMap.values())
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void WebProcessProxy::getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
</span><span class="cx"> {
</span><del>- PluginProcessManager::shared().getPluginProcessConnection(pluginProcessToken, reply);
</del><ins>+ PluginProcessManager::singleton().getPluginProcessConnection(pluginProcessToken, reply);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebTextCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebTextChecker.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebTextChecker.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebTextChecker.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebTextChecker* WebTextChecker::shared()
</del><ins>+WebTextChecker* WebTextChecker::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WebTextChecker* textChecker = adoptRef(new WebTextChecker).leakRef();
</span><span class="cx"> return textChecker;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebTextCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebTextChecker.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebTextChecker.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/WebTextChecker.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class WebTextChecker : public API::ObjectImpl<API::Object::Type::TextChecker> {
</span><span class="cx"> public:
</span><del>- static WebTextChecker* shared();
</del><ins>+ static WebTextChecker* singleton();
</ins><span class="cx">
</span><span class="cx"> void setClient(const WKTextCheckerClientBase*);
</span><span class="cx"> WebTextCheckerClient& client() { return m_client; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflEwkDebugh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/EwkDebug.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/EwkDebug.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/efl/EwkDebug.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx">
</span><span class="cx"> #include "ewk_main_private.h"
</span><span class="cx">
</span><del>-#define CRITICAL(...) EINA_LOG_DOM_CRIT(EwkMain::shared().logDomainId(), __VA_ARGS__)
-#define ERR(...) EINA_LOG_DOM_ERR(EwkMain::shared().logDomainId(), __VA_ARGS__)
-#define WARN(...) EINA_LOG_DOM_WARN(EwkMain::shared().logDomainId(), __VA_ARGS__)
-#define INFO(...) EINA_LOG_DOM_INFO(EwkMain::shared().logDomainId(), __VA_ARGS__)
-#define DBG(...) EINA_LOG_DOM_DBG(EwkMain::shared().logDomainId(), __VA_ARGS__)
</del><ins>+#define CRITICAL(...) EINA_LOG_DOM_CRIT(EwkMain::singleton().logDomainId(), __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(EwkMain::singleton().logDomainId(), __VA_ARGS__)
+#define WARN(...) EINA_LOG_DOM_WARN(EwkMain::singleton().logDomainId(), __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(EwkMain::singleton().logDomainId(), __VA_ARGS__)
+#define DBG(...) EINA_LOG_DOM_DBG(EwkMain::singleton().logDomainId(), __VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> #endif // EwkDebug_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflTextCheckerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> textCheckerState.isContinuousSpellCheckingEnabled = isContinuousSpellCheckingEnabled;
</span><span class="cx">
</span><span class="cx"> // Notify the client about the setting change.
</span><del>- WebTextChecker::shared()->client().setContinuousSpellCheckingEnabled(isContinuousSpellCheckingEnabled);
</del><ins>+ WebTextChecker::singleton()->client().setContinuousSpellCheckingEnabled(isContinuousSpellCheckingEnabled);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(isContinuousSpellCheckingEnabled);
</span><span class="cx"> #endif
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> int64_t TextChecker::uniqueSpellDocumentTag(WebPageProxy* page)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><del>- return WebTextChecker::shared()->client().uniqueSpellDocumentTag(page);
</del><ins>+ return WebTextChecker::singleton()->client().uniqueSpellDocumentTag(page);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> return 0;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> void TextChecker::closeSpellDocumentWithTag(int64_t tag)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><del>- WebTextChecker::shared()->client().closeSpellDocumentWithTag(tag);
</del><ins>+ WebTextChecker::singleton()->client().closeSpellDocumentWithTag(tag);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(tag);
</span><span class="cx"> #endif
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> void TextChecker::checkSpellingOfString(int64_t spellDocumentTag, StringView text, int32_t& misspellingLocation, int32_t& misspellingLength)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><del>- WebTextChecker::shared()->client().checkSpellingOfString(spellDocumentTag, text.toStringWithoutCopying(), misspellingLocation, misspellingLength);
</del><ins>+ WebTextChecker::singleton()->client().checkSpellingOfString(spellDocumentTag, text.toStringWithoutCopying(), misspellingLocation, misspellingLength);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(spellDocumentTag);
</span><span class="cx"> UNUSED_PARAM(text);
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> void TextChecker::getGuessesForWord(int64_t spellDocumentTag, const String& word, const String& , Vector<String>& guesses)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><del>- WebTextChecker::shared()->client().guessesForWord(spellDocumentTag, word, guesses);
</del><ins>+ WebTextChecker::singleton()->client().guessesForWord(spellDocumentTag, word, guesses);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(spellDocumentTag);
</span><span class="cx"> UNUSED_PARAM(word);
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> void TextChecker::learnWord(int64_t spellDocumentTag, const String& word)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><del>- WebTextChecker::shared()->client().learnWord(spellDocumentTag, word);
</del><ins>+ WebTextChecker::singleton()->client().learnWord(spellDocumentTag, word);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(spellDocumentTag);
</span><span class="cx"> UNUSED_PARAM(word);
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> void TextChecker::ignoreWord(int64_t spellDocumentTag, const String& word)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span><del>- WebTextChecker::shared()->client().ignoreWord(spellDocumentTag, word);
</del><ins>+ WebTextChecker::singleton()->client().ignoreWord(spellDocumentTag, word);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(spellDocumentTag);
</span><span class="cx"> UNUSED_PARAM(word);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebContextEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> } else
</span><span class="cx"> LOG_ERROR("Couldn't parse %s, wrong format? Using 127.0.0.1:2999 instead.", serverAddress.utf8().data());
</span><span class="cx">
</span><del>- if (!WebInspectorServer::shared().listen(bindAddress, port))
</del><ins>+ if (!WebInspectorServer::singleton().listen(bindAddress, port))
</ins><span class="cx"> LOG_ERROR("Couldn't start listening on: IP address=%s, port=%d.", bindAddress.utf8().data(), port);
</span><span class="cx">
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkTextCheckerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> if (didInitializeState)
</span><span class="cx"> return textCheckerState;
</span><span class="cx">
</span><del>- WebTextCheckerClient& client = WebTextChecker::shared()->client();
</del><ins>+ WebTextCheckerClient& client = WebTextChecker::singleton()->client();
</ins><span class="cx"> textCheckerState.isContinuousSpellCheckingEnabled = client.continuousSpellCheckingEnabled();
</span><span class="cx"> textCheckerState.isGrammarCheckingEnabled = client.grammarCheckingEnabled();
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> bool TextChecker::isContinuousSpellCheckingAllowed()
</span><span class="cx"> {
</span><del>- return WebTextChecker::shared()->client().continuousSpellCheckingAllowed();
</del><ins>+ return WebTextChecker::singleton()->client().continuousSpellCheckingAllowed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::setContinuousSpellCheckingEnabled(bool isContinuousSpellCheckingEnabled)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> if (state().isContinuousSpellCheckingEnabled == isContinuousSpellCheckingEnabled)
</span><span class="cx"> return;
</span><span class="cx"> textCheckerState.isContinuousSpellCheckingEnabled = isContinuousSpellCheckingEnabled;
</span><del>- WebTextChecker::shared()->client().setContinuousSpellCheckingEnabled(isContinuousSpellCheckingEnabled);
</del><ins>+ WebTextChecker::singleton()->client().setContinuousSpellCheckingEnabled(isContinuousSpellCheckingEnabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::setGrammarCheckingEnabled(bool isGrammarCheckingEnabled)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> if (state().isGrammarCheckingEnabled == isGrammarCheckingEnabled)
</span><span class="cx"> return;
</span><span class="cx"> textCheckerState.isGrammarCheckingEnabled = isGrammarCheckingEnabled;
</span><del>- WebTextChecker::shared()->client().setGrammarCheckingEnabled(isGrammarCheckingEnabled);
</del><ins>+ WebTextChecker::singleton()->client().setGrammarCheckingEnabled(isGrammarCheckingEnabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::continuousSpellCheckingEnabledStateChanged(bool enabled)
</span><span class="lines">@@ -85,57 +85,57 @@
</span><span class="cx">
</span><span class="cx"> int64_t TextChecker::uniqueSpellDocumentTag(WebPageProxy* page)
</span><span class="cx"> {
</span><del>- return WebTextChecker::shared()->client().uniqueSpellDocumentTag(page);
</del><ins>+ return WebTextChecker::singleton()->client().uniqueSpellDocumentTag(page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::closeSpellDocumentWithTag(int64_t tag)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().closeSpellDocumentWithTag(tag);
</del><ins>+ WebTextChecker::singleton()->client().closeSpellDocumentWithTag(tag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::checkSpellingOfString(int64_t spellDocumentTag, StringView text, int32_t& misspellingLocation, int32_t& misspellingLength)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().checkSpellingOfString(spellDocumentTag, text.toStringWithoutCopying(), misspellingLocation, misspellingLength);
</del><ins>+ WebTextChecker::singleton()->client().checkSpellingOfString(spellDocumentTag, text.toStringWithoutCopying(), misspellingLocation, misspellingLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::checkGrammarOfString(int64_t spellDocumentTag, StringView text, Vector<WebCore::GrammarDetail>& grammarDetails, int32_t& badGrammarLocation, int32_t& badGrammarLength)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().checkGrammarOfString(spellDocumentTag, text.toStringWithoutCopying(), grammarDetails, badGrammarLocation, badGrammarLength);
</del><ins>+ WebTextChecker::singleton()->client().checkGrammarOfString(spellDocumentTag, text.toStringWithoutCopying(), grammarDetails, badGrammarLocation, badGrammarLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TextChecker::spellingUIIsShowing()
</span><span class="cx"> {
</span><del>- return WebTextChecker::shared()->client().spellingUIIsShowing();
</del><ins>+ return WebTextChecker::singleton()->client().spellingUIIsShowing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::toggleSpellingUIIsShowing()
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().toggleSpellingUIIsShowing();
</del><ins>+ WebTextChecker::singleton()->client().toggleSpellingUIIsShowing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::updateSpellingUIWithMisspelledWord(int64_t spellDocumentTag, const String& misspelledWord)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().updateSpellingUIWithMisspelledWord(spellDocumentTag, misspelledWord);
</del><ins>+ WebTextChecker::singleton()->client().updateSpellingUIWithMisspelledWord(spellDocumentTag, misspelledWord);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::updateSpellingUIWithGrammarString(int64_t spellDocumentTag, const String& badGrammarPhrase, const GrammarDetail& grammarDetail)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().updateSpellingUIWithGrammarString(spellDocumentTag, badGrammarPhrase, grammarDetail);
</del><ins>+ WebTextChecker::singleton()->client().updateSpellingUIWithGrammarString(spellDocumentTag, badGrammarPhrase, grammarDetail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::getGuessesForWord(int64_t spellDocumentTag, const String& word, const String& /* context */, Vector<String>& guesses)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().guessesForWord(spellDocumentTag, word, guesses);
</del><ins>+ WebTextChecker::singleton()->client().guessesForWord(spellDocumentTag, word, guesses);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::learnWord(int64_t spellDocumentTag, const String& word)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().learnWord(spellDocumentTag, word);
</del><ins>+ WebTextChecker::singleton()->client().learnWord(spellDocumentTag, word);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::ignoreWord(int64_t spellDocumentTag, const String& word)
</span><span class="cx"> {
</span><del>- WebTextChecker::shared()->client().ignoreWord(spellDocumentTag, word);
</del><ins>+ WebTextChecker::singleton()->client().ignoreWord(spellDocumentTag, word);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextChecker::requestCheckingOfString(PassRefPtr<TextCheckerCompletion>)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> } else
</span><span class="cx"> LOG_ERROR("Couldn't parse %s, wrong format? Use 127.0.0.1:2999 instead.", serverAddress.utf8().data());
</span><span class="cx">
</span><del>- if (!WebInspectorServer::shared().listen(bindAddress, port))
</del><ins>+ if (!WebInspectorServer::singleton().listen(bindAddress, port))
</ins><span class="cx"> LOG_ERROR("Couldn't start listening on: IP address=%s, port=%d.", bindAddress.utf8().data(), port);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebMemoryPressureHandlerIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class WebMemoryPressureHandler {
</span><span class="cx"> friend class NeverDestroyed<WebMemoryPressureHandler>;
</span><span class="cx"> public:
</span><del>- static WebMemoryPressureHandler& shared();
</del><ins>+ static WebMemoryPressureHandler& singleton();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebMemoryPressureHandler();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebMemoryPressureHandlerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebMemoryPressureHandler& WebMemoryPressureHandler::shared()
</del><ins>+WebMemoryPressureHandler& WebMemoryPressureHandler::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebMemoryPressureHandler> memoryPressureHandler;
</span><span class="cx"> return memoryPressureHandler;
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_main_queue());
</span><span class="cx"> dispatch_set_context(source, this);
</span><span class="cx"> dispatch_source_set_event_handler(source, ^{
</span><del>- ViewSnapshotStore::shared().discardSnapshotImages();
</del><ins>+ ViewSnapshotStore::singleton().discardSnapshotImages();
</ins><span class="cx"> });
</span><span class="cx"> dispatch_resume(source);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isVisuallyIdle()
</span><span class="cx"> {
</span><del>- return WindowServerConnection::shared().applicationWindowModificationsHaveStopped() || !isViewVisible();
</del><ins>+ return WindowServerConnection::singleton().applicationWindowModificationsHaveStopped() || !isViewVisible();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayerHostingMode PageClientImpl::viewLayerHostingMode()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacSecItemShimProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-SecItemShimProxy& SecItemShimProxy::shared()
</del><ins>+SecItemShimProxy& SecItemShimProxy::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static SecItemShimProxy* proxy;
</span><span class="cx"> static dispatch_once_t once;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacSecItemShimProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> class SecItemShimProxy : public IPC::Connection::WorkQueueMessageReceiver {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SecItemShimProxy);
</span><span class="cx"> public:
</span><del>- static SecItemShimProxy& shared();
</del><ins>+ static SecItemShimProxy& singleton();
</ins><span class="cx">
</span><span class="cx"> void initializeConnection(IPC::Connection&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacServicesControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ServicesController.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ServicesController.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/ServicesController.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ServicesController);
</span><span class="cx"> friend class NeverDestroyed<ServicesController>;
</span><span class="cx"> public:
</span><del>- static ServicesController& shared();
</del><ins>+ static ServicesController& singleton();
</ins><span class="cx">
</span><span class="cx"> bool hasImageServices() const { return m_hasImageServices; }
</span><span class="cx"> bool hasSelectionServices() const { return m_hasSelectionServices; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacServicesControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/ServicesController.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ServicesController& ServicesController::shared()
</del><ins>+ServicesController& ServicesController::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<ServicesController> sharedController;
</span><span class="cx"> return sharedController;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewSnapshotStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> ViewSnapshotStore();
</span><span class="cx"> ~ViewSnapshotStore();
</span><span class="cx">
</span><del>- static ViewSnapshotStore& shared();
</del><ins>+ static ViewSnapshotStore& singleton();
</ins><span class="cx">
</span><span class="cx"> void recordSnapshot(WebPageProxy&, WebBackForwardListItem&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewSnapshotStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> discardSnapshotImages();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ViewSnapshotStore& ViewSnapshotStore::shared()
</del><ins>+ViewSnapshotStore& ViewSnapshotStore::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static ViewSnapshotStore& store = *new ViewSnapshotStore;
</span><span class="cx"> return store;
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> , m_size(size)
</span><span class="cx"> {
</span><span class="cx"> if (hasImage())
</span><del>- ViewSnapshotStore::shared().didAddImageToSnapshot(*this);
</del><ins>+ ViewSnapshotStore::singleton().didAddImageToSnapshot(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ViewSnapshot::~ViewSnapshot()
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> if (!hasImage())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ViewSnapshotStore::shared().willRemoveImageFromSnapshot(*this);
</del><ins>+ ViewSnapshotStore::singleton().willRemoveImageFromSnapshot(*this);
</ins><span class="cx">
</span><span class="cx"> #if USE_IOSURFACE_VIEW_SNAPSHOTS
</span><span class="cx"> m_surface = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> // If there is no services menu, then the existing services on the system have changed, so refresh that list of services.
</span><span class="cx"> // If <rdar://problem/17954709> is resolved then we can more accurately keep the list up to date without this call.
</span><span class="cx"> if (!m_servicesMenu)
</span><del>- ServicesController::shared().refreshExistingServices();
</del><ins>+ ServicesController::singleton().refreshExistingServices();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::clearServicesMenu()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWindowServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> class WindowServerConnection {
</span><span class="cx"> public:
</span><del>- static WindowServerConnection& shared();
</del><ins>+ static WindowServerConnection& singleton();
</ins><span class="cx">
</span><span class="cx"> bool applicationWindowModificationsHaveStopped() const { return m_applicationWindowModificationsHaveStopped; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWindowServerConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/UIProcess/mac/WindowServerConnection.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx">
</span><span class="cx"> void WindowServerConnection::applicationWindowModificationsStarted(uint32_t, void*, uint32_t, void*, uint32_t)
</span><span class="cx"> {
</span><del>- WindowServerConnection::shared().applicationWindowModificationsStopped(false);
</del><ins>+ WindowServerConnection::singleton().applicationWindowModificationsStopped(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WindowServerConnection::applicationWindowModificationsStopped(uint32_t, void*, uint32_t, void*, uint32_t)
</span><span class="cx"> {
</span><del>- WindowServerConnection::shared().applicationWindowModificationsStopped(true);
</del><ins>+ WindowServerConnection::singleton().applicationWindowModificationsStopped(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WindowServerConnection::windowServerConnectionStateChanged()
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-WindowServerConnection& WindowServerConnection::shared()
</del><ins>+WindowServerConnection& WindowServerConnection::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WindowServerConnection& windowServerConnection = *new WindowServerConnection;
</span><span class="cx"> return windowServerConnection;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> PassRefPtr<WebIDBServerConnection> WebIDBServerConnection::create(const String& databaseName, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebIDBServerConnection> result = adoptRef(new WebIDBServerConnection(databaseName, openingOrigin, mainFrameOrigin));
</span><del>- WebProcess::shared().webToDatabaseProcessConnection()->registerWebIDBServerConnection(*result);
</del><ins>+ WebProcess::singleton().webToDatabaseProcessConnection()->registerWebIDBServerConnection(*result);
</ins><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> WebIDBServerConnection::~WebIDBServerConnection()
</span><span class="cx"> {
</span><del>- WebProcess::shared().webToDatabaseProcessConnection()->removeWebIDBServerConnection(*this);
</del><ins>+ WebProcess::singleton().webToDatabaseProcessConnection()->removeWebIDBServerConnection(*this);
</ins><span class="cx">
</span><span class="cx"> for (const auto& it : m_serverRequests)
</span><span class="cx"> it.value->requestAborted();
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx">
</span><span class="cx"> IPC::Connection* WebIDBServerConnection::messageSenderConnection()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().webToDatabaseProcessConnection()->connection();
</del><ins>+ return WebProcess::singleton().webToDatabaseProcessConnection()->connection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesWebToDatabaseProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> void WebToDatabaseProcessConnection::didClose(IPC::Connection& connection)
</span><span class="cx"> {
</span><del>- WebProcess::shared().webToDatabaseProcessConnectionClosed(this);
</del><ins>+ WebProcess::singleton().webToDatabaseProcessConnectionClosed(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebToDatabaseProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, PassRefPtr<BlobDataFileReference> file, const String& contentType)
</span><span class="cx"> {
</span><del>- ASSERT(WebProcess::shared().usesNetworkProcess());
</del><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
</ins><span class="cx">
</span><span class="cx"> SandboxExtension::Handle extensionHandle;
</span><span class="cx">
</span><span class="lines">@@ -48,43 +48,43 @@
</span><span class="cx"> if (!file->path().isEmpty())
</span><span class="cx"> SandboxExtension::createHandle(file->path(), SandboxExtension::ReadOnly, extensionHandle);
</span><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, file->path(), extensionHandle, contentType), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, file->path(), extensionHandle, contentType), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</span><span class="cx"> {
</span><del>- ASSERT(WebProcess::shared().usesNetworkProcess());
</del><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
</ins><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURL(const URL& url, const URL& srcURL)
</span><span class="cx"> {
</span><del>- ASSERT(WebProcess::shared().usesNetworkProcess());
</del><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
</ins><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::unregisterBlobURL(const URL& url)
</span><span class="cx"> {
</span><del>- ASSERT(WebProcess::shared().usesNetworkProcess());
</del><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
</ins><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</span><span class="cx"> {
</span><del>- ASSERT(WebProcess::shared().usesNetworkProcess());
</del><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
</ins><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long BlobRegistryProxy::blobSize(const URL& url)
</span><span class="cx"> {
</span><del>- ASSERT(WebProcess::shared().usesNetworkProcess());
</del><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
</ins><span class="cx">
</span><span class="cx"> uint64_t resultSize;
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
</del><ins>+ if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
</ins><span class="cx"> return 0;
</span><span class="cx"> return resultSize;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> + (instancetype)lookUpFrameFromHandle:(_WKFrameHandle *)handle
</span><span class="cx"> {
</span><del>- WebFrame* webFrame = WebProcess::shared().webFrame(handle._frameID);
</del><ins>+ WebFrame* webFrame = WebProcess::singleton().webFrame(handle._frameID);
</ins><span class="cx"> if (!webFrame)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Frame"), toImpl(frame));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Request"), toImpl(request));
</span><del>- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLRequestRef wkRequest, WKURLResponseRef wkRedirectResponse, const void* clientInfo)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Request"), newRequest.get());
</span><span class="cx"> if (!redirectResourceResponse.isNull())
</span><span class="cx"> message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
</span><del>- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), API::Dictionary::create(WTF::move(message)).get());
</ins><span class="cx">
</span><span class="cx"> return toAPI(newRequest.release().leakRef());
</span><span class="cx"> }
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Response"), toImpl(response));
</span><del>- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), API::Dictionary::create(WTF::move(message)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didReceiveContentLengthForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, uint64_t length, const void*)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("ContentLength"), API::UInt64::create(length));
</span><del>- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), API::Dictionary::create(WTF::move(message)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didFinishLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, const void*)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> API::Dictionary::MapType message;
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><del>- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didFailLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKErrorRef error, const void*)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Error"), toImpl(error));
</span><del>- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class PageContextMenuClient final : public API::InjectedBundle::PageContextMenuClient {
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> messageReply.set("Page", webPage);
</span><span class="cx"> messageReply.set("CallbackID", API::UInt64::create(callbackID));
</span><span class="cx"> messageReply.set("Snapshot", snapshotImage);
</span><del>- WebProcess::shared().injectedBundle()->postMessage("WebPage.DidGetSnapshot", API::Dictionary::create(WTF::move(messageReply)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage("WebPage.DidGetSnapshot", API::Dictionary::create(WTF::move(messageReply)).get());
</ins><span class="cx"> } else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx">
</span><span class="cx"> + (instancetype)lookUpBrowsingContextFromHandle:(WKBrowsingContextHandle *)handle
</span><span class="cx"> {
</span><del>- WebPage* webPage = WebProcess::shared().webPage(handle.pageID);
</del><ins>+ WebPage* webPage = WebProcess::singleton().webPage(handle.pageID);
</ins><span class="cx"> if (!webPage)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!_remoteObjectRegistry) {
</span><span class="cx"> _remoteObjectRegistry = adoptNS([[_WKRemoteObjectRegistry alloc] _initWithMessageSender:*_page]);
</span><del>- WebProcess::shared().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return _remoteObjectRegistry.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -116,32 +116,34 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::postMessage(const String& messageName, API::Object* messageBody)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessPool::HandleMessage(messageName, UserData(WebProcess::shared().transformObjectsToHandles(messageBody))), 0);
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ webProcess.parentProcessConnection()->send(Messages::WebProcessPool::HandleMessage(messageName, UserData(webProcess.transformObjectsToHandles(messageBody))), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::postSynchronousMessage(const String& messageName, API::Object* messageBody, RefPtr<API::Object>& returnData)
</span><span class="cx"> {
</span><span class="cx"> UserData returnUserData;
</span><span class="cx">
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::HandleSynchronousMessage(messageName, UserData(WebProcess::shared().transformObjectsToHandles(messageBody))), Messages::WebProcessPool::HandleSynchronousMessage::Reply(returnUserData), 0))
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (!webProcess.parentProcessConnection()->sendSync(Messages::WebProcessPool::HandleSynchronousMessage(messageName, UserData(webProcess.transformObjectsToHandles(messageBody))), Messages::WebProcessPool::HandleSynchronousMessage::Reply(returnUserData), 0))
</ins><span class="cx"> returnData = nullptr;
</span><span class="cx"> else
</span><del>- returnData = WebProcess::shared().transformHandlesToObjects(returnUserData.object());
</del><ins>+ returnData = webProcess.transformHandlesToObjects(returnUserData.object());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebConnection* InjectedBundle::webConnectionToUIProcess() const
</span><span class="cx"> {
</span><del>- return WebProcess::shared().webConnectionToUIProcess();
</del><ins>+ return WebProcess::singleton().webConnectionToUIProcess();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setAlwaysAcceptCookies(bool accept)
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(accept ? HTTPCookieAcceptPolicyAlways : HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
</del><ins>+ WebProcess::singleton().supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(accept ? HTTPCookieAcceptPolicyAlways : HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setCacheModel(uint32_t cacheModel)
</span><span class="cx"> {
</span><del>- WebProcess::shared().setCacheModel(cacheModel);
</del><ins>+ WebProcess::singleton().setCacheModel(cacheModel);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* pageGroup, const String& preference, bool enabled)
</span><span class="lines">@@ -342,19 +344,19 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearAllDatabases()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebDatabaseManager>()->deleteAllDatabases();
</del><ins>+ WebProcess::singleton().supplement<WebDatabaseManager>()->deleteAllDatabases();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setDatabaseQuota(uint64_t quota)
</span><span class="cx"> {
</span><span class="cx"> // Historically, we've used the following (somewhat non-sensical) string
</span><span class="cx"> // for the databaseIdentifier of local files.
</span><del>- WebProcess::shared().supplement<WebDatabaseManager>()->setQuotaForOrigin("file__0", quota);
</del><ins>+ WebProcess::singleton().supplement<WebDatabaseManager>()->setQuotaForOrigin("file__0", quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearApplicationCache()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebApplicationCacheManager>()->deleteAllEntries();
</del><ins>+ WebProcess::singleton().supplement<WebApplicationCacheManager>()->deleteAllEntries();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearApplicationCacheForOrigin(const String& originString)
</span><span class="lines">@@ -365,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebApplicationCacheManager>()->setAppCacheMaximumSize(size);
</del><ins>+ WebProcess::singleton().supplement<WebApplicationCacheManager>()->setAppCacheMaximumSize(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t InjectedBundle::appCacheUsageForOrigin(const String& originString)
</span><span class="lines">@@ -586,7 +588,7 @@
</span><span class="cx"> WebCore::Notification* notification = JSNotification::toWrapped(toJS(toJS(jsContext), jsNotification));
</span><span class="cx"> if (!notification)
</span><span class="cx"> return 0;
</span><del>- return WebProcess::shared().supplement<WebNotificationManager>()->notificationIDForTesting(notification);
</del><ins>+ return WebProcess::singleton().supplement<WebNotificationManager>()->notificationIDForTesting(notification);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(jsContext);
</span><span class="cx"> UNUSED_PARAM(jsNotification);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> void NetworkProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {
</span><del>- if (WebResourceLoader* webResourceLoader = WebProcess::shared().webResourceLoadScheduler().webResourceLoaderForIdentifier(decoder.destinationID()))
</del><ins>+ if (WebResourceLoader* webResourceLoader = WebProcess::singleton().webResourceLoadScheduler().webResourceLoaderForIdentifier(decoder.destinationID()))
</ins><span class="cx"> webResourceLoader->didReceiveWebResourceLoaderMessage(connection, decoder);
</span><span class="cx">
</span><span class="cx"> return;
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void NetworkProcessConnection::didClose(IPC::Connection&)
</span><span class="cx"> {
</span><span class="cx"> // The NetworkProcess probably crashed.
</span><del>- WebProcess::shared().networkProcessConnectionClosed(this);
</del><ins>+ WebProcess::singleton().networkProcessConnectionClosed(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
</span><span class="cx">
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
</del><ins>+ if (!WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
</ins><span class="cx"> // We probably failed to schedule this load with the NetworkProcess because it had crashed.
</span><span class="cx"> // This load will never succeed so we will schedule it to fail asynchronously.
</span><span class="cx"> scheduleInternallyFailedLoad(resourceLoader);
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
</ins><span class="cx">
</span><span class="cx"> // It's possible that this WebResourceLoader might be just about to message back to the NetworkProcess (e.g. ContinueWillSendRequest)
</span><span class="cx"> // but there's no point in doing so anymore.
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> void WebResourceLoadScheduler::setDefersLoading(ResourceLoader* resourceLoader, bool defers)
</span><span class="cx"> {
</span><span class="cx"> ResourceLoadIdentifier identifier = resourceLoader->identifier();
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader*, const URL&)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> if (m_suspendPendingRequestsCount)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ServePendingRequests(minimumPriority), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ServePendingRequests(minimumPriority), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::suspendPendingRequests()
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::setSerialLoadingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::SetSerialLoadingEnabled(enabled), Messages::NetworkConnectionToWebProcess::SetSerialLoadingEnabled::Reply(), 0);
</del><ins>+ WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::SetSerialLoadingEnabled(enabled), Messages::NetworkConnectionToWebProcess::SetSerialLoadingEnabled::Reply(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::networkProcessCrashed()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> IPC::Connection* WebResourceLoader::messageSenderConnection()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().networkConnection()->connection();
</del><ins>+ return WebProcess::singleton().networkConnection()->connection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t WebResourceLoader::messageSenderDestinationID()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNotificationsNotificationPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (!m_page->corePage()->settings().notificationsEnabled())
</span><span class="cx"> return NotificationClient::PermissionDenied;
</span><span class="cx">
</span><del>- return WebProcess::shared().supplement<WebNotificationManager>()->policyForOrigin(securityOrigin);
</del><ins>+ return WebProcess::singleton().supplement<WebNotificationManager>()->policyForOrigin(securityOrigin);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(securityOrigin);
</span><span class="cx"> return NotificationClient::PermissionDenied;
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> void NotificationPermissionRequestManager::setPermissionLevelForTesting(const String& originString, bool allowed)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- WebProcess::shared().supplement<WebNotificationManager>()->didUpdateNotificationDecision(originString, allowed);
</del><ins>+ WebProcess::singleton().supplement<WebNotificationManager>()->didUpdateNotificationDecision(originString, allowed);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(originString);
</span><span class="cx"> UNUSED_PARAM(allowed);
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> void NotificationPermissionRequestManager::removeAllPermissionsForTesting()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><del>- WebProcess::shared().supplement<WebNotificationManager>()->removeAllPermissionsForTesting();
</del><ins>+ WebProcess::singleton().supplement<WebNotificationManager>()->removeAllPermissionsForTesting();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> m_originToIDMap.remove(origin);
</span><span class="cx">
</span><del>- WebProcess::shared().supplement<WebNotificationManager>()->didUpdateNotificationDecision(origin->toString(), allowed);
</del><ins>+ WebProcess::singleton().supplement<WebNotificationManager>()->didUpdateNotificationDecision(origin->toString(), allowed);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> RefPtr<WebCore::VoidCallback> voidCallback = m_idToVoidCallbackMap.take(requestID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1662,7 +1662,8 @@
</span><span class="cx"> pasteboardTypes.append(type);
</span><span class="cx">
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardTypes(pasteboardName, pasteboardTypes),
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ webProcess.parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardTypes(pasteboardName, pasteboardTypes),
</ins><span class="cx"> Messages::WebPasteboardProxy::SetPasteboardTypes::Reply(newChangeCount), 0);
</span><span class="cx">
</span><span class="cx"> for (NSUInteger i = 0, count = items.count; i < count; ++i) {
</span><span class="lines">@@ -1677,7 +1678,7 @@
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:NSStringPboardType] || [type isEqualToString:NSPasteboardTypeString]) {
</span><span class="cx"> RetainPtr<NSString> plainTextString = adoptNS([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardStringForType(pasteboardName, type, plainTextString.get()), Messages::WebPasteboardProxy::SetPasteboardStringForType::Reply(newChangeCount), 0);
</del><ins>+ webProcess.parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardStringForType(pasteboardName, type, plainTextString.get()), Messages::WebPasteboardProxy::SetPasteboardStringForType::Reply(newChangeCount), 0);
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::wrapNSData(data);
</span><span class="cx">
</span><span class="lines">@@ -1688,7 +1689,7 @@
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory = SharedMemory::create(buffer->size());
</span><span class="cx"> memcpy(sharedMemory->data(), buffer->data(), buffer->size());
</span><span class="cx"> sharedMemory->createHandle(handle, SharedMemory::ReadOnly);
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</del><ins>+ webProcess.parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> IPC::Attachment encodedConnectionIdentifier;
</span><span class="cx"> bool supportsAsynchronousInitialization;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPluginProcessConnection(pluginProcessToken),
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPluginProcessConnection(pluginProcessToken),
</ins><span class="cx"> Messages::WebProcessProxy::GetPluginProcessConnection::Reply(encodedConnectionIdentifier, supportsAsynchronousInitialization), 0))
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> bool PluginProxy::initialize(const Parameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_connection);
</span><del>- m_connection = WebProcess::shared().pluginProcessConnectionManager().getPluginProcessConnection(m_pluginProcessToken);
</del><ins>+ m_connection = WebProcess::singleton().pluginProcessConnectionManager().getPluginProcessConnection(m_pluginProcessToken);
</ins><span class="cx">
</span><span class="cx"> if (!m_connection)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1532,7 +1532,7 @@
</span><span class="cx">
</span><span class="cx"> const MachSendRight& PluginView::compositingRenderServerPort()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().compositingRenderServerPort();
</del><ins>+ return WebProcess::singleton().compositingRenderServerPort();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::openPluginPreferencePane()
</span><span class="lines">@@ -1814,7 +1814,7 @@
</span><span class="cx"> String pluginOrigin = plugInImageElement.loadedUrl().host();
</span><span class="cx"> String mimeType = plugInImageElement.loadedMimeType();
</span><span class="cx">
</span><del>- WebProcess::shared().plugInDidReceiveUserInteraction(pageOrigin, pluginOrigin, mimeType, plugInImageElement.document().page()->sessionID());
</del><ins>+ WebProcess::singleton().plugInDidReceiveUserInteraction(pageOrigin, pluginOrigin, mimeType, plugInImageElement.document().page()->sessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PluginView::shouldCreateTransientPaintingSnapshot() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -54,12 +54,12 @@
</span><span class="cx"> : AsyncScrollingCoordinator(page->corePage())
</span><span class="cx"> , m_webPage(page)
</span><span class="cx"> {
</span><del>- WebProcess::shared().addMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->pageID(), *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->pageID(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteScrollingCoordinator::~RemoteScrollingCoordinator()
</span><span class="cx"> {
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->pageID());
</del><ins>+ WebProcess::singleton().removeMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteScrollingCoordinator::scheduleTreeStateCommit()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageAreaMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -71,24 +71,24 @@
</span><span class="cx"> switch (m_storageType) {
</span><span class="cx"> case WebCore::LocalStorage:
</span><span class="cx"> if (SecurityOrigin* topLevelOrigin = storageNamespace->topLevelOrigin())
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateTransientLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(topLevelOrigin), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::CreateTransientLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(topLevelOrigin), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</ins><span class="cx"> else
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::CreateLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebCore::SessionStorage:
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateSessionStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::CreateSessionStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WebProcess::shared().addMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID, *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StorageAreaMap::~StorageAreaMap()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::DestroyStorageMap(m_storageMapID), 0);
- WebProcess::shared().removeMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::DestroyStorageMap(m_storageMapID), 0);
+ WebProcess::singleton().removeMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned StorageAreaMap::length()
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> m_pendingValueChanges.add(key);
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::SetItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, value, sourceFrame->document()->url()), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::SetItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, value, sourceFrame->document()->url()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageAreaMap::removeItem(WebCore::Frame* sourceFrame, StorageAreaImpl* sourceArea, const String& key)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> m_pendingValueChanges.add(key);
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::RemoveItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, sourceFrame->document()->url()), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::RemoveItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, sourceFrame->document()->url()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageAreaMap::clear(WebCore::Frame* sourceFrame, StorageAreaImpl* sourceArea)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> m_hasPendingClear = true;
</span><span class="cx"> m_storageMap = StorageMap::create(m_quotaInBytes);
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::Clear(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, sourceFrame->document()->url()), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::StorageManager::Clear(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, sourceFrame->document()->url()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StorageAreaMap::contains(const String& key)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> // FIXME: This should use a special sendSync flag to indicate that we don't want to process incoming messages while waiting for a reply.
</span><span class="cx"> // (This flag does not yet exist). Since loadValuesIfNeeded() ends up being called from within JavaScript code, processing incoming synchronous messages
</span><span class="cx"> // could lead to weird reentrency bugs otherwise.
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::StorageManager::GetValues(m_storageMapID, m_currentSeed), Messages::StorageManager::GetValues::Reply(values), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::StorageManager::GetValues(m_storageMapID, m_currentSeed), Messages::StorageManager::GetValues::Reply(values), 0);
</ins><span class="cx">
</span><span class="cx"> m_storageMap = StorageMap::create(m_quotaInBytes);
</span><span class="cx"> m_storageMap->importItems(values);
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">
</span><span class="cx"> // Namespace IDs for session storage namespaces are equivalent to web page IDs
</span><span class="cx"> // so we can get the right page here.
</span><del>- WebPage* webPage = WebProcess::shared().webPage(m_storageNamespaceID);
</del><ins>+ WebPage* webPage = WebProcess::singleton().webPage(m_storageNamespaceID);
</ins><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<Frame>> frames;
</span><span class="cx">
</span><del>- PageGroup& pageGroup = *WebProcess::shared().webPageGroup(m_storageNamespaceID)->corePageGroup();
</del><ins>+ PageGroup& pageGroup = *WebProcess::singleton().webPageGroup(m_storageNamespaceID)->corePageGroup();
</ins><span class="cx"> const HashSet<Page*>& pages = pageGroup.pages();
</span><span class="cx"> for (HashSet<Page*>::const_iterator it = pages.begin(), end = pages.end(); it != end; ++it) {
</span><span class="cx"> for (Frame* frame = &(*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -70,14 +70,14 @@
</span><span class="cx"> : m_identifier(identifier)
</span><span class="cx"> , m_userContentController(*UserContentController::create())
</span><span class="cx"> {
</span><del>- WebProcess::shared().addMessageReceiver(Messages::WebUserContentController::messageReceiverName(), m_identifier, *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::WebUserContentController::messageReceiverName(), m_identifier, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebUserContentController::~WebUserContentController()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(userContentControllers().contains(m_identifier));
</span><span class="cx">
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::WebUserContentController::messageReceiverName(), m_identifier);
</del><ins>+ WebProcess::singleton().removeMessageReceiver(Messages::WebUserContentController::messageReceiverName(), m_identifier);
</ins><span class="cx">
</span><span class="cx"> userContentControllers().remove(m_identifier);
</span><span class="cx"> }
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebUserContentControllerProxy::DidPostMessage(webPage->pageID(), webFrame->frameID(), m_identifier, IPC::DataReference(value->data())), m_controller->identifier());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebUserContentControllerProxy::DidPostMessage(webPage->pageID(), webFrame->frameID(), m_identifier, IPC::DataReference(value->data())), m_controller->identifier());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::UserMessageHandlerDescriptor& descriptor() { return *m_descriptor; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebBatteryClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -38,17 +38,17 @@
</span><span class="cx">
</span><span class="cx"> void WebBatteryClient::startUpdating()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebBatteryManager>()->registerWebPage(m_page);
</del><ins>+ WebProcess::singleton().supplement<WebBatteryManager>()->registerWebPage(m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBatteryClient::stopUpdating()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebBatteryManager>()->unregisterWebPage(m_page);
</del><ins>+ WebProcess::singleton().supplement<WebBatteryManager>()->unregisterWebPage(m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBatteryClient::batteryControllerDestroyed()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebBatteryManager>()->unregisterWebPage(m_page);
</del><ins>+ WebProcess::singleton().supplement<WebBatteryManager>()->unregisterWebPage(m_page);
</ins><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect newWindowFrame;
</span><span class="cx">
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page->pageID()))
</ins><span class="cx"> return FloatRect();
</span><span class="cx">
</span><span class="cx"> return newWindowFrame;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebFrame* webFrame = frame ? WebFrame::fromCoreFrame(*frame) : nullptr;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? webFrame->frameID() : 0), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? webFrame->frameID() : 0), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Page* WebChromeClient::createWindow(Frame* frame, const FrameLoadRequest& request, const WindowFeatures& windowFeatures, const NavigationAction& navigationAction)
</span><span class="lines">@@ -213,14 +213,15 @@
</span><span class="cx">
</span><span class="cx"> uint64_t newPageID = 0;
</span><span class="cx"> WebPageCreationParameters parameters;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(webFrame->frameID(), request.resourceRequest(), windowFeatures, navigationActionData), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page->pageID()))
- return 0;
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (!webProcess.parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(webFrame->frameID(), request.resourceRequest(), windowFeatures, navigationActionData), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page->pageID()))
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!newPageID)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- WebProcess::shared().createWebPage(newPageID, parameters);
- return WebProcess::shared().webPage(newPageID)->corePage();
</del><ins>+ webProcess.createWebPage(newPageID, parameters);
+ return webProcess.webPage(newPageID)->corePage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::show()
</span><span class="lines">@@ -250,7 +251,7 @@
</span><span class="cx"> return toolbarsVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
</span><span class="cx">
</span><span class="cx"> bool toolbarsAreVisible = true;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page->pageID()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return toolbarsAreVisible;
</span><span class="lines">@@ -268,7 +269,7 @@
</span><span class="cx"> return statusbarVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
</span><span class="cx">
</span><span class="cx"> bool statusBarIsVisible = true;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page->pageID()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return statusBarIsVisible;
</span><span class="lines">@@ -297,7 +298,7 @@
</span><span class="cx"> return menubarVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
</span><span class="cx">
</span><span class="cx"> bool menuBarIsVisible = true;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page->pageID()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return menuBarIsVisible;
</span><span class="lines">@@ -331,7 +332,7 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx">
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return shouldClose;
</span><span class="lines">@@ -367,7 +368,7 @@
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
</span><span class="lines">@@ -382,7 +383,7 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx"> bool result = false;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -400,7 +401,7 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx">
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !result.isNull();
</span><span class="lines">@@ -417,7 +418,7 @@
</span><span class="cx"> bool WebChromeClient::shouldInterruptJavaScript()
</span><span class="cx"> {
</span><span class="cx"> bool shouldInterrupt = false;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::ShouldInterruptJavaScript(), Messages::WebPageProxy::ShouldInterruptJavaScript::Reply(shouldInterrupt), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::ShouldInterruptJavaScript(), Messages::WebPageProxy::ShouldInterruptJavaScript::Reply(shouldInterrupt), m_page->pageID()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return shouldInterrupt;
</span><span class="lines">@@ -601,7 +602,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebHitTestResult::Data webHitTestResultData(hitTestResult);
</span><del>- m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(webHitTestResultData, modifierFlags, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didBeginTrackingPotentialLongMousePress(const IntPoint& mouseDownPosition, const HitTestResult& hitTestResult)
</span><span class="lines">@@ -613,7 +614,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebHitTestResult::Data webHitTestResultData(hitTestResult);
</span><del>- m_page->send(Messages::WebPageProxy::DidBeginTrackingPotentialLongMousePress(mouseDownPosition, webHitTestResultData, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page->send(Messages::WebPageProxy::DidBeginTrackingPotentialLongMousePress(mouseDownPosition, webHitTestResultData, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didRecognizeLongMousePress()
</span><span class="lines">@@ -624,7 +625,7 @@
</span><span class="cx"> m_page->injectedBundleUIClient().didRecognizeLongMousePress(m_page, userData);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- m_page->send(Messages::WebPageProxy::DidRecognizeLongMousePress(UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page->send(Messages::WebPageProxy::DidRecognizeLongMousePress(UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didCancelTrackingPotentialLongMousePress()
</span><span class="lines">@@ -635,7 +636,7 @@
</span><span class="cx"> m_page->injectedBundleUIClient().didCancelTrackingPotentialLongMousePress(m_page, userData);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- m_page->send(Messages::WebPageProxy::DidCancelTrackingPotentialLongMousePress(UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page->send(Messages::WebPageProxy::DidCancelTrackingPotentialLongMousePress(UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::setToolTip(const String& toolTip, TextDirection)
</span><span class="lines">@@ -661,7 +662,7 @@
</span><span class="cx"> // the print operation is finished unexpectely and the web process crashes, see https://bugs.webkit.org/show_bug.cgi?id=126979.
</span><span class="cx"> // The PrinterListGtk class gets the list of printers in the constructor so we just need to ensure there's an instance alive
</span><span class="cx"> // during the synchronous print operation.
</span><del>- RefPtr<PrinterListGtk> printerList = PrinterListGtk::shared();
</del><ins>+ RefPtr<PrinterListGtk> printerList = PrinterListGtk::singleton();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="lines">@@ -690,7 +691,7 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(
</ins><span class="cx"> Messages::WebPageProxy::ExceededDatabaseQuota(webFrame->frameID(), origin->databaseIdentifier(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage()),
</span><span class="cx"> Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</span><span class="cx"> }
</span><span class="lines">@@ -718,7 +719,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> uint64_t newQuota = 0;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(
</ins><span class="cx"> Messages::WebPageProxy::ReachedApplicationCacheOriginQuota(origin->databaseIdentifier(), currentQuota, totalBytesNeeded),
</span><span class="cx"> Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::Reply(newQuota), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</span><span class="cx">
</span><span class="lines">@@ -1053,7 +1054,7 @@
</span><span class="cx"> bool WebChromeClient::wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) const
</span><span class="cx"> {
</span><span class="cx"> bool succeeded;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::WrapCryptoKey(key), Messages::WebPageProxy::WrapCryptoKey::Reply(succeeded, wrappedKey), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::WrapCryptoKey(key), Messages::WebPageProxy::WrapCryptoKey::Reply(succeeded, wrappedKey), m_page->pageID()))
</ins><span class="cx"> return false;
</span><span class="cx"> return succeeded;
</span><span class="cx"> }
</span><span class="lines">@@ -1061,7 +1062,7 @@
</span><span class="cx"> bool WebChromeClient::unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) const
</span><span class="cx"> {
</span><span class="cx"> bool succeeded;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::UnwrapCryptoKey(wrappedKey), Messages::WebPageProxy::UnwrapCryptoKey::Reply(succeeded, key), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::UnwrapCryptoKey(wrappedKey), Messages::WebPageProxy::UnwrapCryptoKey::Reply(succeeded, key), m_page->pageID()))
</ins><span class="cx"> return false;
</span><span class="cx"> return succeeded;
</span><span class="cx"> }
</span><span class="lines">@@ -1082,7 +1083,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::hasRelevantSelectionServices(bool isTextOnly) const
</span><span class="cx"> {
</span><del>- return (isTextOnly && WebProcess::shared().hasSelectionServices()) || WebProcess::shared().hasRichContentServices();
</del><ins>+ return (isTextOnly && WebProcess::singleton().hasSelectionServices()) || WebProcess::singleton().hasRichContentServices();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebColorChoosercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> , m_page(page)
</span><span class="cx"> {
</span><span class="cx"> m_page->setActiveColorChooser(this);
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(initialColor, client->elementRectRelativeToRootView()), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(initialColor, client->elementRectRelativeToRootView()), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebColorChooser::~WebColorChooser()
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> m_page->setActiveColorChooser(this);
</span><span class="cx">
</span><span class="cx"> ASSERT(m_colorChooserClient);
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(color, m_colorChooserClient->elementRectRelativeToRootView()), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(color, m_colorChooserClient->elementRectRelativeToRootView()), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebColorChooser::setSelectedColor(const Color& color)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> if (m_page->activeColorChooser() != this)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::SetColorPickerColor(color), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SetColorPickerColor(color), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebColorChooser::endChooser()
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::EndColorPicker(), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::EndColorPicker(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isContinuousSpellCheckingEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isContinuousSpellCheckingEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isContinuousSpellCheckingEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleContinuousSpellChecking()
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isGrammarCheckingEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isGrammarCheckingEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isGrammarCheckingEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleGrammarChecking()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> webPage->injectedBundleLoaderClient().didRemoveFrameFromHierarchy(webPage, m_frame, userData);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::detachedFromParent3()
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().supplement<AuthenticationManager>()->didReceiveAuthenticationChallenge(m_frame, challenge);
</del><ins>+ WebProcess::singleton().supplement<AuthenticationManager>()->didReceiveAuthenticationChallenge(m_frame, challenge);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long /*identifier*/, const AuthenticationChallenge&)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> webPage->injectedBundleLoaderClient().didReceiveServerRedirectForProvisionalLoadForFrame(webPage, m_frame, userData);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), url, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), url, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidCancelClientRedirect()
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><del>- webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationAnchorNavigation, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationAnchorNavigation, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidPushStateWithinPage()
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><del>- webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePush, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePush, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidReplaceStateWithinPage()
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><del>- webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStateReplace, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStateReplace, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidPopStateWithinPage()
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><del>- webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePop, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), documentLoader.navigationID(), SameDocumentNavigationSessionStatePop, m_frame->coreFrame()->document()->url().string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchWillClose()
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidReceiveIcon()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebIconDatabase::DidReceiveIconForPageURL(m_frame->url()), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebIconDatabase::DidReceiveIconForPageURL(m_frame->url()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidStartProvisionalLoad()
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> String unreachableURL = provisionalLoader.unreachableURL().string();
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), provisionalLoader.navigationID(), url, unreachableURL, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), provisionalLoader.navigationID(), url, unreachableURL, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidReceiveTitle(const StringWithDirection& title)
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> webPage->injectedBundleLoaderClient().didReceiveTitleForFrame(webPage, title.string(), m_frame, userData);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title.string(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title.string(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidChangeIcons(WebCore::IconType)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), documentLoader.response().mimeType(), m_frameHasCustomContentProvider, static_cast<uint32_t>(m_frame->coreFrame()->loader().loadType()), documentLoader.response().certificateInfo(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> webPage->didCommitLoad(m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> navigationID = static_cast<WebDocumentLoader*>(documentLoader)->navigationID();
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), navigationID, error, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), navigationID, error, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx">
</span><span class="cx"> // If we have a load listener, notify it.
</span><span class="cx"> if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><del>- webPage->send(Messages::WebPageProxy::DidFailLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), error, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidFailLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), error, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx">
</span><span class="cx"> // If we have a load listener, notify it.
</span><span class="cx"> if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidFinishLoad()
</span><span class="lines">@@ -541,7 +541,7 @@
</span><span class="cx"> WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader());
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::DidFinishLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidFinishLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx">
</span><span class="cx"> // If we have a load listener, notify it.
</span><span class="cx"> if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> // FIXME: We should consider removing the old didFirstLayout API since this is doing double duty with the
</span><span class="cx"> // new didLayout API.
</span><span class="cx"> webPage->injectedBundleLoaderClient().didFirstLayoutForFrame(webPage, m_frame, userData);
</span><del>- webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // FIXME: Do this on DidFirstVisuallyNonEmptyLayout when Mac Safari is able to handle it (<rdar://problem/17580021>)
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx">
</span><span class="cx"> // Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
</span><span class="cx"> webPage->injectedBundleLoaderClient().didLayout(webPage, milestones, userData);
</span><del>- webPage->send(Messages::WebPageProxy::DidLayout(milestones, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidLayout(milestones, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx">
</span><span class="cx"> if (milestones & DidFirstVisuallyNonEmptyLayout) {
</span><span class="cx"> if (m_frame->isMainFrame() && !m_didCompletePageTransition && !webPage->corePage()->settings().suppressesIncrementalRendering()) {
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> // FIXME: We should consider removing the old didFirstVisuallyNonEmptyLayoutForFrame API since this is doing
</span><span class="cx"> // double duty with the new didLayout API.
</span><span class="cx"> webPage->injectedBundleLoaderClient().didFirstVisuallyNonEmptyLayoutForFrame(webPage, m_frame, userData);
</span><del>- webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))
</del><ins>+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We call this synchronously because CFNetwork can only convert a loading connection to a download from its didReceiveResponse callback.
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx"> navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
</span><span class="cx"> navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationActionData, request, frameName, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationActionData, request, frameName, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState> prpFormState, FramePolicyFunction function)
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx"> documentLoader = static_cast<WebDocumentLoader*>(coreFrame->loader().documentLoader());
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID)))
</del><ins>+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We call this synchronously because WebCore cannot gracefully handle a frame load without a synchronous navigation policy reply.
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx"> webPage->injectedBundlePolicyClient().unableToImplementPolicy(webPage, m_frame, error, userData);
</span><span class="cx">
</span><span class="cx"> // Notify the UIProcess.
</span><del>- webPage->send(Messages::WebPageProxy::UnableToImplementPolicy(m_frame->frameID(), error, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::UnableToImplementPolicy(m_frame->frameID(), error, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::dispatchWillSendSubmitEvent(PassRefPtr<FormState> prpFormState)
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t listenerID = m_frame->setUpPolicyListener(WTF::move(function));
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), values, listenerID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), values, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::revertToProvisionalState(DocumentLoader*)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> if (!shouldGoToBackForwardListItem)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(itemID, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(itemID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1023,7 +1023,7 @@
</span><span class="cx">
</span><span class="cx"> webPage->injectedBundleLoaderClient().didDisplayInsecureContentForFrame(webPage, m_frame, userData);
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::DidDisplayInsecureContentForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidDisplayInsecureContentForFrame(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::didRunInsecureContent(SecurityOrigin*, const URL&)
</span><span class="lines">@@ -1036,7 +1036,7 @@
</span><span class="cx">
</span><span class="cx"> webPage->injectedBundleLoaderClient().didRunInsecureContentForFrame(webPage, m_frame, userData);
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::DidRunInsecureContentForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidRunInsecureContentForFrame(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::didDetectXSS(const URL&, bool)
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx">
</span><span class="cx"> webPage->injectedBundleLoaderClient().didDetectXSSForFrame(webPage, m_frame, userData);
</span><span class="cx">
</span><del>- webPage->send(Messages::WebPageProxy::DidDetectXSSForFrame(m_frame->frameID(), UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ webPage->send(Messages::WebPageProxy::DidDetectXSSForFrame(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceError WebFrameLoaderClient::cancelledError(const ResourceRequest& request)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebGeolocationClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGeolocationClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGeolocationClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGeolocationClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,23 +44,23 @@
</span><span class="cx">
</span><span class="cx"> void WebGeolocationClient::geolocationDestroyed()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebGeolocationManager>()->unregisterWebPage(m_page);
</del><ins>+ WebProcess::singleton().supplement<WebGeolocationManager>()->unregisterWebPage(m_page);
</ins><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGeolocationClient::startUpdating()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebGeolocationManager>()->registerWebPage(m_page);
</del><ins>+ WebProcess::singleton().supplement<WebGeolocationManager>()->registerWebPage(m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGeolocationClient::stopUpdating()
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebGeolocationManager>()->unregisterWebPage(m_page);
</del><ins>+ WebProcess::singleton().supplement<WebGeolocationManager>()->unregisterWebPage(m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGeolocationClient::setEnableHighAccuracy(bool enabled)
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebGeolocationManager>()->setEnableHighAccuracyForPage(m_page, enabled);
</del><ins>+ WebProcess::singleton().supplement<WebGeolocationManager>()->setEnableHighAccuracyForPage(m_page, enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GeolocationPosition* WebGeolocationClient::lastPosition()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebNotificationClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -49,22 +49,22 @@
</span><span class="cx">
</span><span class="cx"> bool WebNotificationClient::show(Notification* notification)
</span><span class="cx"> {
</span><del>- return WebProcess::shared().supplement<WebNotificationManager>()->show(notification, m_page);
</del><ins>+ return WebProcess::singleton().supplement<WebNotificationManager>()->show(notification, m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationClient::cancel(Notification* notification)
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebNotificationManager>()->cancel(notification, m_page);
</del><ins>+ WebProcess::singleton().supplement<WebNotificationManager>()->cancel(notification, m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationClient::clearNotifications(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebNotificationManager>()->clearNotifications(context, m_page);
</del><ins>+ WebProcess::singleton().supplement<WebNotificationManager>()->clearNotifications(context, m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationClient::notificationObjectDestroyed(Notification* notification)
</span><span class="cx"> {
</span><del>- WebProcess::shared().supplement<WebNotificationManager>()->didDestroyNotification(notification, m_page);
</del><ins>+ WebProcess::singleton().supplement<WebNotificationManager>()->didDestroyNotification(notification, m_page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationClient::notificationControllerDestroyed()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -110,9 +110,10 @@
</span><span class="cx"> String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
</ins><span class="cx"> String result;
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
</del><ins>+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
</ins><span class="cx"> return String();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -124,8 +125,9 @@
</span><span class="cx"> void WebPlatformStrategies::setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieString)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -136,9 +138,10 @@
</span><span class="cx"> bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
</ins><span class="cx"> bool result;
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
</del><ins>+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
</ins><span class="cx"> return false;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -150,9 +153,10 @@
</span><span class="cx"> String WebPlatformStrategies::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
</ins><span class="cx"> String result;
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
</del><ins>+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
</ins><span class="cx"> return String();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -164,8 +168,9 @@
</span><span class="cx"> bool WebPlatformStrategies::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
</ins><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -177,8 +182,9 @@
</span><span class="cx"> void WebPlatformStrategies::deleteCookie(const NetworkStorageSession& session, const URL& url, const String& cookieName)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -193,8 +199,9 @@
</span><span class="cx"> {
</span><span class="cx"> static ResourceLoadScheduler* scheduler;
</span><span class="cx"> if (!scheduler) {
</span><del>- if (WebProcess::shared().usesNetworkProcess())
- scheduler = &WebProcess::shared().webResourceLoadScheduler();
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess())
+ scheduler = &webProcess.webResourceLoadScheduler();
</ins><span class="cx"> else
</span><span class="cx"> scheduler = WebCore::resourceLoadScheduler();
</span><span class="cx"> }
</span><span class="lines">@@ -204,7 +211,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::loadResourceSynchronously(NetworkingContext* context, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</span><span class="cx"> {
</span><del>- if (!WebProcess::shared().usesNetworkProcess()) {
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ if (!webProcess.usesNetworkProcess()) {
</ins><span class="cx"> LoaderStrategy::loadResourceSynchronously(context, resourceLoadIdentifier, request, storedCredentials, clientCredentialPolicy, error, response, data);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -230,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> data.resize(0);
</span><span class="cx">
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</del><ins>+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</ins><span class="cx"> response = ResourceResponse();
</span><span class="cx"> error = internalError(request.url());
</span><span class="cx"> }
</span><span class="lines">@@ -238,7 +246,7 @@
</span><span class="cx">
</span><span class="cx"> BlobRegistry* WebPlatformStrategies::createBlobRegistry()
</span><span class="cx"> {
</span><del>- if (!WebProcess::shared().usesNetworkProcess())
</del><ins>+ if (!WebProcess::singleton().usesNetworkProcess())
</ins><span class="cx"> return LoaderStrategy::createBlobRegistry();
</span><span class="cx"> return new BlobRegistryProxy;
</span><span class="cx"> }
</span><span class="lines">@@ -281,7 +289,7 @@
</span><span class="cx"> ASSERT(m_cachedPlugins.isEmpty());
</span><span class="cx">
</span><span class="cx"> // FIXME: Should we do something in case of error here?
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_shouldRefreshPlugins = false;
</span><span class="lines">@@ -301,7 +309,7 @@
</span><span class="cx"> if (!types.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardTypes(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardTypes::Reply(types), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardTypes(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardTypes::Reply(types), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebCore::SharedBuffer> WebPlatformStrategies::bufferForType(const String& pasteboardType, const String& pasteboardName)
</span><span class="lines">@@ -314,7 +322,7 @@
</span><span class="cx"> // Fallback to messaging the UI process for native pasteboard content.
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardBufferForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardBufferForType::Reply(handle, size), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardBufferForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardBufferForType::Reply(handle, size), 0);
</ins><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</span><span class="lines">@@ -323,62 +331,62 @@
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardPathnamesForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardPathnamesForType::Reply(pathnames), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardPathnamesForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardPathnamesForType::Reply(pathnames), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::stringForType(const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> String value;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardStringForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardStringForType::Reply(value), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardStringForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardStringForType::Reply(value), 0);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::copy(const String& fromPasteboard, const String& toPasteboard)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::PasteboardCopy(fromPasteboard, toPasteboard), Messages::WebPasteboardProxy::PasteboardCopy::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::PasteboardCopy(fromPasteboard, toPasteboard), Messages::WebPasteboardProxy::PasteboardCopy::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::changeCount(const WTF::String &pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t changeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
</ins><span class="cx"> return changeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::uniqueName()
</span><span class="cx"> {
</span><span class="cx"> String pasteboardName;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardUniqueName(), Messages::WebPasteboardProxy::GetPasteboardUniqueName::Reply(pasteboardName), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardUniqueName(), Messages::WebPasteboardProxy::GetPasteboardUniqueName::Reply(pasteboardName), 0);
</ins><span class="cx"> return pasteboardName;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color WebPlatformStrategies::color(const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> Color color;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardColor(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardColor::Reply(color), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardColor(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardColor::Reply(color), 0);
</ins><span class="cx"> return color;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL WebPlatformStrategies::url(const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> String urlString;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardURL(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardURL::Reply(urlString), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardURL(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardURL::Reply(urlString), 0);
</ins><span class="cx"> return URL(ParsedURLString, urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::AddPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebPasteboardProxy::AddPasteboardTypes::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::AddPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebPasteboardProxy::AddPasteboardTypes::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebPasteboardProxy::SetPasteboardTypes::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebPasteboardProxy::SetPasteboardTypes::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -395,44 +403,44 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, pasteboardType, handle, buffer ? buffer->size() : 0), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, pasteboardType, handle, buffer ? buffer->size() : 0), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardPathnamesForType(pasteboardName, pasteboardType, pathnames), Messages::WebPasteboardProxy::SetPasteboardPathnamesForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardPathnamesForType(pasteboardName, pasteboardType, pathnames), Messages::WebPasteboardProxy::SetPasteboardPathnamesForType::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::setStringForType(const String& string, const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardStringForType(pasteboardName, pasteboardType, string), Messages::WebPasteboardProxy::SetPasteboardStringForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardStringForType(pasteboardName, pasteboardType, string), Messages::WebPasteboardProxy::SetPasteboardStringForType::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardWebContent& content)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteWebContentToPasteboard(content), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteWebContentToPasteboard(content), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardImage& image)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteImageToPasteboard(image), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteImageToPasteboard(image), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::writeToPasteboard(const String& pasteboardType, const String& text)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteStringToPasteboard(pasteboardType, text), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteStringToPasteboard(pasteboardType, text), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int WebPlatformStrategies::getPasteboardItemsCount()
</span><span class="cx"> {
</span><span class="cx"> uint64_t itemsCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardItemsCount(), Messages::WebPasteboardProxy::GetPasteboardItemsCount::Reply(itemsCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardItemsCount(), Messages::WebPasteboardProxy::GetPasteboardItemsCount::Reply(itemsCount), 0);
</ins><span class="cx"> return itemsCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -440,7 +448,7 @@
</span><span class="cx"> {
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
</ins><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</span><span class="lines">@@ -450,21 +458,21 @@
</span><span class="cx"> WebCore::URL WebPlatformStrategies::readURLFromPasteboard(int index, const String& pasteboardType)
</span><span class="cx"> {
</span><span class="cx"> String urlString;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadURLFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadURLFromPasteboard::Reply(urlString), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadURLFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadURLFromPasteboard::Reply(urlString), 0);
</ins><span class="cx"> return URL(ParsedURLString, urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::readStringFromPasteboard(int index, const String& pasteboardType)
</span><span class="cx"> {
</span><span class="cx"> String value;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadStringFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadStringFromPasteboard::Reply(value), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadStringFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadStringFromPasteboard::Reply(value), 0);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::changeCount()
</span><span class="cx"> {
</span><span class="cx"> uint64_t changeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(String()), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(String()), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
</ins><span class="cx"> return changeCount;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx">
</span><span class="cx"> bool WebPlugInClient::shouldAutoStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</span><span class="cx"> {
</span><del>- return WebProcess::shared().shouldPlugInAutoStartFromOrigin(m_webPage, pageOrigin, pluginOrigin, mimeType);
</del><ins>+ return WebProcess::singleton().shouldPlugInAutoStartFromOrigin(m_webPage, pageOrigin, pluginOrigin, mimeType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlugInClient::didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID sessionID)
</span><span class="cx"> {
</span><del>- WebProcess::shared().plugInDidStartFromOrigin(pageOrigin, pluginOrigin, mimeType, sessionID);
</del><ins>+ WebProcess::singleton().plugInDidStartFromOrigin(pageOrigin, pluginOrigin, mimeType, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPopupMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> PlatformPopupMenuData platformData;
</span><span class="cx"> setUpPlatformData(pageCoordinates, platformData);
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::ShowPopupMenu(pageCoordinates, m_popupClient->menuStyle().textDirection(), items, index, platformData), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowPopupMenu(pageCoordinates, m_popupClient->menuStyle().textDirection(), items, index, platformData), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPopupMenu::hide()
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> if (!m_page || !m_popupClient)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::HidePopupMenu(), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::HidePopupMenu(), m_page->pageID());
</ins><span class="cx"> m_page->setActivePopupMenu(0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebSearchPopupMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& resultItems)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebSearchPopupMenu::enabled()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebVibrationClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebVibrationClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebVibrationClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebVibrationClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx">
</span><span class="cx"> void WebVibrationClient::vibrate(const unsigned& vibrationTime)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebVibrationProxy::Vibrate(vibrationTime), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebVibrationProxy::Vibrate(vibrationTime), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVibrationClient::cancelVibration()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebVibrationProxy::CancelVibration(), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebVibrationProxy::CancelVibration(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVibrationClient::vibrationDestroyed()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportgtkWebEditorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> /* First try to interpret the command in the UI and get the commands.
</span><span class="cx"> UI needs to receive event type because only knows current NativeWebKeyboardEvent.*/
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetEditorCommandsForKeyEvent(event->type()),
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetEditorCommandsForKeyEvent(event->type()),
</ins><span class="cx"> Messages::WebPageProxy::GetEditorCommandsForKeyEvent::Reply(pendingEditorCommands),
</span><span class="cx"> m_page->pageID(), std::chrono::milliseconds::max());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebQuickLookHandleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> , m_uti(handle.previewUTI())
</span><span class="cx"> , m_pageID(pageID)
</span><span class="cx"> {
</span><del>- WebProcess::shared().send(Messages::WebPageProxy::DidStartLoadForQuickLookDocumentInMainFrame(m_fileName, m_uti), m_pageID);
</del><ins>+ WebProcess::singleton().send(Messages::WebPageProxy::DidStartLoadForQuickLookDocumentInMainFrame(m_fileName, m_uti), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebQuickLookHandleClient::didReceiveDataArray(CFArrayRef dataArray)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> void WebQuickLookHandleClient::didFinishLoading()
</span><span class="cx"> {
</span><del>- WebProcess::shared().send(Messages::WebPageProxy::DidFinishLoadForQuickLookDocumentInMainFrame(m_data), m_pageID);
</del><ins>+ WebProcess::singleton().send(Messages::WebPageProxy::DidFinishLoadForQuickLookDocumentInMainFrame(m_data), m_pageID);
</ins><span class="cx"> m_data.clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebEditorClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isAutomaticQuoteSubstitutionEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isAutomaticQuoteSubstitutionEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isAutomaticQuoteSubstitutionEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleAutomaticQuoteSubstitution()
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isAutomaticLinkDetectionEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isAutomaticLinkDetectionEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isAutomaticLinkDetectionEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleAutomaticLinkDetection()
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isAutomaticDashSubstitutionEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isAutomaticDashSubstitutionEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isAutomaticDashSubstitutionEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleAutomaticDashSubstitution()
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isAutomaticTextReplacementEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isAutomaticTextReplacementEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isAutomaticTextReplacementEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleAutomaticTextReplacement()
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::isAutomaticSpellingCorrectionEnabled()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().textCheckerState().isAutomaticSpellingCorrectionEnabled;
</del><ins>+ return WebProcess::singleton().textCheckerState().isAutomaticSpellingCorrectionEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::toggleAutomaticSpellingCorrection()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> audit_token_t auditToken;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->getAuditToken(auditToken))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -81,12 +81,12 @@
</span><span class="cx"> , m_nativeSurfaceHandleForCompositing(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- WebProcess::shared().addMessageReceiver(Messages::DrawingArea::messageReceiverName(), m_webPage.pageID(), *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::DrawingArea::messageReceiverName(), m_webPage.pageID(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DrawingArea::~DrawingArea()
</span><span class="cx"> {
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::DrawingArea::messageReceiverName(), m_webPage.pageID());
</del><ins>+ WebProcess::singleton().removeMessageReceiver(Messages::DrawingArea::messageReceiverName(), m_webPage.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingArea::dispatchAfterEnsuringUpdatedScrollPosition(std::function<void ()> function)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& slot : localCopy) {
</span><del>- if (WebPage* webPage = WebProcess::shared().webPage(slot.key))
</del><ins>+ if (WebPage* webPage = WebProcess::singleton().webPage(slot.key))
</ins><span class="cx"> webPage->dispatchAsynchronousTouchEvents(slot.value);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><del>- WebPage* webPage = WebProcess::shared().webPage(pageID);
</del><ins>+ WebPage* webPage = WebProcess::singleton().webPage(pageID);
</ins><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> void EventDispatcher::sendDidReceiveEvent(uint64_t pageID, const WebEvent& event, bool didHandleEvent)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(event.type()), didHandleEvent), pageID);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(event.type()), didHandleEvent), pageID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx"> , m_renderTreeSizeNotificationTimer(RunLoop::main(), this, &ViewGestureGeometryCollector::renderTreeSizeNotificationTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- WebProcess::shared().addMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID(), *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ViewGestureGeometryCollector::~ViewGestureGeometryCollector()
</span><span class="cx"> {
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID());
</del><ins>+ WebProcess::singleton().removeMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureGeometryCollector::dispatchDidCollectGeometryForSmartMagnificationGesture(FloatPoint origin, FloatRect targetRect, FloatRect visibleContentRect, bool isReplacedElement, double viewportMinimumScale, double viewportMaximumScale)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewUpdateDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& slot : update) {
</span><del>- if (WebPage* webPage = WebProcess::shared().webPage(slot.key))
</del><ins>+ if (WebPage* webPage = WebProcess::singleton().webPage(slot.key))
</ins><span class="cx"> webPage->updateVisibleContentRects(slot.value.visibleContentRectUpdateInfo, slot.value.oldestTimestamp);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -59,14 +59,14 @@
</span><span class="cx"> VisitedLinkTableController::VisitedLinkTableController(uint64_t identifier)
</span><span class="cx"> : m_identifier(identifier)
</span><span class="cx"> {
</span><del>- WebProcess::shared().addMessageReceiver(Messages::VisitedLinkTableController::messageReceiverName(), m_identifier, *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::VisitedLinkTableController::messageReceiverName(), m_identifier, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisitedLinkTableController::~VisitedLinkTableController()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(visitedLinkTableControllers().contains(m_identifier));
</span><span class="cx">
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::VisitedLinkTableController::messageReceiverName(), m_identifier);
</del><ins>+ WebProcess::singleton().removeMessageReceiver(Messages::VisitedLinkTableController::messageReceiverName(), m_identifier);
</ins><span class="cx">
</span><span class="cx"> visitedLinkTableControllers().remove(m_identifier);
</span><span class="cx"> }
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::VisitedLinkProvider::AddVisitedLinkHashFromPage(webPage->pageID(), linkHash), m_identifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::VisitedLinkProvider::AddVisitedLinkHashFromPage(webPage->pageID(), linkHash), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkTableController::setVisitedLinkTable(const SharedMemory::Handle& handle)
</span><span class="lines">@@ -97,20 +97,20 @@
</span><span class="cx"> m_visitedLinkTable.setSharedMemory(sharedMemory.release());
</span><span class="cx">
</span><span class="cx"> invalidateStylesForAllLinks();
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkTableController::visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHashes)
</span><span class="cx"> {
</span><span class="cx"> for (auto linkHash : linkHashes)
</span><span class="cx"> invalidateStylesForLink(linkHash);
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkTableController::allVisitedLinkStateChanged()
</span><span class="cx"> {
</span><span class="cx"> invalidateStylesForAllLinks();
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkTableController::removeAllVisitedLinks()
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> m_visitedLinkTable.clear();
</span><span class="cx">
</span><span class="cx"> invalidateStylesForAllLinks();
</span><del>- PageCache::shared().markPagesForVisitedLinkStyleRecalc();
</del><ins>+ PageCache::singleton().markPagesForVisitedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebBackForwardListProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> static void updateBackForwardItem(uint64_t itemID, uint64_t pageID, HistoryItem* item)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::AddBackForwardItem(itemID, pageID, toPageState(*item)), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebProcessProxy::AddBackForwardItem(itemID, pageID, toPageState(*item)), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBackForwardListProxy::addItemFromUIProcess(uint64_t itemID, PassRefPtr<WebCore::HistoryItem> prpItem, uint64_t pageID)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> if (!item)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- PageCache::shared().remove(*item);
</del><ins>+ PageCache::singleton().remove(*item);
</ins><span class="cx"> WebCore::Page::clearPreviousItemFromAllPages(item.get());
</span><span class="cx"> historyItemToIDMap().remove(item);
</span><span class="cx"> }
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> uint64_t itemID = 0;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->pageID()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (!itemID)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> int backListCount = 0;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->pageID()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return backListCount;
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> int forwardListCount = 0;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->pageID()))
</del><ins>+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->pageID()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return forwardListCount;
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (auto& itemID : m_associatedItemIDs) {
</span><span class="cx"> if (HistoryItem* item = itemForID(itemID))
</span><del>- WebCore::PageCache::shared().remove(*item);
</del><ins>+ WebCore::PageCache::singleton().remove(*item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_associatedItemIDs.clear();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> // Mark the WebPage has having a shown context menu then notify the UIProcess.
</span><span class="cx"> m_page->contextMenuShowing();
</span><del>- m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame()), contextMenuContextData, menuItems, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame()), contextMenuContextData, menuItems, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenu::itemSelected(const WebContextMenuItemData& item)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> , m_frameID(generateFrameID())
</span><span class="cx"> {
</span><span class="cx"> m_frameLoaderClient->setWebFrame(this);
</span><del>- WebProcess::shared().addWebFrame(m_frameID, this);
</del><ins>+ WebProcess::singleton().addWebFrame(m_frameID, this);
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> webFrameCounter.increment();
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> void WebFrame::invalidate()
</span><span class="cx"> {
</span><del>- WebProcess::shared().removeWebFrame(m_frameID);
</del><ins>+ WebProcess::singleton().removeWebFrame(m_frameID);
</ins><span class="cx"> m_coreFrame = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -250,14 +250,15 @@
</span><span class="cx"> uint64_t policyDownloadID = m_policyDownloadID;
</span><span class="cx"> m_policyDownloadID = 0;
</span><span class="cx">
</span><ins>+ auto& webProcess = WebProcess::singleton();
</ins><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(page()->sessionID(), policyDownloadID, request), 0);
</del><ins>+ if (webProcess.usesNetworkProcess()) {
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(page()->sessionID(), policyDownloadID, request), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebProcess::shared().downloadManager().startDownload(policyDownloadID, request);
</del><ins>+ webProcess.downloadManager().startDownload(policyDownloadID, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="lines">@@ -269,8 +270,9 @@
</span><span class="cx">
</span><span class="cx"> ResourceLoader* mainResourceLoader = documentLoader->mainResourceLoader();
</span><span class="cx">
</span><ins>+ auto& webProcess = WebProcess::singleton();
</ins><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- if (WebProcess::shared().usesNetworkProcess()) {
</del><ins>+ if (webProcess.usesNetworkProcess()) {
</ins><span class="cx"> // Use 0 to indicate that there is no main resource loader.
</span><span class="cx"> // This can happen if the main resource is in the WebCore memory cache.
</span><span class="cx"> uint64_t mainResourceLoadIdentifier;
</span><span class="lines">@@ -279,18 +281,18 @@
</span><span class="cx"> else
</span><span class="cx"> mainResourceLoadIdentifier = 0;
</span><span class="cx">
</span><del>- WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
</del><ins>+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!mainResourceLoader) {
</span><span class="cx"> // The main resource has already been loaded. Start a new download instead.
</span><del>- WebProcess::shared().downloadManager().startDownload(policyDownloadID, request);
</del><ins>+ webProcess.downloadManager().startDownload(policyDownloadID, request);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WebProcess::shared().downloadManager().convertHandleToDownload(policyDownloadID, documentLoader->mainResourceLoader()->handle(), request, response);
</del><ins>+ webProcess.downloadManager().convertHandleToDownload(policyDownloadID, documentLoader->mainResourceLoader()->handle(), request, response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebFrame::source() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -92,12 +92,12 @@
</span><span class="cx"> m_frontendConnection = IPC::Connection::createServerConnection(connectionIdentifier, *this, RunLoop::main());
</span><span class="cx"> m_frontendConnection->open();
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::CreateInspectorPage(connectionClientPort, canAttachWindow(), underTest), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::CreateInspectorPage(connectionClientPort, canAttachWindow(), underTest), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::closeFrontend()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID());
</ins><span class="cx">
</span><span class="cx"> m_frontendConnection->invalidate();
</span><span class="cx"> m_frontendConnection = nullptr;
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> void WebInspector::bringToFront()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Called by WebInspector messages
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> void WebInspector::showMainResourceForFrame(uint64_t frameIdentifier)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameIdentifier);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameIdentifier);
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx">
</span><span class="cx"> m_previousCanAttach = canAttachWindow;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::sendMessageToBackend(const String& message)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx"> if (m_remoteFrontendConnected)
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
</ins><span class="cx"> else
</span><span class="cx"> #endif
</span><span class="cx"> m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -111,12 +111,12 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::bringToFront()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::closeWindow()
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_inspectedPageIdentifier);
</ins><span class="cx">
</span><span class="cx"> m_backendConnection->invalidate();
</span><span class="cx"> m_backendConnection = nullptr;
</span><span class="lines">@@ -127,17 +127,16 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::requestSetDockSide(DockSide side)
</span><span class="cx"> {
</span><ins>+ auto& webProcess = WebProcess::singleton();
</ins><span class="cx"> switch (side) {
</span><span class="cx"> case DockSide::Undocked:
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::Detach(), m_inspectedPageIdentifier);
</del><ins>+ webProcess.parentProcessConnection()->send(Messages::WebInspectorProxy::Detach(), m_inspectedPageIdentifier);
</ins><span class="cx"> break;
</span><del>-
</del><span class="cx"> case DockSide::Right:
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachRight(), m_inspectedPageIdentifier);
</del><ins>+ webProcess.parentProcessConnection()->send(Messages::WebInspectorProxy::AttachRight(), m_inspectedPageIdentifier);
</ins><span class="cx"> break;
</span><del>-
</del><span class="cx"> case DockSide::Bottom:
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachBottom(), m_inspectedPageIdentifier);
</del><ins>+ webProcess.parentProcessConnection()->send(Messages::WebInspectorProxy::AttachBottom(), m_inspectedPageIdentifier);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -167,17 +166,17 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::changeAttachedWindowHeight(unsigned height)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowHeight(height), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowHeight(height), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::changeAttachedWindowWidth(unsigned width)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowWidth(width), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowWidth(width), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::setToolbarHeight(unsigned height)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SetToolbarHeight(height), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SetToolbarHeight(height), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::openInNewTab(const String& url)
</span><span class="lines">@@ -188,17 +187,17 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::save(const WTF::String& filename, const WTF::String& content, bool base64Encoded, bool forceSaveAs)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::Save(filename, content, base64Encoded, forceSaveAs), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::Save(filename, content, base64Encoded, forceSaveAs), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::append(const WTF::String& filename, const WTF::String& content)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::Append(filename, content), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::Append(filename, content), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::inspectedURLChanged(const String& urlString)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::InspectedURLChanged(urlString), m_inspectedPageIdentifier);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::InspectedURLChanged(urlString), m_inspectedPageIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::showConsole()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebPage> page = adoptRef(new WebPage(pageID, parameters));
</span><span class="cx">
</span><del>- if (page->pageGroup()->isVisibleToInjectedBundle() && WebProcess::shared().injectedBundle())
- WebProcess::shared().injectedBundle()->didCreatePage(page.get());
</del><ins>+ if (page->pageGroup()->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+ WebProcess::singleton().injectedBundle()->didCreatePage(page.get());
</ins><span class="cx">
</span><span class="cx"> return page.release();
</span><span class="cx"> }
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> // 4ms should be adopted project-wide now, https://bugs.webkit.org/show_bug.cgi?id=61214
</span><span class="cx"> Settings::setDefaultMinDOMTimerInterval(0.004);
</span><span class="cx">
</span><del>- m_pageGroup = WebProcess::shared().webPageGroup(parameters.pageGroupData);
</del><ins>+ m_pageGroup = WebProcess::singleton().webPageGroup(parameters.pageGroupData);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> Settings::setShouldManageAudioSessionCategory(true);
</span><span class="lines">@@ -474,16 +474,17 @@
</span><span class="cx"> // We use the DidFirstVisuallyNonEmptyLayout milestone to determine when to unfreeze the layer tree.
</span><span class="cx"> m_page->addLayoutMilestones(DidFirstLayout | DidFirstVisuallyNonEmptyLayout);
</span><span class="cx">
</span><del>- WebProcess::shared().addMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID, *this);
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ webProcess.addMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID, *this);
</ins><span class="cx">
</span><span class="cx"> // FIXME: This should be done in the object constructors, and the objects themselves should be message receivers.
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><del>- WebProcess::shared().addMessageReceiver(Messages::CoordinatedLayerTreeHost::messageReceiverName(), m_pageID, *this);
</del><ins>+ webProcess.addMessageReceiver(Messages::CoordinatedLayerTreeHost::messageReceiverName(), m_pageID, *this);
</ins><span class="cx"> #endif
</span><del>- WebProcess::shared().addMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID, *this);
- WebProcess::shared().addMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID, *this);
</del><ins>+ webProcess.addMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID, *this);
+ webProcess.addMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID, *this);
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- WebProcess::shared().addMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_pageID, *this);
</del><ins>+ webProcess.addMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_pageID, *this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -492,7 +493,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> if (m_useAsyncScrolling)
</span><del>- WebProcess::shared().eventDispatcher().addScrollingTreeForPage(this);
</del><ins>+ webProcess.eventDispatcher().addScrollingTreeForPage(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (auto& mimeType : parameters.mimeTypesWithCustomContentProviders)
</span><span class="lines">@@ -500,7 +501,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><del>- if (WebMediaKeyStorageManager* manager = WebProcess::shared().supplement<WebMediaKeyStorageManager>())
</del><ins>+ if (WebMediaKeyStorageManager* manager = webProcess.supplement<WebMediaKeyStorageManager>())
</ins><span class="cx"> m_page->settings().setMediaKeysStorageDirectory(manager->mediaKeyStorageDirectory());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -539,9 +540,10 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_page);
</span><span class="cx">
</span><ins>+ auto& webProcess = WebProcess::singleton();
</ins><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> if (m_useAsyncScrolling)
</span><del>- WebProcess::shared().eventDispatcher().removeScrollingTreeForPage(this);
</del><ins>+ webProcess.eventDispatcher().removeScrollingTreeForPage(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> platformDetach();
</span><span class="lines">@@ -558,16 +560,16 @@
</span><span class="cx"> m_footerBanner->detachFromPage();
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID);
</del><ins>+ webProcess.removeMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID);
</ins><span class="cx">
</span><span class="cx"> // FIXME: This should be done in the object destructors, and the objects themselves should be message receivers.
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::CoordinatedLayerTreeHost::messageReceiverName(), m_pageID);
</del><ins>+ webProcess.removeMessageReceiver(Messages::CoordinatedLayerTreeHost::messageReceiverName(), m_pageID);
</ins><span class="cx"> #endif
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID);
- WebProcess::shared().removeMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID);
</del><ins>+ webProcess.removeMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID);
+ webProcess.removeMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID);
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_pageID);
</del><ins>+ webProcess.removeMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_pageID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -581,7 +583,7 @@
</span><span class="cx">
</span><span class="cx"> IPC::Connection* WebPage::messageSenderConnection()
</span><span class="cx"> {
</span><del>- return WebProcess::shared().parentProcessConnection();
</del><ins>+ return WebProcess::singleton().parentProcessConnection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t WebPage::messageSenderDestinationID()
</span><span class="lines">@@ -974,8 +976,8 @@
</span><span class="cx"> if (!mainWebFrame()->url().isEmpty())
</span><span class="cx"> reportUsedFeatures();
</span><span class="cx">
</span><del>- if (pageGroup()->isVisibleToInjectedBundle() && WebProcess::shared().injectedBundle())
- WebProcess::shared().injectedBundle()->willDestroyPage(this);
</del><ins>+ if (pageGroup()->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+ WebProcess::singleton().injectedBundle()->willDestroyPage(this);
</ins><span class="cx">
</span><span class="cx"> if (m_inspector) {
</span><span class="cx"> m_inspector->disconnectFromPage();
</span><span class="lines">@@ -1039,7 +1041,7 @@
</span><span class="cx"> m_isRunningModal = false;
</span><span class="cx">
</span><span class="cx"> // The WebPage can be destroyed by this call.
</span><del>- WebProcess::shared().removeWebPage(m_pageID);
</del><ins>+ WebProcess::singleton().removeWebPage(m_pageID);
</ins><span class="cx">
</span><span class="cx"> if (isRunningModal)
</span><span class="cx"> RunLoop::main().stop();
</span><span class="lines">@@ -1064,7 +1066,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::loadURLInFrame(const String& url, uint64_t frameID)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1081,7 +1083,7 @@
</span><span class="cx">
</span><span class="cx"> // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
</span><span class="cx"> // to all the client to set up any needed state.
</span><del>- m_loaderClient.willLoadURLRequest(this, request, WebProcess::shared().transformHandlesToObjects(userData.object()).get());
</del><ins>+ m_loaderClient.willLoadURLRequest(this, request, WebProcess::singleton().transformHandlesToObjects(userData.object()).get());
</ins><span class="cx">
</span><span class="cx"> // Initate the load in WebCore.
</span><span class="cx"> corePage()->userInputBridge().loadRequest(FrameLoadRequest(m_mainFrame->coreFrame(), request));
</span><span class="lines">@@ -1100,7 +1102,7 @@
</span><span class="cx">
</span><span class="cx"> // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
</span><span class="cx"> // to all the client to set up any needed state.
</span><del>- m_loaderClient.willLoadDataRequest(this, request, const_cast<SharedBuffer*>(substituteData.content()), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), WebProcess::shared().transformHandlesToObjects(userData.object()).get());
</del><ins>+ m_loaderClient.willLoadDataRequest(this, request, const_cast<SharedBuffer*>(substituteData.content()), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), WebProcess::singleton().transformHandlesToObjects(userData.object()).get());
</ins><span class="cx">
</span><span class="cx"> // Initate the load in WebCore.
</span><span class="cx"> m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
</span><span class="lines">@@ -1162,7 +1164,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::stopLoadingFrame(uint64_t frameID)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1616,11 +1618,12 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::postInjectedBundleMessage(const String& messageName, const UserData& userData)
</span><span class="cx"> {
</span><del>- InjectedBundle* injectedBundle = WebProcess::shared().injectedBundle();
</del><ins>+ auto& webProcess = WebProcess::singleton();
+ InjectedBundle* injectedBundle = webProcess.injectedBundle();
</ins><span class="cx"> if (!injectedBundle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- injectedBundle->didReceiveMessageToPage(this, messageName, WebProcess::shared().transformHandlesToObjects(userData.object()).get());
</del><ins>+ injectedBundle->didReceiveMessageToPage(this, messageName, webProcess.transformHandlesToObjects(userData.object()).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -2154,7 +2157,7 @@
</span><span class="cx"> void WebPage::touchEventSync(const WebTouchEvent& touchEvent, bool& handled)
</span><span class="cx"> {
</span><span class="cx"> EventDispatcher::TouchEventQueue queuedEvents;
</span><del>- WebProcess::shared().eventDispatcher().getQueuedTouchEventsForPage(*this, queuedEvents);
</del><ins>+ WebProcess::singleton().eventDispatcher().getQueuedTouchEventsForPage(*this, queuedEvents);
</ins><span class="cx"> dispatchAsynchronousTouchEvents(queuedEvents);
</span><span class="cx">
</span><span class="cx"> dispatchTouchEvent(touchEvent, handled);
</span><span class="lines">@@ -2331,7 +2334,7 @@
</span><span class="cx">
</span><span class="cx"> // The WebProcess does not yet know about this page; no need to tell it we're leaving the window.
</span><span class="cx"> if (!isInitialState)
</span><del>- WebProcess::shared().pageWillLeaveWindow(m_pageID);
</del><ins>+ WebProcess::singleton().pageWillLeaveWindow(m_pageID);
</ins><span class="cx"> } else {
</span><span class="cx"> // Defer the call to Page::setCanStartMedia() since it ends up sending a synchronous message to the UI process
</span><span class="cx"> // in order to get plug-in connections, and the UI process will be waiting for the Web process to update the backing
</span><span class="lines">@@ -2339,7 +2342,7 @@
</span><span class="cx"> if (m_mayStartMediaWhenInWindow)
</span><span class="cx"> m_setCanStartMediaTimer.startOneShot(0);
</span><span class="cx">
</span><del>- WebProcess::shared().pageDidEnterWindow(m_pageID);
</del><ins>+ WebProcess::singleton().pageDidEnterWindow(m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isInWindow)
</span><span class="lines">@@ -2377,13 +2380,13 @@
</span><span class="cx"> void WebPage::setSessionID(SessionID sessionID)
</span><span class="cx"> {
</span><span class="cx"> if (sessionID.isEphemeral())
</span><del>- WebProcess::shared().ensurePrivateBrowsingSession(sessionID);
</del><ins>+ WebProcess::singleton().ensurePrivateBrowsingSession(sessionID);
</ins><span class="cx"> m_page->setSessionID(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx"> frame->didReceivePolicyDecision(listenerID, static_cast<PolicyAction>(policyAction), navigationID, downloadID);
</span><span class="lines">@@ -2495,7 +2498,7 @@
</span><span class="cx">
</span><span class="cx"> KeyboardUIMode WebPage::keyboardUIMode()
</span><span class="cx"> {
</span><del>- bool fullKeyboardAccessEnabled = WebProcess::shared().fullKeyboardAccessEnabled();
</del><ins>+ bool fullKeyboardAccessEnabled = WebProcess::singleton().fullKeyboardAccessEnabled();
</ins><span class="cx"> return static_cast<KeyboardUIMode>((fullKeyboardAccessEnabled ? KeyboardAccessFull : KeyboardAccessDefault) | (m_tabToLinks ? KeyboardAccessTabsToLinks : 0));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2581,7 +2584,7 @@
</span><span class="cx"> void WebPage::getSourceForFrame(uint64_t frameID, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> String resultString;
</span><del>- if (WebFrame* frame = WebProcess::shared().webFrame(frameID))
</del><ins>+ if (WebFrame* frame = WebProcess::singleton().webFrame(frameID))
</ins><span class="cx"> resultString = frame->source();
</span><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::StringCallback(resultString, callbackID));
</span><span class="lines">@@ -2590,7 +2593,7 @@
</span><span class="cx"> void WebPage::getMainResourceDataOfFrame(uint64_t frameID, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> buffer;
</span><del>- if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
</del><ins>+ if (WebFrame* frame = WebProcess::singleton().webFrame(frameID)) {
</ins><span class="cx"> if (PluginView* pluginView = pluginViewForFrame(frame->coreFrame()))
</span><span class="cx"> buffer = pluginView->liveResourceData();
</span><span class="cx"> if (!buffer) {
</span><span class="lines">@@ -2622,7 +2625,7 @@
</span><span class="cx"> void WebPage::getResourceDataFromFrame(uint64_t frameID, const String& resourceURLString, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> buffer;
</span><del>- if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
</del><ins>+ if (WebFrame* frame = WebProcess::singleton().webFrame(frameID)) {
</ins><span class="cx"> URL resourceURL(URL(), resourceURLString);
</span><span class="cx"> buffer = resourceDataForFrame(frame->coreFrame(), resourceURL);
</span><span class="cx"> if (!buffer) {
</span><span class="lines">@@ -2642,7 +2645,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<CFDataRef> data;
</span><del>- if (WebFrame* frame = WebProcess::shared().webFrame(frameID))
</del><ins>+ if (WebFrame* frame = WebProcess::singleton().webFrame(frameID))
</ins><span class="cx"> data = frame->webArchiveData(nullptr, nullptr);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frameID);
</span><span class="lines">@@ -3768,7 +3771,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::beginPrinting(uint64_t frameID, const PrintInfo& printInfo)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -3833,7 +3836,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void WebPage::drawRectToImage(uint64_t frameID, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> Frame* coreFrame = frame ? frame->coreFrame() : 0;
</span><span class="cx">
</span><span class="cx"> RefPtr<WebImage> image;
</span><span class="lines">@@ -3885,7 +3888,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::drawPagesToPDFImpl(uint64_t frameID, const PrintInfo& printInfo, uint32_t first, uint32_t count, RetainPtr<CFMutableDataRef>& pdfPageData)
</span><span class="cx"> {
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> Frame* coreFrame = frame ? frame->coreFrame() : 0;
</span><span class="cx">
</span><span class="cx"> pdfPageData = adoptCF(CFDataCreateMutable(0, 0));
</span><span class="lines">@@ -4549,7 +4552,7 @@
</span><span class="cx"> cancelPotentialTap();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>- WebProcess::shared().eventDispatcher().clearQueuedTouchEventsForPage(*this);
</del><ins>+ WebProcess::singleton().eventDispatcher().clearQueuedTouchEventsForPage(*this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> resetViewportDefaultConfiguration(frame);
</span><span class="lines">@@ -4563,7 +4566,7 @@
</span><span class="cx"> resetPrimarySnapshottedPlugIn();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebProcess::shared().updateActivePages();
</del><ins>+ WebProcess::singleton().updateActivePages();
</ins><span class="cx">
</span><span class="cx"> updateMainFrameScrollOffsetPinning();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageGroupProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebPageGroupProxy> pageGroup = adoptRef(new WebPageGroupProxy(data));
</span><span class="cx">
</span><del>- if (pageGroup->isVisibleToInjectedBundle() && WebProcess::shared().injectedBundle())
- WebProcess::shared().injectedBundle()->didInitializePageGroup(pageGroup.get());
</del><ins>+ if (pageGroup->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+ WebProcess::singleton().injectedBundle()->didInitializePageGroup(pageGroup.get());
</ins><span class="cx">
</span><span class="cx"> return pageGroup.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> PrinterListGtk* PrinterListGtk::s_sharedPrinterList = nullptr;
</span><span class="cx">
</span><del>-RefPtr<PrinterListGtk> PrinterListGtk::shared()
</del><ins>+RefPtr<PrinterListGtk> PrinterListGtk::singleton()
</ins><span class="cx"> {
</span><span class="cx"> if (s_sharedPrinterList)
</span><span class="cx"> return s_sharedPrinterList;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class PrinterListGtk: public RefCounted<PrinterListGtk> {
</span><span class="cx"> public:
</span><del>- static RefPtr<PrinterListGtk> shared();
</del><ins>+ static RefPtr<PrinterListGtk> singleton();
</ins><span class="cx"> ~PrinterListGtk();
</span><span class="cx">
</span><span class="cx"> GtkPrinter* findPrinter(const char*) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> m_printContext = printContext;
</span><span class="cx"> m_callbackID = callbackID;
</span><span class="cx">
</span><del>- RefPtr<PrinterListGtk> printerList = PrinterListGtk::shared();
</del><ins>+ RefPtr<PrinterListGtk> printerList = PrinterListGtk::singleton();
</ins><span class="cx"> const char* printerName = gtk_print_settings_get_printer(m_printSettings.get());
</span><span class="cx"> GtkPrinter* printer = printerName ? printerList->findPrinter(printerName) : printerList->defaultPrinter();
</span><span class="cx"> if (!printer) {
</span><span class="lines">@@ -149,13 +149,13 @@
</span><span class="cx"> static void printJobFinished(WebPrintOperationGtkUnix* printOperation)
</span><span class="cx"> {
</span><span class="cx"> printOperation->deref();
</span><del>- WebProcess::shared().enableTermination();
</del><ins>+ WebProcess::singleton().enableTermination();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void endPrint() override
</span><span class="cx"> {
</span><span class="cx"> // Disable web process termination until the print job finishes.
</span><del>- WebProcess::shared().disableTermination();
</del><ins>+ WebProcess::singleton().disableTermination();
</ins><span class="cx">
</span><span class="cx"> cairo_surface_finish(gtk_print_job_get_surface(m_printJob.get(), 0));
</span><span class="cx"> // Make sure the operation is alive until the job is sent.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Interpret the event immediately upon receiving it in UI process, without sending to WebProcess first.
</span><span class="cx"> bool eventWasHandled = false;
</span><del>- bool sendResult = WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::InterpretKeyEvent(editorState(), platformEvent->type() == PlatformKeyboardEvent::Char),
</del><ins>+ bool sendResult = WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::InterpretKeyEvent(editorState(), platformEvent->type() == PlatformKeyboardEvent::Char),
</ins><span class="cx"> Messages::WebPageProxy::InterpretKeyEvent::Reply(eventWasHandled), m_pageID);
</span><span class="cx"> if (!sendResult)
</span><span class="cx"> return false;
</span><span class="lines">@@ -2277,7 +2277,7 @@
</span><span class="cx"> if (m_userIsInteracting)
</span><span class="cx"> m_formClient->willBeginInputSession(this, downcast<Element>(node), WebFrame::fromCoreFrame(*node->document().frame()), userData);
</span><span class="cx">
</span><del>- send(Messages::WebPageProxy::StartAssistingNode(information, m_userIsInteracting, m_hasPendingBlurNotification, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ send(Messages::WebPageProxy::StartAssistingNode(information, m_userIsInteracting, m_hasPendingBlurNotification, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> m_hasPendingBlurNotification = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteCustommm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (context.layerHostingMode()) {
</span><span class="cx"> case LayerHostingMode::InProcess:
</span><del>- m_layerHostingContext = LayerHostingContext::createForPort(WebProcess::shared().compositingRenderServerPort());
</del><ins>+ m_layerHostingContext = LayerHostingContext::createForPort(WebProcess::singleton().compositingRenderServerPort());
</ins><span class="cx"> break;
</span><span class="cx"> #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
</span><span class="cx"> case LayerHostingMode::OutOfProcess:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -393,14 +393,14 @@
</span><span class="cx"> if (hadAnyChangedBackingStore)
</span><span class="cx"> backingStoreCollection.scheduleVolatilityTimer();
</span><span class="cx">
</span><del>- RefPtr<BackingStoreFlusher> backingStoreFlusher = BackingStoreFlusher::create(WebProcess::shared().parentProcessConnection(), WTF::move(commitEncoder), WTF::move(contextsToFlush));
</del><ins>+ RefPtr<BackingStoreFlusher> backingStoreFlusher = BackingStoreFlusher::create(WebProcess::singleton().parentProcessConnection(), WTF::move(commitEncoder), WTF::move(contextsToFlush));
</ins><span class="cx"> m_pendingBackingStoreFlusher = backingStoreFlusher;
</span><span class="cx">
</span><span class="cx"> uint64_t pageID = m_webPage.pageID();
</span><span class="cx"> dispatch_async(m_commitQueue, [backingStoreFlusher, pageID] {
</span><span class="cx"> backingStoreFlusher->flush();
</span><span class="cx">
</span><del>- if (WebPage *webPage = WebProcess::shared().webPage(pageID)) {
</del><ins>+ if (WebPage *webPage = WebProcess::singleton().webPage(pageID)) {
</ins><span class="cx"> std::chrono::milliseconds timestamp = std::chrono::milliseconds(static_cast<std::chrono::milliseconds::rep>(monotonicallyIncreasingTime() * 1000));
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> webPage->didFlushLayerTreeAtTime(timestamp);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> // Create a new context and set it up.
</span><span class="cx"> switch (m_webPage.layerHostingMode()) {
</span><span class="cx"> case LayerHostingMode::InProcess:
</span><del>- m_layerHostingContext = LayerHostingContext::createForPort(WebProcess::shared().compositingRenderServerPort());
</del><ins>+ m_layerHostingContext = LayerHostingContext::createForPort(WebProcess::singleton().compositingRenderServerPort());
</ins><span class="cx"> break;
</span><span class="cx"> #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
</span><span class="cx"> case LayerHostingMode::OutOfProcess:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> WKAccessibilityWebPageObject* mockAccessibilityElement = [[[WKAccessibilityWebPageObject alloc] init] autorelease];
</span><span class="cx">
</span><span class="cx"> // Get the pid for the starting process.
</span><del>- pid_t pid = WebProcess::shared().presenterApplicationPid();
</del><ins>+ pid_t pid = WebProcess::singleton().presenterApplicationPid();
</ins><span class="cx"> WKAXInitializeElementWithPresenterPid(mockAccessibilityElement, pid);
</span><span class="cx"> [mockAccessibilityElement setWebPage:this];
</span><span class="cx">
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> bool commandWasHandledByUIProcess = false;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::ExecuteSavedCommandBySelector(commands[i].commandName),
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::ExecuteSavedCommandBySelector(commands[i].commandName),
</ins><span class="cx"> Messages::WebPageProxy::ExecuteSavedCommandBySelector::Reply(commandWasHandledByUIProcess), m_pageID);
</span><span class="cx"> eventWasHandled |= commandWasHandledByUIProcess;
</span><span class="cx"> }
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> void WebPage::computePagesForPrintingPDFDocument(uint64_t frameID, const PrintInfo& printInfo, Vector<IntRect>& resultPageRects)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resultPageRects.isEmpty());
</span><del>- WebFrame* frame = WebProcess::shared().webFrame(frameID);
</del><ins>+ WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</ins><span class="cx"> Frame* coreFrame = frame ? frame->coreFrame() : 0;
</span><span class="cx"> RetainPtr<PDFDocument> pdfDocument = coreFrame ? pdfDocumentForPrintingFrame(coreFrame) : 0;
</span><span class="cx"> if ([pdfDocument allowsPrinting]) {
</span><span class="lines">@@ -1081,7 +1081,7 @@
</span><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx"> injectedBundleContextMenuClient().prepareForActionMenu(*this, hitTestResult, userData);
</span><span class="cx">
</span><del>- send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult, forImmediateAction, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult, forImmediateAction, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebCore::Range> WebPage::lookupTextAtLocation(FloatPoint locationInViewCooordinates, NSDictionary **options)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebProcess& WebProcess::shared()
</del><ins>+WebProcess& WebProcess::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static WebProcess& process = *new WebProcess;
</span><span class="cx"> return process;
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShim::shared().initializeConnection(connection);
</del><ins>+ SecItemShim::singleton().initializeConnection(connection);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebProcessSupplementMap::const_iterator it = m_supplements.begin();
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> if (usesNetworkProcess())
</span><del>- CookieStorageShim::shared().initialize();
</del><ins>+ CookieStorageShim::singleton().initialize();
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> setTerminationTimeout(parameters.terminationTimeout);
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> audit_token_t auditToken;
</span><span class="cx"> if (parentProcessConnection()->getAuditToken(auditToken)) {
</span><span class="cx"> RetainPtr<CFDataRef> auditData = adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
</span><del>- Inspector::RemoteInspector::shared().setParentProcessInformation(presenterApplicationPid(), auditData);
</del><ins>+ Inspector::RemoteInspector::singleton().setParentProcessInformation(presenterApplicationPid(), auditData);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> memoryCache().evictResources();
</span><span class="cx">
</span><span class="cx"> // Empty the cross-origin preflight cache.
</span><del>- CrossOriginPreflightResultCache::shared().empty();
</del><ins>+ CrossOriginPreflightResultCache::singleton().empty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::clearApplicationCache()
</span><span class="lines">@@ -951,7 +951,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::handleInjectedBundleMessage(const String& messageName, const UserData& messageBody)
</span><span class="cx"> {
</span><del>- InjectedBundle* injectedBundle = WebProcess::shared().injectedBundle();
</del><ins>+ InjectedBundle* injectedBundle = WebProcess::singleton().injectedBundle();
</ins><span class="cx"> if (!injectedBundle)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::setInjectedBundleParameter(const String& key, const IPC::DataReference& value)
</span><span class="cx"> {
</span><del>- InjectedBundle* injectedBundle = WebProcess::shared().injectedBundle();
</del><ins>+ InjectedBundle* injectedBundle = WebProcess::singleton().injectedBundle();
</ins><span class="cx"> if (!injectedBundle)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1079,7 +1079,7 @@
</span><span class="cx"> void WebProcess::startMemorySampler(const SandboxExtension::Handle& sampleLogFileHandle, const String& sampleLogFilePath, const double interval)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEMORY_SAMPLER)
</span><del>- WebMemorySampler::shared()->start(sampleLogFileHandle, sampleLogFilePath, interval);
</del><ins>+ WebMemorySampler::singleton()->start(sampleLogFileHandle, sampleLogFilePath, interval);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(sampleLogFileHandle);
</span><span class="cx"> UNUSED_PARAM(sampleLogFilePath);
</span><span class="lines">@@ -1090,7 +1090,7 @@
</span><span class="cx"> void WebProcess::stopMemorySampler()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEMORY_SAMPLER)
</span><del>- WebMemorySampler::shared()->stop();
</del><ins>+ WebMemorySampler::singleton()->stop();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1116,7 +1116,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::releasePageCache()
</span><span class="cx"> {
</span><del>- PageCache::shared().pruneToSizeNow(0, PruningReason::MemoryPressure);
</del><ins>+ PageCache::singleton().pruneToSizeNow(0, PruningReason::MemoryPressure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> class WebProcess : public ChildProcess, public WebOriginDataManagerSupplement, private DownloadManager::Client {
</span><span class="cx"> friend class NeverDestroyed<DownloadManager>;
</span><span class="cx"> public:
</span><del>- static WebProcess& shared();
</del><ins>+ static WebProcess& singleton();
</ins><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="cx"> T* supplement()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> memoryCache().setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
</span><span class="cx"> memoryCache().setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><del>- PageCache::shared().setMaxSize(pageCacheSize);
</del><ins>+ PageCache::singleton().setMaxSize(pageCacheSize);
</ins><span class="cx">
</span><span class="cx"> NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> static id NSApplicationAccessibilityFocusedUIElement(NSApplication*, SEL)
</span><span class="cx"> {
</span><del>- WebPage* page = WebProcess::shared().focusedWebPage();
</del><ins>+ WebPage* page = WebProcess::singleton().focusedWebPage();
</ins><span class="cx"> if (!page || !page->accessibilityRemoteObject())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> WKAXRegisterRemoteApp();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><del>- SecItemShim::shared().initialize(this);
</del><ins>+ SecItemShim::singleton().initialize(this);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesseflExtensionManagerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ExtensionManagerEfl& ExtensionManagerEfl::shared()
</del><ins>+ExtensionManagerEfl& ExtensionManagerEfl::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<ExtensionManagerEfl> extensionManager;
</span><span class="cx"> return extensionManager;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesseflExtensionManagerEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> class ExtensionManagerEfl {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ExtensionManagerEfl);
</span><span class="cx"> public:
</span><del>- WK_EXPORT static ExtensionManagerEfl& shared();
</del><ins>+ WK_EXPORT static ExtensionManagerEfl& singleton();
</ins><span class="cx"> WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
</span><span class="cx"> private:
</span><span class="cx"> ExtensionManagerEfl();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesseflWebInjectedBundleMainEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/efl/WebInjectedBundleMainEfl.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/efl/WebInjectedBundleMainEfl.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/efl/WebInjectedBundleMainEfl.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,5 +32,5 @@
</span><span class="cx">
</span><span class="cx"> extern "C" void WKBundleInitialize(WKBundleRef bundle, WKTypeRef userData)
</span><span class="cx"> {
</span><del>- ExtensionManagerEfl::shared().initialize(bundle, userData);
</del><ins>+ ExtensionManagerEfl::singleton().initialize(bundle, userData);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebGtkExtensionManager& WebGtkExtensionManager::shared()
</del><ins>+WebGtkExtensionManager& WebGtkExtensionManager::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<WebGtkExtensionManager> extensionManager;
</span><span class="cx"> return extensionManager;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebGtkExtensionManager);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- WK_EXPORT static WebGtkExtensionManager& shared();
</del><ins>+ WK_EXPORT static WebGtkExtensionManager& singleton();
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkInjectedBundleMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -31,5 +31,5 @@
</span><span class="cx"> #endif
</span><span class="cx"> void WKBundleInitialize(WKBundleRef bundle, WKTypeRef userData)
</span><span class="cx"> {
</span><del>- WebGtkExtensionManager::shared().initialize(bundle, userData);
</del><ins>+ WebGtkExtensionManager::singleton().initialize(bundle, userData);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx"> , m_isFullscreen(false)
</span><span class="cx"> {
</span><span class="cx"> setWebVideoFullscreenInterface(this);
</span><del>- WebProcess::shared().addMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), page->pageID(), *this);
</del><ins>+ WebProcess::singleton().addMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), page->pageID(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebVideoFullscreenManager::~WebVideoFullscreenManager()
</span><span class="cx"> {
</span><del>- WebProcess::shared().removeMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), m_page->pageID());
</del><ins>+ WebProcess::singleton().removeMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebVideoFullscreenManager::supportsVideoFullscreen() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx"> WebCore::memoryCache().setDisabled(cacheModel == CacheModelDocumentViewer);
</span><span class="cx"> WebCore::memoryCache().setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
</span><span class="cx"> WebCore::memoryCache().setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><del>- WebCore::PageCache::shared().setMaxSize(pageCacheSize);
</del><ins>+ WebCore::PageCache::singleton().setMaxSize(pageCacheSize);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- WebCore::PageCache::shared().setShouldClearBackingStores(true);
</del><ins>+ WebCore::PageCache::singleton().setShouldClearBackingStores(true);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!usesNetworkProcess()) {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-30 Chris Dumez <cdumez@apple.com>
+
+ Rename shared() static member functions to singleton() for singleton classes.
+ https://bugs.webkit.org/show_bug.cgi?id=141088
+
+ Reviewed by Ryosuke Niwa and Benjamin Poulain.
+
+ Rename shared() static member functions to singleton() for singleton
+ classes as per the recent coding style change.
+
</ins><span class="cx"> 2015-01-30 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> OSObjectPtr does not work with dispatch_data_t on Maverics
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -2144,37 +2144,37 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoadHTMLString(JSStringRef content, JSStringRef baseURL)
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new LoadHTMLStringItem(content, baseURL));
</del><ins>+ WorkQueue::singleton().queue(new LoadHTMLStringItem(content, baseURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoadAlternateHTMLString(JSStringRef content, JSStringRef baseURL, JSStringRef unreachableURL)
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new LoadHTMLStringItem(content, baseURL, unreachableURL));
</del><ins>+ WorkQueue::singleton().queue(new LoadHTMLStringItem(content, baseURL, unreachableURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueBackNavigation(int howFarBack)
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new BackItem(howFarBack));
</del><ins>+ WorkQueue::singleton().queue(new BackItem(howFarBack));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueForwardNavigation(int howFarForward)
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new ForwardItem(howFarForward));
</del><ins>+ WorkQueue::singleton().queue(new ForwardItem(howFarForward));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoadingScript(JSStringRef script)
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new LoadingScriptItem(script));
</del><ins>+ WorkQueue::singleton().queue(new LoadingScriptItem(script));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueNonLoadingScript(JSStringRef script)
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new NonLoadingScriptItem(script));
</del><ins>+ WorkQueue::singleton().queue(new NonLoadingScriptItem(script));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueReload()
</span><span class="cx"> {
</span><del>- WorkQueue::shared()->queue(new ReloadItem);
</del><ins>+ WorkQueue::singleton().queue(new ReloadItem);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::ignoreLegacyWebNotificationPermissionRequests()
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeWorkQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/WorkQueue.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/WorkQueue.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/WorkQueue.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WorkQueueItem.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> static const unsigned queueLength = 1024;
</span><span class="cx">
</span><span class="lines">@@ -38,9 +39,9 @@
</span><span class="cx"> static unsigned startOfQueue;
</span><span class="cx"> static unsigned endOfQueue;
</span><span class="cx">
</span><del>-WorkQueue* WorkQueue::shared()
</del><ins>+WorkQueue& WorkQueue::singleton()
</ins><span class="cx"> {
</span><del>- static WorkQueue* sharedInstance = new WorkQueue;
</del><ins>+ static NeverDestroyed<WorkQueue> sharedInstance;
</ins><span class="cx"> return sharedInstance;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/WorkQueue.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/WorkQueue.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/WorkQueue.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -29,11 +29,15 @@
</span><span class="cx"> #ifndef WorkQueue_h
</span><span class="cx"> #define WorkQueue_h
</span><span class="cx">
</span><ins>+#include <wtf/Forward.h>
+
</ins><span class="cx"> class WorkQueueItem;
</span><span class="cx">
</span><span class="cx"> class WorkQueue {
</span><ins>+friend class WTF::NeverDestroyed<WorkQueue>;
+
</ins><span class="cx"> public:
</span><del>- static WorkQueue* shared();
</del><ins>+ static WorkQueue& singleton();
</ins><span class="cx">
</span><span class="cx"> void queue(WorkQueueItem*);
</span><span class="cx"> WorkQueueItem* dequeue();
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1870,8 +1870,9 @@
</span><span class="cx"> [prevTestBFItem release];
</span><span class="cx"> prevTestBFItem = [[[[mainFrame webView] backForwardList] currentItem] retain];
</span><span class="cx">
</span><del>- WorkQueue::shared()->clear();
- WorkQueue::shared()->setFrozen(false);
</del><ins>+ auto& workQueue = WorkQueue::singleton();
+ workQueue.clear();
+ workQueue.setFrozen(false);
</ins><span class="cx">
</span><span class="cx"> bool ignoreWebCoreNodeLeaks = shouldIgnoreWebCoreNodeLeaks(testURL);
</span><span class="cx"> if (ignoreWebCoreNodeLeaks)
</span><span class="lines">@@ -1895,7 +1896,7 @@
</span><span class="cx"> [EventSendingController clearSavedEvents];
</span><span class="cx"> [[mainFrame webView] setSelectedDOMRange:nil affinity:NSSelectionAffinityDownstream];
</span><span class="cx">
</span><del>- WorkQueue::shared()->clear();
</del><ins>+ workQueue.clear();
</ins><span class="cx">
</span><span class="cx"> if (gTestRunner->closeRemainingWindowsWhenComplete()) {
</span><span class="cx"> NSArray* array = [DumpRenderTreeWindow openWindows];
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacFrameLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // if we finish all the commands, we're ready to dump state
</span><del>- if (WorkQueue::shared()->processWork() && !gTestRunner->waitToDump())
</del><ins>+ if (WorkQueue::singleton().processWork() && !gTestRunner->waitToDump())
</ins><span class="cx"> dump();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,9 +159,10 @@
</span><span class="cx"> {
</span><span class="cx"> if ([dataSource webFrame] == topLoadingFrame) {
</span><span class="cx"> topLoadingFrame = nil;
</span><del>- WorkQueue::shared()->setFrozen(true); // first complete load freezes the queue for the rest of this test
</del><ins>+ auto& workQueue = WorkQueue::singleton();
+ workQueue.setFrozen(true); // first complete load freezes the queue for the rest of this test
</ins><span class="cx"> if (!gTestRunner->waitToDump()) {
</span><del>- if (WorkQueue::shared()->count())
</del><ins>+ if (workQueue.count())
</ins><span class="cx"> [self performSelector:@selector(processWork:) withObject:nil afterDelay:0];
</span><span class="cx"> else
</span><span class="cx"> dump();
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::notifyDone()
</span><span class="cx"> {
</span><del>- if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
</del><ins>+ if (m_waitToDump && !topLoadingFrame && !WorkQueue::singleton().count())
</ins><span class="cx"> dump();
</span><span class="cx"> m_waitToDump = false;
</span><span class="cx"> }
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> NSString *nsurlString = [nsurl absoluteString];
</span><span class="cx">
</span><span class="cx"> JSRetainPtr<JSStringRef> absoluteURL(Adopt, JSStringCreateWithUTF8CString([nsurlString UTF8String]));
</span><del>- WorkQueue::shared()->queue(new LoadItem(absoluteURL.get(), target));
</del><ins>+ WorkQueue::singleton().queue(new LoadItem(absoluteURL.get(), target));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAcceptsEditing(bool newAcceptsEditing)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -1107,8 +1107,9 @@
</span><span class="cx"> if (webView && SUCCEEDED(webView->backForwardList(&bfList)))
</span><span class="cx"> bfList->currentItem(&prevTestBFItem);
</span><span class="cx">
</span><del>- WorkQueue::shared()->clear();
- WorkQueue::shared()->setFrozen(false);
</del><ins>+ auto& workQueue = WorkQueue::singleton();
+ workQueue.clear();
+ workQueue.setFrozen(false);
</ins><span class="cx">
</span><span class="cx"> MSG msg = { 0 };
</span><span class="cx"> HWND hostWindow;
</span><span class="lines">@@ -1140,7 +1141,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // EventSendingController clearSavedEvents
</span><del>- WorkQueue::shared()->clear();
</del><ins>+ workQueue.clear();
</ins><span class="cx">
</span><span class="cx"> if (::gTestRunner->closeRemainingWindowsWhenComplete()) {
</span><span class="cx"> Vector<HWND> windows = openWindows();
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinFrameLoadDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // if we finish all the commands, we're ready to dump state
</span><del>- if (WorkQueue::shared()->processWork() && !::gTestRunner->waitToDump())
</del><ins>+ if (WorkQueue::singleton().processWork() && !::gTestRunner->waitToDump())
</ins><span class="cx"> dump();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -233,13 +233,14 @@
</span><span class="cx"> if (frame != topLoadingFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- topLoadingFrame = 0;
- WorkQueue::shared()->setFrozen(true);
</del><ins>+ topLoadingFrame = nullptr;
+ auto& workQueue = WorkQueue::singleton();
+ workQueue.setFrozen(true);
</ins><span class="cx">
</span><span class="cx"> if (::gTestRunner->waitToDump())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (WorkQueue::shared()->count()) {
</del><ins>+ if (workQueue.count()) {
</ins><span class="cx"> if (!processWorkTimerID)
</span><span class="cx"> processWorkTimerID = ::SetTimer(0, 0, 0, processWorkTimer);
</span><span class="cx"> delegatesWithDelayedWork().append(this);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> void TestRunner::notifyDone()
</span><span class="cx"> {
</span><span class="cx"> // Same as on mac. This can be shared.
</span><del>- if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
</del><ins>+ if (m_waitToDump && !topLoadingFrame && !WorkQueue::singleton()->count())
</ins><span class="cx"> dump();
</span><span class="cx"> m_waitToDump = false;
</span><span class="cx"> }
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> wstring wAbsoluteURL = responseURL + TEXT("/") + wURL;
</span><span class="cx"> JSRetainPtr<JSStringRef> jsAbsoluteURL(Adopt, JSStringCreateWithCharacters(wAbsoluteURL.data(), wAbsoluteURL.length()));
</span><span class="cx">
</span><del>- WorkQueue::shared()->queue(new LoadItem(jsAbsoluteURL.get(), target));
</del><ins>+ WorkQueue::singleton()->queue(new LoadItem(jsAbsoluteURL.get(), target));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAcceptsEditing(bool acceptsEditing)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -4093,14 +4093,14 @@
</span><span class="cx"> '}\n',
</span><span class="cx"> '')
</span><span class="cx"> self.assert_multi_line_lint(
</span><del>- '#define TEST_ASSERT(expression) do { if (!(expression)) { TestsController::shared().testFailed(__FILE__, __LINE__, #expression); return; } } while (0)\n',
</del><ins>+ '#define TEST_ASSERT(expression) do { if (!(expression)) { TestsController::singleton().testFailed(__FILE__, __LINE__, #expression); return; } } while (0)\n',
</ins><span class="cx"> '')
</span><span class="cx"> self.assert_multi_line_lint(
</span><del>- '#define TEST_ASSERT(expression) do { if ( !(expression)) { TestsController::shared().testFailed(__FILE__, __LINE__, #expression); return; } } while (0)\n',
</del><ins>+ '#define TEST_ASSERT(expression) do { if ( !(expression)) { TestsController::singleton().testFailed(__FILE__, __LINE__, #expression); return; } } while (0)\n',
</ins><span class="cx"> 'Extra space after ( in if [whitespace/parens] [5]')
</span><span class="cx"> # FIXME: currently we only check first conditional, so we cannot detect errors in next ones.
</span><span class="cx"> # self.assert_multi_line_lint(
</span><del>- # '#define TEST_ASSERT(expression) do { if (!(expression)) { TestsController::shared().testFailed(__FILE__, __LINE__, #expression); return; } } while (0 )\n',
</del><ins>+ # '#define TEST_ASSERT(expression) do { if (!(expression)) { TestsController::singleton().testFailed(__FILE__, __LINE__, #expression); return; } } while (0 )\n',
</ins><span class="cx"> # 'Mismatching spaces inside () in if [whitespace/parens] [5]')
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> 'WTF_MAKE_NONCOPYABLE(ClassName); WTF_MAKE_FAST_ALLOCATED;\n',
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIInjectedBundleControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><del>-InjectedBundleController& InjectedBundleController::shared()
</del><ins>+InjectedBundleController& InjectedBundleController::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static InjectedBundleController& shared = *new InjectedBundleController;
</span><span class="cx"> return shared;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIInjectedBundleControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/InjectedBundleController.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/InjectedBundleController.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/InjectedBundleController.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class InjectedBundleController {
</span><span class="cx"> public:
</span><del>- static InjectedBundleController& shared();
</del><ins>+ static InjectedBundleController& singleton();
</ins><span class="cx">
</span><span class="cx"> void initialize(WKBundleRef, WKTypeRef);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIInjectedBundleMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
</span><span class="cx"> {
</span><del>- TestWebKitAPI::InjectedBundleController::shared().initialize(bundle, initializationUserData);
</del><ins>+ TestWebKitAPI::InjectedBundleController::singleton().initialize(bundle, initializationUserData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIInjectedBundleTesth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/InjectedBundleTest.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/InjectedBundleTest.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/InjectedBundleTest.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> public:
</span><span class="cx"> Register(const std::string& test)
</span><span class="cx"> {
</span><del>- InjectedBundleController::shared().registerCreateInjectedBundleTestFunction(test, Register::create);
</del><ins>+ InjectedBundleController::singleton().registerCreateInjectedBundleTestFunction(test, Register::create);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControls_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> numberOfElements = adoptWK(WKUInt64Create(WKArrayGetSize(elementHandles)));
</span><span class="cx"> WKDictionarySetItem(messageBody.get(), Util::toWK("NumberOfControls").get(), numberOfElements.get());
</span><span class="cx">
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("DidReceiveDidAssociateFormControls").get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("DidReceiveDidAssociateFormControls").get(), messageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DidAssociateFormControlsTest::DidAssociateFormControlsTest(const std::string& identifier)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2HitTestResultNodeHandle_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> if (!nodeHandle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("HitTestResultNodeHandleTestDoneMessageName").get(), Util::toWK("HitTestResultNodeHandleTestDoneMessageBody").get());
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("HitTestResultNodeHandleTestDoneMessageName").get(), Util::toWK("HitTestResultNodeHandleTestDoneMessageBody").get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PasteboardNotifications_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> static void willWriteToPasteboard(WKBundlePageRef page, WKBundleRangeHandleRef range, const void*)
</span><span class="cx"> {
</span><span class="cx"> if (!range)
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("willWritetoPasteboardFail").get());
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("willWritetoPasteboardFail").get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void getPasteboardDataForRange(WKBundlePageRef, WKBundleRangeHandleRef range, WKArrayRef* pasteboardTypes, WKArrayRef* pasteboardData, const void*)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> static void didWriteToPasteboard(WKBundlePageRef, const void*)
</span><span class="cx"> {
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("didWriteToPasteboard").get());
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("didWriteToPasteboard").get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PasteboardNotificationsTest::PasteboardNotificationsTest(const std::string& identifier)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillLoad_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> WKDictionarySetItem(messageBody.get(), Util::toWK("URLRequestReturn").get(), request);
</span><span class="cx"> WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
</span><span class="cx">
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadURLRequestReturn").get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("WillLoadURLRequestReturn").get(), messageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void willLoadDataRequest(WKBundlePageRef page, WKURLRequestRef request, WKDataRef data, WKStringRef MIMEType, WKStringRef encodingName, WKURLRef unreachableURL, WKTypeRef userData, const void *clientInfo)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> WKDictionarySetItem(messageBody.get(), Util::toWK("UnreachableURLReturn").get(), unreachableURL);
</span><span class="cx"> WKDictionarySetItem(messageBody.get(), Util::toWK("UserDataReturn").get(), userData);
</span><span class="cx">
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("WillLoadDataRequestReturn").get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("WillLoadDataRequestReturn").get(), messageBody.get());
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillSendSubmitEvent_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> static void willSendSubmitEvent(WKBundlePageRef, WKBundleNodeHandleRef, WKBundleFrameRef, WKBundleFrameRef, WKDictionaryRef values, const void*)
</span><span class="cx"> {
</span><del>- WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("DidReceiveWillSendSubmitEvent").get(), values);
</del><ins>+ WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("DidReceiveWillSendSubmitEvent").get(), values);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WillSendSubmitEventTest::WillSendSubmitEventTest(const std::string& identifier)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestsController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestsController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/TestsController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> std::string failures;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-TestsController& TestsController::shared()
</del><ins>+TestsController& TestsController::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<TestsController> shared;
</span><span class="cx"> return shared;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestsController.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestsController.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/TestsController.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class TestsController {
</span><span class="cx"> public:
</span><del>- static TestsController& shared();
</del><ins>+ static TestsController& singleton();
</ins><span class="cx">
</span><span class="cx"> bool run(int argc, char** argv);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIeflmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/efl/main.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/efl/main.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/efl/main.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> useX11Window = checkForUseX11WindowArgument(argc, argv);
</span><span class="cx">
</span><del>- int returnCode = TestWebKitAPI::TestsController::shared().run(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE;
</del><ins>+ int returnCode = TestWebKitAPI::TestsController::singleton().run(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE;
</ins><span class="cx">
</span><span class="cx"> ewk_shutdown();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/main.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/main.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/gtk/main.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -32,5 +32,5 @@
</span><span class="cx"> {
</span><span class="cx"> gtk_init(&argc, &argv);
</span><span class="cx">
</span><del>- return TestWebKitAPI::TestsController::shared().run(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE;
</del><ins>+ return TestWebKitAPI::TestsController::singleton().run(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIiosmainIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/ios/mainIOS.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/ios/mainIOS.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/ios/mainIOS.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx">
</span><span class="cx"> [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:@"TestWebKitAPI"];
</span><del>- bool passed = TestWebKitAPI::TestsController::shared().run(argc, argv);
</del><ins>+ bool passed = TestWebKitAPI::TestsController::singleton().run(argc, argv);
</ins><span class="cx">
</span><span class="cx"> [pool drain];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacmainMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/mainMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/mainMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/mac/mainMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:@"TestWebKitAPI"];
</span><span class="cx"> [NSApplication sharedApplication];
</span><span class="cx">
</span><del>- bool passed = TestWebKitAPI::TestsController::shared().run(argc, argv);
</del><ins>+ bool passed = TestWebKitAPI::TestsController::singleton().run(argc, argv);
</ins><span class="cx">
</span><span class="cx"> [pool drain];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIwinmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/win/main.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/win/main.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/TestWebKitAPI/win/main.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> // FIXME: Remove this line once <http://webkit.org/b/32867> is fixed.
</span><span class="cx"> ::OleInitialize(0);
</span><span class="cx">
</span><del>- bool passed = TestWebKitAPI::TestsController::shared().run(argc, argv);
</del><ins>+ bool passed = TestWebKitAPI::TestsController::singleton().run(argc, argv);
</ins><span class="cx">
</span><span class="cx"> return passed ? EXIT_SUCCESS : EXIT_FAILURE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> #if !PLATFORM(GTK) && !PLATFORM(EFL)
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> void* root = WKAccessibilityRootObject(page);
</span><span class="cx">
</span><span class="cx"> return AccessibilityUIElement::create(static_cast<PlatformUIElement>(root));
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement()
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> void* root = WKAccessibilityFocusedObject(page);
</span><span class="cx">
</span><span class="cx"> return AccessibilityUIElement::create(static_cast<PlatformUIElement>(root));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -208,7 +208,8 @@
</span><span class="cx">
</span><span class="cx"> void EventSendingController::mouseDown(int button, JSValueRef modifierArray)
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ auto& injectedBungle = InjectedBundle::singleton();
+ WKBundlePageRef page = injectedBungle.page()->page();
</ins><span class="cx"> WKBundleFrameRef frame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(frame);
</span><span class="cx"> WKEventModifiers modifiers = parseModifierArray(context, modifierArray);
</span><span class="lines">@@ -216,12 +217,12 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> EventSenderMessageBody(AdoptWK, createMouseMessageBody(MouseDown, button, modifiers));
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(injectedBungle.bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::mouseUp(int button, JSValueRef modifierArray)
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundleFrameRef frame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(frame);
</span><span class="cx"> WKEventModifiers modifiers = parseModifierArray(context, modifierArray);
</span><span class="lines">@@ -229,7 +230,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> EventSenderMessageBody(AdoptWK, createMouseMessageBody(MouseUp, button, modifiers));
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::mouseMoveTo(int x, int y)
</span><span class="lines">@@ -249,7 +250,7 @@
</span><span class="cx"> WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::leapForward(int milliseconds)
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> timeRef(AdoptWK, WKUInt64Create(milliseconds));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), timeKey.get(), timeRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::scheduleAsynchronousClick()
</span><span class="lines">@@ -277,11 +278,11 @@
</span><span class="cx">
</span><span class="cx"> // Asynchronous mouse down.
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> mouseDownMessageBody(AdoptWK, createMouseMessageBody(MouseDown, button, modifiers));
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), mouseDownMessageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), mouseDownMessageBody.get());
</ins><span class="cx">
</span><span class="cx"> // Asynchronous mouse up.
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> mouseUpMessageBody(AdoptWK, createMouseMessageBody(MouseUp, button, modifiers));
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), mouseUpMessageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), mouseUpMessageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKRetainPtr<WKMutableDictionaryRef> createKeyDownMessageBody(JSStringRef key, WKEventModifiers modifiers, int location)
</span><span class="lines">@@ -308,7 +309,7 @@
</span><span class="cx">
</span><span class="cx"> void EventSendingController::keyDown(JSStringRef key, JSValueRef modifierArray, int location)
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundleFrameRef frame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(frame);
</span><span class="cx"> WKEventModifiers modifiers = parseModifierArray(context, modifierArray);
</span><span class="lines">@@ -316,7 +317,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> keyDownMessageBody = createKeyDownMessageBody(key, modifiers, location);
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), keyDownMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), keyDownMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::scheduleAsynchronousKeyDown(JSStringRef key)
</span><span class="lines">@@ -324,7 +325,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
</span><span class="cx"> WKRetainPtr<WKMutableDictionaryRef> keyDownMessageBody = createKeyDownMessageBody(key, 0 /* modifiers */, 0 /* location */);
</span><span class="cx">
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), keyDownMessageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), keyDownMessageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::mouseScrollBy(int x, int y)
</span><span class="lines">@@ -344,7 +345,7 @@
</span><span class="cx"> WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::mouseScrollByWithWheelAndMomentumPhases(int x, int y, JSStringRef phaseStr, JSStringRef momentumStr, bool asyncScrolling)
</span><span class="lines">@@ -397,9 +398,9 @@
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), momentumKey.get(), momentumRef.get());
</span><span class="cx">
</span><span class="cx"> if (asyncScrolling)
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get());
</ins><span class="cx"> else
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::continuousMouseScrollBy(int x, int y, bool paged)
</span><span class="lines">@@ -423,12 +424,12 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> pagedRef(AdoptWK, WKUInt64Create(paged));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), pagedKey.get(), pagedRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef EventSendingController::contextClick()
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="lines">@@ -456,44 +457,48 @@
</span><span class="cx">
</span><span class="cx"> void EventSendingController::textZoomIn()
</span><span class="cx"> {
</span><ins>+ auto& injectedBundle = InjectedBundle::singleton();
</ins><span class="cx"> // Ensure page zoom is reset.
</span><del>- WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), 1);
</del><ins>+ WKBundlePageSetPageZoomFactor(injectedBundle.page()->page(), 1);
</ins><span class="cx">
</span><del>- double zoomFactor = WKBundlePageGetTextZoomFactor(InjectedBundle::shared().page()->page());
- WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor * ZoomMultiplierRatio);
</del><ins>+ double zoomFactor = WKBundlePageGetTextZoomFactor(injectedBundle.page()->page());
+ WKBundlePageSetTextZoomFactor(injectedBundle.page()->page(), zoomFactor * ZoomMultiplierRatio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::textZoomOut()
</span><span class="cx"> {
</span><ins>+ auto& injectedBundle = InjectedBundle::singleton();
</ins><span class="cx"> // Ensure page zoom is reset.
</span><del>- WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), 1);
</del><ins>+ WKBundlePageSetPageZoomFactor(injectedBundle.page()->page(), 1);
</ins><span class="cx">
</span><del>- double zoomFactor = WKBundlePageGetTextZoomFactor(InjectedBundle::shared().page()->page());
- WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor / ZoomMultiplierRatio);
</del><ins>+ double zoomFactor = WKBundlePageGetTextZoomFactor(injectedBundle.page()->page());
+ WKBundlePageSetTextZoomFactor(injectedBundle.page()->page(), zoomFactor / ZoomMultiplierRatio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::zoomPageIn()
</span><span class="cx"> {
</span><ins>+ auto& injectedBundle = InjectedBundle::singleton();
</ins><span class="cx"> // Ensure text zoom is reset.
</span><del>- WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), 1);
</del><ins>+ WKBundlePageSetTextZoomFactor(injectedBundle.page()->page(), 1);
</ins><span class="cx">
</span><del>- double zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
- WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor * ZoomMultiplierRatio);
</del><ins>+ double zoomFactor = WKBundlePageGetPageZoomFactor(injectedBundle.page()->page());
+ WKBundlePageSetPageZoomFactor(injectedBundle.page()->page(), zoomFactor * ZoomMultiplierRatio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::zoomPageOut()
</span><span class="cx"> {
</span><ins>+ auto& injectedBundle = InjectedBundle::singleton();
</ins><span class="cx"> // Ensure text zoom is reset.
</span><del>- WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), 1);
</del><ins>+ WKBundlePageSetTextZoomFactor(injectedBundle.page()->page(), 1);
</ins><span class="cx">
</span><del>- double zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
- WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor / ZoomMultiplierRatio);
</del><ins>+ double zoomFactor = WKBundlePageGetPageZoomFactor(injectedBundle.page()->page());
+ WKBundlePageSetPageZoomFactor(injectedBundle.page()->page(), zoomFactor / ZoomMultiplierRatio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::scalePageBy(double scale, double x, double y)
</span><span class="cx"> {
</span><span class="cx"> WKPoint origin = { x, y };
</span><del>- WKBundlePageSetScaleAtOrigin(InjectedBundle::shared().page()->page(), scale, origin);
</del><ins>+ WKBundlePageSetScaleAtOrigin(InjectedBundle::singleton().page()->page(), scale, origin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="lines">@@ -514,7 +519,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(y));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::updateTouchPoint(int index, int x, int y)
</span><span class="lines">@@ -538,7 +543,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(y));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::setTouchModifier(const JSStringRef &modifier, bool enable)
</span><span class="lines">@@ -568,7 +573,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> enableRef(AdoptWK, WKUInt64Create(enable));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), enableKey.get(), enableRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -589,7 +594,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> yRef(AdoptWK, WKUInt64Create(radiusY));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::touchStart()
</span><span class="lines">@@ -601,7 +606,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchStart"));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::touchMove()
</span><span class="lines">@@ -613,7 +618,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchMove"));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::touchEnd()
</span><span class="lines">@@ -625,7 +630,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchEnd"));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::touchCancel()
</span><span class="lines">@@ -637,7 +642,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("TouchCancel"));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::clearTouchPoints()
</span><span class="lines">@@ -649,7 +654,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("ClearTouchPoints"));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::releaseTouchPoint(int index)
</span><span class="lines">@@ -665,7 +670,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventSendingController::cancelTouchPoint(int index)
</span><span class="lines">@@ -681,7 +686,7 @@
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> indexRef(AdoptWK, WKUInt64Create(index));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), indexKey.get(), indexRef.get());
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleGCControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/GCController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/GCController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/GCController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -52,17 +52,17 @@
</span><span class="cx">
</span><span class="cx"> void GCController::collect()
</span><span class="cx"> {
</span><del>- WKBundleGarbageCollectJavaScriptObjects(InjectedBundle::shared().bundle());
</del><ins>+ WKBundleGarbageCollectJavaScriptObjects(InjectedBundle::singleton().bundle());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCController::collectOnAlternateThread(bool waitUntilDone)
</span><span class="cx"> {
</span><del>- WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(InjectedBundle::shared().bundle(), waitUntilDone);
</del><ins>+ WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(InjectedBundle::singleton().bundle(), waitUntilDone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t GCController::getJSObjectCount()
</span><span class="cx"> {
</span><del>- return WKBundleGetJavaScriptObjectsCount(InjectedBundle::shared().bundle());
</del><ins>+ return WKBundleGetJavaScriptObjectsCount(InjectedBundle::singleton().bundle());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Object Creation
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><del>-InjectedBundle& InjectedBundle::shared()
</del><ins>+InjectedBundle& InjectedBundle::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static InjectedBundle& shared = *new InjectedBundle;
</span><span class="cx"> return shared;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class InjectedBundle {
</span><span class="cx"> public:
</span><del>- static InjectedBundle& shared();
</del><ins>+ static InjectedBundle& singleton();
</ins><span class="cx">
</span><span class="cx"> // Initialize the InjectedBundle.
</span><span class="cx"> void initialize(WKBundleRef, WKTypeRef initializationUserData);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -31,5 +31,5 @@
</span><span class="cx"> extern "C"
</span><span class="cx"> void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
</span><span class="cx"> {
</span><del>- WTR::InjectedBundle::shared().initialize(bundle, initializationUserData);
</del><ins>+ WTR::InjectedBundle::singleton().initialize(bundle, initializationUserData);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> if (!isLocalFileScheme(schemeString.get()))
</span><span class="cx"> return toWTFString(adoptWK(WKURLCopyString(fileUrl)));
</span><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> WKRetainPtr<WKURLRef> mainFrameURL = adoptWK(WKBundleFrameCopyURL(mainFrame));
</span><span class="cx"> if (!mainFrameURL)
</span><span class="cx"> mainFrameURL = adoptWK(WKBundleFrameCopyProvisionalURL(mainFrame));
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> stringBuilder.appendLiteral(" - ");
</span><span class="cx"> stringBuilder.append(eventName);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ InjectedBundle::singleton().outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void dumpRequestDescriptionSuitableForTestResult(WKURLRequestRef request, StringBuilder& stringBuilder)
</span><span class="lines">@@ -652,32 +652,34 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didStartProvisionalLoadForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->testURL()) {
</del><ins>+ if (!injectedBundle.testRunner()->testURL()) {
</ins><span class="cx"> WKRetainPtr<WKURLRef> testURL = adoptWK(WKBundleFrameCopyProvisionalURL(frame));
</span><del>- InjectedBundle::shared().testRunner()->setTestURL(testURL.get());
</del><ins>+ injectedBundle.testRunner()->setTestURL(testURL.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> platformDidStartProvisionalLoadForFrame(frame);
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> dumpLoadEvent(frame, "didStartProvisionalLoadForFrame");
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().topLoadingFrame())
- InjectedBundle::shared().setTopLoadingFrame(frame);
</del><ins>+ if (!injectedBundle.topLoadingFrame())
+ injectedBundle.setTopLoadingFrame(frame);
</ins><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldStopProvisionalFrameLoads())
</del><ins>+ if (injectedBundle.testRunner()->shouldStopProvisionalFrameLoads())
</ins><span class="cx"> dumpLoadEvent(frame, "stopping load in didStartProvisionalLoadForFrame callback");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didReceiveServerRedirectForProvisionalLoadForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dumpLoadEvent(frame, "didReceiveServerRedirectForProvisionalLoadForFrame");
</span><span class="lines">@@ -685,10 +687,11 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame(WKBundleFrameRef frame, WKErrorRef)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> dumpLoadEvent(frame, "didFailProvisionalLoadWithError");
</span><span class="cx">
</span><span class="cx"> frameDidChangeLocation(frame);
</span><span class="lines">@@ -696,10 +699,11 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didCommitLoadForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dumpLoadEvent(frame, "didCommitLoadForFrame");
</span><span class="lines">@@ -707,13 +711,14 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFinishProgress()
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpProgressFinishedCallback())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpProgressFinishedCallback())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- InjectedBundle::shared().outputText("postProgressFinishedNotification\n");
</del><ins>+ injectedBundle.outputText("postProgressFinishedNotification\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum FrameNamePolicy { ShouldNotIncludeFrameName, ShouldIncludeFrameName };
</span><span class="lines">@@ -834,7 +839,8 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::dump()
</span><span class="cx"> {
</span><del>- ASSERT(InjectedBundle::shared().isTestRunning());
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ ASSERT(injectedBundle.isTestRunning());
</ins><span class="cx">
</span><span class="cx"> // Force a paint before dumping. This matches DumpRenderTree on Windows. (DumpRenderTree on Mac
</span><span class="cx"> // does this at a slightly different time.) See <http://webkit.org/b/55469> for details.
</span><span class="lines">@@ -845,13 +851,13 @@
</span><span class="cx"> String url = toWTFString(adoptWK(WKURLCopyString(urlRef.get())));
</span><span class="cx"> WKRetainPtr<WKStringRef> mimeType = adoptWK(WKBundleFrameCopyMIMETypeForResourceWithURL(frame, urlRef.get()));
</span><span class="cx"> if (url.find("dumpAsText/") != notFound || WKStringIsEqualToUTF8CString(mimeType.get(), "text/plain"))
</span><del>- InjectedBundle::shared().testRunner()->dumpAsText(false);
</del><ins>+ injectedBundle.testRunner()->dumpAsText(false);
</ins><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx">
</span><del>- switch (InjectedBundle::shared().testRunner()->whatToDump()) {
</del><ins>+ switch (injectedBundle.testRunner()->whatToDump()) {
</ins><span class="cx"> case TestRunner::RenderTree: {
</span><del>- if (InjectedBundle::shared().testRunner()->isPrinting())
</del><ins>+ if (injectedBundle.testRunner()->isPrinting())
</ins><span class="cx"> stringBuilder.append(toWTFString(adoptWK(WKBundlePageCopyRenderTreeExternalRepresentationForPrinting(m_page)).get()));
</span><span class="cx"> else
</span><span class="cx"> stringBuilder.append(toWTFString(adoptWK(WKBundlePageCopyRenderTreeExternalRepresentation(m_page)).get()));
</span><span class="lines">@@ -870,34 +876,35 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpAllFrameScrollPositions())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpAllFrameScrollPositions())
</ins><span class="cx"> dumpAllFrameScrollPositions(stringBuilder);
</span><del>- else if (InjectedBundle::shared().testRunner()->shouldDumpMainFrameScrollPosition())
</del><ins>+ else if (injectedBundle.testRunner()->shouldDumpMainFrameScrollPosition())
</ins><span class="cx"> dumpFrameScrollPosition(WKBundlePageGetMainFrame(m_page), stringBuilder);
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpBackForwardListsForAllWindows())
- InjectedBundle::shared().dumpBackForwardListsForAllPages(stringBuilder);
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpBackForwardListsForAllWindows())
+ injectedBundle.dumpBackForwardListsForAllPages(stringBuilder);
</ins><span class="cx">
</span><del>- if (InjectedBundle::shared().shouldDumpPixels() && InjectedBundle::shared().testRunner()->shouldDumpPixels()) {
</del><ins>+ if (injectedBundle.shouldDumpPixels() && injectedBundle.testRunner()->shouldDumpPixels()) {
</ins><span class="cx"> WKSnapshotOptions options = kWKSnapshotOptionsShareable | kWKSnapshotOptionsInViewCoordinates;
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpSelectionRect())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpSelectionRect())
</ins><span class="cx"> options |= kWKSnapshotOptionsPaintSelectionRectangle;
</span><span class="cx">
</span><del>- InjectedBundle::shared().setPixelResult(adoptWK(WKBundlePageCreateSnapshotWithOptions(m_page, WKBundleFrameGetVisibleContentBounds(WKBundlePageGetMainFrame(m_page)), options)).get());
</del><ins>+ injectedBundle.setPixelResult(adoptWK(WKBundlePageCreateSnapshotWithOptions(m_page, WKBundleFrameGetVisibleContentBounds(WKBundlePageGetMainFrame(m_page)), options)).get());
</ins><span class="cx"> if (WKBundlePageIsTrackingRepaints(m_page))
</span><del>- InjectedBundle::shared().setRepaintRects(adoptWK(WKBundlePageCopyTrackedRepaintRects(m_page)).get());
</del><ins>+ injectedBundle.setRepaintRects(adoptWK(WKBundlePageCopyTrackedRepaintRects(m_page)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
- InjectedBundle::shared().done();
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
+ injectedBundle.done();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFinishLoadForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> dumpLoadEvent(frame, "didFinishLoadForFrame");
</span><span class="cx">
</span><span class="cx"> frameDidChangeLocation(frame, /*shouldDump*/ true);
</span><span class="lines">@@ -905,10 +912,11 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFailLoadWithErrorForFrame(WKBundleFrameRef frame, WKErrorRef)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> dumpLoadEvent(frame, "didFailLoadWithError");
</span><span class="cx">
</span><span class="cx"> frameDidChangeLocation(frame);
</span><span class="lines">@@ -916,29 +924,31 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didReceiveTitleForFrame(WKStringRef title, WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks()) {
</ins><span class="cx"> dumpFrameDescriptionSuitableForTestResult(frame, stringBuilder);
</span><span class="cx"> stringBuilder.appendLiteral(" - didReceiveTitle: ");
</span><span class="cx"> stringBuilder.append(toWTFString(title));
</span><span class="cx"> stringBuilder.append('\n');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpTitleChanges()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpTitleChanges()) {
</ins><span class="cx"> stringBuilder.appendLiteral("TITLE CHANGED: '");
</span><span class="cx"> stringBuilder.append(toWTFString(title));
</span><span class="cx"> stringBuilder.appendLiteral("'\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, WKBundleScriptWorldRef world)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSGlobalContextRef context = WKBundleFrameGetJavaScriptContextForWorld(frame, world);
</span><span class="lines">@@ -949,22 +959,23 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSValueRef exception = 0;
- InjectedBundle::shared().testRunner()->makeWindowObject(context, window, &exception);
- InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
- InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
- InjectedBundle::shared().textInputController()->makeWindowObject(context, window, &exception);
- InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception);
</del><ins>+ JSValueRef exception = nullptr;
+ injectedBundle.testRunner()->makeWindowObject(context, window, &exception);
+ injectedBundle.gcController()->makeWindowObject(context, window, &exception);
+ injectedBundle.eventSendingController()->makeWindowObject(context, window, &exception);
+ injectedBundle.textInputController()->makeWindowObject(context, window, &exception);
+ injectedBundle.accessibilityController()->makeWindowObject(context, window, &exception);
</ins><span class="cx">
</span><span class="cx"> WebCoreTestSupport::injectInternalsObject(context);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dumpLoadEvent(frame, "didCancelClientRedirectForFrame");
</span><span class="lines">@@ -972,10 +983,11 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::willPerformClientRedirectForFrame(WKBundlePageRef, WKBundleFrameRef frame, WKURLRef url, double delay, double date)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="lines">@@ -983,7 +995,7 @@
</span><span class="cx"> stringBuilder.appendLiteral(" - willPerformClientRedirectToURL: ");
</span><span class="cx"> stringBuilder.append(pathSuitableForTestResult(url));
</span><span class="cx"> stringBuilder.appendLiteral(" \n");
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didSameDocumentNavigationForFrame(WKBundleFrameRef frame, WKSameDocumentNavigationType type)
</span><span class="lines">@@ -992,10 +1004,11 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFinishDocumentLoadForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> dumpLoadEvent(frame, "didFinishDocumentLoadForFrame");
</span><span class="cx">
</span><span class="cx"> unsigned pendingFrameUnloadEvents = WKBundleFrameGetPendingUnloadCount(frame);
</span><span class="lines">@@ -1005,40 +1018,44 @@
</span><span class="cx"> stringBuilder.appendLiteral(" - has ");
</span><span class="cx"> stringBuilder.appendNumber(pendingFrameUnloadEvents);
</span><span class="cx"> stringBuilder.appendLiteral(" onunload handler(s)\n");
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didHandleOnloadEventsForFrame(WKBundleFrameRef frame)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
</ins><span class="cx"> dumpLoadEvent(frame, "didHandleOnloadEventsForFrame");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didDisplayInsecureContentForFrame(WKBundleFrameRef frame)
</del><ins>+void InjectedBundlePage::didDisplayInsecureContentForFrame(WKBundleFrameRef)
</ins><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
- InjectedBundle::shared().outputText("didDisplayInsecureContent\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
+ injectedBundle.outputText("didDisplayInsecureContent\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didRunInsecureContentForFrame(WKBundleFrameRef frame)
</del><ins>+void InjectedBundlePage::didRunInsecureContentForFrame(WKBundleFrameRef)
</ins><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
- InjectedBundle::shared().outputText("didRunInsecureContent\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
+ injectedBundle.outputText("didRunInsecureContent\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePage::didDetectXSSForFrame(WKBundleFrameRef frame)
</del><ins>+void InjectedBundlePage::didDetectXSSForFrame(WKBundleFrameRef)
</ins><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks())
- InjectedBundle::shared().outputText("didDetectXSS\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFrameLoadCallbacks())
+ injectedBundle.outputText("didDetectXSS\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didInitiateLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLRequestRef request, bool)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ if (!InjectedBundle::singleton().isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLRequestCopyURL(request));
</span><span class="lines">@@ -1059,8 +1076,9 @@
</span><span class="cx">
</span><span class="cx"> WKURLRequestRef InjectedBundlePage::willSendRequestForFrame(WKBundlePageRef page, WKBundleFrameRef frame, uint64_t identifier, WKURLRequestRef request, WKURLResponseRef response)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().isTestRunning()
- && InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.isTestRunning()
+ && injectedBundle.testRunner()->shouldDumpResourceLoadCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> dumpResourceURL(identifier, stringBuilder);
</span><span class="cx"> stringBuilder.appendLiteral(" - willSendRequest ");
</span><span class="lines">@@ -1068,16 +1086,16 @@
</span><span class="cx"> stringBuilder.appendLiteral(" redirectResponse ");
</span><span class="cx"> dumpResponseDescriptionSuitableForTestResult(response, stringBuilder);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNull())
- return 0;
</del><ins>+ if (injectedBundle.isTestRunning() && injectedBundle.testRunner()->willSendRequestReturnsNull())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> redirectURL = adoptWK(WKURLResponseCopyURL(response));
</span><del>- if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNullOnRedirect() && redirectURL) {
- InjectedBundle::shared().outputText("Returning null for this redirect\n");
- return 0;
</del><ins>+ if (injectedBundle.isTestRunning() && injectedBundle.testRunner()->willSendRequestReturnsNullOnRedirect() && redirectURL) {
+ injectedBundle.outputText("Returning null for this redirect\n");
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLRequestCopyURL(request));
</span><span class="lines">@@ -1089,8 +1107,8 @@
</span><span class="cx"> && !WKStringIsEqualToUTF8CString(host.get(), "255.255.255.255") // Used in some tests that expect to get back an error.
</span><span class="cx"> && !isLocalHost(host.get())) {
</span><span class="cx"> bool mainFrameIsExternal = false;
</span><del>- if (InjectedBundle::shared().isTestRunning()) {
- WKBundleFrameRef mainFrame = InjectedBundle::shared().topLoadingFrame();
</del><ins>+ if (injectedBundle.isTestRunning()) {
+ WKBundleFrameRef mainFrame = injectedBundle.topLoadingFrame();
</ins><span class="cx"> WKRetainPtr<WKURLRef> mainFrameURL = adoptWK(WKBundleFrameCopyURL(mainFrame));
</span><span class="cx"> if (!mainFrameURL || WKStringIsEqualToUTF8CString(adoptWK(WKURLCopyString(mainFrameURL.get())).get(), "about:blank"))
</span><span class="cx"> mainFrameURL = adoptWK(WKBundleFrameCopyProvisionalURL(mainFrame));
</span><span class="lines">@@ -1104,8 +1122,8 @@
</span><span class="cx"> stringBuilder.appendLiteral("Blocked access to external URL ");
</span><span class="cx"> stringBuilder.append(toWTFString(urlString));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
- return 0;
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1115,20 +1133,21 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didReceiveResponseForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLResponseRef response)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpResourceLoadCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> dumpResourceURL(identifier, stringBuilder);
</span><span class="cx"> stringBuilder.appendLiteral(" - didReceiveResponse ");
</span><span class="cx"> dumpResponseDescriptionSuitableForTestResult(response, stringBuilder);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpResourceResponseMIMETypes())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpResourceResponseMIMETypes())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLResponseCopyURL(response));
</span><span class="lines">@@ -1148,7 +1167,7 @@
</span><span class="cx">
</span><span class="cx"> stringBuilder.append('\n');
</span><span class="cx">
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didReceiveContentLengthForResource(WKBundlePageRef, WKBundleFrameRef, uint64_t, uint64_t)
</span><span class="lines">@@ -1157,24 +1176,26 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpResourceLoadCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> dumpResourceURL(identifier, stringBuilder);
</span><span class="cx"> stringBuilder.appendLiteral(" - didFinishLoading\n");
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier, WKErrorRef error)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpResourceLoadCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="lines">@@ -1183,21 +1204,22 @@
</span><span class="cx">
</span><span class="cx"> dumpErrorDescriptionSuitableForTestResult(error, stringBuilder);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldCacheResponse(WKBundlePageRef, WKBundleFrameRef, uint64_t identifier)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpWillCacheResponse())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpWillCacheResponse())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendNumber(identifier);
</span><span class="cx"> stringBuilder.appendLiteral(" - willCacheResponse: called\n");
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx">
</span><span class="cx"> // The default behavior is the cache the response.
</span><span class="cx"> return true;
</span><span class="lines">@@ -1228,10 +1250,11 @@
</span><span class="cx">
</span><span class="cx"> WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForNavigationAction(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleNavigationActionRef navigationAction, WKURLRequestRef request, WKTypeRef* userData)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return WKBundlePagePolicyActionUse;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->isPolicyDelegateEnabled())
</del><ins>+ if (!injectedBundle.testRunner()->isPolicyDelegateEnabled())
</ins><span class="cx"> return WKBundlePagePolicyActionUse;
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLRequestCopyURL(request));
</span><span class="lines">@@ -1256,10 +1279,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
- InjectedBundle::shared().testRunner()->notifyDone();
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
+ injectedBundle.testRunner()->notifyDone();
</ins><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->isPolicyDelegatePermissive())
</del><ins>+ if (injectedBundle.testRunner()->isPolicyDelegatePermissive())
</ins><span class="cx"> return WKBundlePagePolicyActionUse;
</span><span class="cx"> return WKBundlePagePolicyActionPassThrough;
</span><span class="cx"> }
</span><span class="lines">@@ -1277,7 +1300,7 @@
</span><span class="cx"> stringBuilder.appendLiteral("Policy delegate: resource is an attachment, suggested file name \'");
</span><span class="cx"> stringBuilder.append(toWTFString(filename));
</span><span class="cx"> stringBuilder.appendLiteral("\'\n");
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ InjectedBundle::singleton().outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> mimeType = adoptWK(WKURLResponseCopyMIMEType(response));
</span><span class="lines">@@ -1347,7 +1370,8 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::willAddMessageToConsole(WKStringRef message, uint32_t lineNumber)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WTF::String messageString = toWTFString(message);
</span><span class="lines">@@ -1369,46 +1393,49 @@
</span><span class="cx"> }
</span><span class="cx"> stringBuilder.append(messageString);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::willSetStatusbarText(WKStringRef statusbarText)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpStatusCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpStatusCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("UI DELEGATE STATUS CALLBACK: setStatusText:");
</span><span class="cx"> stringBuilder.append(toWTFString(statusbarText));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::willRunJavaScriptAlert(WKStringRef message, WKBundleFrameRef)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("ALERT: ");
</span><span class="cx"> stringBuilder.append(toWTFString(message));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::willRunJavaScriptConfirm(WKStringRef message, WKBundleFrameRef)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("CONFIRM: ");
</span><span class="cx"> stringBuilder.append(toWTFString(message));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::willRunJavaScriptPrompt(WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef)
</span><span class="lines">@@ -1419,12 +1446,13 @@
</span><span class="cx"> stringBuilder.appendLiteral(", default text: ");
</span><span class="cx"> stringBuilder.append(toWTFString(defaultValue));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ InjectedBundle::singleton().outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKSecurityOriginRef origin, int64_t totalBytesNeeded)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpApplicationCacheDelegateCallbacks()) {
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpApplicationCacheDelegateCallbacks()) {
</ins><span class="cx"> // For example, numbers from 30000 - 39999 will output as 30000.
</span><span class="cx"> // Rounding up or down does not really matter for these tests. It's
</span><span class="cx"> // sufficient to just get a range of 10000 to determine if we were
</span><span class="lines">@@ -1437,36 +1465,37 @@
</span><span class="cx"> stringBuilder.appendLiteral(" totalSpaceNeeded:~");
</span><span class="cx"> stringBuilder.appendNumber(truncatedSpaceNeeded);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDisallowIncreaseForApplicationCacheQuota())
</del><ins>+ if (injectedBundle.testRunner()->shouldDisallowIncreaseForApplicationCacheQuota())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Reset default application cache quota.
</span><del>- WKBundleResetApplicationCacheOriginQuota(InjectedBundle::shared().bundle(), adoptWK(WKSecurityOriginCopyToString(origin)).get());
</del><ins>+ WKBundleResetApplicationCacheOriginQuota(injectedBundle.bundle(), adoptWK(WKSecurityOriginCopyToString(origin)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t InjectedBundlePage::didExceedDatabaseQuota(WKSecurityOriginRef origin, WKStringRef databaseName, WKStringRef databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpDatabaseCallbacks()) {
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpDatabaseCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("UI DELEGATE DATABASE CALLBACK: exceededDatabaseQuotaForSecurityOrigin:");
</span><span class="cx"> stringBuilder.append(securityOriginToStr(origin));
</span><span class="cx"> stringBuilder.appendLiteral(" database:");
</span><span class="cx"> stringBuilder.append(toWTFString(databaseName));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t defaultQuota = 5 * 1024 * 1024;
</span><del>- double testDefaultQuota = InjectedBundle::shared().testRunner()->databaseDefaultQuota();
</del><ins>+ double testDefaultQuota = injectedBundle.testRunner()->databaseDefaultQuota();
</ins><span class="cx"> if (testDefaultQuota >= 0)
</span><span class="cx"> defaultQuota = testDefaultQuota;
</span><span class="cx">
</span><span class="cx"> unsigned long long newQuota = defaultQuota;
</span><span class="cx">
</span><del>- double maxQuota = InjectedBundle::shared().testRunner()->databaseMaxQuota();
</del><ins>+ double maxQuota = injectedBundle.testRunner()->databaseMaxQuota();
</ins><span class="cx"> if (maxQuota >= 0) {
</span><span class="cx"> if (defaultQuota < expectedUsageBytes && expectedUsageBytes <= maxQuota) {
</span><span class="cx"> newQuota = expectedUsageBytes;
</span><span class="lines">@@ -1475,7 +1504,7 @@
</span><span class="cx"> stringBuilder.appendLiteral("UI DELEGATE DATABASE CALLBACK: increased quota to ");
</span><span class="cx"> stringBuilder.appendNumber(newQuota);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return newQuota;
</span><span class="lines">@@ -1540,37 +1569,40 @@
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldBeginEditing(WKBundleRangeHandleRef range)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldBeginEditingInDOMRange:");
</span><span class="cx"> stringBuilder.append(rangeToStr(m_page, m_world.get(), range));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldEndEditing(WKBundleRangeHandleRef range)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldEndEditingInDOMRange:");
</span><span class="cx"> stringBuilder.append(rangeToStr(m_page, m_world.get(), range));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldInsertNode(WKBundleNodeHandleRef node, WKBundleRangeHandleRef rangeToReplace, WKInsertActionType action)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> static const char* insertactionstring[] = {
</span><span class="lines">@@ -1579,7 +1611,7 @@
</span><span class="cx"> "WebViewInsertActionDropped",
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldInsertNode:");
</span><span class="cx"> stringBuilder.append(dumpPath(m_page, m_world.get(), node));
</span><span class="lines">@@ -1588,14 +1620,15 @@
</span><span class="cx"> stringBuilder.appendLiteral(" givenAction:");
</span><span class="cx"> stringBuilder.append(insertactionstring[action]);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldInsertText(WKStringRef text, WKBundleRangeHandleRef rangeToReplace, WKInsertActionType action)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> static const char *insertactionstring[] = {
</span><span class="lines">@@ -1604,7 +1637,7 @@
</span><span class="cx"> "WebViewInsertActionDropped",
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldInsertText:");
</span><span class="cx"> stringBuilder.append(toWTFString(text));
</span><span class="lines">@@ -1613,29 +1646,31 @@
</span><span class="cx"> stringBuilder.appendLiteral(" givenAction:");
</span><span class="cx"> stringBuilder.append(insertactionstring[action]);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldDeleteRange(WKBundleRangeHandleRef range)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldDeleteDOMRange:");
</span><span class="cx"> stringBuilder.append(rangeToStr(m_page, m_world.get(), range));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldChangeSelectedRange(WKBundleRangeHandleRef fromRange, WKBundleRangeHandleRef toRange, WKAffinityType affinity, bool stillSelecting)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> static const char *affinitystring[] = {
</span><span class="lines">@@ -1647,7 +1682,7 @@
</span><span class="cx"> "TRUE"
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldChangeSelectedDOMRange:");
</span><span class="cx"> stringBuilder.append(rangeToStr(m_page, m_world.get(), fromRange));
</span><span class="lines">@@ -1658,98 +1693,105 @@
</span><span class="cx"> stringBuilder.appendLiteral(" stillSelecting:");
</span><span class="cx"> stringBuilder.append(boolstring[stillSelecting]);
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePage::shouldApplyStyle(WKBundleCSSStyleDeclarationRef style, WKBundleRangeHandleRef range)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks()) {
</del><ins>+ if (injectedBundle.testRunner()->shouldDumpEditingCallbacks()) {
</ins><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: shouldApplyStyle:");
</span><span class="cx"> stringBuilder.append(styleDecToStr(style));
</span><span class="cx"> stringBuilder.appendLiteral(" toElementsInDOMRange:");
</span><span class="cx"> stringBuilder.append(rangeToStr(m_page, m_world.get(), range));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><del>- return InjectedBundle::shared().testRunner()->shouldAllowEditing();
</del><ins>+ return injectedBundle.testRunner()->shouldAllowEditing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didBeginEditing(WKStringRef notificationName)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpEditingCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: webViewDidBeginEditing:");
</span><span class="cx"> stringBuilder.append(toWTFString(notificationName));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didEndEditing(WKStringRef notificationName)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpEditingCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: webViewDidEndEditing:");
</span><span class="cx"> stringBuilder.append(toWTFString(notificationName));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didChange(WKStringRef notificationName)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpEditingCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: webViewDidChange:");
</span><span class="cx"> stringBuilder.append(toWTFString(notificationName));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::didChangeSelection(WKStringRef notificationName)
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><del>- if (!InjectedBundle::shared().testRunner()->shouldDumpEditingCallbacks())
</del><ins>+ if (!injectedBundle.testRunner()->shouldDumpEditingCallbacks())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> StringBuilder stringBuilder;
</span><span class="cx"> stringBuilder.appendLiteral("EDITING DELEGATE: webViewDidChangeSelection:");
</span><span class="cx"> stringBuilder.append(toWTFString(notificationName));
</span><span class="cx"> stringBuilder.append('\n');
</span><del>- InjectedBundle::shared().outputText(stringBuilder.toString());
</del><ins>+ injectedBundle.outputText(stringBuilder.toString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> bool InjectedBundlePage::supportsFullScreen(WKBundlePageRef pageRef, WKFullScreenKeyboardRequestType requestType)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
- InjectedBundle::shared().outputText("supportsFullScreen() == true\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFullScreenCallbacks())
+ injectedBundle.outputText("supportsFullScreen() == true\n");
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::enterFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
- InjectedBundle::shared().outputText("enterFullScreenForElement()\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFullScreenCallbacks())
+ injectedBundle.outputText("enterFullScreenForElement()\n");
</ins><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
</del><ins>+ if (!injectedBundle.testRunner()->hasCustomFullScreenBehavior()) {
</ins><span class="cx"> WKBundlePageWillEnterFullScreen(pageRef);
</span><span class="cx"> WKBundlePageDidEnterFullScreen(pageRef);
</span><span class="cx"> }
</span><span class="lines">@@ -1757,10 +1799,11 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::exitFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
- InjectedBundle::shared().outputText("exitFullScreenForElement()\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFullScreenCallbacks())
+ injectedBundle.outputText("exitFullScreenForElement()\n");
</ins><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
</del><ins>+ if (!injectedBundle.testRunner()->hasCustomFullScreenBehavior()) {
</ins><span class="cx"> WKBundlePageWillExitFullScreen(pageRef);
</span><span class="cx"> WKBundlePageDidExitFullScreen(pageRef);
</span><span class="cx"> }
</span><span class="lines">@@ -1768,22 +1811,25 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::beganEnterFullScreen(WKBundlePageRef, WKRect, WKRect)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
- InjectedBundle::shared().outputText("beganEnterFullScreen()\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFullScreenCallbacks())
+ injectedBundle.outputText("beganEnterFullScreen()\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::beganExitFullScreen(WKBundlePageRef, WKRect, WKRect)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
- InjectedBundle::shared().outputText("beganExitFullScreen()\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFullScreenCallbacks())
+ injectedBundle.outputText("beganExitFullScreen()\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::closeFullScreen(WKBundlePageRef pageRef)
</span><span class="cx"> {
</span><del>- if (InjectedBundle::shared().testRunner()->shouldDumpFullScreenCallbacks())
- InjectedBundle::shared().outputText("closeFullScreen()\n");
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (injectedBundle.testRunner()->shouldDumpFullScreenCallbacks())
+ injectedBundle.outputText("closeFullScreen()\n");
</ins><span class="cx">
</span><del>- if (!InjectedBundle::shared().testRunner()->hasCustomFullScreenBehavior()) {
</del><ins>+ if (!injectedBundle.testRunner()->hasCustomFullScreenBehavior()) {
</ins><span class="cx"> WKBundlePageWillExitFullScreen(pageRef);
</span><span class="cx"> WKBundlePageDidExitFullScreen(pageRef);
</span><span class="cx"> }
</span><span class="lines">@@ -1892,23 +1938,24 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePage::frameDidChangeLocation(WKBundleFrameRef frame, bool shouldDump)
</span><span class="cx"> {
</span><del>- if (frame != InjectedBundle::shared().topLoadingFrame())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (frame != injectedBundle.topLoadingFrame())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- InjectedBundle::shared().setTopLoadingFrame(0);
</del><ins>+ injectedBundle.setTopLoadingFrame(nullptr);
</ins><span class="cx">
</span><del>- if (InjectedBundle::shared().testRunner()->waitToDump())
</del><ins>+ if (injectedBundle.testRunner()->waitToDump())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InjectedBundle::shared().shouldProcessWorkQueue()) {
- InjectedBundle::shared().processWorkQueue();
</del><ins>+ if (injectedBundle.shouldProcessWorkQueue()) {
+ injectedBundle.processWorkQueue();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldDump)
</span><del>- InjectedBundle::shared().page()->dump();
</del><ins>+ injectedBundle.page()->dump();
</ins><span class="cx"> else
</span><del>- InjectedBundle::shared().done();
</del><ins>+ injectedBundle.done();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::display()
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundlePageForceRepaint(page);
</span><span class="cx"> WKBundlePageSetTracksRepaints(page, true);
</span><span class="cx"> WKBundlePageResetTrackedRepaints(page);
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> m_policyDelegateEnabled = enabled;
</span><span class="cx"> m_policyDelegatePermissive = permissive;
</span><span class="cx">
</span><del>- InjectedBundle::shared().setCustomPolicyDelegate(enabled, permissive);
</del><ins>+ InjectedBundle::singleton().setCustomPolicyDelegate(enabled, permissive);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::waitForPolicyDelegate()
</span><span class="lines">@@ -141,24 +141,26 @@
</span><span class="cx"> void TestRunner::waitUntilDone()
</span><span class="cx"> {
</span><span class="cx"> m_waitToDump = true;
</span><del>- if (InjectedBundle::shared().useWaitToDumpWatchdogTimer())
</del><ins>+ if (InjectedBundle::singleton().useWaitToDumpWatchdogTimer())
</ins><span class="cx"> initializeWaitToDumpWatchdogTimerIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::waitToDumpWatchdogTimerFired()
</span><span class="cx"> {
</span><span class="cx"> invalidateWaitToDumpWatchdogTimer();
</span><del>- InjectedBundle::shared().outputText("FAIL: Timed out waiting for notifyDone to be called\n\n");
- InjectedBundle::shared().done();
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ injectedBundle.outputText("FAIL: Timed out waiting for notifyDone to be called\n\n");
+ injectedBundle.done();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::notifyDone()
</span><span class="cx"> {
</span><del>- if (!InjectedBundle::shared().isTestRunning())
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ if (!injectedBundle.isTestRunning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_waitToDump && !InjectedBundle::shared().topLoadingFrame())
- InjectedBundle::shared().page()->dump();
</del><ins>+ if (m_waitToDump && !injectedBundle.topLoadingFrame())
+ injectedBundle.page()->dump();
</ins><span class="cx">
</span><span class="cx"> // We don't call invalidateWaitToDumpWatchdogTimer() here, even if we continue to wait for a load to finish.
</span><span class="cx"> // The test is still subject to timeout checking - it is better to detect an async timeout inside WebKitTestRunner
</span><span class="lines">@@ -172,7 +174,8 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> sourceWK = toWK(source);
</span><span class="cx"> WKRetainPtr<WKBundleScriptWorldRef> scriptWorld(AdoptWK, WKBundleScriptWorldCreateWorld());
</span><span class="cx">
</span><del>- WKBundleAddUserScript(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), scriptWorld.get(), sourceWK.get(), 0, 0, 0,
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleAddUserScript(injectedBundle.bundle(), injectedBundle.pageGroup(), scriptWorld.get(), sourceWK.get(), 0, 0, 0,
</ins><span class="cx"> (runAtStart ? kWKInjectAtDocumentStart : kWKInjectAtDocumentEnd),
</span><span class="cx"> (allFrames ? kWKInjectInAllFrames : kWKInjectInTopFrameOnly));
</span><span class="cx"> }
</span><span class="lines">@@ -182,25 +185,27 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> sourceWK = toWK(source);
</span><span class="cx"> WKRetainPtr<WKBundleScriptWorldRef> scriptWorld(AdoptWK, WKBundleScriptWorldCreateWorld());
</span><span class="cx">
</span><del>- WKBundleAddUserStyleSheet(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), scriptWorld.get(), sourceWK.get(), 0, 0, 0,
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleAddUserStyleSheet(injectedBundle.bundle(), injectedBundle.pageGroup(), scriptWorld.get(), sourceWK.get(), 0, 0, 0,
</ins><span class="cx"> (allFrames ? kWKInjectInAllFrames : kWKInjectInTopFrameOnly));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::keepWebHistory()
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().postSetAddsVisitedLinks(true);
</del><ins>+ InjectedBundle::singleton().postSetAddsVisitedLinks(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::execCommand(JSStringRef name, JSStringRef argument)
</span><span class="cx"> {
</span><del>- WKBundlePageExecuteEditingCommand(InjectedBundle::shared().page()->page(), toWK(name).get(), toWK(argument).get());
</del><ins>+ WKBundlePageExecuteEditingCommand(InjectedBundle::singleton().page()->page(), toWK(name).get(), toWK(argument).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TestRunner::findString(JSStringRef target, JSValueRef optionsArrayAsValue)
</span><span class="cx"> {
</span><span class="cx"> WKFindOptions options = 0;
</span><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(injectedBundle.page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> JSRetainPtr<JSStringRef> lengthPropertyName(Adopt, JSStringCreateWithUTF8CString("length"));
</span><span class="cx"> JSObjectRef optionsArray = JSValueToObject(context, optionsArrayAsValue, 0);
</span><span class="lines">@@ -231,37 +236,37 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WKBundlePageFindString(InjectedBundle::shared().page()->page(), toWK(target).get(), options);
</del><ins>+ return WKBundlePageFindString(injectedBundle.page()->page(), toWK(target).get(), options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearAllDatabases()
</span><span class="cx"> {
</span><del>- WKBundleClearAllDatabases(InjectedBundle::shared().bundle());
</del><ins>+ WKBundleClearAllDatabases(InjectedBundle::singleton().bundle());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setDatabaseQuota(uint64_t quota)
</span><span class="cx"> {
</span><del>- return WKBundleSetDatabaseQuota(InjectedBundle::shared().bundle(), quota);
</del><ins>+ return WKBundleSetDatabaseQuota(InjectedBundle::singleton().bundle(), quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearAllApplicationCaches()
</span><span class="cx"> {
</span><del>- WKBundleClearApplicationCache(InjectedBundle::shared().bundle());
</del><ins>+ WKBundleClearApplicationCache(InjectedBundle::singleton().bundle());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearApplicationCacheForOrigin(JSStringRef origin)
</span><span class="cx"> {
</span><del>- WKBundleClearApplicationCacheForOrigin(InjectedBundle::shared().bundle(), toWK(origin).get());
</del><ins>+ WKBundleClearApplicationCacheForOrigin(InjectedBundle::singleton().bundle(), toWK(origin).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAppCacheMaximumSize(uint64_t size)
</span><span class="cx"> {
</span><del>- WKBundleSetAppCacheMaximumSize(InjectedBundle::shared().bundle(), size);
</del><ins>+ WKBundleSetAppCacheMaximumSize(InjectedBundle::singleton().bundle(), size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long long TestRunner::applicationCacheDiskUsageForOrigin(JSStringRef origin)
</span><span class="cx"> {
</span><del>- return WKBundleGetAppCacheUsageForOrigin(InjectedBundle::shared().bundle(), toWK(origin).get());
</del><ins>+ return WKBundleGetAppCacheUsageForOrigin(InjectedBundle::singleton().bundle(), toWK(origin).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::disallowIncreaseForApplicationCacheQuota()
</span><span class="lines">@@ -286,9 +291,10 @@
</span><span class="cx">
</span><span class="cx"> JSValueRef TestRunner::originsWithApplicationCache()
</span><span class="cx"> {
</span><del>- WKRetainPtr<WKArrayRef> origins(AdoptWK, WKBundleCopyOriginsWithApplicationCache(InjectedBundle::shared().bundle()));
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKRetainPtr<WKArrayRef> origins(AdoptWK, WKBundleCopyOriginsWithApplicationCache(injectedBundle.bundle()));
</ins><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(injectedBundle.page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> return stringArrayToJS(context, origins.get());
</span><span class="lines">@@ -296,7 +302,7 @@
</span><span class="cx">
</span><span class="cx"> bool TestRunner::isCommandEnabled(JSStringRef name)
</span><span class="cx"> {
</span><del>- return WKBundlePageIsEditingCommandEnabled(InjectedBundle::shared().page()->page(), toWK(name).get());
</del><ins>+ return WKBundlePageIsEditingCommandEnabled(InjectedBundle::singleton().page()->page(), toWK(name).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setCanOpenWindows(bool)
</span><span class="lines">@@ -308,58 +314,67 @@
</span><span class="cx"> void TestRunner::setXSSAuditorEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitXSSAuditorEnabled"));
</span><del>- WKBundleOverrideBoolPreferenceForTestRunner(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), key.get(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAllowUniversalAccessFromFileURLs(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetAllowUniversalAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetAllowUniversalAccessFromFileURLs(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAllowFileAccessFromFileURLs(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetAllowFileAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetAllowFileAccessFromFileURLs(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setPluginsEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetPluginsEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetPluginsEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setJavaScriptCanAccessClipboard(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetJavaScriptCanAccessClipboard(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetJavaScriptCanAccessClipboard(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setPrivateBrowsingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetPrivateBrowsingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetPrivateBrowsingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setPopupBlockingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetPopupBlockingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetPopupBlockingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAuthorAndUserStylesEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetAuthorAndUserStylesEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetAuthorAndUserStylesEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
</del><ins>+ WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- WKBundleRemoveOriginAccessWhitelistEntry(InjectedBundle::shared().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
</del><ins>+ WKBundleRemoveOriginAccessWhitelistEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TestRunner::isPageBoxVisible(int pageIndex)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
- return WKBundleIsPageBoxVisible(InjectedBundle::shared().bundle(), mainFrame, pageIndex);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(injectedBundle.page()->page());
+ return WKBundleIsPageBoxVisible(injectedBundle.bundle(), mainFrame, pageIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setValueForUser(JSContextRef context, JSValueRef element, JSStringRef value)
</span><span class="lines">@@ -373,21 +388,22 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAudioResult(JSContextRef context, JSValueRef data)
</span><span class="cx"> {
</span><ins>+ auto& injectedBundle = InjectedBundle::singleton();
</ins><span class="cx"> // FIXME (123058): Use a JSC API to get buffer contents once such is exposed.
</span><del>- WKRetainPtr<WKDataRef> audioData(AdoptWK, WKBundleCreateWKDataFromUInt8Array(InjectedBundle::shared().bundle(), context, data));
- InjectedBundle::shared().setAudioResult(audioData.get());
</del><ins>+ WKRetainPtr<WKDataRef> audioData(AdoptWK, WKBundleCreateWKDataFromUInt8Array(injectedBundle.bundle(), context, data));
+ injectedBundle.setAudioResult(audioData.get());
</ins><span class="cx"> m_whatToDump = Audio;
</span><span class="cx"> m_dumpPixels = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned TestRunner::windowCount()
</span><span class="cx"> {
</span><del>- return InjectedBundle::shared().pageCount();
</del><ins>+ return InjectedBundle::singleton().pageCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearBackForwardList()
</span><span class="cx"> {
</span><del>- WKBundleBackForwardListClear(WKBundlePageGetBackForwardList(InjectedBundle::shared().page()->page()));
</del><ins>+ WKBundleBackForwardListClear(WKBundlePageGetBackForwardList(InjectedBundle::singleton().page()->page()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Object Creation
</span><span class="lines">@@ -399,18 +415,18 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::showWebInspector()
</span><span class="cx"> {
</span><del>- WKBundleInspectorShow(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()));
</del><ins>+ WKBundleInspectorShow(WKBundlePageGetInspector(InjectedBundle::singleton().page()->page()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::closeWebInspector()
</span><span class="cx"> {
</span><del>- WKBundleInspectorClose(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()));
</del><ins>+ WKBundleInspectorClose(WKBundlePageGetInspector(InjectedBundle::singleton().page()->page()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::evaluateInWebInspector(JSStringRef script)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> scriptWK = toWK(script);
</span><del>- WKBundleInspectorEvaluateScriptForTest(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), scriptWK.get());
</del><ins>+ WKBundleInspectorEvaluateScriptForTest(WKBundlePageGetInspector(InjectedBundle::singleton().page()->page()), scriptWK.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef WTF::HashMap<unsigned, WKRetainPtr<WKBundleScriptWorldRef> > WorldMap;
</span><span class="lines">@@ -447,7 +463,7 @@
</span><span class="cx">
</span><span class="cx"> WKBundleFrameRef frame = WKBundleFrameForJavaScriptContext(context);
</span><span class="cx"> if (!frame)
</span><del>- frame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ frame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx">
</span><span class="cx"> JSGlobalContextRef jsContext = WKBundleFrameGetJavaScriptContextForWorld(frame, world.get());
</span><span class="cx"> JSEvaluateScript(jsContext, script, 0, 0, 0, 0);
</span><span class="lines">@@ -462,28 +478,28 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setTextDirection(JSStringRef direction)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> return WKBundleFrameSetTextDirection(mainFrame, toWK(direction).get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload(bool shouldStayOnPage)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().postNewBeforeUnloadReturnValue(!shouldStayOnPage);
</del><ins>+ InjectedBundle::singleton().postNewBeforeUnloadReturnValue(!shouldStayOnPage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setDefersLoading(bool shouldDeferLoading)
</span><span class="cx"> {
</span><del>- WKBundlePageSetDefersLoading(InjectedBundle::shared().page()->page(), shouldDeferLoading);
</del><ins>+ WKBundlePageSetDefersLoading(InjectedBundle::singleton().page()->page(), shouldDeferLoading);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setPageVisibility(JSStringRef state)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().setHidden(JSStringIsEqualToUTF8CString(state, "hidden") || JSStringIsEqualToUTF8CString(state, "prerender"));
</del><ins>+ InjectedBundle::singleton().setHidden(JSStringIsEqualToUTF8CString(state, "hidden") || JSStringIsEqualToUTF8CString(state, "prerender"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::resetPageVisibility()
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().setHidden(false);
</del><ins>+ InjectedBundle::singleton().setHidden(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef WTF::HashMap<unsigned, JSValueRef> CallbackMap;
</span><span class="lines">@@ -505,7 +521,7 @@
</span><span class="cx"> if (!callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> JSValueProtect(context, callback);
</span><span class="cx"> callbackMap().add(index, callback);
</span><span class="lines">@@ -515,7 +531,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!callbackMap().contains(index))
</span><span class="cx"> return;
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> JSObjectRef callback = JSValueToObject(context, callbackMap().take(index), 0);
</span><span class="cx"> JSObjectCallAsFunction(context, callback, JSContextGetGlobalObject(context), 0, 0, 0);
</span><span class="lines">@@ -525,30 +541,30 @@
</span><span class="cx"> void TestRunner::addChromeInputField(JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx"> cacheTestRunnerCallback(AddChromeInputFieldCallbackID, callback);
</span><del>- InjectedBundle::shared().postAddChromeInputField();
</del><ins>+ InjectedBundle::singleton().postAddChromeInputField();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::removeChromeInputField(JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx"> cacheTestRunnerCallback(RemoveChromeInputFieldCallbackID, callback);
</span><del>- InjectedBundle::shared().postRemoveChromeInputField();
</del><ins>+ InjectedBundle::singleton().postRemoveChromeInputField();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::focusWebView(JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx"> cacheTestRunnerCallback(FocusWebViewCallbackID, callback);
</span><del>- InjectedBundle::shared().postFocusWebView();
</del><ins>+ InjectedBundle::singleton().postFocusWebView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setBackingScaleFactor(double backingScaleFactor, JSValueRef callback)
</span><span class="cx"> {
</span><span class="cx"> cacheTestRunnerCallback(SetBackingScaleFactorCallbackID, callback);
</span><del>- InjectedBundle::shared().postSetBackingScaleFactor(backingScaleFactor);
</del><ins>+ InjectedBundle::singleton().postSetBackingScaleFactor(backingScaleFactor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setWindowIsKey(bool isKey)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().postSetWindowIsKey(isKey);
</del><ins>+ InjectedBundle::singleton().postSetWindowIsKey(isKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::callAddChromeInputFieldCallback()
</span><span class="lines">@@ -578,13 +594,14 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::overridePreference(JSStringRef preference, JSStringRef value)
</span><span class="cx"> {
</span><ins>+ auto& injectedBundle = InjectedBundle::singleton();
</ins><span class="cx"> // FIXME: handle non-boolean preferences.
</span><del>- WKBundleOverrideBoolPreferenceForTestRunner(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), toWK(preference).get(), toBool(value));
</del><ins>+ WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), toWK(preference).get(), toBool(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAlwaysAcceptCookies(bool accept)
</span><span class="cx"> {
</span><del>- WKBundleSetAlwaysAcceptCookies(InjectedBundle::shared().bundle(), accept);
</del><ins>+ WKBundleSetAlwaysAcceptCookies(InjectedBundle::singleton().bundle(), accept);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double TestRunner::preciseTime()
</span><span class="lines">@@ -598,7 +615,8 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> emptyUrl = adoptWK(WKStringCreateWithUTF8CString(""));
</span><span class="cx"> WKStringRef location = enabled ? m_userStyleSheetLocation.get() : emptyUrl.get();
</span><del>- WKBundleSetUserStyleSheetLocation(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), location);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetUserStyleSheetLocation(injectedBundle.bundle(), injectedBundle.pageGroup(), location);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setUserStyleSheetLocation(JSStringRef location)
</span><span class="lines">@@ -611,68 +629,76 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setSpatialNavigationEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetSpatialNavigationEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetSpatialNavigationEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setTabKeyCyclesThroughElements(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetTabKeyCyclesThroughElements(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetTabKeyCyclesThroughElements(injectedBundle.bundle(), injectedBundle.page()->page(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setSerializeHTTPLoads()
</span><span class="cx"> {
</span><del>- WKBundleSetSerialLoadingEnabled(InjectedBundle::shared().bundle(), true);
</del><ins>+ WKBundleSetSerialLoadingEnabled(InjectedBundle::singleton().bundle(), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::dispatchPendingLoadRequests()
</span><span class="cx"> {
</span><del>- WKBundleDispatchPendingLoadRequests(InjectedBundle::shared().bundle());
</del><ins>+ WKBundleDispatchPendingLoadRequests(InjectedBundle::singleton().bundle());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setCacheModel(int model)
</span><span class="cx"> {
</span><del>- WKBundleSetCacheModel(InjectedBundle::shared().bundle(), model);
</del><ins>+ WKBundleSetCacheModel(InjectedBundle::singleton().bundle(), model);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAsynchronousSpellCheckingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- WKBundleSetAsynchronousSpellCheckingEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetAsynchronousSpellCheckingEnabled(injectedBundle.bundle(), injectedBundle.pageGroup(), enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::grantWebNotificationPermission(JSStringRef origin)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> originWK = toWK(origin);
</span><del>- WKBundleSetWebNotificationPermission(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), originWK.get(), true);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetWebNotificationPermission(injectedBundle.bundle(), injectedBundle.page()->page(), originWK.get(), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::denyWebNotificationPermission(JSStringRef origin)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> originWK = toWK(origin);
</span><del>- WKBundleSetWebNotificationPermission(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), originWK.get(), false);
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleSetWebNotificationPermission(injectedBundle.bundle(), injectedBundle.page()->page(), originWK.get(), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::removeAllWebNotificationPermissions()
</span><span class="cx"> {
</span><del>- WKBundleRemoveAllWebNotificationPermissions(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page());
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleRemoveAllWebNotificationPermissions(injectedBundle.bundle(), injectedBundle.page()->page());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::simulateWebNotificationClick(JSValueRef notification)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(injectedBundle.page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><del>- uint64_t notificationID = WKBundleGetWebNotificationID(InjectedBundle::shared().bundle(), context, notification);
- InjectedBundle::shared().postSimulateWebNotificationClick(notificationID);
</del><ins>+ uint64_t notificationID = WKBundleGetWebNotificationID(injectedBundle.bundle(), context, notification);
+ injectedBundle.postSimulateWebNotificationClick(notificationID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setGeolocationPermission(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: this should be done by frame.
</span><del>- InjectedBundle::shared().setGeolocationPermission(enabled);
</del><ins>+ InjectedBundle::singleton().setGeolocationPermission(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setMockGeolocationPosition(double latitude, double longitude, double accuracy, JSValueRef jsAltitude, JSValueRef jsAltitudeAccuracy, JSValueRef jsHeading, JSValueRef jsSpeed)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(injectedBundle.page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> bool providesAltitude = false;
</span><span class="lines">@@ -703,44 +729,45 @@
</span><span class="cx"> speed = JSValueToNumber(context, jsSpeed, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InjectedBundle::shared().setMockGeolocationPosition(latitude, longitude, accuracy, providesAltitude, altitude, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed);
</del><ins>+ injectedBundle.setMockGeolocationPosition(latitude, longitude, accuracy, providesAltitude, altitude, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setMockGeolocationPositionUnavailableError(JSStringRef message)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageWK = toWK(message);
</span><del>- InjectedBundle::shared().setMockGeolocationPositionUnavailableError(messageWK.get());
</del><ins>+ InjectedBundle::singleton().setMockGeolocationPositionUnavailableError(messageWK.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setUserMediaPermission(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: this should be done by frame.
</span><del>- InjectedBundle::shared().setUserMediaPermission(enabled);
</del><ins>+ InjectedBundle::singleton().setUserMediaPermission(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TestRunner::callShouldCloseOnWebView()
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> return WKBundleFrameCallShouldCloseOnWebView(mainFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueBackNavigation(unsigned howFarBackward)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().queueBackNavigation(howFarBackward);
</del><ins>+ InjectedBundle::singleton().queueBackNavigation(howFarBackward);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueForwardNavigation(unsigned howFarForward)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().queueForwardNavigation(howFarForward);
</del><ins>+ InjectedBundle::singleton().queueForwardNavigation(howFarForward);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoad(JSStringRef url, JSStringRef target)
</span><span class="cx"> {
</span><del>- WKRetainPtr<WKURLRef> baseURLWK(AdoptWK, WKBundleFrameCopyURL(WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page())));
</del><ins>+ auto& injectedBundle = InjectedBundle::singleton();
+ WKRetainPtr<WKURLRef> baseURLWK(AdoptWK, WKBundleFrameCopyURL(WKBundlePageGetMainFrame(injectedBundle.page()->page())));
</ins><span class="cx"> WKRetainPtr<WKURLRef> urlWK(AdoptWK, WKURLCreateWithBaseURL(baseURLWK.get(), toWTFString(toWK(url)).utf8().data()));
</span><span class="cx"> WKRetainPtr<WKStringRef> urlStringWK(AdoptWK, WKURLCopyString(urlWK.get()));
</span><span class="cx">
</span><del>- InjectedBundle::shared().queueLoad(urlStringWK.get(), toWK(target).get());
</del><ins>+ injectedBundle.queueLoad(urlStringWK.get(), toWK(target).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoadHTMLString(JSStringRef content, JSStringRef baseURL, JSStringRef unreachableURL)
</span><span class="lines">@@ -749,45 +776,45 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> baseURLWK = baseURL ? toWK(baseURL) : WKRetainPtr<WKStringRef>();
</span><span class="cx"> WKRetainPtr<WKStringRef> unreachableURLWK = unreachableURL ? toWK(unreachableURL) : WKRetainPtr<WKStringRef>();
</span><span class="cx">
</span><del>- InjectedBundle::shared().queueLoadHTMLString(contentWK.get(), baseURLWK.get(), unreachableURLWK.get());
</del><ins>+ InjectedBundle::singleton().queueLoadHTMLString(contentWK.get(), baseURLWK.get(), unreachableURLWK.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueReload()
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().queueReload();
</del><ins>+ InjectedBundle::singleton().queueReload();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoadingScript(JSStringRef script)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> scriptWK = toWK(script);
</span><del>- InjectedBundle::shared().queueLoadingScript(scriptWK.get());
</del><ins>+ InjectedBundle::singleton().queueLoadingScript(scriptWK.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueNonLoadingScript(JSStringRef script)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> scriptWK = toWK(script);
</span><del>- InjectedBundle::shared().queueNonLoadingScript(scriptWK.get());
</del><ins>+ InjectedBundle::singleton().queueNonLoadingScript(scriptWK.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setHandlesAuthenticationChallenges(bool handlesAuthenticationChallenges)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetHandlesAuthenticationChallenge"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(handlesAuthenticationChallenges));
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), messageName.get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAuthenticationUsername(JSStringRef username)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetAuthenticationUsername"));
</span><span class="cx"> WKRetainPtr<WKStringRef> messageBody(AdoptWK, WKStringCreateWithJSString(username));
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), messageName.get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAuthenticationPassword(JSStringRef password)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetAuthenticationPassword"));
</span><span class="cx"> WKRetainPtr<WKStringRef> messageBody(AdoptWK, WKStringCreateWithJSString(password));
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), messageName.get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TestRunner::secureEventInputIsEnabled() const
</span><span class="lines">@@ -795,7 +822,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SecureEventInputIsEnabled"));
</span><span class="cx"> WKTypeRef returnData = 0;
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), messageName.get(), 0, &returnData);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), 0, &returnData);
</ins><span class="cx"> return WKBooleanGetValue(static_cast<WKBooleanRef>(returnData));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -803,19 +830,19 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetBlockAllPlugins"));
</span><span class="cx"> WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(shouldBlock));
</span><del>- WKBundlePostMessage(InjectedBundle::shared().bundle(), messageName.get(), messageBody.get());
</del><ins>+ WKBundlePostMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef TestRunner::numberOfDFGCompiles(JSValueRef theFunction)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> return JSC::numberOfDFGCompiles(context, theFunction);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef TestRunner::neverInlineFunction(JSValueRef theFunction)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> return JSC::setNeverInline(context, theFunction);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTextInputControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -59,22 +59,22 @@
</span><span class="cx">
</span><span class="cx"> void TextInputController::setMarkedText(JSStringRef text, int from, int length)
</span><span class="cx"> {
</span><del>- WKBundlePageSetComposition(InjectedBundle::shared().page()->page(), toWK(text).get(), from, length);
</del><ins>+ WKBundlePageSetComposition(InjectedBundle::singleton().page()->page(), toWK(text).get(), from, length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TextInputController::hasMarkedText()
</span><span class="cx"> {
</span><del>- return WKBundlePageHasComposition(InjectedBundle::shared().page()->page());
</del><ins>+ return WKBundlePageHasComposition(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextInputController::unmarkText()
</span><span class="cx"> {
</span><del>- WKBundlePageConfirmComposition(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundlePageConfirmComposition(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextInputController::insertText(JSStringRef text)
</span><span class="cx"> {
</span><del>- WKBundlePageConfirmCompositionWithText(InjectedBundle::shared().page()->page(), toWK(text).get());
</del><ins>+ WKBundlePageConfirmCompositionWithText(InjectedBundle::singleton().page()->page(), toWK(text).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef id)
</span><span class="cx"> {
</span><del>- AtkObject* root = ATK_OBJECT(WKAccessibilityRootObject(InjectedBundle::shared().page()->page()));
</del><ins>+ AtkObject* root = ATK_OBJECT(WKAccessibilityRootObject(InjectedBundle::singleton().page()->page()));
</ins><span class="cx"> if (!root)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> void* root = WKAccessibilityRootObject(page);
</span><span class="cx">
</span><span class="cx"> return AccessibilityUIElement::create(static_cast<AtkObject*>(root));
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement()
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> void* root = WKAccessibilityFocusedObject(page);
</span><span class="cx">
</span><span class="cx"> return AccessibilityUIElement::create(static_cast<AtkObject*>(root));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> #else
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> m_notificationFunctionCallback = notificationFunctionCallback;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> #else
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> void AccessibilityNotificationHandler::removeAccessibilityNotificationHandler()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> #else
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> unsigned id = atk_add_global_event_listener(axObjectEventListener, *signalName);
</span><span class="cx"> if (!id) {
</span><span class="cx"> String message = String::format("atk_add_global_event_listener failed for signal %s\n", *signalName);
</span><del>- InjectedBundle::shared().outputText(message);
</del><ins>+ InjectedBundle::singleton().outputText(message);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx">
</span><span class="cx"> static JSValueRef convertToJSObjectArray(const Vector<RefPtr<AccessibilityUIElement>>& children)
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> size_t elementCount = children.size();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlecocoaInjectedBundlePageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> if (!WKBundleFrameIsMainFrame(frame))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- setCrashReportApplicationSpecificInformationToURL(InjectedBundle::shared().testRunner()->testURL());
</del><ins>+ setCrashReportApplicationSpecificInformationToURL(InjectedBundle::singleton().testRunner()->testURL());
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WKBundlePageSetUseTestingViewportConfiguration(page(), true);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleeflTestRunnerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> static Eina_Bool waitToDumpWatchdogTimerCallback(void*)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
</del><ins>+ InjectedBundle::singleton().testRunner()->waitToDumpWatchdogTimerFired();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef idAttribute)
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> id root = static_cast<PlatformUIElement>(WKAccessibilityRootObject(page));
</span><span class="cx">
</span><span class="cx"> id result = findAccessibleObjectById(root, [NSString stringWithJSStringRef:idAttribute]);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef idAttribute)
</span><span class="cx"> {
</span><del>- WKBundlePageRef page = InjectedBundle::shared().page()->page();
</del><ins>+ WKBundlePageRef page = InjectedBundle::singleton().page()->page();
</ins><span class="cx"> id root = static_cast<PlatformUIElement>(WKAccessibilityRootObject(page));
</span><span class="cx">
</span><span class="cx"> id result = findAccessibleObjectById(root, [NSString stringWithJSStringRef:idAttribute]);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityNotificationHandlermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> {
</span><span class="cx"> [self stopObserving];
</span><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> JSValueUnprotect(context, m_notificationFunctionCallback);
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> if (!callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> if (m_notificationFunctionCallback)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> if (m_platformElement && m_platformElement != [notification object])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> JSRetainPtr<JSStringRef> jsNotification(Adopt, [notificationName createJSStringRef]);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> JSValueRef AccessibilityUIElement::rowHeaders() const
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> JSValueRef AccessibilityUIElement::columnHeaders() const
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> BEGIN_AX_OBJC_EXCEPTIONS
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx">
</span><span class="cx"> JSValueRef AccessibilityUIElement::uiElementArrayAttributeValue(JSStringRef attribute) const
</span><span class="cx"> {
</span><del>- WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
</del><ins>+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
</ins><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<AccessibilityUIElement>> elements;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> static void waitUntilDoneWatchdogTimerFired(CFRunLoopTimerRef timer, void* info)
</span><span class="cx"> {
</span><del>- InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
</del><ins>+ InjectedBundle::singleton().testRunner()->waitToDumpWatchdogTimerFired();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> static TestController* controller;
</span><span class="cx">
</span><del>-TestController& TestController::shared()
</del><ins>+TestController& TestController::singleton()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(controller);
</span><span class="cx"> return *controller;
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKFrameRef frame, const void*)
</span><span class="cx"> {
</span><span class="cx"> printf("CONFIRM NAVIGATION: %s\n", toSTD(message).c_str());
</span><del>- return TestController::shared().beforeUnloadReturnValue();
</del><ins>+ return TestController::singleton().beforeUnloadReturnValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::runModal(WKPageRef page, const void* clientInfo)
</span><span class="lines">@@ -183,12 +183,12 @@
</span><span class="cx">
</span><span class="cx"> static void decidePolicyForGeolocationPermissionRequest(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKGeolocationPermissionRequestRef permissionRequest, const void* clientInfo)
</span><span class="cx"> {
</span><del>- TestController::shared().handleGeolocationPermissionRequest(permissionRequest);
</del><ins>+ TestController::singleton().handleGeolocationPermissionRequest(permissionRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void decidePolicyForUserMediaPermissionRequest(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKUserMediaPermissionRequestRef permissionRequest, const void* clientInfo)
</span><span class="cx"> {
</span><del>- TestController::shared().handleUserMediaPermissionRequest(permissionRequest);
</del><ins>+ TestController::singleton().handleUserMediaPermissionRequest(permissionRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPageRef TestController::createOtherPage(WKPageRef oldPage, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void* clientInfo)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> WKPageSetPageUIClient(newPage, &otherPageUIClient.base);
</span><span class="cx">
</span><span class="cx"> WKPageLoaderClientV5 pageLoaderClient = {
</span><del>- { 5, &TestController::shared() },
</del><ins>+ { 5, &TestController::singleton() },
</ins><span class="cx"> 0, // didStartProvisionalLoadForFrame
</span><span class="cx"> 0, // didReceiveServerRedirectForProvisionalLoadForFrame
</span><span class="cx"> 0, // didFailProvisionalLoadWithErrorForFrame
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> WKPageSetPageLoaderClient(view->page(), &pageLoaderClient.base);
</span><span class="cx">
</span><span class="cx"> WKPagePolicyClientV1 pagePolicyClient = {
</span><del>- { 1, &TestController::shared() },
</del><ins>+ { 1, &TestController::singleton() },
</ins><span class="cx"> 0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
</span><span class="cx"> 0, // decidePolicyForNewWindowAction
</span><span class="cx"> 0, // decidePolicyForResponse_deprecatedForUseWithV0
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">
</span><span class="cx"> view->didInitializeClients();
</span><span class="cx">
</span><del>- TestController::shared().updateWindowScaleForTest(view, *TestController::shared().m_currentInvocation);
</del><ins>+ TestController::singleton().updateWindowScaleForTest(view, *TestController::singleton().m_currentInvocation);
</ins><span class="cx">
</span><span class="cx"> WKRetain(newPage);
</span><span class="cx"> return newPage;
</span><span class="lines">@@ -674,11 +674,11 @@
</span><span class="cx"> WKRetainPtr<WKBooleanRef> shouldGCValue = adoptWK(WKBooleanCreate(m_gcBetweenTests));
</span><span class="cx"> WKDictionarySetItem(resetMessageBody.get(), shouldGCKey.get(), shouldGCValue.get());
</span><span class="cx">
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), resetMessageBody.get());
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), resetMessageBody.get());
</ins><span class="cx">
</span><del>- WKContextSetShouldUseFontSmoothing(TestController::shared().context(), false);
</del><ins>+ WKContextSetShouldUseFontSmoothing(TestController::singleton().context(), false);
</ins><span class="cx">
</span><del>- WKContextSetCacheModel(TestController::shared().context(), kWKCacheModelDocumentBrowser);
</del><ins>+ WKContextSetCacheModel(TestController::singleton().context(), kWKCacheModelDocumentBrowser);
</ins><span class="cx">
</span><span class="cx"> // FIXME: This function should also ensure that there is only one page open.
</span><span class="cx">
</span><span class="lines">@@ -1342,7 +1342,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_doneResetting = true;
</span><del>- shared().notifyDone();
</del><ins>+ singleton().notifyDone();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::didReceiveAuthenticationChallengeInFrame(WKPageRef page, WKFrameRef frame, WKAuthenticationChallengeRef authenticationChallenge)
</span><span class="lines">@@ -1475,7 +1475,7 @@
</span><span class="cx">
</span><span class="cx"> void TestController::decidePolicyForNotificationPermissionRequest(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef request, const void*)
</span><span class="cx"> {
</span><del>- TestController::shared().decidePolicyForNotificationPermissionRequest(page, origin, request);
</del><ins>+ TestController::singleton().decidePolicyForNotificationPermissionRequest(page, origin, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::decidePolicyForNotificationPermissionRequest(WKPageRef, WKSecurityOriginRef, WKNotificationPermissionRequestRef request)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> // FIXME: Rename this TestRunner?
</span><span class="cx"> class TestController {
</span><span class="cx"> public:
</span><del>- static TestController& shared();
</del><ins>+ static TestController& singleton();
</ins><span class="cx">
</span><span class="cx"> static const unsigned viewWidth;
</span><span class="cx"> static const unsigned viewHeight;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -129,13 +129,13 @@
</span><span class="cx">
</span><span class="cx"> void TestInvocation::invoke()
</span><span class="cx"> {
</span><del>- TestController::shared().configureViewForTest(*this);
</del><ins>+ TestController::singleton().configureViewForTest(*this);
</ins><span class="cx">
</span><del>- WKPageSetAddsVisitedLinks(TestController::shared().mainWebView()->page(), false);
</del><ins>+ WKPageSetAddsVisitedLinks(TestController::singleton().mainWebView()->page(), false);
</ins><span class="cx">
</span><span class="cx"> m_textOutput.clear();
</span><span class="cx">
</span><del>- TestController::shared().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks(m_pathOrURL.c_str()));
</del><ins>+ TestController::singleton().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks(m_pathOrURL.c_str()));
</ins><span class="cx">
</span><span class="cx"> // FIXME: We should clear out visited links here.
</span><span class="cx">
</span><span class="lines">@@ -151,16 +151,16 @@
</span><span class="cx"> WKDictionarySetItem(beginTestMessageBody.get(), dumpPixelsKey.get(), dumpPixelsValue.get());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> useWaitToDumpWatchdogTimerKey = adoptWK(WKStringCreateWithUTF8CString("UseWaitToDumpWatchdogTimer"));
</span><del>- WKRetainPtr<WKBooleanRef> useWaitToDumpWatchdogTimerValue = adoptWK(WKBooleanCreate(TestController::shared().useWaitToDumpWatchdogTimer()));
</del><ins>+ WKRetainPtr<WKBooleanRef> useWaitToDumpWatchdogTimerValue = adoptWK(WKBooleanCreate(TestController::singleton().useWaitToDumpWatchdogTimer()));
</ins><span class="cx"> WKDictionarySetItem(beginTestMessageBody.get(), useWaitToDumpWatchdogTimerKey.get(), useWaitToDumpWatchdogTimerValue.get());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> timeoutKey = adoptWK(WKStringCreateWithUTF8CString("Timeout"));
</span><span class="cx"> WKRetainPtr<WKUInt64Ref> timeoutValue = adoptWK(WKUInt64Create(m_timeout));
</span><span class="cx"> WKDictionarySetItem(beginTestMessageBody.get(), timeoutKey.get(), timeoutValue.get());
</span><span class="cx">
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), beginTestMessageBody.get());
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), beginTestMessageBody.get());
</ins><span class="cx">
</span><del>- TestController::shared().runUntil(m_gotInitialResponse, TestController::shortTimeout);
</del><ins>+ TestController::singleton().runUntil(m_gotInitialResponse, TestController::shortTimeout);
</ins><span class="cx"> if (!m_gotInitialResponse) {
</span><span class="cx"> m_errorMessage = "Timed out waiting for initial response from web process\n";
</span><span class="cx"> m_webProcessIsUnresponsive = true;
</span><span class="lines">@@ -169,9 +169,9 @@
</span><span class="cx"> if (m_error)
</span><span class="cx"> goto end;
</span><span class="cx">
</span><del>- WKPageLoadURL(TestController::shared().mainWebView()->page(), m_url.get());
</del><ins>+ WKPageLoadURL(TestController::singleton().mainWebView()->page(), m_url.get());
</ins><span class="cx">
</span><del>- TestController::shared().runUntil(m_gotFinalMessage, TestController::noTimeout);
</del><ins>+ TestController::singleton().runUntil(m_gotFinalMessage, TestController::noTimeout);
</ins><span class="cx"> if (m_error)
</span><span class="cx"> goto end;
</span><span class="cx">
</span><span class="lines">@@ -180,17 +180,17 @@
</span><span class="cx"> end:
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (m_gotInitialResponse)
</span><del>- WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
</del><ins>+ WKInspectorClose(WKPageGetInspector(TestController::singleton().mainWebView()->page()));
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> if (m_webProcessIsUnresponsive)
</span><span class="cx"> dumpWebProcessUnresponsiveness();
</span><del>- else if (!TestController::shared().resetStateToConsistentValues()) {
</del><ins>+ else if (!TestController::singleton().resetStateToConsistentValues()) {
</ins><span class="cx"> // The process froze while loading about:blank, let's start a fresh one.
</span><span class="cx"> // It would be nice to report that the previous test froze after dumping results, but we have no way to do that.
</span><del>- TestController::shared().terminateWebContentProcess();
</del><ins>+ TestController::singleton().terminateWebContentProcess();
</ins><span class="cx"> // Make sure that we have a process, as invoke() will need one to send bundle messages for the next test.
</span><del>- TestController::shared().reattachPageToWebProcess();
</del><ins>+ TestController::singleton().reattachPageToWebProcess();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> {
</span><span class="cx"> char errorMessageToStderr[1024];
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- pid_t pid = WKPageGetProcessIdentifier(TestController::shared().mainWebView()->page());
</del><ins>+ pid_t pid = WKPageGetProcessIdentifier(TestController::singleton().mainWebView()->page());
</ins><span class="cx"> sprintf(errorMessageToStderr, "#PROCESS UNRESPONSIVE - %s (pid %ld)\n", TestController::webProcessName(), static_cast<long>(pid));
</span><span class="cx"> #else
</span><span class="cx"> sprintf(errorMessageToStderr, "#PROCESS UNRESPONSIVE - %s", TestController::webProcessName());
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> {
</span><span class="cx"> TestInvocation* testInvocation = static_cast<TestInvocation*>(context);
</span><span class="cx"> testInvocation->m_gotRepaint = true;
</span><del>- TestController::shared().notifyDone();
</del><ins>+ TestController::singleton().notifyDone();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestInvocation::dumpResults()
</span><span class="lines">@@ -245,8 +245,8 @@
</span><span class="cx"> if (m_dumpPixels && m_pixelResult) {
</span><span class="cx"> if (PlatformWebView::windowSnapshotEnabled()) {
</span><span class="cx"> m_gotRepaint = false;
</span><del>- WKPageForceRepaint(TestController::shared().mainWebView()->page(), this, TestInvocation::forceRepaintDoneCallback);
- TestController::shared().runUntil(m_gotRepaint, TestController::shortTimeout);
</del><ins>+ WKPageForceRepaint(TestController::singleton().mainWebView()->page(), this, TestInvocation::forceRepaintDoneCallback);
+ TestController::singleton().runUntil(m_gotRepaint, TestController::shortTimeout);
</ins><span class="cx"> if (!m_gotRepaint) {
</span><span class="cx"> m_errorMessage = "Timed out waiting for pre-pixel dump repaint\n";
</span><span class="cx"> m_webProcessIsUnresponsive = true;
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> m_gotFinalMessage = true;
</span><span class="cx"> m_error = true;
</span><span class="cx"> m_errorMessage = "FAIL\n";
</span><del>- TestController::shared().notifyDone();
</del><ins>+ TestController::singleton().notifyDone();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> WKStringRef messageBodyString = static_cast<WKStringRef>(messageBody);
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageBodyString, "BeginTest")) {
</span><span class="cx"> m_gotInitialResponse = true;
</span><del>- TestController::shared().notifyDone();
</del><ins>+ TestController::singleton().notifyDone();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> m_audioResult = static_cast<WKDataRef>(WKDictionaryGetItemForKey(messageBodyDictionary, audioResultKey.get()));
</span><span class="cx">
</span><span class="cx"> m_gotFinalMessage = true;
</span><del>- TestController::shared().notifyDone();
</del><ins>+ TestController::singleton().notifyDone();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -345,59 +345,59 @@
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "BeforeUnloadReturnValue")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef beforeUnloadReturnValue = static_cast<WKBooleanRef>(messageBody);
</span><del>- TestController::shared().setBeforeUnloadReturnValue(WKBooleanGetValue(beforeUnloadReturnValue));
</del><ins>+ TestController::singleton().setBeforeUnloadReturnValue(WKBooleanGetValue(beforeUnloadReturnValue));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "AddChromeInputField")) {
</span><del>- TestController::shared().mainWebView()->addChromeInputField();
</del><ins>+ TestController::singleton().mainWebView()->addChromeInputField();
</ins><span class="cx"> WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("CallAddChromeInputFieldCallback"));
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "RemoveChromeInputField")) {
</span><del>- TestController::shared().mainWebView()->removeChromeInputField();
</del><ins>+ TestController::singleton().mainWebView()->removeChromeInputField();
</ins><span class="cx"> WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("CallRemoveChromeInputFieldCallback"));
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "FocusWebView")) {
</span><del>- TestController::shared().mainWebView()->makeWebViewFirstResponder();
</del><ins>+ TestController::singleton().mainWebView()->makeWebViewFirstResponder();
</ins><span class="cx"> WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("CallFocusWebViewCallback"));
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetBackingScaleFactor")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKDoubleGetTypeID());
</span><span class="cx"> double backingScaleFactor = WKDoubleGetValue(static_cast<WKDoubleRef>(messageBody));
</span><del>- WKPageSetCustomBackingScaleFactor(TestController::shared().mainWebView()->page(), backingScaleFactor);
</del><ins>+ WKPageSetCustomBackingScaleFactor(TestController::singleton().mainWebView()->page(), backingScaleFactor);
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("CallSetBackingScaleFactorCallback"));
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), 0);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SimulateWebNotificationClick")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKUInt64GetTypeID());
</span><span class="cx"> uint64_t notificationID = WKUInt64GetValue(static_cast<WKUInt64Ref>(messageBody));
</span><del>- TestController::shared().simulateWebNotificationClick(notificationID);
</del><ins>+ TestController::singleton().simulateWebNotificationClick(notificationID);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetAddsVisitedLinks")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef enabledWK = static_cast<WKBooleanRef>(messageBody);
</span><del>- WKPageSetAddsVisitedLinks(TestController::shared().mainWebView()->page(), WKBooleanGetValue(enabledWK));
</del><ins>+ WKPageSetAddsVisitedLinks(TestController::singleton().mainWebView()->page(), WKBooleanGetValue(enabledWK));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetGeolocationPermission")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef enabledWK = static_cast<WKBooleanRef>(messageBody);
</span><del>- TestController::shared().setGeolocationPermission(WKBooleanGetValue(enabledWK));
</del><ins>+ TestController::singleton().setGeolocationPermission(WKBooleanGetValue(enabledWK));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -449,21 +449,21 @@
</span><span class="cx"> WKDoubleRef speedWK = static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, speedKeyWK.get()));
</span><span class="cx"> double speed = WKDoubleGetValue(speedWK);
</span><span class="cx">
</span><del>- TestController::shared().setMockGeolocationPosition(latitude, longitude, accuracy, providesAltitude, altitude, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed);
</del><ins>+ TestController::singleton().setMockGeolocationPosition(latitude, longitude, accuracy, providesAltitude, altitude, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetMockGeolocationPositionUnavailableError")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
</span><span class="cx"> WKStringRef errorMessage = static_cast<WKStringRef>(messageBody);
</span><del>- TestController::shared().setMockGeolocationPositionUnavailableError(errorMessage);
</del><ins>+ TestController::singleton().setMockGeolocationPositionUnavailableError(errorMessage);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetUserMediaPermission")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef enabledWK = static_cast<WKBooleanRef>(messageBody);
</span><del>- TestController::shared().setUserMediaPermission(WKBooleanGetValue(enabledWK));
</del><ins>+ TestController::singleton().setUserMediaPermission(WKBooleanGetValue(enabledWK));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> WKBooleanRef permissiveWK = static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(messageBodyDictionary, permissiveKeyWK.get()));
</span><span class="cx"> bool permissive = WKBooleanGetValue(permissiveWK);
</span><span class="cx">
</span><del>- TestController::shared().setCustomPolicyDelegate(enabled, permissive);
</del><ins>+ TestController::singleton().setCustomPolicyDelegate(enabled, permissive);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -491,14 +491,14 @@
</span><span class="cx"> WKBooleanRef hiddenWK = static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(messageBodyDictionary, isInitialKeyWK.get()));
</span><span class="cx"> bool hidden = WKBooleanGetValue(hiddenWK);
</span><span class="cx">
</span><del>- TestController::shared().setHidden(hidden);
</del><ins>+ TestController::singleton().setHidden(hidden);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "ProcessWorkQueue")) {
</span><del>- if (TestController::shared().workQueueManager().processWorkQueue()) {
</del><ins>+ if (TestController::singleton().workQueueManager().processWorkQueue()) {
</ins><span class="cx"> WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("WorkQueueProcessedCallback"));
</span><del>- WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
</del><ins>+ WKContextPostMessageToInjectedBundle(TestController::singleton().context(), messageName.get(), 0);
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -506,14 +506,14 @@
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "QueueBackNavigation")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKUInt64GetTypeID());
</span><span class="cx"> uint64_t stepCount = WKUInt64GetValue(static_cast<WKUInt64Ref>(messageBody));
</span><del>- TestController::shared().workQueueManager().queueBackNavigation(stepCount);
</del><ins>+ TestController::singleton().workQueueManager().queueBackNavigation(stepCount);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "QueueForwardNavigation")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKUInt64GetTypeID());
</span><span class="cx"> uint64_t stepCount = WKUInt64GetValue(static_cast<WKUInt64Ref>(messageBody));
</span><del>- TestController::shared().workQueueManager().queueForwardNavigation(stepCount);
</del><ins>+ TestController::singleton().workQueueManager().queueForwardNavigation(stepCount);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> targetKey(AdoptWK, WKStringCreateWithUTF8CString("target"));
</span><span class="cx"> WKStringRef targetWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(loadDataDictionary, targetKey.get()));
</span><span class="cx">
</span><del>- TestController::shared().workQueueManager().queueLoad(toWTFString(urlWK), toWTFString(targetWK));
</del><ins>+ TestController::singleton().workQueueManager().queueLoad(toWTFString(urlWK), toWTFString(targetWK));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -544,54 +544,54 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> unreachableURLKey(AdoptWK, WKStringCreateWithUTF8CString("unreachableURL"));
</span><span class="cx"> WKStringRef unreachableURLWK = static_cast<WKStringRef>(WKDictionaryGetItemForKey(loadDataDictionary, unreachableURLKey.get()));
</span><span class="cx">
</span><del>- TestController::shared().workQueueManager().queueLoadHTMLString(toWTFString(contentWK), baseURLWK ? toWTFString(baseURLWK) : String(), unreachableURLWK ? toWTFString(unreachableURLWK) : String());
</del><ins>+ TestController::singleton().workQueueManager().queueLoadHTMLString(toWTFString(contentWK), baseURLWK ? toWTFString(baseURLWK) : String(), unreachableURLWK ? toWTFString(unreachableURLWK) : String());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "QueueReload")) {
</span><del>- TestController::shared().workQueueManager().queueReload();
</del><ins>+ TestController::singleton().workQueueManager().queueReload();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "QueueLoadingScript")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
</span><span class="cx"> WKStringRef script = static_cast<WKStringRef>(messageBody);
</span><del>- TestController::shared().workQueueManager().queueLoadingScript(toWTFString(script));
</del><ins>+ TestController::singleton().workQueueManager().queueLoadingScript(toWTFString(script));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "QueueNonLoadingScript")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
</span><span class="cx"> WKStringRef script = static_cast<WKStringRef>(messageBody);
</span><del>- TestController::shared().workQueueManager().queueNonLoadingScript(toWTFString(script));
</del><ins>+ TestController::singleton().workQueueManager().queueNonLoadingScript(toWTFString(script));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetHandlesAuthenticationChallenge")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef value = static_cast<WKBooleanRef>(messageBody);
</span><del>- TestController::shared().setHandlesAuthenticationChallenges(WKBooleanGetValue(value));
</del><ins>+ TestController::singleton().setHandlesAuthenticationChallenges(WKBooleanGetValue(value));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetAuthenticationUsername")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
</span><span class="cx"> WKStringRef username = static_cast<WKStringRef>(messageBody);
</span><del>- TestController::shared().setAuthenticationUsername(toWTFString(username));
</del><ins>+ TestController::singleton().setAuthenticationUsername(toWTFString(username));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetAuthenticationPassword")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
</span><span class="cx"> WKStringRef password = static_cast<WKStringRef>(messageBody);
</span><del>- TestController::shared().setAuthenticationPassword(toWTFString(password));
</del><ins>+ TestController::singleton().setAuthenticationPassword(toWTFString(password));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetBlockAllPlugins")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef shouldBlock = static_cast<WKBooleanRef>(messageBody);
</span><del>- TestController::shared().setBlockAllPlugins(WKBooleanGetValue(shouldBlock));
</del><ins>+ TestController::singleton().setBlockAllPlugins(WKBooleanGetValue(shouldBlock));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -603,12 +603,12 @@
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetWindowIsKey")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef isKeyValue = static_cast<WKBooleanRef>(messageBody);
</span><del>- TestController::shared().mainWebView()->setWindowIsKey(WKBooleanGetValue(isKeyValue));
</del><ins>+ TestController::singleton().mainWebView()->setWindowIsKey(WKBooleanGetValue(isKeyValue));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "IsWorkQueueEmpty")) {
</span><del>- bool isEmpty = TestController::shared().workQueueManager().isWorkQueueEmpty();
</del><ins>+ bool isEmpty = TestController::singleton().workQueueManager().isWorkQueueEmpty();
</ins><span class="cx"> WKRetainPtr<WKTypeRef> result(AdoptWK, WKBooleanCreate(isEmpty));
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerWorkQueueManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> static inline WKPageRef mainPage()
</span><span class="cx"> {
</span><del>- return TestController::shared().mainWebView()->page();
</del><ins>+ return TestController::singleton().mainWebView()->page();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool goToItemAtIndex(int index)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnercairoTestInvocationCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(EFL) || PLATFORM(GTK)
</span><span class="cx"> UNUSED_PARAM(wkImage);
</span><del>- cairo_surface_t* surface = WKImageCreateCairoSurface(TestController::shared().mainWebView()->windowSnapshotImage().get());
</del><ins>+ cairo_surface_t* surface = WKImageCreateCairoSurface(TestController::singleton().mainWebView()->windowSnapshotImage().get());
</ins><span class="cx"> #else
</span><span class="cx"> cairo_surface_t* surface = WKImageCreateCairoSurface(wkImage);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnercgTestInvocationCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef image, WKArrayRef repaintRects)
</span><span class="cx"> {
</span><del>- PlatformWebView* webView = TestController::shared().mainWebView();
</del><ins>+ PlatformWebView* webView = TestController::singleton().mainWebView();
</ins><span class="cx"> WKRetainPtr<WKImageRef> windowSnapshot = webView->windowSnapshotImage();
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGContextRef> context;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacWebKitTestRunnerDraggingInfomm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSWindow *)draggingDestinationWindow
</span><span class="cx"> {
</span><del>- return [TestController::shared().mainWebView()->platformView() window];
</del><ins>+ return [TestController::singleton().mainWebView()->platformView() window];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSDragOperation)draggingSourceOperationMask
</span><span class="lines">@@ -69,13 +69,13 @@
</span><span class="cx">
</span><span class="cx"> - (NSPoint)draggingLocation
</span><span class="cx"> {
</span><del>- WKPoint location = TestController::shared().eventSenderProxy()->position();
</del><ins>+ WKPoint location = TestController::singleton().eventSenderProxy()->position();
</ins><span class="cx"> return NSMakePoint(location.x, location.y);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSPoint)draggedImageLocation
</span><span class="cx"> {
</span><del>- WKPoint location = TestController::shared().eventSenderProxy()->position();
</del><ins>+ WKPoint location = TestController::singleton().eventSenderProxy()->position();
</ins><span class="cx"> return NSMakePoint(location.x + _offset.width, location.y + _offset.height);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacWebKitTestRunnerEventmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerEvent.mm (179408 => 179409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerEvent.mm 2015-01-30 20:46:00 UTC (rev 179408)
+++ trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerEvent.mm 2015-01-30 20:49:33 UTC (rev 179409)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx">
</span><span class="cx"> + (NSPoint)mouseLocation
</span><span class="cx"> {
</span><del>- WKPoint location = TestController::shared().eventSenderProxy()->position();
- return [TestController::shared().mainWebView()->platformWindow() convertBaseToScreen:NSMakePoint(location.x, location.y)];
</del><ins>+ WKPoint location = TestController::singleton().eventSenderProxy()->position();
+ return [TestController::singleton().mainWebView()->platformWindow() convertBaseToScreen:NSMakePoint(location.x, location.y)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>