Title: [101792] trunk/Source/WebCore
- Revision
- 101792
- Author
- [email protected]
- Date
- 2011-12-02 07:15:43 -0800 (Fri, 02 Dec 2011)
Log Message
Remove instrumentation tracking a fixed bug
https://bugs.webkit.org/show_bug.cgi?id=73471
The underlying bug is fixed (bug 72068), and this instrumentation was intrusive and using
memory, plus the conditional compilation made me sad.
Reviewed by Nate Chapin.
No new tests.
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::ScriptElement):
(WebCore::ScriptElement::requestScript):
(WebCore::ScriptElement::stopLoadRequest):
(WebCore::ScriptElement::notifyFinished):
* dom/ScriptElement.h:
* dom/ScriptRunner.cpp:
(WebCore::ScriptRunner::queueScriptForExecution):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101791 => 101792)
--- trunk/Source/WebCore/ChangeLog 2011-12-02 14:45:44 UTC (rev 101791)
+++ trunk/Source/WebCore/ChangeLog 2011-12-02 15:15:43 UTC (rev 101792)
@@ -1,3 +1,24 @@
+2011-12-02 Gavin Peters <[email protected]>
+
+ Remove instrumentation tracking a fixed bug
+ https://bugs.webkit.org/show_bug.cgi?id=73471
+
+ The underlying bug is fixed (bug 72068), and this instrumentation was intrusive and using
+ memory, plus the conditional compilation made me sad.
+
+ Reviewed by Nate Chapin.
+
+ No new tests.
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::ScriptElement):
+ (WebCore::ScriptElement::requestScript):
+ (WebCore::ScriptElement::stopLoadRequest):
+ (WebCore::ScriptElement::notifyFinished):
+ * dom/ScriptElement.h:
+ * dom/ScriptRunner.cpp:
+ (WebCore::ScriptRunner::queueScriptForExecution):
+
2011-12-02 Vsevolod Vlasov <[email protected]>
Web Inspector: Split view works weirdly in network panel when resizing, showing/hiding main element.
Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (101791 => 101792)
--- trunk/Source/WebCore/dom/ScriptElement.cpp 2011-12-02 14:45:44 UTC (rev 101791)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2011-12-02 15:15:43 UTC (rev 101792)
@@ -65,10 +65,6 @@
, m_willExecuteWhenDocumentFinishedParsing(false)
, m_forceAsync(!parserInserted)
, m_willExecuteInOrder(false)
-#if PLATFORM(CHROMIUM)
- , m_cachedScriptState(NeverSet)
- , m_backtraceSize(0)
-#endif
{
ASSERT(m_element);
}
@@ -269,10 +265,6 @@
}
if (m_cachedScript) {
-#if PLATFORM(CHROMIUM)
- ASSERT(m_cachedScriptState == NeverSet);
- m_cachedScriptState = Set;
-#endif
return true;
}
@@ -310,12 +302,6 @@
if (m_cachedScript) {
if (!m_willBeParserExecuted)
m_cachedScript->removeClient(this);
-#if PLATFORM(CHROMIUM)
- ASSERT(m_cachedScriptState == Set);
- m_cachedScriptState = ZeroedInStopLoadRequest;
- m_backtraceSize = MaxBacktraceSize;
- WTFGetBacktrace(m_backtrace, &m_backtraceSize);
-#endif
m_cachedScript = 0;
}
}
@@ -342,12 +328,6 @@
else
m_element->document()->scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::ASYNC_EXECUTION);
-#if PLATFORM(CHROMIUM)
- ASSERT(m_cachedScriptState == Set);
- m_cachedScriptState = ZeroedInNotifyFinished;
- m_backtraceSize = MaxBacktraceSize;
- WTFGetBacktrace(m_backtrace, &m_backtraceSize);
-#endif
m_cachedScript = 0;
}
Modified: trunk/Source/WebCore/dom/ScriptElement.h (101791 => 101792)
--- trunk/Source/WebCore/dom/ScriptElement.h 2011-12-02 14:45:44 UTC (rev 101791)
+++ trunk/Source/WebCore/dom/ScriptElement.h 2011-12-02 15:15:43 UTC (rev 101792)
@@ -104,25 +104,6 @@
bool m_willExecuteInOrder : 1;
String m_characterEncoding;
String m_fallbackCharacterEncoding;
-
-#if PLATFORM(CHROMIUM)
- // Temporary: intended to help debug how we get notifyFinished() called when m_cachedScript is null,
- // which seems to sometimes happen (see http://code.google.com/p/chromium/issues/detail?id=75604 )
- enum {
- NeverSet,
- Set,
- ZeroedInStopLoadRequest,
- ZeroedInNotifyFinished,
- } m_cachedScriptState;
-
- // We grab a backtrace when we zero m_cachedScript, so that at later crashes
- // we'll have a debuggable stack.
- enum {
- MaxBacktraceSize = 32
- };
- int m_backtraceSize;
- void* m_backtrace[MaxBacktraceSize];
-#endif
};
ScriptElement* toScriptElement(Element*);
Modified: trunk/Source/WebCore/dom/ScriptRunner.cpp (101791 => 101792)
--- trunk/Source/WebCore/dom/ScriptRunner.cpp 2011-12-02 14:45:44 UTC (rev 101791)
+++ trunk/Source/WebCore/dom/ScriptRunner.cpp 2011-12-02 15:15:43 UTC (rev 101792)
@@ -52,11 +52,7 @@
void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedResourceHandle<CachedScript> cachedScript, ExecutionType executionType)
{
ASSERT(scriptElement);
-
- // Temporary: intended to help debug how null CachedScript objects can even get queued for execution, which
- // seems to sometimes happen (see http://code.google.com/p/chromium/issues/detail?id=75604 )
- if (!cachedScript.get())
- CRASH();
+ ASSERT(cachedScript.get());
Element* element = scriptElement->element();
ASSERT(element);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
