Changeset 92693 in webkit


Ignore:
Timestamp:
Aug 9, 2011 11:36:47 AM (13 years ago)
Author:
steveblock@google.com
Message:

JavaString is not needed by V8
​https://bugs.webkit.org/show_bug.cgi?id=65909

Removes the JavaString wrapper class, moves the JSC implementation
to JavaStringJSC.h and removes the V8 implementation.

Reviewed by Alexey Proskuryakov.

No new tests, refactoring only.

  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • bridge/jni/JavaString.h: Removed.
  • bridge/jni/jni_jsobject.mm:
  • bridge/jni/jsc/JavaFieldJSC.h:
  • bridge/jni/jsc/JavaInstanceJSC.cpp:
  • bridge/jni/jsc/JavaMethodJSC.h:
  • bridge/jni/jsc/JavaStringJSC.h:

(JSC::Bindings::JavaString::JavaString):
(JSC::Bindings::JavaString::~JavaString):
(JSC::Bindings::JavaString::init):

  • bridge/jni/v8/JavaStringV8.h: Removed.
Location:
trunk/Source/WebCore
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r92692 r92693  
     12011-08-09  Steve Block  <steveblock@google.com>
     2
     3        JavaString is not needed by V8
     4        https://bugs.webkit.org/show_bug.cgi?id=65909
     5
     6        Removes the JavaString wrapper class, moves the JSC implementation
     7        to JavaStringJSC.h and removes the V8 implementation.
     8
     9        Reviewed by Alexey Proskuryakov.
     10
     11        No new tests, refactoring only.
     12
     13        * GNUmakefile.list.am:
     14        * WebCore.gypi:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * bridge/jni/JavaString.h: Removed.
     17        * bridge/jni/jni_jsobject.mm:
     18        * bridge/jni/jsc/JavaFieldJSC.h:
     19        * bridge/jni/jsc/JavaInstanceJSC.cpp:
     20        * bridge/jni/jsc/JavaMethodJSC.h:
     21        * bridge/jni/jsc/JavaStringJSC.h:
     22        (JSC::Bindings::JavaString::JavaString):
     23        (JSC::Bindings::JavaString::~JavaString):
     24        (JSC::Bindings::JavaString::init):
     25        * bridge/jni/v8/JavaStringV8.h: Removed.
     26
    1272011-08-09  Abhishek Arya  <inferno@chromium.org>
    228

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

    r92681 r92693  
    885885        Source/WebCore/bridge/IdentifierRep.h \
    886886        Source/WebCore/bridge/jni/JNIUtility.h \
    887         Source/WebCore/bridge/jni/JavaString.h \
    888887        Source/WebCore/bridge/jni/JavaType.h \
    889888        Source/WebCore/bridge/jni/jni_jsobject.h \

  • trunk/Source/WebCore/WebCore.gypi

    r92681 r92693  
    22332233            'bridge/c/c_utility.h',
    22342234            'bridge/jni/JNIUtility.cpp',
    2235             'bridge/jni/JavaString.h',
    22362235            'bridge/jni/JavaType.h',
    22372236            'bridge/jni/JobjectWrapper.cpp',
    … …  
    22622261            'bridge/jni/v8/JavaNPObjectV8.cpp',
    22632262            'bridge/jni/v8/JavaNPObjectV8.h',
    2264             'bridge/jni/v8/JavaStringV8.h',
    22652263            'bridge/jni/v8/JavaValueV8.h',
    22662264            'bridge/jsc/BridgeJSC.cpp',

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

    r92681 r92693  
    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                 593D3EB1132532950057E7EE /* JavaString.h in Headers */ = {isa = PBXBuildFile; fileRef = 593D3EB0132532950057E7EE /* JavaString.h */; };
    15071506                596950821321059900C3ED18 /* JobjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 596950811321059900C3ED18 /* JobjectWrapper.h */; };
    15081507                59695084132105A500C3ED18 /* JobjectWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59695083132105A500C3ED18 /* JobjectWrapper.cpp */; };
    … …  
    81218120                593AB6971355CD9200FC8211 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = "<group>"; };
    81228121                593AB6991355CDAE00FC8211 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionErrorCallback.idl; sourceTree = "<group>"; };
    8123                 593D3EB0132532950057E7EE /* JavaString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaString.h; sourceTree = "<group>"; };
    81248122                5958F1CB1343917C0080B31F /* XMLViewer.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = XMLViewer.css; sourceTree = "<group>"; };
    81258123                5958F1CC1343917C0080B31F /* XMLViewer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = XMLViewer.js; sourceTree = "<group>"; };
    … …  
    1324813246                        isa = PBXGroup;
    1324913247                        children = (
    13250                                 593D3EB0132532950057E7EE /* JavaString.h */,
    1325113248                                59B0EEA6132A6F2A004331C7 /* JavaType.h */,
    1325213249                                1A569CD40D7E2B82007C3983 /* jni_jsobject.h */,
    … …  
    2175621753                                FD31603612B0267600C1A359 /* JavaScriptAudioNode.h in Headers */,
    2175721754                                1C81BA0A0E97348300266E07 /* JavaScriptCallFrame.h in Headers */,
    21758                                 593D3EB1132532950057E7EE /* JavaString.h in Headers */,
    2175921755                                59BC393F11054A1300FD85DB /* JavaStringJSC.h in Headers */,
    2176021756                                59B0EEA7132A6F2A004331C7 /* JavaType.h in Headers */,

  • trunk/Source/WebCore/bridge/jni/jni_jsobject.mm

    r81860 r92693  
    3434#include "JSDOMBinding.h"
    3535#include "JavaRuntimeObject.h"
    36 #include "JavaString.h"
     36#include "JavaStringJSC.h"
    3737#include "Logging.h"
    3838#include "ScriptController.h"

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

    r92681 r92693  
    3333#include "JNIUtility.h"
    3434#include "JavaMethodJSC.h"
    35 #include "JavaString.h"
     35#include "JavaStringJSC.h"
    3636#include "JobjectWrapper.h"
    3737

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

    r92681 r92693  
    3535#include "JavaClassJSC.h"
    3636#include "JavaMethodJSC.h"
    37 #include "JavaString.h"
     37#include "JavaStringJSC.h"
    3838#include "Logging.h"
    3939#include "jni_jsobject.h"

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

    r92681 r92693  
    3131
    3232#include "Bridge.h"
    33 #include "JavaString.h"
     33#include "JavaStringJSC.h"
    3434#include "JavaType.h"
    3535

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

    r81036 r92693  
    11/*
    2  * Copyright (C) 2010 Apple Computer, Inc.  All rights reserved.
     2 * Copyright (C) 2003, 2004, 2005, 2007, 2009, 2010 Apple Inc. All rights reserved.
     3 * Copyright 2010, The Android Open Source Project
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    3839namespace Bindings {
    3940
    40 class JavaStringImpl {
     41class JavaString {
    4142public:
    42     ~JavaStringImpl()
     43    JavaString(JNIEnv* e, jstring s)
    4344    {
    44         JSLock lock(SilenceAssertionsOnly);
    45         m_impl = 0;
     45        init(e, s);
    4646    }
    4747
    48     void init()
     48    JavaString(jstring s)
     49    {
     50        init(getJNIEnv(), s);
     51    }
     52
     53    JavaString()
    4954    {
    5055        JSLock lock(SilenceAssertionsOnly);
    … …  
    5257    }
    5358
    54     void init(JNIEnv* e, jstring s)
     59    ~JavaString()
    5560    {
    56         int size = e->GetStringLength(s);
    57         const jchar* uc = getUCharactersFromJStringInEnv(e, s);
    58         {
    59             JSLock lock(SilenceAssertionsOnly);
    60             m_impl = UString(reinterpret_cast<const UChar*>(uc), size).impl();
    61         }
    62         releaseUCharactersForJStringInEnv(e, s, uc);
     61        JSLock lock(SilenceAssertionsOnly);
     62        m_impl = 0;
    6363    }
    6464
    … …  
    7575
    7676private:
     77    void init(JNIEnv* e, jstring s)
     78    {
     79        int size = e->GetStringLength(s);
     80        const jchar* uc = getUCharactersFromJStringInEnv(e, s);
     81        {
     82            JSLock lock(SilenceAssertionsOnly);
     83            m_impl = UString(reinterpret_cast<const UChar*>(uc), size).impl();
     84        }
     85        releaseUCharactersForJStringInEnv(e, s, uc);
     86    }
     87
    7788    RefPtr<StringImpl> m_impl;
    7889    mutable CString m_utf8String;
Note: See TracChangeset for help on using the changeset viewer.