Web Inspector: [WebGL] Rename InjectedWebGLScriptSource.js -> InjectedScriptWebGLModu...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jun 2012 19:26:37 +0000 (19:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jun 2012 19:26:37 +0000 (19:26 +0000)
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.
(.):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/DerivedSources.pri
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/inspector/InjectedScriptWebGLModule.cpp
Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js [moved from Source/WebCore/inspector/InjectedWebGLScriptSource.js with 100% similarity]

index 7b3ae50..ec7f6d7 100644 (file)
@@ -2678,14 +2678,14 @@ ADD_CUSTOM_COMMAND(
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h)
 
 
-# Generate InjectedWebGLScriptSource.h
+# Generate InjectedScriptWebGLModuleSource.h
 IF (ENABLE_WEBGL)
     ADD_CUSTOM_COMMAND(
-        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h
-        MAIN_DEPENDENCY inspector/InjectedWebGLScriptSource.js
-        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedWebGLScriptSource_js ${WEBCORE_DIR}/inspector/InjectedWebGLScriptSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h
+        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h
+        MAIN_DEPENDENCY inspector/InjectedScriptWebGLModuleSource.js
+        COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedScriptWebGLModuleSource_js ${WEBCORE_DIR}/inspector/InjectedScriptWebGLModuleSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h
         VERBATIM)
-    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h)
+    LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h)
 ENDIF ()
 
 
index 617a1f3..01edbed 100644 (file)
@@ -1,3 +1,24 @@
+2012-06-21  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [WebGL] Rename InjectedWebGLScriptSource.js -> InjectedScriptWebGLModuleSource.js
+        https://bugs.webkit.org/show_bug.cgi?id=89675
+
+        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.
+        (.):
+
 2012-06-21  Kalev Lember  <kalevlember@gmail.com>
 
         [GTK] Fix NPAPI plugins on Windows
index 3589c0b..03f4004 100644 (file)
@@ -991,10 +991,10 @@ all : InjectedScriptSource.h
 InjectedScriptSource.h : InjectedScriptSource.js
        perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js InjectedScriptSource.h
 
-all : InjectedWebGLScriptSource.h
+all : InjectedScriptWebGLModuleSource.h
 
-InjectedWebGLScriptSource.h : InjectedWebGLScriptSource.js
-       perl $(WebCore)/inspector/xxd.pl InjectedWebGLScriptSource_js $(WebCore)/inspector/InjectedWebGLScriptSource.js InjectedWebGLScriptSource.h
+InjectedScriptWebGLModuleSource.h : InjectedScriptWebGLModuleSource.js
+       perl $(WebCore)/inspector/xxd.pl InjectedScriptWebGLModuleSource_js $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js InjectedScriptWebGLModuleSource.h
 
 -include $(JS_DOM_HEADERS:.h=.dep)
 
index 9b54c7e..3e5fa4d 100644 (file)
@@ -61,7 +61,7 @@ INSPECTOR_BACKEND_COMMANDS_QRC = $$PWD/inspector/front-end/InspectorBackendComma
 
 INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
 
-INJECTED_WEBGL_SCRIPT_SOURCE = $$PWD/inspector/InjectedWebGLScriptSource.js
+INJECTED_SCRIPT_WEBGL_MODULE_SOURCE = $$PWD/inspector/InjectedScriptWebGLModuleSource.js
 
 DEBUGGER_SCRIPT_SOURCE = $$PWD/bindings/v8/DebuggerScript.js
 
@@ -778,11 +778,11 @@ injectedScriptSource.add_output_to_sources = false
 GENERATORS += injectedScriptSource
 
 # GENERATOR 2-b: inspector webgl injected script source compiler
-InjectedWebGLScriptSource.output = InjectedWebGLScriptSource.h
-InjectedWebGLScriptSource.input = INJECTED_WEBGL_SCRIPT_SOURCE
-InjectedWebGLScriptSource.commands = perl $$PWD/inspector/xxd.pl InjectedWebGLScriptSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-InjectedWebGLScriptSource.add_output_to_sources = false
-GENERATORS += InjectedWebGLScriptSource
+InjectedScriptWebGLModuleSource.output = InjectedScriptWebGLModuleSource.h
+InjectedScriptWebGLModuleSource.input = INJECTED_SCRIPT_WEBGL_MODULE_SOURCE
+InjectedScriptWebGLModuleSource.commands = perl $$PWD/inspector/xxd.pl InjectedScriptWebGLModuleSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+InjectedScriptWebGLModuleSource.add_output_to_sources = false
+GENERATORS += InjectedScriptWebGLModuleSource
 
 # GENERATOR 2-c: inspector debugger script source compiler
 debuggerScriptSource.output = DebuggerScriptSource.h
index 1649872..f328077 100644 (file)
@@ -846,8 +846,8 @@ DerivedSources/WebCore/InspectorBackendCommands.js: DerivedSources/WebCore/Inspe
 DerivedSources/WebCore/InspectorBackendDispatcher.h: DerivedSources/WebCore/InspectorBackendDispatcher.cpp
 DerivedSources/WebCore/InjectedScriptSource.h: $(WebCore)/inspector/InjectedScriptSource.js
        $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js $(GENSOURCES_WEBCORE)/InjectedScriptSource.h
-DerivedSources/WebCore/InjectedWebGLScriptSource.h: $(WebCore)/inspector/InjectedWebGLScriptSource.js
-       $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedWebGLScriptSource_js $(WebCore)/inspector/InjectedWebGLScriptSource.js $(GENSOURCES_WEBCORE)/InjectedWebGLScriptSource.h
+DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h: $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js
+       $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptWebGLModuleSource_js $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js $(GENSOURCES_WEBCORE)/InjectedScriptWebGLModuleSource.h
 
 if ENABLE_WEB_AUDIO
 # Installing HRTF database wav files
@@ -1104,7 +1104,7 @@ EXTRA_DIST += \
        Source/WebCore/icu/LICENSE \
        Source/WebCore/inspector/CodeGeneratorInspector.py \
        Source/WebCore/inspector/InjectedScriptSource.js \
-       Source/WebCore/inspector/InjectedWebGLScriptSource.js \
+       Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js \
        Source/WebCore/inspector/Inspector.json \
        Source/WebCore/inspector/Inspector-1.0.json \
        Source/WebCore/inspector/generate-inspector-protocol-version \
index e55d972..9d15978 100644 (file)
@@ -20,7 +20,7 @@ webcore_built_sources += \
        DerivedSources/WebCore/HTMLNames.cpp \
        DerivedSources/WebCore/HTMLNames.h \
        DerivedSources/WebCore/InjectedScriptSource.h \
-       DerivedSources/WebCore/InjectedWebGLScriptSource.h \
+       DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h \
        DerivedSources/WebCore/InspectorBackendDispatcher.cpp \
        DerivedSources/WebCore/InspectorBackendDispatcher.h \
        DerivedSources/WebCore/InspectorFrontend.cpp \
index d95f4cd..2ac0bf2 100644 (file)
       'type': 'none',
       'actions': [
         {
-          'action_name': 'generateInjectedWebGLScriptSource',
+          'action_name': 'generateInjectedScriptWebGLModuleSource',
           'inputs': [
-            '../inspector/InjectedWebGLScriptSource.js',
+            '../inspector/InjectedScriptWebGLModuleSource.js',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedWebGLScriptSource.h',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptWebGLModuleSource.h',
           ],
           'action': [
             'perl',
             '../inspector/xxd.pl',
-            'InjectedWebGLScriptSource_js',
+            'InjectedScriptWebGLModuleSource_js',
             '<@(_inputs)',
             '<@(_outputs)'
           ],
-          'message': 'Generating InjectedWebGLScriptSource.h from InjectedWebGLScriptSource.js',
+          'message': 'Generating InjectedScriptWebGLModuleSource.h from InjectedScriptWebGLModuleSource.js',
         },
       ]
     },
index 407888f..7a5f84a 100644 (file)
             '<(PRODUCT_DIR)/DerivedSources/WebCore/HTMLNames.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/HeaderDetection.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedScriptSource.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedWebGLScriptSource.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendCommands.js',
index 4b69275..fedcce8 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedWebGLScriptSource.h"
+                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedScriptWebGLModuleSource.h"
                                >
                        </File>
                        <File
index 63d2544..2de77fd 100644 (file)
                AA4C3A750B2B1679002334A2 /* StyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StyleElement.h; sourceTree = "<group>"; };
                AA73183C159255B900A93E6E /* InjectedScriptWebGLModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptWebGLModule.cpp; sourceTree = "<group>"; };
                AA73183D159255B900A93E6E /* InjectedScriptWebGLModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptWebGLModule.h; sourceTree = "<group>"; };
-               AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedWebGLScriptSource.js; sourceTree = "<group>"; };
-               AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedWebGLScriptSource.h; sourceTree = "<group>"; };
+               AA9030FE157E16A000276247 /* InjectedScriptWebGLModuleSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedScriptWebGLModuleSource.js; sourceTree = "<group>"; };
+               AA912750157E35A500454E54 /* InjectedScriptWebGLModuleSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptWebGLModuleSource.h; sourceTree = "<group>"; };
                AAB6054A15874C58007B5031 /* InjectedScriptBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptBase.cpp; sourceTree = "<group>"; };
                AAB6054B15874C58007B5031 /* InjectedScriptBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptBase.h; sourceTree = "<group>"; };
                AAB6054C15874C58007B5031 /* InjectedScriptModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptModule.cpp; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,
-                               AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */,
+                               AA912750157E35A500454E54 /* InjectedScriptWebGLModuleSource.h */,
                                4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */,
                                4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */,
                                4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */,
                                7A563F9512DF5C9100F4536D /* InjectedScriptSource.js */,
                                AA73183C159255B900A93E6E /* InjectedScriptWebGLModule.cpp */,
                                AA73183D159255B900A93E6E /* InjectedScriptWebGLModule.h */,
-                               AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */,
+                               AA9030FE157E16A000276247 /* InjectedScriptWebGLModuleSource.js */,
                                1C435CD414E8545B004E10EA /* Inspector-0.1.json */,
                                1C435CD514E8545B004E10EA /* Inspector-1.0.json */,
                                1C435CD314E8544F004E10EA /* Inspector.json */,
index 72ede51..73790dd 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "InjectedScript.h"
 #include "InjectedScriptManager.h"
-#include "InjectedWebGLScriptSource.h"
+#include "InjectedScriptWebGLModuleSource.h"
 #include "ScriptFunctionCall.h"
 #include "ScriptObject.h"
 
@@ -56,7 +56,7 @@ InjectedScriptWebGLModule InjectedScriptWebGLModule::moduleForState(InjectedScri
 
 String InjectedScriptWebGLModule::source() const
 {
-    return String(reinterpret_cast<const char*>(InjectedWebGLScriptSource_js), sizeof(InjectedWebGLScriptSource_js));
+    return String(reinterpret_cast<const char*>(InjectedScriptWebGLModuleSource_js), sizeof(InjectedScriptWebGLModuleSource_js));
 }
 
 ScriptObject InjectedScriptWebGLModule::wrapWebGLContext(const ScriptObject& glContext)