diff options
author | Steve Block <steveblock@google.com> | 2010-01-19 07:52:14 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-19 07:52:14 -0800 |
commit | 012431a09c7b675eb3f80078d7021d2402b28211 (patch) | |
tree | 54c3f01c2d41019022e2ceab76e4ebc5aa3376b9 /WebCore | |
parent | 30c4e907f29631057297b32e1a4a6e288237472d (diff) | |
parent | f83060e89e8ba30d0321f33164a0c4819f837a03 (diff) | |
download | external_webkit-012431a09c7b675eb3f80078d7021d2402b28211.zip external_webkit-012431a09c7b675eb3f80078d7021d2402b28211.tar.gz external_webkit-012431a09c7b675eb3f80078d7021d2402b28211.tar.bz2 |
am f83060e8: am be164dbc: Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
Merge commit 'f83060e89e8ba30d0321f33164a0c4819f837a03'
* commit 'f83060e89e8ba30d0321f33164a0c4819f837a03':
Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/Android.jscbindings.mk | 2 | ||||
-rw-r--r-- | WebCore/ChangeLog | 18 | ||||
-rw-r--r-- | WebCore/GNUmakefile.am | 2 | ||||
-rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 16 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaClassJSC.cpp (renamed from WebCore/bridge/jni/jni_class.cpp) | 2 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaClassJSC.h (renamed from WebCore/bridge/jni/jni_class.h) | 6 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp | 2 |
7 files changed, 33 insertions, 15 deletions
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 31edd49..119601d 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -187,9 +187,9 @@ LOCAL_SRC_FILES += \ bridge/c/c_instance.cpp \ bridge/c/c_runtime.cpp \ bridge/c/c_utility.cpp \ - bridge/jni/jni_class.cpp \ bridge/jni/jni_runtime.cpp \ bridge/jni/jni_utility.cpp \ + bridge/jni/jsc/JavaClassJSC.cpp \ bridge/jni/jsc/JavaInstanceJSC.cpp \ bridge/jni/jsc/jni_utility_private.cpp \ bridge/npruntime.cpp \ diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 372d728..1e9ec41 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -176,6 +176,24 @@ (WebCore::WebGLRenderingContext::bufferSubData): (WebCore::WebGLRenderingContext::compileShader): (WebCore::WebGLRenderingContext::createShader): + +2010-01-18 Steve Block <steveblock@google.com> + + Reviewed by Adam Barth. + + Moves JSC-specific version of JavaClass from bridge/jni/jni_class to bridge/jni/jsc/JavaClassJSC + https://bugs.webkit.org/show_bug.cgi?id=33561 + + No new tests, refactoring only. + + * Android.jscbindings.mk: Modified. Removed jni_class.cpp and added JavaClassJSC.cpp + * GNUmakefile.am: Modified. Removed jni_class.h and added JavaClassJSC.h + * WebCore.xcodeproj/project.pbxproj: Modified. Removed jni_class.[cpp|h] and added JavaClassJSC.[cpp|h] + * bridge/jni/jni_class.cpp: Removed. + * bridge/jni/jni_class.h: Removed. + * bridge/jni/jsc/JavaClassJSC.cpp: Copied from WebCore/bridge/jni/jni_class.cpp. + * bridge/jni/jsc/JavaClassJSC.h: Copied from WebCore/bridge/jni/jni_class.h. + * bridge/jni/jsc/JavaInstanceJSC.cpp: Modified. Includes JavaClassJSC.h (WebCore::WebGLRenderingContext::detachShader): (WebCore::WebGLRenderingContext::disableVertexAttribArray): (WebCore::WebGLRenderingContext::drawArrays): diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am index 310a1b0..a04c123 100644 --- a/WebCore/GNUmakefile.am +++ b/WebCore/GNUmakefile.am @@ -496,10 +496,10 @@ webcore_sources += \ WebCore/bridge/c/c_runtime.h \ WebCore/bridge/c/c_utility.cpp \ WebCore/bridge/c/c_utility.h \ - WebCore/bridge/jni/jni_class.h \ WebCore/bridge/jni/jni_jsobject.h \ WebCore/bridge/jni/jni_runtime.h \ WebCore/bridge/jni/jni_utility.h \ + WebCore/bridge/jni/jsc/JavaClassJSC.h \ WebCore/bridge/jni/jsc/JavaInstanceJSC.h \ WebCore/bridge/npapi.h \ WebCore/bridge/npruntime.cpp \ diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index b07a7db..3635ae7 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -295,8 +295,6 @@ 1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CCB0D7E2B82007C3983 /* c_runtime.h */; }; 1A569CFD0D7E2B82007C3983 /* c_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCC0D7E2B82007C3983 /* c_utility.cpp */; }; 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 */; }; 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 */; }; @@ -1105,6 +1103,8 @@ 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, ); }; }; + 59E560A71105336600AA1258 /* JavaClassJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E560A61105336600AA1258 /* JavaClassJSC.h */; }; + 59E560A91105336F00AA1258 /* JavaClassJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59E560A81105336F00AA1258 /* JavaClassJSC.cpp */; }; 5D15E3AB0F9E6AC1009E0E3F /* XMLTokenizerScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */; }; 5D15E3AC0F9E6AC1009E0E3F /* XMLTokenizerScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D15E3AA0F9E6AC1009E0E3F /* XMLTokenizerScope.h */; }; 5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; }; @@ -5520,8 +5520,6 @@ 1A569CCB0D7E2B82007C3983 /* c_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_runtime.h; sourceTree = "<group>"; }; 1A569CCC0D7E2B82007C3983 /* c_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_utility.cpp; sourceTree = "<group>"; }; 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>"; }; 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>"; }; @@ -6434,6 +6432,8 @@ 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>"; }; + 59E560A61105336600AA1258 /* JavaClassJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaClassJSC.h; path = jsc/JavaClassJSC.h; sourceTree = "<group>"; }; + 59E560A81105336F00AA1258 /* JavaClassJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaClassJSC.cpp; path = jsc/JavaClassJSC.cpp; sourceTree = "<group>"; }; 5D15E3A90F9E6AC1009E0E3F /* XMLTokenizerScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizerScope.cpp; sourceTree = "<group>"; }; 5D15E3AA0F9E6AC1009E0E3F /* XMLTokenizerScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTokenizerScope.h; sourceTree = "<group>"; }; 5D925B650F64D4DD00B847F0 /* ScrollBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollBehavior.cpp; sourceTree = "<group>"; }; @@ -10291,8 +10291,6 @@ isa = PBXGroup; children = ( 599D1E2F10C97D4C00E0EF12 /* jsc */, - 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */, - 1A569CD00D7E2B82007C3983 /* jni_class.h */, 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */, 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */, 1A569CD50D7E2B82007C3983 /* jni_objc.mm */, @@ -10994,6 +10992,8 @@ 599D1E2F10C97D4C00E0EF12 /* jsc */ = { isa = PBXGroup; children = ( + 59E560A81105336F00AA1258 /* JavaClassJSC.cpp */, + 59E560A61105336600AA1258 /* JavaClassJSC.h */, 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */, 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */, 599D1E3010C97D6E00E0EF12 /* jni_utility_private.cpp */, @@ -17069,7 +17069,6 @@ 1C81BA0E0E97348300266E07 /* JavaScriptDebugServer.h in Headers */, 1C81BA010E9733CB00266E07 /* JavaScriptProfile.h in Headers */, 1C81B9FF0E9733CB00266E07 /* JavaScriptProfileNode.h in Headers */, - 1A569D000D7E2B82007C3983 /* jni_class.h in Headers */, 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */, 1A569D070D7E2B82007C3983 /* jni_runtime.h in Headers */, 1A569D090D7E2B82007C3983 /* jni_utility.h in Headers */, @@ -18282,6 +18281,7 @@ 1C81BA330E97357C00266E07 /* Copy Inspector Resources */, 59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */, 1C5F9D760E09A1B400E91D0A /* Streamline Inspector Source */, + 59E560A71105336600AA1258 /* JavaClassJSC.h in Headers */, 93F19A0C08245E59001E9ABC /* Sources */, 93F19B1208245E59001E9ABC /* Frameworks */, 939D050109D9FF6B00984996 /* Check For Global Initializers */, @@ -19231,7 +19231,6 @@ 1C81BA0D0E97348300266E07 /* JavaScriptDebugServer.cpp in Sources */, 1C81BA020E9733CB00266E07 /* JavaScriptProfile.cpp in Sources */, 1C81BA000E9733CB00266E07 /* JavaScriptProfileNode.cpp in Sources */, - 1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */, 1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */, 1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */, 1A569D060D7E2B82007C3983 /* jni_runtime.cpp in Sources */, @@ -20432,6 +20431,7 @@ isa = PBXTargetDependency; 59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */, target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */; + 59E560A91105336F00AA1258 /* JavaClassJSC.cpp in Sources */, targetProxy = DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/WebCore/bridge/jni/jni_class.cpp b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp index 6728e7b..3e30a4a 100644 --- a/WebCore/bridge/jni/jni_class.cpp +++ b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include "jni_class.h" +#include "JavaClassJSC.h" #if ENABLE(MAC_JAVA_BRIDGE) diff --git a/WebCore/bridge/jni/jni_class.h b/WebCore/bridge/jni/jsc/JavaClassJSC.h index 890b4d3..cbf7160 100644 --- a/WebCore/bridge/jni/jni_class.h +++ b/WebCore/bridge/jni/jsc/JavaClassJSC.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef JNI_CLASS_H_ -#define JNI_CLASS_H_ +#ifndef JavaClassJSC_h +#define JavaClassJSC_h #if ENABLE(MAC_JAVA_BRIDGE) @@ -59,4 +59,4 @@ private: #endif // ENABLE(MAC_JAVA_BRIDGE) -#endif // JNI_CLASS_H_ +#endif // JavaClassJSC_h diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp index 37f413e..17e0147 100644 --- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp @@ -28,7 +28,7 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include "jni_class.h" +#include "JavaClassJSC.h" #include "jni_runtime.h" #include "jni_utility.h" #include "jni_utility_private.h" |