Changeset 92681 in webkit


Ignore:
Timestamp:
Aug 9, 2011 7:18:53 AM (13 years ago)
Author:
steveblock@google.com
Message:

JavaMethodJobject is no longer needed by V8
​https://bugs.webkit.org/show_bug.cgi?id=65910

Reviewed by Tony Gentilcore.

Removes the JavaMethod interface and moves the JavaMethodJobject
implementation to bridge/jni/jsc/JavaMethodJSC.[cpp|h].

No new tests, refactoring only.

  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • bridge/jni/JavaMethod.h: Removed.
  • bridge/jni/jsc/JavaClassJSC.cpp:

(JavaClass::JavaClass):

  • bridge/jni/jsc/JavaFieldJSC.h:
  • bridge/jni/jsc/JavaInstanceJSC.cpp:
  • bridge/jni/jsc/JavaMethodJSC.cpp: Renamed from Source/WebCore/bridge/jni/JavaMethodJobject.cpp.

(JavaMethod::JavaMethod):
(JavaMethod::~JavaMethod):
(appendClassName):
(JavaMethod::signature):

  • bridge/jni/jsc/JavaMethodJSC.h: Renamed from Source/WebCore/bridge/jni/JavaMethodJobject.h.

(JSC::Bindings::JavaMethod::name):
(JSC::Bindings::JavaMethod::returnTypeClassName):
(JSC::Bindings::JavaMethod::parameterAt):
(JSC::Bindings::JavaMethod::returnType):
(JSC::Bindings::JavaMethod::isStatic):
(JSC::Bindings::JavaMethod::numParameters):

  • bridge/jni/v8/JavaNPObjectV8.cpp:
Location:
trunk/Source/WebCore
Files:
1 deleted
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r92678 r92681  
     12011-08-09  Steve Block  <steveblock@google.com>
     2
     3        JavaMethodJobject is no longer needed by V8
     4        https://bugs.webkit.org/show_bug.cgi?id=65910
     5
     6        Reviewed by Tony Gentilcore.
     7
     8        Removes the JavaMethod interface and moves the JavaMethodJobject
     9        implementation to bridge/jni/jsc/JavaMethodJSC.[cpp|h].
     10
     11        No new tests, refactoring only.
     12
     13        * GNUmakefile.list.am:
     14        * WebCore.gypi:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * bridge/jni/JavaMethod.h: Removed.
     17        * bridge/jni/jsc/JavaClassJSC.cpp:
     18        (JavaClass::JavaClass):
     19        * bridge/jni/jsc/JavaFieldJSC.h:
     20        * bridge/jni/jsc/JavaInstanceJSC.cpp:
     21        * bridge/jni/jsc/JavaMethodJSC.cpp: Renamed from Source/WebCore/bridge/jni/JavaMethodJobject.cpp.
     22        (JavaMethod::JavaMethod):
     23        (JavaMethod::~JavaMethod):
     24        (appendClassName):
     25        (JavaMethod::signature):
     26        * bridge/jni/jsc/JavaMethodJSC.h: Renamed from Source/WebCore/bridge/jni/JavaMethodJobject.h.
     27        (JSC::Bindings::JavaMethod::name):
     28        (JSC::Bindings::JavaMethod::returnTypeClassName):
     29        (JSC::Bindings::JavaMethod::parameterAt):
     30        (JSC::Bindings::JavaMethod::returnType):
     31        (JSC::Bindings::JavaMethod::isStatic):
     32        (JSC::Bindings::JavaMethod::numParameters):
     33        * bridge/jni/v8/JavaNPObjectV8.cpp:
     34
    1352011-08-09  Andrey Kosyakov  <caseq@chromium.org>
    236

  • trunk/Source/WebCore/GNUmakefile.list.am

    r92677 r92681  
    885885        Source/WebCore/bridge/IdentifierRep.h \
    886886        Source/WebCore/bridge/jni/JNIUtility.h \
    887         Source/WebCore/bridge/jni/JavaMethod.h \
    888         Source/WebCore/bridge/jni/JavaMethodJobject.cpp \
    889         Source/WebCore/bridge/jni/JavaMethodJobject.h \
    890887        Source/WebCore/bridge/jni/JavaString.h \
    891888        Source/WebCore/bridge/jni/JavaType.h \
    … …  
    895892        Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h \
    896893        Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h \
     894        Source/WebCore/bridge/jni/jsc/JavaMethodJSC.cpp \
     895        Source/WebCore/bridge/jni/jsc/JavaMethodJSC.h \
    897896        Source/WebCore/bridge/jsc/BridgeJSC.cpp \
    898897        Source/WebCore/bridge/jsc/BridgeJSC.h \

  • trunk/Source/WebCore/WebCore.gypi

    r92677 r92681  
    22332233            'bridge/c/c_utility.h',
    22342234            'bridge/jni/JNIUtility.cpp',
    2235             'bridge/jni/JavaMethod.h',
    2236             'bridge/jni/JavaMethodJobject.cpp',
    2237             'bridge/jni/JavaMethodJobject.h',
    22382235            'bridge/jni/JavaString.h',
    22392236            'bridge/jni/JavaType.h',
    … …  
    22522249            'bridge/jni/jsc/JavaInstanceJSC.cpp',
    22532250            'bridge/jni/jsc/JavaInstanceJSC.h',
     2251            'bridge/jni/jsc/JavaMethodJSC.cpp',
     2252            'bridge/jni/jsc/JavaMethodJSC.h',
    22542253            'bridge/jni/jsc/JavaRuntimeObject.cpp',
    22552254            'bridge/jni/jsc/JavaRuntimeObject.h',

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r92677 r92681  
    15041504                59309A1111F4AE5800250603 /* DeviceOrientationClientMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */; };
    15051505                59309A1311F4AE6A00250603 /* DeviceOrientationClientMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1506                 593D3EAF1325328C0057E7EE /* JavaMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 593D3EAE1325328C0057E7EE /* JavaMethod.h */; };
    15071506                593D3EB1132532950057E7EE /* JavaString.h in Headers */ = {isa = PBXBuildFile; fileRef = 593D3EB0132532950057E7EE /* JavaString.h */; };
    15081507                596950821321059900C3ED18 /* JobjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 596950811321059900C3ED18 /* JobjectWrapper.h */; };
    … …  
    15161515                598D77E11325420400761B22 /* JavaFieldJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 598D77E01325420400761B22 /* JavaFieldJSC.cpp */; };
    15171516                598D77E31325420E00761B22 /* JavaFieldJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 598D77E21325420E00761B22 /* JavaFieldJSC.h */; };
    1518                 599C671C1343438900C3423C /* JavaMethodJobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 599C671B1343438900C3423C /* JavaMethodJobject.cpp */; };
    1519                 599C671E1343439400C3423C /* JavaMethodJobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 599C671D1343439400C3423C /* JavaMethodJobject.h */; };
    15201517                599E759011055A1F00D904FA /* Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 599E758F11055A1F00D904FA /* Bridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15211518                59A85EA2119D68D900DEF1EF /* DeviceOrientationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59A85EA1119D68D900DEF1EF /* DeviceOrientationEvent.cpp */; };
    … …  
    15371534                59C28046138DC2410079B7E2 /* XMLErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C28044138DC2410079B7E2 /* XMLErrors.h */; };
    15381535                59D1C10411EB5DCF00B638C8 /* DeviceOrientation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D1C10311EB5DCF00B638C8 /* DeviceOrientation.cpp */; };
     1536                59DE790413F16C7F0007FCDF /* JavaMethodJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59DE790313F16C7F0007FCDF /* JavaMethodJSC.cpp */; };
     1537                59DE790613F16C8C0007FCDF /* JavaMethodJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59DE790513F16C8C0007FCDF /* JavaMethodJSC.h */; };
    15391538                59E560A71105336600AA1258 /* JavaClassJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E560A61105336600AA1258 /* JavaClassJSC.h */; };
    15401539                59E560A91105336F00AA1258 /* JavaClassJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59E560A81105336F00AA1258 /* JavaClassJSC.cpp */; };
    … …  
    81228121                593AB6971355CD9200FC8211 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = "<group>"; };
    81238122                593AB6991355CDAE00FC8211 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionErrorCallback.idl; sourceTree = "<group>"; };
    8124                 593D3EAE1325328C0057E7EE /* JavaMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaMethod.h; sourceTree = "<group>"; };
    81258123                593D3EB0132532950057E7EE /* JavaString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaString.h; sourceTree = "<group>"; };
    81268124                5958F1CB1343917C0080B31F /* XMLViewer.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = XMLViewer.css; sourceTree = "<group>"; };
    … …  
    81368134                598D77E01325420400761B22 /* JavaFieldJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaFieldJSC.cpp; path = jsc/JavaFieldJSC.cpp; sourceTree = "<group>"; };
    81378135                598D77E21325420E00761B22 /* JavaFieldJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaFieldJSC.h; path = jsc/JavaFieldJSC.h; sourceTree = "<group>"; };
    8138                 599C671B1343438900C3423C /* JavaMethodJobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JavaMethodJobject.cpp; sourceTree = "<group>"; };
    8139                 599C671D1343439400C3423C /* JavaMethodJobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaMethodJobject.h; sourceTree = "<group>"; };
    81408136                599E758F11055A1F00D904FA /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bridge.h; path = bridge/Bridge.h; sourceTree = "<group>"; };
    81418137                59A85EA1119D68D900DEF1EF /* DeviceOrientationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceOrientationEvent.cpp; sourceTree = "<group>"; };
    … …  
    81588154                59C28044138DC2410079B7E2 /* XMLErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLErrors.h; sourceTree = "<group>"; };
    81598155                59D1C10311EB5DCF00B638C8 /* DeviceOrientation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceOrientation.cpp; sourceTree = "<group>"; };
     8156                59DE790313F16C7F0007FCDF /* JavaMethodJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaMethodJSC.cpp; path = jsc/JavaMethodJSC.cpp; sourceTree = "<group>"; };
     8157                59DE790513F16C8C0007FCDF /* JavaMethodJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaMethodJSC.h; path = jsc/JavaMethodJSC.h; sourceTree = "<group>"; };
    81608158                59E560A61105336600AA1258 /* JavaClassJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaClassJSC.h; path = jsc/JavaClassJSC.h; sourceTree = "<group>"; };
    81618159                59E560A81105336F00AA1258 /* JavaClassJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaClassJSC.cpp; path = jsc/JavaClassJSC.cpp; sourceTree = "<group>"; };
    … …  
    1325013248                        isa = PBXGroup;
    1325113249                        children = (
    13252                                 593D3EAE1325328C0057E7EE /* JavaMethod.h */,
    13253                                 599C671B1343438900C3423C /* JavaMethodJobject.cpp */,
    13254                                 599C671D1343439400C3423C /* JavaMethodJobject.h */,
    1325513250                                593D3EB0132532950057E7EE /* JavaString.h */,
    1325613251                                59B0EEA6132A6F2A004331C7 /* JavaType.h */,
    … …  
    1423414229                        isa = PBXGroup;
    1423514230                        children = (
     14231                                59DE790513F16C8C0007FCDF /* JavaMethodJSC.h */,
     14232                                59DE790313F16C7F0007FCDF /* JavaMethodJSC.cpp */,
    1423614233                                598D77DC132541EE00761B22 /* JavaArrayJSC.cpp */,
    1423714234                                598D77DE132541FA00761B22 /* JavaArrayJSC.h */,
    … …  
    2175621753                                598D77E31325420E00761B22 /* JavaFieldJSC.h in Headers */,
    2175721754                                59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */,
    21758                                 593D3EAF1325328C0057E7EE /* JavaMethod.h in Headers */,
    21759                                 599C671E1343439400C3423C /* JavaMethodJobject.h in Headers */,
    2176021755                                E16982681134680700894115 /* JavaRuntimeObject.h in Headers */,
    2176121756                                FD31603612B0267600C1A359 /* JavaScriptAudioNode.h in Headers */,
    … …  
    2335823353                                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
    2335923354                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
     23355                                59DE790613F16C8C0007FCDF /* JavaMethodJSC.h in Headers */,
    2336023356                        );
    2336123357                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2467224668                                598D77E11325420400761B22 /* JavaFieldJSC.cpp in Sources */,
    2467324669                                59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */,
    24674                                 599C671C1343438900C3423C /* JavaMethodJobject.cpp in Sources */,
    2467524670                                E1698264113467F300894115 /* JavaRuntimeObject.cpp in Sources */,
    2467624671                                FD31603512B0267600C1A359 /* JavaScriptAudioNode.cpp in Sources */,
    … …  
    2616626161                                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
    2616726162                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
     26163                                59DE790413F16C7F0007FCDF /* JavaMethodJSC.cpp in Sources */,
    2616826164                        );
    2616926165                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/bridge/jni/jsc/JavaClassJSC.cpp

    r82423 r92681  
    3131#include "JSDOMWindow.h"
    3232#include "JavaFieldJSC.h"
    33 #include "JavaMethodJobject.h"
     33#include "JavaMethodJSC.h"
    3434#include <runtime/Identifier.h>
    3535#include <runtime/JSLock.h>
    … …  
    7777        for (i = 0; i < numMethods; i++) {
    7878            jobject aJMethod = env->GetObjectArrayElement((jobjectArray)methods, i);
    79             JavaMethod* aMethod = new JavaMethodJobject(env, aJMethod); // deleted in the JavaClass destructor
     79            JavaMethod* aMethod = new JavaMethod(env, aJMethod); // deleted in the JavaClass destructor
    8080            MethodList* methodList;
    8181            {

  • trunk/Source/WebCore/bridge/jni/jsc/JavaFieldJSC.h

    r81860 r92681  
    3232#include "BridgeJSC.h"
    3333#include "JNIUtility.h"
    34 #include "JavaMethod.h"
     34#include "JavaMethodJSC.h"
    3535#include "JavaString.h"
    3636#include "JobjectWrapper.h"

  • trunk/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp

    r91903 r92681  
    3434#include "JavaArrayJSC.h"
    3535#include "JavaClassJSC.h"
    36 #include "JavaMethod.h"
     36#include "JavaMethodJSC.h"
    3737#include "JavaString.h"
    3838#include "Logging.h"

  • trunk/Source/WebCore/bridge/jni/jsc/JavaMethodJSC.cpp

    • Property svn:eol-style changed from native to LF
    r92680 r92681  
    2626
    2727#include "config.h"
    28 #include "JavaMethodJobject.h"
     28#include "JavaMethodJSC.h"
    2929
    3030#if ENABLE(JAVA_BRIDGE)
    3131
    32 #include "JavaString.h"
    33 
    34 #if USE(JSC)
    3532#include <runtime/JSObject.h>
    3633#include <runtime/ScopeChain.h>
    37 #endif
    3834#include <wtf/text/StringBuilder.h>
    3935
    … …  
    4137using namespace JSC::Bindings;
    4238
    43 JavaMethodJobject::JavaMethodJobject(JNIEnv* env, jobject aMethod)
     39JavaMethod::JavaMethod(JNIEnv* env, jobject aMethod)
    4440{
    4541    // Get return type name
    … …  
    8783}
    8884
    89 JavaMethodJobject::~JavaMethodJobject()
     85JavaMethod::~JavaMethod()
    9086{
    9187    if (m_signature)
    … …  
    115111}
    116112
    117 const char* JavaMethodJobject::signature() const
     113const char* JavaMethod::signature() const
    118114{
    119115    if (!m_signature) {

  • trunk/Source/WebCore/bridge/jni/jsc/JavaMethodJSC.h

    • Property svn:eol-style changed from native to LF
    r92680 r92681  
    2525 */
    2626
    27 #ifndef JavaMethodJobject_h
    28 #define JavaMethodJobject_h
     27#ifndef JavaMethodJSC_h
     28#define JavaMethodJSC_h
    2929
    3030#if ENABLE(JAVA_BRIDGE)
    3131
    32 #include "JavaMethod.h"
     32#include "Bridge.h"
    3333#include "JavaString.h"
    34 
    35 #include <wtf/text/CString.h>
     34#include "JavaType.h"
    3635
    3736namespace JSC {
    … …  
    3938namespace Bindings {
    4039
    41 class JavaMethodJobject : public JavaMethod {
     40typedef const char* RuntimeType;
     41
     42class JavaMethod : public Method {
    4243public:
    43     JavaMethodJobject(JNIEnv*, jobject);
    44     virtual ~JavaMethodJobject();
     44    JavaMethod(JNIEnv*, jobject aMethod);
     45    ~JavaMethod();
    4546
    46     // JavaMethod implementation
    47     virtual String name() const { return m_name.impl(); }
    48     virtual RuntimeType returnTypeClassName() const { return m_returnTypeClassName.utf8(); }
    49     virtual String parameterAt(int i) const { return m_parameters[i]; }
    50     virtual const char* signature() const;
    51     virtual JavaType returnType() const { return m_returnType; }
    52     virtual bool isStatic() const { return m_isStatic; }
     47    const String name() const { return m_name.impl(); }
     48    RuntimeType returnTypeClassName() const { return m_returnTypeClassName.utf8(); }
     49    const String parameterAt(int i) const { return m_parameters[i]; }
     50    const char* signature() const;
     51    JavaType returnType() const { return m_returnType; }
     52    bool isStatic() const { return m_isStatic; }
    5353
    5454    // Method implementation
    55     virtual int numParameters() const { return m_parameters.size(); }
     55    int numParameters() const { return m_parameters.size(); }
    5656
    5757private:
    58     Vector<String> m_parameters;
     58    Vector<WTF::String> m_parameters;
    5959    JavaString m_name;
    6060    mutable char* m_signature;
    … …  
    7070#endif // ENABLE(JAVA_BRIDGE)
    7171
    72 #endif // JavaMethodJobject_h
     72#endif // JavaMethodJSC_h

  • trunk/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp

    r92659 r92681  
    3434#include "JavaFieldV8.h"
    3535#include "JavaInstanceV8.h"
    36 #include "JavaMethod.h"
     36#include "JavaMethodV8.h"
    3737#include "JavaValueV8.h"
    3838#include "npruntime_impl.h"
Note: See TracChangeset for help on using the changeset viewer.