Changeset 120957 in webkit


Ignore:
Timestamp:
Jun 21, 2012 12:26:37 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: [WebGL] Rename InjectedWebGLScriptSource.js -> InjectedScriptWebGLModuleSource.js
​https://bugs.webkit.org/show_bug.cgi?id=89675

Patch by Andrey Adaikin <​aandrey@chromium.org> on 2012-06-21
Reviewed by Pavel Feldman.

  • CMakeLists.txt:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • inspector/InjectedScriptWebGLModule.cpp:

(WebCore::InjectedScriptWebGLModule::source):

  • inspector/InjectedScriptWebGLModuleSource.js: Renamed from Source/WebCore/inspector/InjectedWebGLScriptSource.js.

(.):

Location:
trunk/Source/WebCore
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r120929 r120957  
    26792679
    26802680
    2681 # Generate InjectedWebGLScriptSource.h
     2681# Generate InjectedScriptWebGLModuleSource.h
    26822682IF (ENABLE_WEBGL)
    26832683    ADD_CUSTOM_COMMAND(
    2684         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h
    2685         MAIN_DEPENDENCY inspector/InjectedWebGLScriptSource.js
    2686         COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedWebGLScriptSource_js ${WEBCORE_DIR}/inspector/InjectedWebGLScriptSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h
     2684        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h
     2685        MAIN_DEPENDENCY inspector/InjectedScriptWebGLModuleSource.js
     2686        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedScriptWebGLModuleSource_js ${WEBCORE_DIR}/inspector/InjectedScriptWebGLModuleSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h
    26872687        VERBATIM)
    2688     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h)
     2688    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h)
    26892689ENDIF ()
    26902690

  • trunk/Source/WebCore/ChangeLog

    r120956 r120957  
     12012-06-21  Andrey Adaikin  <aandrey@chromium.org>
     2
     3        Web Inspector: [WebGL] Rename InjectedWebGLScriptSource.js -> InjectedScriptWebGLModuleSource.js
     4        https://bugs.webkit.org/show_bug.cgi?id=89675
     5
     6        Reviewed by Pavel Feldman.
     7
     8        * CMakeLists.txt:
     9        * DerivedSources.make:
     10        * DerivedSources.pri:
     11        * GNUmakefile.am:
     12        * GNUmakefile.list.am:
     13        * WebCore.gyp/WebCore.gyp:
     14        * WebCore.gypi:
     15        * WebCore.vcproj/WebCore.vcproj:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * inspector/InjectedScriptWebGLModule.cpp:
     18        (WebCore::InjectedScriptWebGLModule::source):
     19        * inspector/InjectedScriptWebGLModuleSource.js: Renamed from Source/WebCore/inspector/InjectedWebGLScriptSource.js.
     20        (.):
     21
    1222012-06-21  Kalev Lember  <kalevlember@gmail.com>
    223

  • trunk/Source/WebCore/DerivedSources.make

    r120668 r120957  
    992992        perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js InjectedScriptSource.h
    993993
    994 all : InjectedWebGLScriptSource.h
    995 
    996 InjectedWebGLScriptSource.h : InjectedWebGLScriptSource.js
    997         perl $(WebCore)/inspector/xxd.pl InjectedWebGLScriptSource_js $(WebCore)/inspector/InjectedWebGLScriptSource.js InjectedWebGLScriptSource.h
     994all : InjectedScriptWebGLModuleSource.h
     995
     996InjectedScriptWebGLModuleSource.h : InjectedScriptWebGLModuleSource.js
     997        perl $(WebCore)/inspector/xxd.pl InjectedScriptWebGLModuleSource_js $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js InjectedScriptWebGLModuleSource.h
    998998
    999999-include $(JS_DOM_HEADERS:.h=.dep)

  • trunk/Source/WebCore/DerivedSources.pri

    r120668 r120957  
    6262INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
    6363
    64 INJECTED_WEBGL_SCRIPT_SOURCE = $$PWD/inspector/InjectedWebGLScriptSource.js
     64INJECTED_SCRIPT_WEBGL_MODULE_SOURCE = $$PWD/inspector/InjectedScriptWebGLModuleSource.js
    6565
    6666DEBUGGER_SCRIPT_SOURCE = $$PWD/bindings/v8/DebuggerScript.js
    … …  
    779779
    780780# GENERATOR 2-b: inspector webgl injected script source compiler
    781 InjectedWebGLScriptSource.output = InjectedWebGLScriptSource.h
    782 InjectedWebGLScriptSource.input = INJECTED_WEBGL_SCRIPT_SOURCE
    783 InjectedWebGLScriptSource.commands = perl $$PWD/inspector/xxd.pl InjectedWebGLScriptSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
    784 InjectedWebGLScriptSource.add_output_to_sources = false
    785 GENERATORS += InjectedWebGLScriptSource
     781InjectedScriptWebGLModuleSource.output = InjectedScriptWebGLModuleSource.h
     782InjectedScriptWebGLModuleSource.input = INJECTED_SCRIPT_WEBGL_MODULE_SOURCE
     783InjectedScriptWebGLModuleSource.commands = perl $$PWD/inspector/xxd.pl InjectedScriptWebGLModuleSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     784InjectedScriptWebGLModuleSource.add_output_to_sources = false
     785GENERATORS += InjectedScriptWebGLModuleSource
    786786
    787787# GENERATOR 2-c: inspector debugger script source compiler

  • trunk/Source/WebCore/GNUmakefile.am

    r120956 r120957  
    847847DerivedSources/WebCore/InjectedScriptSource.h: $(WebCore)/inspector/InjectedScriptSource.js
    848848        $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js $(GENSOURCES_WEBCORE)/InjectedScriptSource.h
    849 DerivedSources/WebCore/InjectedWebGLScriptSource.h: $(WebCore)/inspector/InjectedWebGLScriptSource.js
    850         $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedWebGLScriptSource_js $(WebCore)/inspector/InjectedWebGLScriptSource.js $(GENSOURCES_WEBCORE)/InjectedWebGLScriptSource.h
     849DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h: $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js
     850        $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptWebGLModuleSource_js $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js $(GENSOURCES_WEBCORE)/InjectedScriptWebGLModuleSource.h
    851851
    852852if ENABLE_WEB_AUDIO
    … …  
    11051105        Source/WebCore/inspector/CodeGeneratorInspector.py \
    11061106        Source/WebCore/inspector/InjectedScriptSource.js \
    1107         Source/WebCore/inspector/InjectedWebGLScriptSource.js \
     1107        Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js \
    11081108        Source/WebCore/inspector/Inspector.json \
    11091109        Source/WebCore/inspector/Inspector-1.0.json \

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

    r120956 r120957  
    2121        DerivedSources/WebCore/HTMLNames.h \
    2222        DerivedSources/WebCore/InjectedScriptSource.h \
    23         DerivedSources/WebCore/InjectedWebGLScriptSource.h \
     23        DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h \
    2424        DerivedSources/WebCore/InspectorBackendDispatcher.cpp \
    2525        DerivedSources/WebCore/InspectorBackendDispatcher.h \

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r120613 r120957  
    442442      'actions': [
    443443        {
    444           'action_name': 'generateInjectedWebGLScriptSource',
    445           'inputs': [
    446             '../inspector/InjectedWebGLScriptSource.js',
    447           ],
    448           'outputs': [
    449             '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedWebGLScriptSource.h',
     444          'action_name': 'generateInjectedScriptWebGLModuleSource',
     445          'inputs': [
     446            '../inspector/InjectedScriptWebGLModuleSource.js',
     447          ],
     448          'outputs': [
     449            '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptWebGLModuleSource.h',
    450450          ],
    451451          'action': [
    452452            'perl',
    453453            '../inspector/xxd.pl',
    454             'InjectedWebGLScriptSource_js',
     454            'InjectedScriptWebGLModuleSource_js',
    455455            '<@(_inputs)',
    456456            '<@(_outputs)'
    457457          ],
    458           'message': 'Generating InjectedWebGLScriptSource.h from InjectedWebGLScriptSource.js',
     458          'message': 'Generating InjectedScriptWebGLModuleSource.h from InjectedScriptWebGLModuleSource.js',
    459459        },
    460460      ]

  • trunk/Source/WebCore/WebCore.gypi

    r120929 r120957  
    72697269            '<(PRODUCT_DIR)/DerivedSources/WebCore/HeaderDetection.h',
    72707270            '<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedScriptSource.h',
    7271             '<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedWebGLScriptSource.h',
     7271            '<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h',
    72727272            '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.cpp',
    72737273            '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r120929 r120957  
    595595                        </File>
    596596                        <File
    597                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedWebGLScriptSource.h"
     597                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedScriptWebGLModuleSource.h"
    598598                                >
    599599                        </File>

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

    r120929 r120957  
    1148311483                AA73183C159255B900A93E6E /* InjectedScriptWebGLModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptWebGLModule.cpp; sourceTree = "<group>"; };
    1148411484                AA73183D159255B900A93E6E /* InjectedScriptWebGLModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptWebGLModule.h; sourceTree = "<group>"; };
    11485                 AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedWebGLScriptSource.js; sourceTree = "<group>"; };
    11486                 AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedWebGLScriptSource.h; sourceTree = "<group>"; };
     11485                AA9030FE157E16A000276247 /* InjectedScriptWebGLModuleSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedScriptWebGLModuleSource.js; sourceTree = "<group>"; };
     11486                AA912750157E35A500454E54 /* InjectedScriptWebGLModuleSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptWebGLModuleSource.h; sourceTree = "<group>"; };
    1148711487                AAB6054A15874C58007B5031 /* InjectedScriptBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptBase.cpp; sourceTree = "<group>"; };
    1148811488                AAB6054B15874C58007B5031 /* InjectedScriptBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptBase.h; sourceTree = "<group>"; };
    … …  
    1437814378                        children = (
    1437914379                                7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,
    14380                                 AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */,
     14380                                AA912750157E35A500454E54 /* InjectedScriptWebGLModuleSource.h */,
    1438114381                                4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */,
    1438214382                                4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */,
    … …  
    1443014430                                AA73183C159255B900A93E6E /* InjectedScriptWebGLModule.cpp */,
    1443114431                                AA73183D159255B900A93E6E /* InjectedScriptWebGLModule.h */,
    14432                                 AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */,
     14432                                AA9030FE157E16A000276247 /* InjectedScriptWebGLModuleSource.js */,
    1443314433                                1C435CD414E8545B004E10EA /* Inspector-0.1.json */,
    1443414434                                1C435CD514E8545B004E10EA /* Inspector-1.0.json */,

  • trunk/Source/WebCore/inspector/InjectedScriptWebGLModule.cpp

    r120929 r120957  
    3737#include "InjectedScript.h"
    3838#include "InjectedScriptManager.h"
    39 #include "InjectedWebGLScriptSource.h"
     39#include "InjectedScriptWebGLModuleSource.h"
    4040#include "ScriptFunctionCall.h"
    4141#include "ScriptObject.h"
    … …  
    5757String InjectedScriptWebGLModule::source() const
    5858{
    59     return String(reinterpret_cast<const char*>(InjectedWebGLScriptSource_js), sizeof(InjectedWebGLScriptSource_js));
     59    return String(reinterpret_cast<const char*>(InjectedScriptWebGLModuleSource_js), sizeof(InjectedScriptWebGLModuleSource_js));
    6060}
    6161
Note: See TracChangeset for help on using the changeset viewer.