<!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>[164968] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164968">164968</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-03-02 21:10:15 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSDOMWindow::commonVM() should return a reference.
<https://webkit.org/b/129293>
Source/JavaScriptCore:
Added a DropAllLocks constructor that takes VM& without null checks.
Reviewed by Geoff Garen.
Source/WebCore:
Since this function always returns a VM and never null, make it
return a reference instead. There are more VM getters that never
return null, but I tried to keep the patch from snowballing.
Reviewed by Geoff Garen.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockh">trunk/Source/JavaScriptCore/runtime/JSLock.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDOMWrapperWorldcpp">trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDOMWrapperWorldh">trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllercpp">trunk/Source/WebCore/bindings/js/GCController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBaseh">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowShellcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventListenerh">trunk/Source/WebCore/bindings/js/JSEventListener.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsPageScriptDebugServercpp">trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScheduledActionh">trunk/Source/WebCore/bindings/js/ScheduledAction.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSClientDatah">trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h</a></li>
<li><a href="#trunkSourceWebCoredomCollectionIndexCachecpp">trunk/Source/WebCore/dom/CollectionIndexCache.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageLoadercpp">trunk/Source/WebCore/html/HTMLImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgentcpp">trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgenth">trunk/Source/WebCore/inspector/PageRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoretestingMemoryInfoh">trunk/Source/WebCore/testing/MemoryInfo.h</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportDumpRenderTreeSupportEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCoreStatisticsmm">trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedProxyInstancemm">trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreStatisticscpp">trunk/Source/WebKit/win/WebCoreStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebJavaScriptCollectorcpp">trunk/Source/WebKit/win/WebJavaScriptCollector.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedlinuxWebMemorySamplerLinuxcpp">trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebMemorySamplermacmm">trunk/Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-25 Andreas Kling <akling@apple.com>
+
+ JSDOMWindow::commonVM() should return a reference.
+ <https://webkit.org/b/129293>
+
+ Added a DropAllLocks constructor that takes VM& without null checks.
+
+ Reviewed by Geoff Garen.
+
</ins><span class="cx"> 2014-03-02 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CodeBlock::hasDebuggerRequests() should returning a bool instead of an int.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -84,11 +84,11 @@
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType::Enum* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>& range)
</span><span class="cx"> {
</span><del>- VM* vm = globalVM();
</del><ins>+ VM& vm = globalVM();
</ins><span class="cx"> JSLockHolder lock(vm);
</span><span class="cx">
</span><span class="cx"> ParserError error;
</span><del>- checkSyntax(*vm, JSC::makeSource(expression), error);
</del><ins>+ checkSyntax(vm, JSC::makeSource(expression), error);
</ins><span class="cx">
</span><span class="cx"> switch (error.m_syntaxErrorType) {
</span><span class="cx"> case ParserError::SyntaxErrorNone:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
</span><span class="cx">
</span><del>- virtual JSC::VM* globalVM() = 0;
</del><ins>+ virtual JSC::VM& globalVM() = 0;
</ins><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void muteConsole() = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-VM* JSGlobalObjectRuntimeAgent::globalVM()
</del><ins>+VM& JSGlobalObjectRuntimeAgent::globalVM()
</ins><span class="cx"> {
</span><del>- return &m_globalObject.vm();
</del><ins>+ return m_globalObject.vm();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript JSGlobalObjectRuntimeAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual JSC::VM* globalVM() override;
</del><ins>+ virtual JSC::VM& globalVM() override;
</ins><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</span><span class="cx">
</span><span class="cx"> // FIXME: JavaScript inspector does not yet have a console object to mute.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -246,6 +246,14 @@
</span><span class="cx"> m_droppedLockCount = m_vm->apiLock().dropAllLocks(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSLock::DropAllLocks::DropAllLocks(VM& vm)
+ : m_droppedLockCount(0)
+ , m_vm(&vm)
+{
+ RELEASE_ASSERT(!m_vm->isCollectorBusy());
+ m_droppedLockCount = m_vm->apiLock().dropAllLocks(this);
+}
+
</ins><span class="cx"> JSLock::DropAllLocks::~DropAllLocks()
</span><span class="cx"> {
</span><span class="cx"> if (!m_vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> public:
</span><span class="cx"> JS_EXPORT_PRIVATE DropAllLocks(ExecState*);
</span><span class="cx"> JS_EXPORT_PRIVATE DropAllLocks(VM*);
</span><ins>+ JS_EXPORT_PRIVATE DropAllLocks(VM&);
</ins><span class="cx"> JS_EXPORT_PRIVATE ~DropAllLocks();
</span><span class="cx">
</span><span class="cx"> void setDropDepth(unsigned depth) { m_dropDepth = depth; }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-25 Andreas Kling <akling@apple.com>
+
+ JSDOMWindow::commonVM() should return a reference.
+ <https://webkit.org/b/129293>
+
+ Since this function always returns a VM and never null, make it
+ return a reference instead. There are more VM getters that never
+ return null, but I tried to keep the patch from snowballing.
+
+ Reviewed by Geoff Garen.
+
</ins><span class="cx"> 2014-03-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ASSERT in ~IDBRequest since it is firing during legitimate uses in Web Inspector.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDOMWrapperWorldcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -30,18 +30,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DOMWrapperWorld::DOMWrapperWorld(JSC::VM* vm, bool isNormal)
</del><ins>+DOMWrapperWorld::DOMWrapperWorld(JSC::VM& vm, bool isNormal)
</ins><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_isNormal(isNormal)
</span><span class="cx"> {
</span><del>- VM::ClientData* clientData = m_vm->clientData;
</del><ins>+ VM::ClientData* clientData = m_vm.clientData;
</ins><span class="cx"> ASSERT(clientData);
</span><span class="cx"> static_cast<WebCoreJSClientData*>(clientData)->rememberWorld(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMWrapperWorld::~DOMWrapperWorld()
</span><span class="cx"> {
</span><del>- VM::ClientData* clientData = m_vm->clientData;
</del><ins>+ VM::ClientData* clientData = m_vm.clientData;
</ins><span class="cx"> ASSERT(clientData);
</span><span class="cx"> static_cast<WebCoreJSClientData*>(clientData)->forgetWorld(*this);
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> DOMWrapperWorld& mainThreadNormalWorld()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- static DOMWrapperWorld& cachedNormalWorld = normalWorld(*JSDOMWindow::commonVM());
</del><ins>+ static DOMWrapperWorld& cachedNormalWorld = normalWorld(JSDOMWindow::commonVM());
</ins><span class="cx"> return cachedNormalWorld;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDOMWrapperWorldh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<DOMWrapperWorld> create(JSC::VM* vm, bool isNormal = false)
</del><ins>+ static PassRefPtr<DOMWrapperWorld> create(JSC::VM& vm, bool isNormal = false)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new DOMWrapperWorld(vm, isNormal));
</span><span class="cx"> }
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx">
</span><span class="cx"> bool isNormal() const { return m_isNormal; }
</span><span class="cx">
</span><del>- JSC::VM* vm() const { return m_vm; }
</del><ins>+ JSC::VM& vm() const { return m_vm; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- DOMWrapperWorld(JSC::VM*, bool isNormal);
</del><ins>+ DOMWrapperWorld(JSC::VM&, bool isNormal);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- JSC::VM* m_vm;
</del><ins>+ JSC::VM& m_vm;
</ins><span class="cx"> HashSet<ScriptController*> m_scriptControllersWithWindowShells;
</span><span class="cx"> bool m_isNormal;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/GCController.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> static void collect(void*)
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- JSDOMWindow::commonVM()->heap.collectAllGarbage();
</del><ins>+ JSDOMWindow::commonVM().heap.collectAllGarbage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GCController& gcController()
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> // able to use reportAbandonedObjectGraph on more platforms.
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- JSDOMWindow::commonVM()->heap.reportAbandonedObjectGraph();
</del><ins>+ JSDOMWindow::commonVM().heap.reportAbandonedObjectGraph();
</ins><span class="cx"> #else
</span><span class="cx"> if (!m_GCTimer.isActive())
</span><span class="cx"> m_GCTimer.startOneShot(0);
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> if (!JSDOMWindow::commonVMExists())
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><del>- if (!JSDOMWindow::commonVM()->heap.isBusy())
- JSDOMWindow::commonVM()->heap.collectAllGarbage();
</del><ins>+ if (!JSDOMWindow::commonVM().heap.isBusy())
+ JSDOMWindow::commonVM().heap.collectAllGarbage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCController::garbageCollectOnAlternateThreadForDebugging(bool waitUntilDone)
</span><span class="lines">@@ -116,24 +116,24 @@
</span><span class="cx">
</span><span class="cx"> // We shouldn't have any javascript running on our stack when this function is called. The
</span><span class="cx"> // following line asserts that.
</span><del>- ASSERT(!JSDOMWindow::commonVM()->entryScope);
</del><ins>+ ASSERT(!JSDOMWindow::commonVM().entryScope);
</ins><span class="cx">
</span><span class="cx"> // But be safe in release builds just in case...
</span><del>- if (JSDOMWindow::commonVM()->entryScope)
</del><ins>+ if (JSDOMWindow::commonVM().entryScope)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- JSDOMWindow::commonVM()->releaseExecutableMemory();
</del><ins>+ JSDOMWindow::commonVM().releaseExecutableMemory();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCController::setJavaScriptGarbageCollectorTimerEnabled(bool enable)
</span><span class="cx"> {
</span><del>- JSDOMWindow::commonVM()->heap.setGarbageCollectionTimerEnabled(enable);
</del><ins>+ JSDOMWindow::commonVM().heap.setGarbageCollectionTimerEnabled(enable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCController::discardAllCompiledCode()
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- JSDOMWindow::commonVM()->discardAllCode();
</del><ins>+ JSDOMWindow::commonVM().discardAllCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> void addImpureProperty(const AtomicString& propertyName)
</span><span class="cx"> {
</span><del>- JSDOMWindow::commonVM()->addImpureProperty(propertyName);
</del><ins>+ JSDOMWindow::commonVM().addImpureProperty(propertyName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const JSC::HashTable& getHashTableForGlobalData(VM& vm, const JSC::HashTable& staticTable)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld& world, JSC::ArrayBuffer*)
</span><span class="cx"> {
</span><del>- return static_cast<WebCoreTypedArrayController*>(world.vm()->m_typedArrayController.get())->wrapperOwner();
</del><ins>+ return static_cast<WebCoreTypedArrayController*>(world.vm().m_typedArrayController.get())->wrapperOwner();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* wrapperContext(DOMWrapperWorld& world, JSC::ArrayBuffer*)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> return m_shell;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-VM* JSDOMWindowBase::commonVM()
</del><ins>+VM& JSDOMWindowBase::commonVM()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> initNormalWorldClientData(vm);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return vm;
</del><ins>+ return *vm;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> JSDOMWindowShell* shell() const;
</span><span class="cx">
</span><del>- static JSC::VM* commonVM();
</del><ins>+ static JSC::VM& commonVM();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool commonVMExists();
</span><span class="cx"> static JSC::VM*& commonVMInternal();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowShellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> // when we allocate the global object. (Once the global object is fully
</span><span class="cx"> // constructed, it can mark its own prototype.)
</span><span class="cx">
</span><del>- VM& vm = *JSDOMWindow::commonVM();
</del><ins>+ VM& vm = JSDOMWindow::commonVM();
</ins><span class="cx"> Structure* prototypeStructure = JSDOMWindowPrototype::createStructure(vm, 0, jsNull());
</span><span class="cx"> Strong<JSDOMWindowPrototype> prototype(vm, JSDOMWindowPrototype::create(vm, 0, prototypeStructure));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> // initializeJSFunction can trigger code that deletes this event listener
</span><span class="cx"> // before we're done. It should always return 0 in this case.
</span><span class="cx"> Ref<JSEventListener> protect(const_cast<JSEventListener&>(*this));
</span><del>- JSC::Strong<JSC::JSObject> wrapper(*m_isolatedWorld->vm(), m_wrapper.get());
</del><ins>+ JSC::Strong<JSC::JSObject> wrapper(m_isolatedWorld->vm(), m_wrapper.get());
</ins><span class="cx">
</span><span class="cx"> if (!m_jsFunction) {
</span><span class="cx"> JSC::JSObject* function = initializeJSFunction(scriptExecutionContext);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> void PageScriptDebugServer::recompileAllJSFunctions()
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- Debugger::recompileAllJSFunctions(JSDOMWindow::commonVM());
</del><ins>+ Debugger::recompileAllJSFunctions(&JSDOMWindow::commonVM());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptDebugServer::ListenerSet* PageScriptDebugServer::getListenersForGlobalObject(JSGlobalObject* globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScheduledActionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScheduledAction.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScheduledAction.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/ScheduledAction.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ScheduledAction(JSC::ExecState*, JSC::JSValue function, DOMWrapperWorld& isolatedWorld);
</span><span class="cx"> ScheduledAction(const String& code, DOMWrapperWorld& isolatedWorld)
</span><del>- : m_function(*isolatedWorld.vm())
</del><ins>+ : m_function(isolatedWorld.vm())
</ins><span class="cx"> , m_code(code)
</span><span class="cx"> , m_isolatedWorld(&isolatedWorld)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_windowShells.contains(&world));
</span><span class="cx">
</span><del>- VM& vm = *world.vm();
</del><ins>+ VM& vm = world.vm();
</ins><span class="cx">
</span><span class="cx"> Structure* structure = JSDOMWindowShell::createStructure(vm, jsNull());
</span><span class="cx"> Strong<JSDOMWindowShell> windowShell(vm, JSDOMWindowShell::create(vm, m_frame.document()->domWindow(), structure, world));
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> void ScriptController::getAllWorlds(Vector<Ref<DOMWrapperWorld>>& worlds)
</span><span class="cx"> {
</span><del>- static_cast<WebCoreJSClientData*>(JSDOMWindow::commonVM()->clientData)->getAllWorlds(worlds);
</del><ins>+ static_cast<WebCoreJSClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptController::clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx">
</span><span class="cx"> bool ScriptController::shouldBypassMainWorldContentSecurityPolicy()
</span><span class="cx"> {
</span><del>- CallFrame* callFrame = JSDOMWindow::commonVM()->topCallFrame;
</del><ins>+ CallFrame* callFrame = JSDOMWindow::commonVM().topCallFrame;
</ins><span class="cx"> if (callFrame == CallFrame::noCaller())
</span><span class="cx"> return false;
</span><span class="cx"> DOMWrapperWorld& domWrapperWorld = currentWorld(callFrame);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSClientDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebCoreJSClientData* webCoreJSClientData = new WebCoreJSClientData;
</span><span class="cx"> vm->clientData = webCoreJSClientData; // ~VM deletes this pointer.
</span><del>- webCoreJSClientData->m_normalWorld = DOMWrapperWorld::create(vm, true);
</del><ins>+ webCoreJSClientData->m_normalWorld = DOMWrapperWorld::create(*vm, true);
</ins><span class="cx"> vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomCollectionIndexCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CollectionIndexCache.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CollectionIndexCache.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/dom/CollectionIndexCache.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">
</span><span class="cx"> void reportExtraMemoryCostForCollectionIndexCache(size_t cost)
</span><span class="cx"> {
</span><del>- JSC::VM* vm = JSDOMWindowBase::commonVM();
</del><ins>+ JSC::VM& vm = JSDOMWindowBase::commonVM();
</ins><span class="cx"> JSC::JSLockHolder lock(vm);
</span><del>- vm->heap.reportExtraMemoryCost(cost);
</del><ins>+ vm.heap.reportExtraMemoryCost(cost);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> JSC::VM* ScriptExecutionContext::vm()
</span><span class="cx"> {
</span><span class="cx"> if (isDocument())
</span><del>- return JSDOMWindow::commonVM();
</del><ins>+ return &JSDOMWindow::commonVM();
</ins><span class="cx">
</span><span class="cx"> if (isWorkerGlobalScope())
</span><span class="cx"> return toWorkerGlobalScope(this)->script()->vm();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageLoader.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageLoader.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/html/HTMLImageLoader.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> bool loadError = cachedImage->errorOccurred() || cachedImage->response().httpStatusCode() >= 400;
</span><span class="cx"> if (!loadError) {
</span><span class="cx"> if (!element().inDocument()) {
</span><del>- JSC::VM* vm = JSDOMWindowBase::commonVM();
</del><ins>+ JSC::VM& vm = JSDOMWindowBase::commonVM();
</ins><span class="cx"> JSC::JSLockHolder lock(vm);
</span><del>- vm->heap.reportExtraMemoryCost(cachedImage->encodedSize());
</del><ins>+ vm.heap.reportExtraMemoryCost(cachedImage->encodedSize());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> exitFullscreen();
</span><span class="cx">
</span><span class="cx"> if (m_player) {
</span><del>- JSC::VM* vm = JSDOMWindowBase::commonVM();
</del><ins>+ JSC::VM& vm = JSDOMWindowBase::commonVM();
</ins><span class="cx"> JSC::JSLockHolder lock(vm);
</span><span class="cx">
</span><span class="cx"> size_t extraMemoryCost = m_player->extraMemoryCost();
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> m_reportedExtraMemoryCost = extraMemoryCost;
</span><span class="cx">
</span><span class="cx"> if (extraMemoryCostDelta > 0)
</span><del>- vm->heap.reportExtraMemoryCost(extraMemoryCostDelta);
</del><ins>+ vm.heap.reportExtraMemoryCost(extraMemoryCostDelta);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> static size_t usedHeapSize()
</span><span class="cx"> {
</span><del>- return JSDOMWindow::commonVM()->heap.size();
</del><ins>+ return JSDOMWindow::commonVM().heap.size();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::setFrameIdentifier(InspectorObject* record, Frame* frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> notifyContextCreated(frameId, scriptState, origin, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::VM* PageRuntimeAgent::globalVM()
</del><ins>+JSC::VM& PageRuntimeAgent::globalVM()
</ins><span class="cx"> {
</span><span class="cx"> return JSDOMWindowBase::commonVM();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void didCreateIsolatedContext(Frame*, JSC::ExecState*, SecurityOrigin*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual JSC::VM* globalVM() override;
</del><ins>+ virtual JSC::VM& globalVM() override;
</ins><span class="cx"> virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</span><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> m_paused = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::VM* WorkerRuntimeAgent::globalVM()
</del><ins>+JSC::VM& WorkerRuntimeAgent::globalVM()
</ins><span class="cx"> {
</span><span class="cx"> return JSDOMWindowBase::commonVM();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> void pauseWorkerGlobalScope(WorkerGlobalScope*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual JSC::VM* globalVM() override;
</del><ins>+ virtual JSC::VM& globalVM() override;
</ins><span class="cx"> virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</span><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMemoryInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MemoryInfo.h (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MemoryInfo.h 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebCore/testing/MemoryInfo.h 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MemoryInfo()
</span><del>- : m_usedJSHeapSize(JSDOMWindow::commonVM()->heap.size())
- , m_totalJSHeapSize(JSDOMWindow::commonVM()->heap.capacity())
</del><ins>+ : m_usedJSHeapSize(JSDOMWindow::commonVM().heap.size())
+ , m_totalJSHeapSize(JSDOMWindow::commonVM().heap.capacity())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportDumpRenderTreeSupportEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> size_t DumpRenderTreeSupportEfl::javaScriptObjectsCount()
</span><span class="cx"> {
</span><del>- return WebCore::JSDOMWindow::commonVM()->heap.objectCount();
</del><ins>+ return WebCore::JSDOMWindow::commonVM().heap.objectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DumpRenderTreeSupportEfl::setDeadDecodedDataDeletionInterval(double interval)
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> unsigned long DumpRenderTreeSupportGtk::gcCountJavascriptObjects()
</span><span class="cx"> {
</span><span class="cx"> JSC::JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.objectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.objectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DumpRenderTreeSupportGtk::layoutFrame(WebKitWebFrame* frame)
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCoreStatisticsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.mm 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -59,25 +59,25 @@
</span><span class="cx"> + (size_t)javaScriptObjectsCount
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.objectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.objectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)javaScriptGlobalObjectsCount
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.globalObjectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.globalObjectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)javaScriptProtectedObjectsCount
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.protectedObjectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.protectedObjectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (size_t)javaScriptProtectedGlobalObjectsCount
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.protectedGlobalObjectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.protectedGlobalObjectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSCountedSet *)javaScriptProtectedObjectTypeCounts
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> NSCountedSet *result = [NSCountedSet set];
</span><span class="cx">
</span><del>- OwnPtr<TypeCountSet> counts(JSDOMWindow::commonVM()->heap.protectedObjectTypeCounts());
</del><ins>+ OwnPtr<TypeCountSet> counts(JSDOMWindow::commonVM().heap.protectedObjectTypeCounts());
</ins><span class="cx"> HashCountedSet<const char*>::iterator end = counts->end();
</span><span class="cx"> for (HashCountedSet<const char*>::iterator it = counts->begin(); it != end; ++it)
</span><span class="cx"> for (unsigned i = 0; i < it->value; ++i)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> NSCountedSet *result = [NSCountedSet set];
</span><span class="cx">
</span><del>- OwnPtr<TypeCountSet> counts(JSDOMWindow::commonVM()->heap.objectTypeCounts());
</del><ins>+ OwnPtr<TypeCountSet> counts(JSDOMWindow::commonVM().heap.objectTypeCounts());
</ins><span class="cx"> HashCountedSet<const char*>::iterator end = counts->end();
</span><span class="cx"> for (HashCountedSet<const char*>::iterator it = counts->begin(); it != end; ++it)
</span><span class="cx"> for (unsigned i = 0; i < it->value; ++i)
</span><span class="lines">@@ -202,8 +202,8 @@
</span><span class="cx"> WTF::FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics();
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- size_t heapSize = JSDOMWindow::commonVM()->heap.size();
- size_t heapFree = JSDOMWindow::commonVM()->heap.capacity() - heapSize;
</del><ins>+ size_t heapSize = JSDOMWindow::commonVM().heap.size();
+ size_t heapFree = JSDOMWindow::commonVM().heap.capacity() - heapSize;
</ins><span class="cx"> GlobalMemoryStatistics globalMemoryStats = globalMemoryStatistics();
</span><span class="cx">
</span><span class="cx"> return [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> + (size_t)javaScriptReferencedObjectsCount
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.protectedObjectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.protectedObjectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSSet *)javaScriptRootObjectClasses
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginHostProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> ASSERT(identifier->isString());
</span><span class="cx">
</span><span class="cx"> const char* str = identifier->string();
</span><del>- return Identifier(JSDOMWindow::commonVM(), String::fromUTF8WithLatin1Fallback(str, strlen(str)));
</del><ins>+ return Identifier(&JSDOMWindow::commonVM(), String::fromUTF8WithLatin1Fallback(str, strlen(str)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t WKPCInvoke(mach_port_t clientPort, uint32_t pluginID, uint32_t requestID, uint32_t objectID, uint64_t serverIdentifier,
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
</span><span class="cx"> objectID = 0;
</span><span class="cx"> else
</span><del>- objectID = m_localObjects.idForObject(*pluginWorld().vm(), frame->script().windowShell(pluginWorld())->window());
</del><ins>+ objectID = m_localObjects.idForObject(pluginWorld().vm(), frame->script().windowShell(pluginWorld())->window());
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (JSObject* object = frame->script().jsObjectForPluginElement([m_pluginView element]))
</span><del>- objectID = m_localObjects.idForObject(*pluginWorld().vm(), object);
</del><ins>+ objectID = m_localObjects.idForObject(pluginWorld().vm(), object);
</ins><span class="cx"> else
</span><span class="cx"> objectID = 0;
</span><span class="cx">
</span><span class="lines">@@ -883,7 +883,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(pluginWorld().vm());
</span><del>- Strong<JSGlobalObject> globalObject(*pluginWorld().vm(), frame->script().globalObject(pluginWorld()));
</del><ins>+ Strong<JSGlobalObject> globalObject(pluginWorld().vm(), frame->script().globalObject(pluginWorld()));
</ins><span class="cx"> ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span><span class="cx"> UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedProxyInstancemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> if (identifier->isString()) {
</span><span class="cx"> const char* str = identifier->string();
</span><del>- nameArray.add(Identifier(JSDOMWindow::commonVM(), String::fromUTF8WithLatin1Fallback(str, strlen(str))));
</del><ins>+ nameArray.add(Identifier(&JSDOMWindow::commonVM(), String::fromUTF8WithLatin1Fallback(str, strlen(str))));
</ins><span class="cx"> } else
</span><span class="cx"> nameArray.add(Identifier::from(exec, identifier->number()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreStatistics.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreStatistics.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/win/WebCoreStatistics.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- *count = (UINT)JSDOMWindow::commonVM()->heap.objectCount();
</del><ins>+ *count = (UINT)JSDOMWindow::commonVM().heap.objectCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- *count = (UINT)JSDOMWindow::commonVM()->heap.globalObjectCount();
</del><ins>+ *count = (UINT)JSDOMWindow::commonVM().heap.globalObjectCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- *count = (UINT)JSDOMWindow::commonVM()->heap.protectedObjectCount();
</del><ins>+ *count = (UINT)JSDOMWindow::commonVM().heap.protectedObjectCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- *count = (UINT)JSDOMWindow::commonVM()->heap.protectedGlobalObjectCount();
</del><ins>+ *count = (UINT)JSDOMWindow::commonVM().heap.protectedGlobalObjectCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> /* [retval][out] */ IPropertyBag2** typeNamesAndCounts)
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- OwnPtr<TypeCountSet> jsObjectTypeNames(JSDOMWindow::commonVM()->heap.protectedObjectTypeCounts());
</del><ins>+ OwnPtr<TypeCountSet> jsObjectTypeNames(JSDOMWindow::commonVM().heap.protectedObjectTypeCounts());
</ins><span class="cx"> typedef TypeCountSet::const_iterator Iterator;
</span><span class="cx"> Iterator end = jsObjectTypeNames->end();
</span><span class="cx"> HashMap<String, int> typeCountMap;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebJavaScriptCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebJavaScriptCollector.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebJavaScriptCollector.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit/win/WebJavaScriptCollector.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -112,6 +112,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- *count = (UINT)JSDOMWindow::commonVM()->heap.objectCount();
</del><ins>+ *count = (UINT)JSDOMWindow::commonVM().heap.objectCount();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedlinuxWebMemorySamplerLinuxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -154,8 +154,8 @@
</span><span class="cx"> appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Fast Malloc Committed Memory"), fastMallocBytesCommitted);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- size_t jscHeapBytesInUse = JSDOMWindow::commonVM()->heap.size();
- size_t jscHeapBytesCommitted = JSDOMWindow::commonVM()->heap.capacity();
</del><ins>+ size_t jscHeapBytesInUse = JSDOMWindow::commonVM().heap.size();
+ size_t jscHeapBytesCommitted = JSDOMWindow::commonVM().heap.capacity();
</ins><span class="cx"> totalBytesInUse += jscHeapBytesInUse;
</span><span class="cx"> totalBytesCommitted += jscHeapBytesCommitted;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebMemorySamplermacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx"> totalBytesCommitted += fastMallocBytesCommitted;
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- size_t jscHeapBytesInUse = JSDOMWindow::commonVM()->heap.size();
- size_t jscHeapBytesCommitted = JSDOMWindow::commonVM()->heap.capacity();
</del><ins>+ size_t jscHeapBytesInUse = JSDOMWindow::commonVM().heap.size();
+ size_t jscHeapBytesCommitted = JSDOMWindow::commonVM().heap.capacity();
</ins><span class="cx"> totalBytesInUse += jscHeapBytesInUse;
</span><span class="cx"> totalBytesCommitted += jscHeapBytesCommitted;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> size_t InjectedBundle::javaScriptObjectsCount()
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- return JSDOMWindow::commonVM()->heap.objectCount();
</del><ins>+ return JSDOMWindow::commonVM().heap.objectCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::reportException(JSContextRef context, JSValueRef exception)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -1371,7 +1371,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return m_npRuntimeObjectMap.getOrCreateNPObject(*pluginWorld().vm(), frame()->script().windowShell(pluginWorld())->window());
</del><ins>+ return m_npRuntimeObjectMap.getOrCreateNPObject(pluginWorld().vm(), frame()->script().windowShell(pluginWorld())->window());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NPObject* PluginView::pluginElementNPObject()
</span><span class="lines">@@ -1387,7 +1387,7 @@
</span><span class="cx"> JSObject* object = frame()->script().jsObjectForPluginElement(m_pluginElement.get());
</span><span class="cx"> ASSERT(object);
</span><span class="cx">
</span><del>- return m_npRuntimeObjectMap.getOrCreateNPObject(*pluginWorld().vm(), object);
</del><ins>+ return m_npRuntimeObjectMap.getOrCreateNPObject(pluginWorld().vm(), object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PluginView::evaluate(NPObject* npObject, const String& scriptString, NPVariant* result, bool allowPopups)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -4282,10 +4282,10 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::getBytecodeProfile(uint64_t callbackID)
</span><span class="cx"> {
</span><del>- ASSERT(JSDOMWindow::commonVM()->m_perBytecodeProfiler);
- if (!JSDOMWindow::commonVM()->m_perBytecodeProfiler)
</del><ins>+ ASSERT(JSDOMWindow::commonVM().m_perBytecodeProfiler);
+ if (!JSDOMWindow::commonVM().m_perBytecodeProfiler)
</ins><span class="cx"> send(Messages::WebPageProxy::StringCallback(String(), callbackID));
</span><del>- String result = JSDOMWindow::commonVM()->m_perBytecodeProfiler->toJSON();
</del><ins>+ String result = JSDOMWindow::commonVM().m_perBytecodeProfiler->toJSON();
</ins><span class="cx"> ASSERT(result.length());
</span><span class="cx"> send(Messages::WebPageProxy::StringCallback(result, callbackID));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (164967 => 164968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-03-03 04:49:38 UTC (rev 164967)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-03-03 05:10:15 UTC (rev 164968)
</span><span class="lines">@@ -922,20 +922,20 @@
</span><span class="cx"> // Gather JavaScript statistics.
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- data.statisticsNumbers.set(ASCIILiteral("JavaScriptObjectsCount"), JSDOMWindow::commonVM()->heap.objectCount());
- data.statisticsNumbers.set(ASCIILiteral("JavaScriptGlobalObjectsCount"), JSDOMWindow::commonVM()->heap.globalObjectCount());
- data.statisticsNumbers.set(ASCIILiteral("JavaScriptProtectedObjectsCount"), JSDOMWindow::commonVM()->heap.protectedObjectCount());
- data.statisticsNumbers.set(ASCIILiteral("JavaScriptProtectedGlobalObjectsCount"), JSDOMWindow::commonVM()->heap.protectedGlobalObjectCount());
</del><ins>+ data.statisticsNumbers.set(ASCIILiteral("JavaScriptObjectsCount"), JSDOMWindow::commonVM().heap.objectCount());
+ data.statisticsNumbers.set(ASCIILiteral("JavaScriptGlobalObjectsCount"), JSDOMWindow::commonVM().heap.globalObjectCount());
+ data.statisticsNumbers.set(ASCIILiteral("JavaScriptProtectedObjectsCount"), JSDOMWindow::commonVM().heap.protectedObjectCount());
+ data.statisticsNumbers.set(ASCIILiteral("JavaScriptProtectedGlobalObjectsCount"), JSDOMWindow::commonVM().heap.protectedGlobalObjectCount());
</ins><span class="cx">
</span><del>- OwnPtr<TypeCountSet> protectedObjectTypeCounts(JSDOMWindow::commonVM()->heap.protectedObjectTypeCounts());
</del><ins>+ OwnPtr<TypeCountSet> protectedObjectTypeCounts(JSDOMWindow::commonVM().heap.protectedObjectTypeCounts());
</ins><span class="cx"> fromCountedSetToHashMap(protectedObjectTypeCounts.get(), data.javaScriptProtectedObjectTypeCounts);
</span><span class="cx">
</span><del>- OwnPtr<TypeCountSet> objectTypeCounts(JSDOMWindow::commonVM()->heap.objectTypeCounts());
</del><ins>+ OwnPtr<TypeCountSet> objectTypeCounts(JSDOMWindow::commonVM().heap.objectTypeCounts());
</ins><span class="cx"> fromCountedSetToHashMap(objectTypeCounts.get(), data.javaScriptObjectTypeCounts);
</span><span class="cx">
</span><del>- uint64_t javaScriptHeapSize = JSDOMWindow::commonVM()->heap.size();
</del><ins>+ uint64_t javaScriptHeapSize = JSDOMWindow::commonVM().heap.size();
</ins><span class="cx"> data.statisticsNumbers.set(ASCIILiteral("JavaScriptHeapSize"), javaScriptHeapSize);
</span><del>- data.statisticsNumbers.set(ASCIILiteral("JavaScriptFreeSize"), JSDOMWindow::commonVM()->heap.capacity() - javaScriptHeapSize);
</del><ins>+ data.statisticsNumbers.set(ASCIILiteral("JavaScriptFreeSize"), JSDOMWindow::commonVM().heap.capacity() - javaScriptHeapSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WTF::FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics();
</span></span></pre>
</div>
</div>
</body>
</html>