Changeset 53412 in webkit


Ignore:
Timestamp:
Jan 18, 2010 10:15:24 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-18 Steve Block <steveblock@google.com>

Reviewed by Adam Barth.

Moves JSC-specific version of JavaInstance from bridge/jni/jni_instance to bridge/jni/jsc/JavaInstanceJSC
https://bugs.webkit.org/show_bug.cgi?id=33672

No new tests, refactoring only.

  • Android.jscbindings.mk: Modified. Removed jni_instance.cpp and added JavaInstanceJSC.cpp
  • GNUmakefile.am: Modified. Removed jni_instance.h and added JavaInstanceJSC.h
  • WebCore.xcodeproj/project.pbxproj: Modified. Removed jni_instance.[cpp|h] and added JavaInstanceJSC.[cpp|h]
  • bindings/js/ScriptControllerMac.mm: Modified. Includes JavaInstanceJSC.h
  • bridge/jni/jni_instance.cpp: Removed.
  • bridge/jni/jni_instance.h: Removed.
  • bridge/jni/jni_runtime.h: Modified. Includes JavaInstanceJSC.h
  • bridge/jni/jsc/JavaInstanceJSC.cpp: Copied from WebCore/bridge/jni/jni_instance.cpp.
  • bridge/jni/jsc/JavaInstanceJSC.h: Copied from WebCore/bridge/jni/jni_instance.h.
Location:
trunk/WebCore
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/Android.jscbindings.mk

    r53086 r53412  
    185185        bridge/c/c_utility.cpp \
    186186        bridge/jni/jni_class.cpp \
    187         bridge/jni/jni_instance.cpp \
    188187        bridge/jni/jni_runtime.cpp \
    189188        bridge/jni/jni_utility.cpp \
     189        bridge/jni/jsc/JavaInstanceJSC.cpp \
    190190        bridge/jni/jsc/jni_utility_private.cpp \
    191191        bridge/npruntime.cpp \
  • trunk/WebCore/ChangeLog

    r53411 r53412  
     12010-01-18  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        Moves JSC-specific version of JavaInstance from bridge/jni/jni_instance to bridge/jni/jsc/JavaInstanceJSC
     6        https://bugs.webkit.org/show_bug.cgi?id=33672
     7
     8        No new tests, refactoring only.
     9
     10        * Android.jscbindings.mk: Modified. Removed jni_instance.cpp and added JavaInstanceJSC.cpp
     11        * GNUmakefile.am: Modified. Removed jni_instance.h and added JavaInstanceJSC.h
     12        * WebCore.xcodeproj/project.pbxproj: Modified. Removed jni_instance.[cpp|h] and added JavaInstanceJSC.[cpp|h]
     13        * bindings/js/ScriptControllerMac.mm: Modified. Includes JavaInstanceJSC.h
     14        * bridge/jni/jni_instance.cpp: Removed.
     15        * bridge/jni/jni_instance.h: Removed.
     16        * bridge/jni/jni_runtime.h: Modified. Includes JavaInstanceJSC.h
     17        * bridge/jni/jsc/JavaInstanceJSC.cpp: Copied from WebCore/bridge/jni/jni_instance.cpp.
     18        * bridge/jni/jsc/JavaInstanceJSC.h: Copied from WebCore/bridge/jni/jni_instance.h.
     19
    1202010-01-18  Peter Kasting  <pkasting@google.com>
    221
  • trunk/WebCore/GNUmakefile.am

    r53264 r53412  
    1515        -I$(srcdir)/WebCore/bridge \
    1616        -I$(srcdir)/WebCore/bridge/c \
     17        -I$(srcdir)/WebCore/bridge/jni/jsc \
    1718        -I$(srcdir)/WebCore/css \
    1819        -I$(srcdir)/WebCore/dom \
     
    504505        WebCore/bridge/c/c_utility.h \
    505506        WebCore/bridge/jni/jni_class.h \
    506         WebCore/bridge/jni/jni_instance.h \
    507507        WebCore/bridge/jni/jni_jsobject.h \
    508508        WebCore/bridge/jni/jni_runtime.h \
    509509        WebCore/bridge/jni/jni_utility.h \
     510        WebCore/bridge/jni/jsc/JavaInstanceJSC.h \
    510511        WebCore/bridge/npapi.h \
    511512        WebCore/bridge/npruntime.cpp \
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r53238 r53412  
    306306                1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */; };
    307307                1A569D000D7E2B82007C3983 /* jni_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD00D7E2B82007C3983 /* jni_class.h */; };
    308                 1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */; };
    309                 1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD20D7E2B82007C3983 /* jni_instance.h */; };
    310308                1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */; };
    311309                1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    11161114                599D1E3210C97D6E00E0EF12 /* jni_utility_private.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */; };
    11171115                599D1E3310C97D6E00E0EF12 /* jni_utility_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 599D1E3110C97D6E00E0EF12 /* jni_utility_private.h */; };
     1116                59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */; };
     1117                59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */; };
    11181118                59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */; };
    11191119                59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    55515551                1A569CCF0D7E2B82007C3983 /* jni_class.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_class.cpp; sourceTree = "<group>"; };
    55525552                1A569CD00D7E2B82007C3983 /* jni_class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_class.h; sourceTree = "<group>"; };
    5553                 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_instance.cpp; sourceTree = "<group>"; };
    5554                 1A569CD20D7E2B82007C3983 /* jni_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_instance.h; sourceTree = "<group>"; };
    55555553                1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = jni_jsobject.mm; sourceTree = "<group>"; };
    55565554                1A569CD40D7E2B82007C3983 /* jni_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_jsobject.h; sourceTree = "<group>"; };
     
    64666464                599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_utility_private.cpp; path = jsc/jni_utility_private.cpp; sourceTree = "<group>"; };
    64676465                599D1E3110C97D6E00E0EF12 /* jni_utility_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jni_utility_private.h; path = jsc/jni_utility_private.h; sourceTree = "<group>"; };
     6466                59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaInstanceJSC.cpp; path = jsc/JavaInstanceJSC.cpp; sourceTree = "<group>"; };
     6467                59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaInstanceJSC.h; path = jsc/JavaInstanceJSC.h; sourceTree = "<group>"; };
    64686468                59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeolocationServiceMock.cpp; path = mock/GeolocationServiceMock.cpp; sourceTree = "<group>"; };
    64696469                59C77F2910545B3B00506104 /* GeolocationServiceMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationServiceMock.h; path = mock/GeolocationServiceMock.h; sourceTree = "<group>"; };
     
    1034410344                                1A569CCF0D7E2B82007C3983 /* jni_class.cpp */,
    1034510345                                1A569CD00D7E2B82007C3983 /* jni_class.h */,
    10346                                 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */,
    10347                                 1A569CD20D7E2B82007C3983 /* jni_instance.h */,
    1034810346                                1A569CD40D7E2B82007C3983 /* jni_jsobject.h */,
    1034910347                                1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */,
     
    1105811056                        isa = PBXGroup;
    1105911057                        children = (
     11058                                59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */,
     11059                                59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */,
    1106011060                                599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */,
    1106111061                                599D1E3110C97D6E00E0EF12 /* jni_utility_private.h */,
     
    1714317143                                1C81B9FF0E9733CB00266E07 /* JavaScriptProfileNode.h in Headers */,
    1714417144                                1A569D000D7E2B82007C3983 /* jni_class.h in Headers */,
    17145                                 1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */,
    1714617145                                1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */,
    1714717146                                1A569D070D7E2B82007C3983 /* jni_runtime.h in Headers */,
     
    1835018349                                6E4E91AF10F7FB3100A2779C /* WebGLContextAttributes.h in Headers */,
    1835118350                                6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */,
     18351                                59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */,
    1835218352                        );
    1835318353                        runOnlyForDeploymentPostprocessing = 0;
     
    1931619316                                1C81BA000E9733CB00266E07 /* JavaScriptProfileNode.cpp in Sources */,
    1931719317                                1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */,
    19318                                 1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */,
    1931919318                                1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */,
    1932019319                                1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */,
     
    2051420513                                6E4E91AE10F7FB3100A2779C /* WebGLContextAttributes.cpp in Sources */,
    2051520514                                6EE8A77210F803F3005A4A24 /* JSWebGLContextAttributes.cpp in Sources */,
     20515                                59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */,
    2051620516                        );
    2051720517                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/WebCore/bindings/js/ScriptControllerMac.mm

    r53046 r53412  
    5252
    5353#if ENABLE(MAC_JAVA_BRIDGE)
    54 #import "jni_instance.h"
     54#import "JavaInstanceJSC.h"
    5555#endif
    5656
  • trunk/WebCore/bridge/jni/jni_runtime.h

    r46431 r53412  
    2929#if ENABLE(MAC_JAVA_BRIDGE)
    3030
    31 #include <jni_utility.h>
    32 #include <jni_instance.h>
     31#include "JavaInstanceJSC.h"
     32#include "jni_utility.h"
    3333#include <runtime/JSLock.h>
    3434
  • trunk/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp

    r53411 r53412  
    2525
    2626#include "config.h"
    27 #include "jni_instance.h"
     27#include "JavaInstanceJSC.h"
    2828
    2929#if ENABLE(MAC_JAVA_BRIDGE)
  • trunk/WebCore/bridge/jni/jsc/JavaInstanceJSC.h

    r53411 r53412  
    2424 */
    2525
    26 #ifndef _JNI_INSTANCE_H_
    27 #define _JNI_INSTANCE_H_
     26#ifndef JavaInstanceJSC_h
     27#define JavaInstanceJSC_h
    2828
    2929#if ENABLE(MAC_JAVA_BRIDGE)
     
    108108#endif // ENABLE(MAC_JAVA_BRIDGE)
    109109
    110 #endif // _JNI_INSTANCE_H_
     110#endif // JavaInstanceJSC_h
Note: See TracChangeset for help on using the changeset viewer.