[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/html
From:       Maks Orlovich <maksim () kde ! org>
Date:       2005-11-30 21:53:24
Message-ID: 1133387604.106382.23541.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 484465 by orlovich:

Get rid of script loader before running the script, so we don't get into weird
reentrancy issues.
BUG:116325


 M  +4 -2      html_headimpl.cpp  


--- branches/KDE/3.5/kdelibs/khtml/html/html_headimpl.cpp #484464:484465
@@ -393,10 +393,12 @@
 
     assert(cs == m_cachedScript);
 
-    evaluateScript(cs->url().string(), cs->script());
-
+    QString   URL    = cs->url().string();
+    DOMString script = cs->script();
     cs->deref(this);
     m_cachedScript = 0;
+
+    evaluateScript(URL, script);
 }
 
 void HTMLScriptElementImpl::evaluateScript(const QString &URL, const DOMString &script)
[prev in list] [next in list] [prev in thread] [next in thread]