JavaScriptCore:
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Mar 2008 14:34:31 +0000 (14:34 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Mar 2008 14:34:31 +0000 (14:34 +0000)
commite9fb9a55aeeeb823935fdc742933190724343b8a
treeb8c1559faed304cbfc6720e31129d753d5bf517e
parent509791a592409f0f1475370340b4f59a515ce537
JavaScriptCore:

        Unify concept of enabling the Mac Java bridge.

        Reviewed by Darin and Anders.

        * wtf/Platform.h: Define ENABLE_MAC_JAVA_BRIDGE here.

WebCore:

        Unify concept of enabling the Mac Java bridge.

        Reviewed by Darin and Anders.

        No test cases added since there is no change in functionality.

        * DerivedSources.make: Added check for ENABLE_MAC_JAVA_BRIDGE macro.
        If defined as "1", add WebCore.JNI.exp to WEBCORE_EXPORT_DEPENDENCIES.
        * WebCore.JNI.exp: Added.
        * WebCore.base.exp: Moved exported JNI methods to WebCore.JNI.exp.

        * bridge/jni/jni_class.cpp: Added #if ENABLE(MAC_JAVA_BRIDGE) guard.
        * bridge/jni/jni_class.h: Ditto.
        * bridge/jni/jni_instance.cpp: Ditto.
        * bridge/jni/jni_instance.h: Ditto.
        * bridge/jni/jni_jsobject.cpp: Ditto.
        * bridge/jni/jni_jsobject.h: Ditto.
        * bridge/jni/jni_objc.mm: Ditto.
        * bridge/jni/jni_runtime.cpp: Ditto.
        * bridge/jni/jni_runtime.h: Ditto.
        * bridge/jni/jni_utility.cpp: Ditto.
        * bridge/jni/jni_utility.h: Ditto.

        * bridge/runtime.cpp: Removed unused #include statements.
        * bridge/runtime.h:
        (KJS::Bindings::Instance::BindingLanguage): Added #if ENABLE(MAC_JAVA_BRIDGE)
        guard for JavaLanguage enum.  Also added #if PLATFORM(MAC) guard for
        ObjectiveCLanguage enum to match corresponding code in runtime.cpp.

        * config.h: Removed definition of HAVE_JNI.

        * loader/FrameLoaderClient.h:
        (WebCore::FrameLoaderClient::javaApplet): Added #if ENABLE(MAC_JAVA_BRIDGE) guard.
        * page/Frame.cpp:
        (WebCore::Frame::Frame): Ditto.
        * page/Frame.h:
        (WebCore::Frame::initJavaJSBindings): Ditto.
        * page/mac/FrameMac.mm:
        (WebCore::Frame::createScriptInstanceForWidget): Ditto.
        (WebCore::Frame::initJavaJSBindings): Ditto.

WebKit/mac:

        Unify concept of enabling the Mac Java bridge.

        Reviewed by Darin and Anders.

        * Plugins/WebPluginJava.h: Removed unused file.
        * WebCoreSupport/WebFrameLoaderClient.h:
        (WebFrameLoaderClient::javaApplet): Added #if ENABLE(MAC_JAVA_BRIDGE) guard.
        * WebCoreSupport/WebFrameLoaderClient.mm: Ditto for #import and NSView SPI method.
        (WebFrameLoaderClient::javaApplet): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31056 268f45cc-cd09-0410-ab3c-d52691b4dbfc
28 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/wtf/Platform.h
WebCore/ChangeLog
WebCore/DerivedSources.make
WebCore/WebCore.JNI.exp [new file with mode: 0644]
WebCore/WebCore.base.exp
WebCore/bridge/jni/jni_class.cpp
WebCore/bridge/jni/jni_class.h
WebCore/bridge/jni/jni_instance.cpp
WebCore/bridge/jni/jni_instance.h
WebCore/bridge/jni/jni_jsobject.cpp
WebCore/bridge/jni/jni_jsobject.h
WebCore/bridge/jni/jni_objc.mm
WebCore/bridge/jni/jni_runtime.cpp
WebCore/bridge/jni/jni_runtime.h
WebCore/bridge/jni/jni_utility.cpp
WebCore/bridge/jni/jni_utility.h
WebCore/bridge/runtime.cpp
WebCore/bridge/runtime.h
WebCore/config.h
WebCore/loader/FrameLoaderClient.h
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/mac/FrameMac.mm
WebKit/mac/ChangeLog
WebKit/mac/Plugins/WebPluginJava.h [deleted file]
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm