Changeset 53412 in webkit
- Timestamp:
- Jan 18, 2010 10:15:24 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 6 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/Android.jscbindings.mk
r53086 r53412 185 185 bridge/c/c_utility.cpp \ 186 186 bridge/jni/jni_class.cpp \ 187 bridge/jni/jni_instance.cpp \188 187 bridge/jni/jni_runtime.cpp \ 189 188 bridge/jni/jni_utility.cpp \ 189 bridge/jni/jsc/JavaInstanceJSC.cpp \ 190 190 bridge/jni/jsc/jni_utility_private.cpp \ 191 191 bridge/npruntime.cpp \ -
trunk/WebCore/ChangeLog
r53411 r53412 1 2010-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 1 20 2010-01-18 Peter Kasting <pkasting@google.com> 2 21 -
trunk/WebCore/GNUmakefile.am
r53264 r53412 15 15 -I$(srcdir)/WebCore/bridge \ 16 16 -I$(srcdir)/WebCore/bridge/c \ 17 -I$(srcdir)/WebCore/bridge/jni/jsc \ 17 18 -I$(srcdir)/WebCore/css \ 18 19 -I$(srcdir)/WebCore/dom \ … … 504 505 WebCore/bridge/c/c_utility.h \ 505 506 WebCore/bridge/jni/jni_class.h \ 506 WebCore/bridge/jni/jni_instance.h \507 507 WebCore/bridge/jni/jni_jsobject.h \ 508 508 WebCore/bridge/jni/jni_runtime.h \ 509 509 WebCore/bridge/jni/jni_utility.h \ 510 WebCore/bridge/jni/jsc/JavaInstanceJSC.h \ 510 511 WebCore/bridge/npapi.h \ 511 512 WebCore/bridge/npruntime.cpp \ -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r53238 r53412 306 306 1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */; }; 307 307 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 */; };310 308 1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */; }; 311 309 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1116 1114 599D1E3210C97D6E00E0EF12 /* jni_utility_private.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */; }; 1117 1115 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 */; }; 1118 1118 59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */; }; 1119 1119 59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 5551 5551 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_class.cpp; sourceTree = "<group>"; }; 5552 5552 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>"; };5555 5553 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = jni_jsobject.mm; sourceTree = "<group>"; }; 5556 5554 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_jsobject.h; sourceTree = "<group>"; }; … … 6466 6464 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>"; }; 6467 6465 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>"; }; 6468 6468 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeolocationServiceMock.cpp; path = mock/GeolocationServiceMock.cpp; sourceTree = "<group>"; }; 6469 6469 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationServiceMock.h; path = mock/GeolocationServiceMock.h; sourceTree = "<group>"; }; … … 10344 10344 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */, 10345 10345 1A569CD00D7E2B82007C3983 /* jni_class.h */, 10346 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */,10347 1A569CD20D7E2B82007C3983 /* jni_instance.h */,10348 10346 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */, 10349 10347 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */, … … 11058 11056 isa = PBXGroup; 11059 11057 children = ( 11058 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */, 11059 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */, 11060 11060 599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */, 11061 11061 599D1E3110C97D6E00E0EF12 /* jni_utility_private.h */, … … 17143 17143 1C81B9FF0E9733CB00266E07 /* JavaScriptProfileNode.h in Headers */, 17144 17144 1A569D000D7E2B82007C3983 /* jni_class.h in Headers */, 17145 1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */,17146 17145 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */, 17147 17146 1A569D070D7E2B82007C3983 /* jni_runtime.h in Headers */, … … 18350 18349 6E4E91AF10F7FB3100A2779C /* WebGLContextAttributes.h in Headers */, 18351 18350 6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */, 18351 59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */, 18352 18352 ); 18353 18353 runOnlyForDeploymentPostprocessing = 0; … … 19316 19316 1C81BA000E9733CB00266E07 /* JavaScriptProfileNode.cpp in Sources */, 19317 19317 1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */, 19318 1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */,19319 19318 1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */, 19320 19319 1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */, … … 20514 20513 6E4E91AE10F7FB3100A2779C /* WebGLContextAttributes.cpp in Sources */, 20515 20514 6EE8A77210F803F3005A4A24 /* JSWebGLContextAttributes.cpp in Sources */, 20515 59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */, 20516 20516 ); 20517 20517 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/bindings/js/ScriptControllerMac.mm
r53046 r53412 52 52 53 53 #if ENABLE(MAC_JAVA_BRIDGE) 54 #import " jni_instance.h"54 #import "JavaInstanceJSC.h" 55 55 #endif 56 56 -
trunk/WebCore/bridge/jni/jni_runtime.h
r46431 r53412 29 29 #if ENABLE(MAC_JAVA_BRIDGE) 30 30 31 #include <jni_utility.h>32 #include <jni_instance.h>31 #include "JavaInstanceJSC.h" 32 #include "jni_utility.h" 33 33 #include <runtime/JSLock.h> 34 34 -
trunk/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
r53411 r53412 25 25 26 26 #include "config.h" 27 #include " jni_instance.h"27 #include "JavaInstanceJSC.h" 28 28 29 29 #if ENABLE(MAC_JAVA_BRIDGE) -
trunk/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
r53411 r53412 24 24 */ 25 25 26 #ifndef _JNI_INSTANCE_H_27 #define _JNI_INSTANCE_H_26 #ifndef JavaInstanceJSC_h 27 #define JavaInstanceJSC_h 28 28 29 29 #if ENABLE(MAC_JAVA_BRIDGE) … … 108 108 #endif // ENABLE(MAC_JAVA_BRIDGE) 109 109 110 #endif // _JNI_INSTANCE_H_110 #endif // JavaInstanceJSC_h
Note: See TracChangeset
for help on using the changeset viewer.