Changeset 26071 in webkit

Timestamp:

Oct 5, 2007, 1:12:58 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Sam Weinig.

Fixed <rdar://problem/5522487> REGRESSION: With JavaScript disabled,
any page load causes a crash in PropertyMap::put

The problem was that we were using JavaScript when JavaScript was
disabled. The architecture for disabling JavaScript could use some
consolidation, but this is the simplest, safest change for now.

Currently passing layout tests still pass.

• bindings/js/kjs_proxy.cpp: (WebCore::KJSProxy::updateDocumentWrapper):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/kjs_proxy.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-05  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+        
+        Fixed <rdar://problem/5522487> REGRESSION: With JavaScript disabled, 
+        any page load causes a crash in PropertyMap::put
+        
+        The problem was that we were using JavaScript when JavaScript was
+        disabled. The architecture for disabling JavaScript could use some
+        consolidation, but this is the simplest, safest change for now.
+        
+        Currently passing layout tests still pass.
+
+        * bindings/js/kjs_proxy.cpp:
+        (WebCore::KJSProxy::updateDocumentWrapper):
+
 2007-10-04  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/bindings/js/kjs_proxy.cpp

@@ -30 +30 @@
 #include "JSDOMWindow.h"
 #include "Page.h"
+#include "Settings.h"
 #include "kjs_events.h"
 #include "kjs_window.h"
@@ -169 +170 @@
 void KJSProxy::updateDocumentWrapper() 
 {
+    Settings* settings = m_frame->settings();
+    if (!settings || !settings->isJavaScriptEnabled())
+        return;
+
     if (!m_script || !m_frame->document())
         return;
+
     JSLock lock;
     // this will update 'document' property to point to the current document