Reviewed by Oliver Hunt.
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Sep 2007 09:25:06 +0000 (09:25 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Sep 2007 09:25:06 +0000 (09:25 +0000)
        - fixed <rdar://problem/5455457> REGRESSION (9A527-9A535): Colloquy crash on launch in WebCoreScriptDebugger initWithDelegate (with announce.js plug-in installed)

        * page/mac/FrameMac.mm:
        (WebCore::Frame::windowScriptObject): Ensure that -[WebView
        windowScriptObject] and -[WebFrame windowObject] return null until
        the windowScriptObjectAvailable: delegate method is sent.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/page/mac/FrameMac.mm

index b5d910c..2905678 100644 (file)
@@ -1,3 +1,14 @@
+2007-09-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        - fixed <rdar://problem/5455457> REGRESSION (9A527-9A535): Colloquy crash on launch in WebCoreScriptDebugger initWithDelegate (with announce.js plug-in installed)
+
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::windowScriptObject): Ensure that -[WebView
+        windowScriptObject] and -[WebFrame windowObject] return null until
+        the windowScriptObjectAvailable: delegate method is sent.
+
 2007-09-05  David Harrison  <harrison@apple.com>
 
         Reviewed by Kevin Decker.
index 8f79298..3674176 100644 (file)
@@ -688,7 +688,7 @@ KJS::Bindings::Instance* Frame::createScriptInstanceForWidget(WebCore::Widget* w
 WebScriptObject* Frame::windowScriptObject()
 {
     Settings* settings = this->settings();
-    if (!settings || !settings->isJavaScriptEnabled())
+    if (!settings || !settings->isJavaScriptEnabled() || !scriptProxy()->haveInterpreter())
         return 0;
 
     if (!d->m_windowScriptObject) {