diff options
author | Steve Block <steveblock@google.com> | 2010-01-19 15:00:28 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-01-19 15:00:48 +0000 |
commit | 23a4578154c0507a6c2a42de452b3bcec971d0ed (patch) | |
tree | fcc8e9db51e01a45cefa674f9b366b3819f63b8e | |
parent | 6f473cc5d35ac6beed6d8c4bafdb37a0639ee08e (diff) | |
parent | df644d06988b2a2839113b5f4fc7b8dd1717d964 (diff) | |
download | external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.zip external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.tar.gz external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.tar.bz2 |
resolved conflicts for merge of df644d06 to master
Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
-rw-r--r-- | WebCore/Android.jscbindings.mk | 2 | ||||
-rw-r--r-- | WebCore/ChangeLog | 19 | ||||
-rw-r--r-- | WebCore/GNUmakefile.am | 3 | ||||
-rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 16 | ||||
-rw-r--r-- | WebCore/bindings/js/ScriptControllerMac.mm | 2 | ||||
-rw-r--r-- | WebCore/bridge/jni/jni_runtime.h | 4 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp (renamed from WebCore/bridge/jni/jni_instance.cpp) | 2 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.h (renamed from WebCore/bridge/jni/jni_instance.h) | 6 | ||||
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
9 files changed, 38 insertions, 18 deletions
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 6dd55ff..31edd49 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -188,9 +188,9 @@ LOCAL_SRC_FILES += \ bridge/c/c_runtime.cpp \ bridge/c/c_utility.cpp \ bridge/jni/jni_class.cpp \ - bridge/jni/jni_instance.cpp \ bridge/jni/jni_runtime.cpp \ bridge/jni/jni_utility.cpp \ + bridge/jni/jsc/JavaInstanceJSC.cpp \ bridge/jni/jsc/jni_utility_private.cpp \ bridge/npruntime.cpp \ bridge/runtime.cpp \ diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index b306b29..e6d6de6 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,22 @@ +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. + 2009-12-13 Sam Weinig <sam@webkit.org> Reviewed by Dan Bernstein. diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am index 7e32d2e..310a1b0 100644 --- a/WebCore/GNUmakefile.am +++ b/WebCore/GNUmakefile.am @@ -14,6 +14,7 @@ webcore_cppflags += \ -I$(srcdir)/WebCore/bindings/js \ -I$(srcdir)/WebCore/bridge \ -I$(srcdir)/WebCore/bridge/c \ + -I$(srcdir)/WebCore/bridge/jni/jsc \ -I$(srcdir)/WebCore/css \ -I$(srcdir)/WebCore/dom \ -I$(srcdir)/WebCore/dom/default \ @@ -496,10 +497,10 @@ webcore_sources += \ WebCore/bridge/c/c_utility.cpp \ WebCore/bridge/c/c_utility.h \ WebCore/bridge/jni/jni_class.h \ - WebCore/bridge/jni/jni_instance.h \ WebCore/bridge/jni/jni_jsobject.h \ WebCore/bridge/jni/jni_runtime.h \ WebCore/bridge/jni/jni_utility.h \ + WebCore/bridge/jni/jsc/JavaInstanceJSC.h \ WebCore/bridge/npapi.h \ WebCore/bridge/npruntime.cpp \ WebCore/bridge/npruntime.h \ diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index 915b509..b07a7db 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -297,8 +297,6 @@ 1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CCD0D7E2B82007C3983 /* c_utility.h */; }; 1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */; }; 1A569D000D7E2B82007C3983 /* jni_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD00D7E2B82007C3983 /* jni_class.h */; }; - 1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */; }; - 1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD20D7E2B82007C3983 /* jni_instance.h */; }; 1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */; }; 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD50D7E2B82007C3983 /* jni_objc.mm */; }; @@ -1103,6 +1101,8 @@ 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; }; 599D1E3210C97D6E00E0EF12 /* jni_utility_private.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */; }; 599D1E3310C97D6E00E0EF12 /* jni_utility_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 599D1E3110C97D6E00E0EF12 /* jni_utility_private.h */; }; + 59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */; }; + 59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */; }; 59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */; }; 59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5D15E3AB0F9E6AC1009E0E3F /* XMLTokenizerScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */; }; @@ -5522,8 +5522,6 @@ 1A569CCD0D7E2B82007C3983 /* c_utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_utility.h; sourceTree = "<group>"; }; 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_class.cpp; sourceTree = "<group>"; }; 1A569CD00D7E2B82007C3983 /* jni_class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_class.h; sourceTree = "<group>"; }; - 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_instance.cpp; sourceTree = "<group>"; }; - 1A569CD20D7E2B82007C3983 /* jni_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_instance.h; sourceTree = "<group>"; }; 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = jni_jsobject.mm; sourceTree = "<group>"; }; 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_jsobject.h; sourceTree = "<group>"; }; 1A569CD50D7E2B82007C3983 /* jni_objc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = jni_objc.mm; sourceTree = "<group>"; }; @@ -6432,6 +6430,8 @@ 550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 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>"; }; 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>"; }; + 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaInstanceJSC.cpp; path = jsc/JavaInstanceJSC.cpp; sourceTree = "<group>"; }; + 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaInstanceJSC.h; path = jsc/JavaInstanceJSC.h; sourceTree = "<group>"; }; 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeolocationServiceMock.cpp; path = mock/GeolocationServiceMock.cpp; sourceTree = "<group>"; }; 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationServiceMock.h; path = mock/GeolocationServiceMock.h; sourceTree = "<group>"; }; 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizerScope.cpp; sourceTree = "<group>"; }; @@ -10293,8 +10293,6 @@ 599D1E2F10C97D4C00E0EF12 /* jsc */, 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */, 1A569CD00D7E2B82007C3983 /* jni_class.h */, - 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */, - 1A569CD20D7E2B82007C3983 /* jni_instance.h */, 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */, 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */, 1A569CD50D7E2B82007C3983 /* jni_objc.mm */, @@ -10996,6 +10994,8 @@ 599D1E2F10C97D4C00E0EF12 /* jsc */ = { isa = PBXGroup; children = ( + 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */, + 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */, 599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */, 599D1E3110C97D6E00E0EF12 /* jni_utility_private.h */, ); @@ -17070,7 +17070,6 @@ 1C81BA010E9733CB00266E07 /* JavaScriptProfile.h in Headers */, 1C81B9FF0E9733CB00266E07 /* JavaScriptProfileNode.h in Headers */, 1A569D000D7E2B82007C3983 /* jni_class.h in Headers */, - 1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */, 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */, 1A569D070D7E2B82007C3983 /* jni_runtime.h in Headers */, 1A569D090D7E2B82007C3983 /* jni_utility.h in Headers */, @@ -18281,6 +18280,7 @@ 1CC93C640DAE929600E4BC3A /* Copy Forwarding and ICU Headers */, 93F199FD08245E59001E9ABC /* Resources */, 1C81BA330E97357C00266E07 /* Copy Inspector Resources */, + 59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */, 1C5F9D760E09A1B400E91D0A /* Streamline Inspector Source */, 93F19A0C08245E59001E9ABC /* Sources */, 93F19B1208245E59001E9ABC /* Frameworks */, @@ -19232,7 +19232,6 @@ 1C81BA020E9733CB00266E07 /* JavaScriptProfile.cpp in Sources */, 1C81BA000E9733CB00266E07 /* JavaScriptProfileNode.cpp in Sources */, 1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */, - 1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */, 1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */, 1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */, 1A569D060D7E2B82007C3983 /* jni_runtime.cpp in Sources */, @@ -20431,6 +20430,7 @@ /* Begin PBXTargetDependency section */ DD041FF109D9E3250010AF2A /* PBXTargetDependency */ = { isa = PBXTargetDependency; + 59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */, target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */; targetProxy = DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */; }; diff --git a/WebCore/bindings/js/ScriptControllerMac.mm b/WebCore/bindings/js/ScriptControllerMac.mm index 21ec0f2..7d3b267 100644 --- a/WebCore/bindings/js/ScriptControllerMac.mm +++ b/WebCore/bindings/js/ScriptControllerMac.mm @@ -51,7 +51,7 @@ #import "runtime.h" #if ENABLE(MAC_JAVA_BRIDGE) -#import "jni_instance.h" +#import "JavaInstanceJSC.h" #endif @interface NSObject (WebPlugin) diff --git a/WebCore/bridge/jni/jni_runtime.h b/WebCore/bridge/jni/jni_runtime.h index 81484ff..e18b9a1 100644 --- a/WebCore/bridge/jni/jni_runtime.h +++ b/WebCore/bridge/jni/jni_runtime.h @@ -28,8 +28,8 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include <jni_utility.h> -#include <jni_instance.h> +#include "JavaInstanceJSC.h" +#include "jni_utility.h" #include <runtime/JSLock.h> diff --git a/WebCore/bridge/jni/jni_instance.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp index 3783d10..3f88002 100644 --- a/WebCore/bridge/jni/jni_instance.cpp +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include "jni_instance.h" +#include "JavaInstanceJSC.h" #if ENABLE(MAC_JAVA_BRIDGE) diff --git a/WebCore/bridge/jni/jni_instance.h b/WebCore/bridge/jni/jsc/JavaInstanceJSC.h index 049bfdb..a9b83e3 100644 --- a/WebCore/bridge/jni/jni_instance.h +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _JNI_INSTANCE_H_ -#define _JNI_INSTANCE_H_ +#ifndef JavaInstanceJSC_h +#define JavaInstanceJSC_h #if ENABLE(MAC_JAVA_BRIDGE) @@ -107,4 +107,4 @@ protected: #endif // ENABLE(MAC_JAVA_BRIDGE) -#endif // _JNI_INSTANCE_H_ +#endif // JavaInstanceJSC_h diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index a7a93d5..5dd0db5 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -103,7 +103,7 @@ #include "jni.h" #if USE(JSC) -#include "jni_instance.h" +#include "JavaInstanceJSC.h" #endif // USE(JSC) #include <JNIHelp.h> |