<!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>[188394] 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/188394">188394</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-08-13 13:17:02 -0700 (Thu, 13 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardize on the phrase "delete code"
https://bugs.webkit.org/show_bug.cgi?id=147984
Reviewed by Mark Lam.
Source/JavaScriptCore:
Use "delete" when we talk about throwing away code, as opposed to
"invalidate" or "discard".
* debugger/Debugger.cpp:
(JSC::Debugger::forEachCodeBlock):
(JSC::Debugger::setSteppingMode):
(JSC::Debugger::recompileAllJSFunctions):
* heap/Heap.cpp:
(JSC::Heap::deleteAllCompiledCode):
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::recompileAllJSFunctionsForTypeProfiling):
* runtime/RegExp.cpp:
(JSC::RegExp::match):
(JSC::RegExp::deleteCode):
(JSC::RegExp::invalidateCode): Deleted.
* runtime/RegExp.h:
* runtime/RegExpCache.cpp:
(JSC::RegExpCache::finalize):
(JSC::RegExpCache::addToStrongCache):
(JSC::RegExpCache::deleteAllCode):
(JSC::RegExpCache::invalidateCode): Deleted.
* runtime/RegExpCache.h:
* runtime/VM.cpp:
(JSC::VM::stopSampling):
(JSC::VM::prepareToDeleteCode):
(JSC::VM::deleteAllCode):
(JSC::VM::setEnabledProfiler):
(JSC::VM::prepareToDiscardCode): Deleted.
(JSC::VM::discardAllCode): Deleted.
* runtime/VM.h:
(JSC::VM::apiLock):
(JSC::VM::codeCache):
* runtime/Watchdog.cpp:
(JSC::Watchdog::setTimeLimit):
Source/WebCore:
Use "delete" when we talk about throwing away code, as opposed to
"invalidate" or "discard".
* bindings/js/GCController.cpp:
(WebCore::GCController::setJavaScriptGarbageCollectorTimerEnabled):
(WebCore::GCController::deleteAllCode):
(WebCore::GCController::discardAllCompiledCode): Deleted.
* bindings/js/GCController.h:
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseCriticalMemory):
Source/WebKit/mac:
* WebView/WebView.mm:
(+[WebView discardAllCompiledCode]):
(+[WebView isCharacterSmartReplaceExempt:isPreviousCharacter:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpcpp">trunk/Source/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExph">trunk/Source/JavaScriptCore/runtime/RegExp.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpCachecpp">trunk/Source/JavaScriptCore/runtime/RegExpCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpCacheh">trunk/Source/JavaScriptCore/runtime/RegExpCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWatchdogcpp">trunk/Source/JavaScriptCore/runtime/Watchdog.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllercpp">trunk/Source/WebCore/bindings/js/GCController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllerh">trunk/Source/WebCore/bindings/js/GCController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-08-13 Geoffrey Garen <ggaren@apple.com>
+
+ Standardize on the phrase "delete code"
+ https://bugs.webkit.org/show_bug.cgi?id=147984
+
+ Reviewed by Mark Lam.
+
+ Use "delete" when we talk about throwing away code, as opposed to
+ "invalidate" or "discard".
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::forEachCodeBlock):
+ (JSC::Debugger::setSteppingMode):
+ (JSC::Debugger::recompileAllJSFunctions):
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode):
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::recompileAllJSFunctionsForTypeProfiling):
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::match):
+ (JSC::RegExp::deleteCode):
+ (JSC::RegExp::invalidateCode): Deleted.
+ * runtime/RegExp.h:
+ * runtime/RegExpCache.cpp:
+ (JSC::RegExpCache::finalize):
+ (JSC::RegExpCache::addToStrongCache):
+ (JSC::RegExpCache::deleteAllCode):
+ (JSC::RegExpCache::invalidateCode): Deleted.
+ * runtime/RegExpCache.h:
+ * runtime/VM.cpp:
+ (JSC::VM::stopSampling):
+ (JSC::VM::prepareToDeleteCode):
+ (JSC::VM::deleteAllCode):
+ (JSC::VM::setEnabledProfiler):
+ (JSC::VM::prepareToDiscardCode): Deleted.
+ (JSC::VM::discardAllCode): Deleted.
+ * runtime/VM.h:
+ (JSC::VM::apiLock):
+ (JSC::VM::codeCache):
+ * runtime/Watchdog.cpp:
+ (JSC::Watchdog::setTimeLimit):
+
</ins><span class="cx"> 2015-08-13 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> X.[[SetPrototypeOf]](Y) should succeed if X.[[Prototype]] is already Y even if X is not extensible
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> template<typename Functor>
</span><span class="cx"> void Debugger::forEachCodeBlock(Functor& functor)
</span><span class="cx"> {
</span><del>- m_vm->prepareToDiscardCode();
</del><ins>+ m_vm->prepareToDeleteCode();
</ins><span class="cx"> m_vm->heap.forEachCodeBlock(functor);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> if (mode == m_steppingMode || !m_vm)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_vm->prepareToDiscardCode();
</del><ins>+ m_vm->prepareToDeleteCode();
</ins><span class="cx">
</span><span class="cx"> m_steppingMode = mode;
</span><span class="cx"> SetSteppingModeFunctor functor(this, mode);
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- vm->prepareToDiscardCode();
</del><ins>+ vm->prepareToDeleteCode();
</ins><span class="cx">
</span><span class="cx"> Recompiler recompiler(this);
</span><span class="cx"> HeapIterationScope iterationScope(vm->heap);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -903,8 +903,8 @@
</span><span class="cx">
</span><span class="cx"> void Heap::deleteAllCompiledCode()
</span><span class="cx"> {
</span><del>- // If JavaScript is running, it's not safe to delete code, since we'll end
- // up deleting code that is live on the stack.
</del><ins>+ // If JavaScript is running, it's not safe to delete JavaScript code, since
+ // we'll end up returning to deleted code.
</ins><span class="cx"> if (m_vm->entryScope)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> bool needsToRecompile = shouldRecompileFromTypeProfiler || shouldRecompileFromControlFlowProfiler;
</span><span class="cx">
</span><span class="cx"> if (needsToRecompile) {
</span><del>- vm.prepareToDiscardCode();
</del><ins>+ vm.prepareToDeleteCode();
</ins><span class="cx"> TypeRecompiler recompiler;
</span><span class="cx"> HeapIterationScope iterationScope(vm.heap);
</span><span class="cx"> vm.heap.objectSpace().forEachLiveCell(iterationScope, recompiler);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> return MatchResult::failed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RegExp::invalidateCode()
</del><ins>+void RegExp::deleteCode()
</ins><span class="cx"> {
</span><span class="cx"> if (!hasCode())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.h (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.h 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.h 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return m_state != NotCompiled;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void invalidateCode();
</del><ins>+ void deleteCode();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> void printTraceData();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpCache.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpCache.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/RegExpCache.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> {
</span><span class="cx"> RegExp* regExp = static_cast<RegExp*>(handle.get().asCell());
</span><span class="cx"> weakRemove(m_weakCache, regExp->key(), regExp);
</span><del>- regExp->invalidateCode();
</del><ins>+ regExp->deleteCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RegExpCache::addToStrongCache(RegExp* regExp)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> m_nextEntryInStrongCache = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RegExpCache::invalidateCode()
</del><ins>+void RegExpCache::deleteAllCode()
</ins><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < maxStrongCacheableEntries; i++)
</span><span class="cx"> m_strongCache[i].clear();
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> RegExp* regExp = it->value.get();
</span><span class="cx"> if (!regExp) // Skip zombies.
</span><span class="cx"> continue;
</span><del>- regExp->invalidateCode();
</del><ins>+ regExp->deleteCode();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpCache.h (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpCache.h 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/RegExpCache.h 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> RegExpCache(VM* vm);
</span><del>- void invalidateCode();
</del><ins>+ void deleteAllCode();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> interpreter->stopSampling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VM::prepareToDiscardCode()
</del><ins>+void VM::prepareToDeleteCode()
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> for (unsigned i = DFG::numberOfWorklists(); i--;) {
</span><span class="lines">@@ -479,11 +479,11 @@
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VM::discardAllCode()
</del><ins>+void VM::deleteAllCode()
</ins><span class="cx"> {
</span><del>- prepareToDiscardCode();
</del><ins>+ prepareToDeleteCode();
</ins><span class="cx"> m_codeCache->clear();
</span><del>- m_regExpCache->invalidateCode();
</del><ins>+ m_regExpCache->deleteAllCode();
</ins><span class="cx"> heap.deleteAllCompiledCode();
</span><span class="cx"> heap.deleteAllUnlinkedFunctionCode();
</span><span class="cx"> heap.reportAbandonedObjectGraph();
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_enabledProfiler = profiler;
</span><span class="cx"> if (m_enabledProfiler) {
</span><del>- prepareToDiscardCode();
</del><ins>+ prepareToDeleteCode();
</ins><span class="cx"> SetEnabledProfilerFunctor functor;
</span><span class="cx"> heap.forEachCodeBlock(functor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -532,9 +532,9 @@
</span><span class="cx"> JSLock& apiLock() { return *m_apiLock; }
</span><span class="cx"> CodeCache* codeCache() { return m_codeCache.get(); }
</span><span class="cx">
</span><del>- void prepareToDiscardCode();
</del><ins>+ void prepareToDeleteCode();
</ins><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void discardAllCode();
</del><ins>+ JS_EXPORT_PRIVATE void deleteAllCode();
</ins><span class="cx">
</span><span class="cx"> void registerWatchpointForImpureProperty(const Identifier&, Watchpoint*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if (!hadTimeLimit) {
</span><span class="cx"> // And if we've previously compiled any functions, we need to revert
</span><span class="cx"> // them because they don't have the needed polling checks yet.
</span><del>- vm.discardAllCode();
</del><ins>+ vm.deleteAllCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_hasEnteredVM && hasTimeLimit())
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/WebCore/ChangeLog 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-13 Geoffrey Garen <ggaren@apple.com>
+
+ Standardize on the phrase "delete code"
+ https://bugs.webkit.org/show_bug.cgi?id=147984
+
+ Reviewed by Mark Lam.
+
+ Use "delete" when we talk about throwing away code, as opposed to
+ "invalidate" or "discard".
+
+ * bindings/js/GCController.cpp:
+ (WebCore::GCController::setJavaScriptGarbageCollectorTimerEnabled):
+ (WebCore::GCController::deleteAllCode):
+ (WebCore::GCController::discardAllCompiledCode): Deleted.
+ * bindings/js/GCController.h:
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseCriticalMemory):
+
</ins><span class="cx"> 2015-08-13 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't short circuit seeking
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/WebCore/bindings/js/GCController.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -118,10 +118,10 @@
</span><span class="cx"> JSDOMWindow::commonVM().heap.setGarbageCollectionTimerEnabled(enable);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GCController::discardAllCompiledCode()
</del><ins>+void GCController::deleteAllCode()
</ins><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><del>- JSDOMWindow::commonVM().discardAllCode();
</del><ins>+ JSDOMWindow::commonVM().deleteAllCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.h (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.h 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/WebCore/bindings/js/GCController.h 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void garbageCollectOnAlternateThreadForDebugging(bool waitUntilDone); // Used for stress testing.
</span><span class="cx"> WEBCORE_EXPORT void setJavaScriptGarbageCollectorTimerEnabled(bool);
</span><del>- WEBCORE_EXPORT void discardAllCompiledCode();
</del><ins>+ WEBCORE_EXPORT void deleteAllCode();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> GCController(); // Use singleton() instead.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> ReliefLogger log("Discard all JIT-compiled code");
</span><del>- GCController::singleton().discardAllCompiledCode();
</del><ins>+ GCController::singleton().deleteAllCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-08-13 Geoffrey Garen <ggaren@apple.com>
+
+ Standardize on the phrase "delete code"
+ https://bugs.webkit.org/show_bug.cgi?id=147984
+
+ Reviewed by Mark Lam.
+
+ * WebView/WebView.mm:
+ (+[WebView discardAllCompiledCode]):
+ (+[WebView isCharacterSmartReplaceExempt:isPreviousCharacter:]):
+
</ins><span class="cx"> 2015-08-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use WTF::Optional in WindowFeatures
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (188393 => 188394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-08-13 19:49:40 UTC (rev 188393)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-08-13 20:17:02 UTC (rev 188394)
</span><span class="lines">@@ -1376,7 +1376,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent());
</span><span class="cx"> WebKit::MemoryMeasure measurer("Memory warning: Discarding JIT'ed code.");
</span><del>- GCController::singleton().discardAllCompiledCode();
</del><ins>+ GCController::singleton().deleteAllCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (BOOL)isCharacterSmartReplaceExempt:(unichar)character isPreviousCharacter:(BOOL)b
</span></span></pre>
</div>
</div>
</body>
</html>