Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2015-08-14 11:28:47 UTC (rev 188460)
@@ -1,3 +1,45 @@
+2015-08-13 Geoffrey Garen <[email protected]>
+
+ 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):
+
2015-08-13 Yusuke Suzuki <[email protected]>
X.[[SetPrototypeOf]](Y) should succeed if X.[[Prototype]] is already Y even if X is not extensible
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/debugger/Debugger.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/debugger/Debugger.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/debugger/Debugger.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -148,7 +148,7 @@
template<typename Functor>
void Debugger::forEachCodeBlock(Functor& functor)
{
- m_vm->prepareToDiscardCode();
+ m_vm->prepareToDeleteCode();
m_vm->heap.forEachCodeBlock(functor);
}
@@ -248,7 +248,7 @@
if (mode == m_steppingMode || !m_vm)
return;
- m_vm->prepareToDiscardCode();
+ m_vm->prepareToDeleteCode();
m_steppingMode = mode;
SetSteppingModeFunctor functor(this, mode);
@@ -358,7 +358,7 @@
return;
}
- vm->prepareToDiscardCode();
+ vm->prepareToDeleteCode();
Recompiler recompiler(this);
HeapIterationScope iterationScope(vm->heap);
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/heap/Heap.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/heap/Heap.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/heap/Heap.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -903,8 +903,8 @@
void Heap::deleteAllCompiledCode()
{
- // If _javascript_ is running, it's not safe to delete code, since we'll end
- // up deleting code that is live on the stack.
+ // If _javascript_ is running, it's not safe to delete _javascript_ code, since
+ // we'll end up returning to deleted code.
if (m_vm->entryScope)
return;
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -332,7 +332,7 @@
bool needsToRecompile = shouldRecompileFromTypeProfiler || shouldRecompileFromControlFlowProfiler;
if (needsToRecompile) {
- vm.prepareToDiscardCode();
+ vm.prepareToDeleteCode();
TypeRecompiler recompiler;
HeapIterationScope iterationScope(vm.heap);
vm.heap.objectSpace().forEachLiveCell(iterationScope, recompiler);
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExp.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExp.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExp.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -482,7 +482,7 @@
return MatchResult::failed();
}
-void RegExp::invalidateCode()
+void RegExp::deleteCode()
{
if (!hasCode())
return;
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExp.h (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExp.h 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExp.h 2015-08-14 11:28:47 UTC (rev 188460)
@@ -69,7 +69,7 @@
return m_state != NotCompiled;
}
- void invalidateCode();
+ void deleteCode();
#if ENABLE(REGEXP_TRACING)
void printTraceData();
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExpCache.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExpCache.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExpCache.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -60,7 +60,7 @@
{
RegExp* regExp = static_cast<RegExp*>(handle.get().asCell());
weakRemove(m_weakCache, regExp->key(), regExp);
- regExp->invalidateCode();
+ regExp->deleteCode();
}
void RegExpCache::addToStrongCache(RegExp* regExp)
@@ -74,7 +74,7 @@
m_nextEntryInStrongCache = 0;
}
-void RegExpCache::invalidateCode()
+void RegExpCache::deleteAllCode()
{
for (int i = 0; i < maxStrongCacheableEntries; i++)
m_strongCache[i].clear();
@@ -85,7 +85,7 @@
RegExp* regExp = it->value.get();
if (!regExp) // Skip zombies.
continue;
- regExp->invalidateCode();
+ regExp->deleteCode();
}
}
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExpCache.h (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExpCache.h 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/RegExpCache.h 2015-08-14 11:28:47 UTC (rev 188460)
@@ -46,7 +46,7 @@
public:
RegExpCache(VM* vm);
- void invalidateCode();
+ void deleteAllCode();
private:
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/VM.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/VM.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/VM.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -469,7 +469,7 @@
interpreter->stopSampling();
}
-void VM::prepareToDiscardCode()
+void VM::prepareToDeleteCode()
{
#if ENABLE(DFG_JIT)
for (unsigned i = DFG::numberOfWorklists(); i--;) {
@@ -479,11 +479,11 @@
#endif // ENABLE(DFG_JIT)
}
-void VM::discardAllCode()
+void VM::deleteAllCode()
{
- prepareToDiscardCode();
+ prepareToDeleteCode();
m_codeCache->clear();
- m_regExpCache->invalidateCode();
+ m_regExpCache->deleteAllCode();
heap.deleteAllCompiledCode();
heap.deleteAllUnlinkedFunctionCode();
heap.reportAbandonedObjectGraph();
@@ -706,7 +706,7 @@
{
m_enabledProfiler = profiler;
if (m_enabledProfiler) {
- prepareToDiscardCode();
+ prepareToDeleteCode();
SetEnabledProfilerFunctor functor;
heap.forEachCodeBlock(functor);
}
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/VM.h (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/VM.h 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/VM.h 2015-08-14 11:28:47 UTC (rev 188460)
@@ -532,9 +532,9 @@
JSLock& apiLock() { return *m_apiLock; }
CodeCache* codeCache() { return m_codeCache.get(); }
- void prepareToDiscardCode();
+ void prepareToDeleteCode();
- JS_EXPORT_PRIVATE void discardAllCode();
+ JS_EXPORT_PRIVATE void deleteAllCode();
void registerWatchpointForImpureProperty(const Identifier&, Watchpoint*);
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/Watchdog.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/Watchdog.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/runtime/Watchdog.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -84,7 +84,7 @@
if (!hadTimeLimit) {
// And if we've previously compiled any functions, we need to revert
// them because they don't have the needed polling checks yet.
- vm.discardAllCode();
+ vm.deleteAllCode();
}
if (m_hasEnteredVM && hasTimeLimit())
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-08-14 11:28:47 UTC (rev 188460)
@@ -1,3 +1,21 @@
+2015-08-13 Geoffrey Garen <[email protected]>
+
+ 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):
+
2015-08-12 Carlos Garcia Campos <[email protected]>
[Cairo] Improve image quality when using newer versions of cairo/pixman
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/bindings/js/GCController.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/bindings/js/GCController.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/bindings/js/GCController.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -118,10 +118,10 @@
JSDOMWindow::commonVM().heap.setGarbageCollectionTimerEnabled(enable);
}
-void GCController::discardAllCompiledCode()
+void GCController::deleteAllCode()
{
JSLockHolder lock(JSDOMWindow::commonVM());
- JSDOMWindow::commonVM().discardAllCode();
+ JSDOMWindow::commonVM().deleteAllCode();
}
} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/bindings/js/GCController.h (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/bindings/js/GCController.h 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/bindings/js/GCController.h 2015-08-14 11:28:47 UTC (rev 188460)
@@ -45,7 +45,7 @@
WEBCORE_EXPORT void garbageCollectOnAlternateThreadForDebugging(bool waitUntilDone); // Used for stress testing.
WEBCORE_EXPORT void setJavaScriptGarbageCollectorTimerEnabled(bool);
- WEBCORE_EXPORT void discardAllCompiledCode();
+ WEBCORE_EXPORT void deleteAllCode();
private:
GCController(); // Use singleton() instead.
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/MemoryPressureHandler.cpp (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-08-14 11:28:47 UTC (rev 188460)
@@ -135,7 +135,7 @@
{
ReliefLogger log("Discard all JIT-compiled code");
- GCController::singleton().discardAllCompiledCode();
+ GCController::singleton().deleteAllCode();
}
{
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog 2015-08-14 11:28:47 UTC (rev 188460)
@@ -1,3 +1,14 @@
+2015-08-13 Geoffrey Garen <[email protected]>
+
+ 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:]):
+
2015-08-10 Chris Dumez <[email protected]>
Align WebKit1's PageCache size with WebKit2's
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebView/WebView.mm (188459 => 188460)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebView/WebView.mm 2015-08-14 11:00:43 UTC (rev 188459)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebView/WebView.mm 2015-08-14 11:28:47 UTC (rev 188460)
@@ -1376,7 +1376,7 @@
{
ASSERT(WebThreadIsCurrent());
WebKit::MemoryMeasure measurer("Memory warning: Discarding JIT'ed code.");
- GCController::singleton().discardAllCompiledCode();
+ GCController::singleton().deleteAllCode();
}
+ (BOOL)isCharacterSmartReplaceExempt:(unichar)character isPreviousCharacter:(BOOL)b
