JavaScriptCore:

        Reviewed by Geoff Garen.

        Fix for http://bugs.webkit.org/show_bug.cgi?id=17419
        Remove CompatMode from JavaScriptCore as it is never set to anything other than NativeMode

        * kjs/JSGlobalObject.cpp:
        (KJS::JSGlobalObject::init):
        * kjs/JSGlobalObject.h:
        (KJS::JSGlobalObject::setDebugger):
        * kjs/date_object.cpp:
        (KJS::dateProtoFuncGetYear):

WebCore:

        Reviewed by Geoff Garen.

        Fix for http://bugs.webkit.org/show_bug.cgi?id=17419
        Remove CompatMode from JavaScriptCore as it is never set to anything other than NativeMode

        * bindings/js/kjs_proxy.cpp:
        (WebCore::KJSProxy::initScript):

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3cff6b3eaac974ea58fd36068123bb85c82c8a6c..3edaf8cb29b29c0d6ae1a7f66a8f3f3c9ebb2b10 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-18  Samuel Weinig  <sam@webkit.org>
+
+        Reviewed by Geoff Garen.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=17419
+        Remove CompatMode from JavaScriptCore as it is never set to anything other than NativeMode
+
+        * kjs/JSGlobalObject.cpp:
+        (KJS::JSGlobalObject::init):
+        * kjs/JSGlobalObject.h:
+        (KJS::JSGlobalObject::setDebugger):
+        * kjs/date_object.cpp:
+        (KJS::dateProtoFuncGetYear):
+
 2008-02-18  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam.

diff --git a/JavaScriptCore/kjs/JSGlobalObject.cpp b/JavaScriptCore/kjs/JSGlobalObject.cpp
index 9ecfa7231eff0a000a6c6ce99fe313b4738dfdb7..1c51cb8b98585f4111713b490f559e1ed0388e3b 100644 (file)
--- a/JavaScriptCore/kjs/JSGlobalObject.cpp
+++ b/JavaScriptCore/kjs/JSGlobalObject.cpp
@@ -130,8 +130,6 @@ void JSGlobalObject::init()
     } else
         s_head = d()->next = d()->prev = this;
 
-    d()->compatMode = NativeMode;
-
     resetTimeoutCheck();
     d()->timeoutTime = 0;
     d()->timeoutCheckCount = 0;

diff --git a/JavaScriptCore/kjs/JSGlobalObject.h b/JavaScriptCore/kjs/JSGlobalObject.h
index 2568b0a8891ff33e80c2190c5c41fa31b7ee2030..9fd2eb4077c4b8a1517ede09a3ed7555691d808c 100644 (file)
--- a/JavaScriptCore/kjs/JSGlobalObject.h
+++ b/JavaScriptCore/kjs/JSGlobalObject.h
@@ -67,8 +67,6 @@ namespace KJS {
     class UriErrorPrototype;
     struct ActivationStackNode;
 
-    enum CompatMode { NativeMode, IECompat, NetscapeCompat };
-
     class JSGlobalObject : public JSVariableObject {
     protected:
         using JSVariableObject::JSVariableObjectData;
@@ -84,7 +82,6 @@ namespace KJS {
             JSGlobalObject* prev;
 
             Debugger* debugger;
-            CompatMode compatMode;
             
             GlobalExecState globalExec;
             int recursion;
@@ -209,10 +206,6 @@ namespace KJS {
 
         Debugger* debugger() const { return d()->debugger; }
         void setDebugger(Debugger* debugger) { d()->debugger = debugger; }
-
-        // FIXME: Let's just pick one compatible behavior and go with it.
-        void setCompatMode(CompatMode mode) { d()->compatMode = mode; }
-        CompatMode compatMode() const { return d()->compatMode; }
         
         int recursion() { return d()->recursion; }
         void incRecursion() { ++d()->recursion; }

diff --git a/JavaScriptCore/kjs/date_object.cpp b/JavaScriptCore/kjs/date_object.cpp
index 6b757c2a5d2f54936abc075f846efc7a07c2b876..2b34923901f1b487dc58497babc0e92bb93d99ba 100644 (file)
--- a/JavaScriptCore/kjs/date_object.cpp
+++ b/JavaScriptCore/kjs/date_object.cpp
@@ -1606,9 +1606,7 @@ JSValue* dateProtoFuncGetYear(ExecState* exec, JSObject* thisObj, const List&)
     GregorianDateTime t;
     msToGregorianDateTime(milli, utc, t);
 
-    // IE returns the full year even in getYear.
-    if (exec->dynamicGlobalObject()->compatMode() == IECompat)
-        return jsNumber(1900 + t.year);
+    // NOTE: IE returns the full year even in getYear.
     return jsNumber(t.year);
 }
 

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ead22ac18d535d4bb2ce1e93c976565d9fefe5bc..14cb40cf7b939311369c950ae874174eaf4b0cce 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-18  Samuel Weinig  <sam@webkit.org>
+
+        Reviewed by Geoff Garen.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=17419
+        Remove CompatMode from JavaScriptCore as it is never set to anything other than NativeMode
+
+        * bindings/js/kjs_proxy.cpp:
+        (WebCore::KJSProxy::initScript):
+
 2008-02-18  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.

diff --git a/WebCore/bindings/js/kjs_proxy.cpp b/WebCore/bindings/js/kjs_proxy.cpp
index 433c9e9cd4f25b8a2fbda3653a2370ed22c92535..7b29b4b553031ce81e0b2cb2efbc28da71a82c20 100644 (file)
--- a/WebCore/bindings/js/kjs_proxy.cpp
+++ b/WebCore/bindings/js/kjs_proxy.cpp
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -147,16 +147,6 @@ void KJSProxy::initScript()
 
     m_globalObject = new JSDOMWindow(m_frame->domWindow());
 
-    // FIXME: We can get rid of this (and eliminate compatMode entirely).
-    String userAgent = m_frame->loader()->userAgent(m_frame->document() ? m_frame->document()->url() : KURL());
-    if (userAgent.find("Microsoft") >= 0 || userAgent.find("MSIE") >= 0)
-        m_globalObject->setCompatMode(IECompat);
-    else {
-        // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
-        if (userAgent.find("Mozilla") >= 0 && userAgent.find("compatible") == -1)
-            m_globalObject->setCompatMode(NetscapeCompat);
-    }
-
     m_frame->loader()->dispatchWindowObjectAvailable();
 }