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.
(.):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 618672dd
...@@ -2678,14 +2678,14 @@ ADD_CUSTOM_COMMAND( ...@@ -2678,14 +2678,14 @@ ADD_CUSTOM_COMMAND(
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h) LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptSource.h)
# Generate InjectedWebGLScriptSource.h # Generate InjectedScriptWebGLModuleSource.h
IF (ENABLE_WEBGL) IF (ENABLE_WEBGL)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h
MAIN_DEPENDENCY inspector/InjectedWebGLScriptSource.js MAIN_DEPENDENCY inspector/InjectedScriptWebGLModuleSource.js
COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedWebGLScriptSource_js ${WEBCORE_DIR}/inspector/InjectedWebGLScriptSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl InjectedScriptWebGLModuleSource_js ${WEBCORE_DIR}/inspector/InjectedScriptWebGLModuleSource.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h
VERBATIM) VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedWebGLScriptSource.h) LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptWebGLModuleSource.h)
ENDIF () ENDIF ()
......
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> 2012-06-21 Kalev Lember <kalevlember@gmail.com>
[GTK] Fix NPAPI plugins on Windows [GTK] Fix NPAPI plugins on Windows
...@@ -991,10 +991,10 @@ all : InjectedScriptSource.h ...@@ -991,10 +991,10 @@ all : InjectedScriptSource.h
InjectedScriptSource.h : InjectedScriptSource.js InjectedScriptSource.h : InjectedScriptSource.js
perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js InjectedScriptSource.h perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js InjectedScriptSource.h
all : InjectedWebGLScriptSource.h all : InjectedScriptWebGLModuleSource.h
InjectedWebGLScriptSource.h : InjectedWebGLScriptSource.js InjectedScriptWebGLModuleSource.h : InjectedScriptWebGLModuleSource.js
perl $(WebCore)/inspector/xxd.pl InjectedWebGLScriptSource_js $(WebCore)/inspector/InjectedWebGLScriptSource.js InjectedWebGLScriptSource.h perl $(WebCore)/inspector/xxd.pl InjectedScriptWebGLModuleSource_js $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js InjectedScriptWebGLModuleSource.h
-include $(JS_DOM_HEADERS:.h=.dep) -include $(JS_DOM_HEADERS:.h=.dep)
......
...@@ -61,7 +61,7 @@ INSPECTOR_BACKEND_COMMANDS_QRC = $$PWD/inspector/front-end/InspectorBackendComma ...@@ -61,7 +61,7 @@ INSPECTOR_BACKEND_COMMANDS_QRC = $$PWD/inspector/front-end/InspectorBackendComma
INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js 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 DEBUGGER_SCRIPT_SOURCE = $$PWD/bindings/v8/DebuggerScript.js
...@@ -778,11 +778,11 @@ injectedScriptSource.add_output_to_sources = false ...@@ -778,11 +778,11 @@ injectedScriptSource.add_output_to_sources = false
GENERATORS += injectedScriptSource GENERATORS += injectedScriptSource
# GENERATOR 2-b: inspector webgl injected script source compiler # GENERATOR 2-b: inspector webgl injected script source compiler
InjectedWebGLScriptSource.output = InjectedWebGLScriptSource.h InjectedScriptWebGLModuleSource.output = InjectedScriptWebGLModuleSource.h
InjectedWebGLScriptSource.input = INJECTED_WEBGL_SCRIPT_SOURCE InjectedScriptWebGLModuleSource.input = INJECTED_SCRIPT_WEBGL_MODULE_SOURCE
InjectedWebGLScriptSource.commands = perl $$PWD/inspector/xxd.pl InjectedWebGLScriptSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} InjectedScriptWebGLModuleSource.commands = perl $$PWD/inspector/xxd.pl InjectedScriptWebGLModuleSource_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
InjectedWebGLScriptSource.add_output_to_sources = false InjectedScriptWebGLModuleSource.add_output_to_sources = false
GENERATORS += InjectedWebGLScriptSource GENERATORS += InjectedScriptWebGLModuleSource
# GENERATOR 2-c: inspector debugger script source compiler # GENERATOR 2-c: inspector debugger script source compiler
debuggerScriptSource.output = DebuggerScriptSource.h debuggerScriptSource.output = DebuggerScriptSource.h
......
...@@ -846,8 +846,8 @@ DerivedSources/WebCore/InspectorBackendCommands.js: DerivedSources/WebCore/Inspe ...@@ -846,8 +846,8 @@ DerivedSources/WebCore/InspectorBackendCommands.js: DerivedSources/WebCore/Inspe
DerivedSources/WebCore/InspectorBackendDispatcher.h: DerivedSources/WebCore/InspectorBackendDispatcher.cpp DerivedSources/WebCore/InspectorBackendDispatcher.h: DerivedSources/WebCore/InspectorBackendDispatcher.cpp
DerivedSources/WebCore/InjectedScriptSource.h: $(WebCore)/inspector/InjectedScriptSource.js 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 $(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 DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h: $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js
$(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedWebGLScriptSource_js $(WebCore)/inspector/InjectedWebGLScriptSource.js $(GENSOURCES_WEBCORE)/InjectedWebGLScriptSource.h $(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptWebGLModuleSource_js $(WebCore)/inspector/InjectedScriptWebGLModuleSource.js $(GENSOURCES_WEBCORE)/InjectedScriptWebGLModuleSource.h
if ENABLE_WEB_AUDIO if ENABLE_WEB_AUDIO
# Installing HRTF database wav files # Installing HRTF database wav files
...@@ -1104,7 +1104,7 @@ EXTRA_DIST += \ ...@@ -1104,7 +1104,7 @@ EXTRA_DIST += \
Source/WebCore/icu/LICENSE \ Source/WebCore/icu/LICENSE \
Source/WebCore/inspector/CodeGeneratorInspector.py \ Source/WebCore/inspector/CodeGeneratorInspector.py \
Source/WebCore/inspector/InjectedScriptSource.js \ Source/WebCore/inspector/InjectedScriptSource.js \
Source/WebCore/inspector/InjectedWebGLScriptSource.js \ Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js \
Source/WebCore/inspector/Inspector.json \ Source/WebCore/inspector/Inspector.json \
Source/WebCore/inspector/Inspector-1.0.json \ Source/WebCore/inspector/Inspector-1.0.json \
Source/WebCore/inspector/generate-inspector-protocol-version \ Source/WebCore/inspector/generate-inspector-protocol-version \
......
...@@ -20,7 +20,7 @@ webcore_built_sources += \ ...@@ -20,7 +20,7 @@ webcore_built_sources += \
DerivedSources/WebCore/HTMLNames.cpp \ DerivedSources/WebCore/HTMLNames.cpp \
DerivedSources/WebCore/HTMLNames.h \ DerivedSources/WebCore/HTMLNames.h \
DerivedSources/WebCore/InjectedScriptSource.h \ DerivedSources/WebCore/InjectedScriptSource.h \
DerivedSources/WebCore/InjectedWebGLScriptSource.h \ DerivedSources/WebCore/InjectedScriptWebGLModuleSource.h \
DerivedSources/WebCore/InspectorBackendDispatcher.cpp \ DerivedSources/WebCore/InspectorBackendDispatcher.cpp \
DerivedSources/WebCore/InspectorBackendDispatcher.h \ DerivedSources/WebCore/InspectorBackendDispatcher.h \
DerivedSources/WebCore/InspectorFrontend.cpp \ DerivedSources/WebCore/InspectorFrontend.cpp \
......
...@@ -441,21 +441,21 @@ ...@@ -441,21 +441,21 @@
'type': 'none', 'type': 'none',
'actions': [ 'actions': [
{ {
'action_name': 'generateInjectedWebGLScriptSource', 'action_name': 'generateInjectedScriptWebGLModuleSource',
'inputs': [ 'inputs': [
'../inspector/InjectedWebGLScriptSource.js', '../inspector/InjectedScriptWebGLModuleSource.js',
], ],
'outputs': [ 'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedWebGLScriptSource.h', '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptWebGLModuleSource.h',
], ],
'action': [ 'action': [
'perl', 'perl',
'../inspector/xxd.pl', '../inspector/xxd.pl',
'InjectedWebGLScriptSource_js', 'InjectedScriptWebGLModuleSource_js',
'<@(_inputs)', '<@(_inputs)',
'<@(_outputs)' '<@(_outputs)'
], ],
'message': 'Generating InjectedWebGLScriptSource.h from InjectedWebGLScriptSource.js', 'message': 'Generating InjectedScriptWebGLModuleSource.h from InjectedScriptWebGLModuleSource.js',
}, },
] ]
}, },
......
...@@ -7268,7 +7268,7 @@ ...@@ -7268,7 +7268,7 @@
'<(PRODUCT_DIR)/DerivedSources/WebCore/HTMLNames.cpp', '<(PRODUCT_DIR)/DerivedSources/WebCore/HTMLNames.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/HeaderDetection.h', '<(PRODUCT_DIR)/DerivedSources/WebCore/HeaderDetection.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedScriptSource.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.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.h', '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendCommands.js', '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendCommands.js',
......
...@@ -594,7 +594,7 @@ ...@@ -594,7 +594,7 @@
> >
</File> </File>
<File <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedWebGLScriptSource.h" RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedScriptWebGLModuleSource.h"
> >
</File> </File>
<File <File
...@@ -11482,8 +11482,8 @@ ...@@ -11482,8 +11482,8 @@
AA4C3A750B2B1679002334A2 /* StyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StyleElement.h; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; }; AA9030FE157E16A000276247 /* InjectedScriptWebGLModuleSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedScriptWebGLModuleSource.js; sourceTree = "<group>"; };
AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedWebGLScriptSource.h; 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>"; }; 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>"; }; 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>"; }; AAB6054C15874C58007B5031 /* InjectedScriptModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptModule.cpp; sourceTree = "<group>"; };
...@@ -14377,7 +14377,7 @@ ...@@ -14377,7 +14377,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
7A563E5412DE32B000F4536D /* InjectedScriptSource.h */, 7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,
AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */, AA912750157E35A500454E54 /* InjectedScriptWebGLModuleSource.h */,
4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */, 4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */,
4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */, 4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */,
4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */, 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */,
...@@ -14429,7 +14429,7 @@ ...@@ -14429,7 +14429,7 @@
7A563F9512DF5C9100F4536D /* InjectedScriptSource.js */, 7A563F9512DF5C9100F4536D /* InjectedScriptSource.js */,
AA73183C159255B900A93E6E /* InjectedScriptWebGLModule.cpp */, AA73183C159255B900A93E6E /* InjectedScriptWebGLModule.cpp */,
AA73183D159255B900A93E6E /* InjectedScriptWebGLModule.h */, AA73183D159255B900A93E6E /* InjectedScriptWebGLModule.h */,
AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */, AA9030FE157E16A000276247 /* InjectedScriptWebGLModuleSource.js */,
1C435CD414E8545B004E10EA /* Inspector-0.1.json */, 1C435CD414E8545B004E10EA /* Inspector-0.1.json */,
1C435CD514E8545B004E10EA /* Inspector-1.0.json */, 1C435CD514E8545B004E10EA /* Inspector-1.0.json */,
1C435CD314E8544F004E10EA /* Inspector.json */, 1C435CD314E8544F004E10EA /* Inspector.json */,
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "InjectedScript.h" #include "InjectedScript.h"
#include "InjectedScriptManager.h" #include "InjectedScriptManager.h"
#include "InjectedWebGLScriptSource.h" #include "InjectedScriptWebGLModuleSource.h"
#include "ScriptFunctionCall.h" #include "ScriptFunctionCall.h"
#include "ScriptObject.h" #include "ScriptObject.h"
...@@ -56,7 +56,7 @@ InjectedScriptWebGLModule InjectedScriptWebGLModule::moduleForState(InjectedScri ...@@ -56,7 +56,7 @@ InjectedScriptWebGLModule InjectedScriptWebGLModule::moduleForState(InjectedScri
String InjectedScriptWebGLModule::source() const 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) ScriptObject InjectedScriptWebGLModule::wrapWebGLContext(const ScriptObject& glContext)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment