Bug 52312 – Web Inspector: embed injected script into the backend.

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Inspector (Deprecated)

[Pavel Feldman]

InjectedScript belongs to the backend of the system and should be exposed by means of protocol, not InjectedScriptAccess. This patch makes injected script a part of the backend. It introduces single manual generation step (xxd -i) that should be automated by the build scripts for all the platforms.

[Pavel Feldman]

Created attachment 78711 [details]
[PATCH] Proposed change.

[WebKit Review Bot]

Attachment 78711 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1

Last 3072 characters of output:
WebCore/inspector/InjectedScriptSource.h:1019:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1020:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1021:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1022:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1023:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1024:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1025:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1026:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1027:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1028:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1029:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1030:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1031:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1032:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1033:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1034:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1035:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1036:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1037:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1039:  InjectedScript_js_len is incorrectly named. Don't use underscores in your identifier names.  [readability/naming] [4]
Total errors found: 1035 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Joseph Pecoraro]

Pavel, if you add the following to your git config and recreate the diff does it
significantly reduce the patch size?

    [diff]
        renames = copies

It looks like you moved  Source/WebCore/inspector/front-end/InjectedScript.js
to Source/WebCore/inspector/InjectedScript.js but git didn't catch on. This makes
it hard to read the patch to see the changes to InjectedScript. Hopefully adding
that to your config will make everything clearer.

[Pavel Feldman]

Created attachment 78795 [details]
[PATCH] Proposed change.

Thanks for the hint, Joe.

[WebKit Review Bot]

Attachment 78795 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1

Last 3072 characters of output:
WebCore/inspector/InjectedScriptSource.h:1019:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1020:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1021:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1022:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1023:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1024:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1025:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1026:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1027:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1028:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1029:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1030:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1031:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1032:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1033:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1034:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1035:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1036:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1037:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/WebCore/inspector/InjectedScriptSource.h:1039:  InjectedScript_js_len is incorrectly named. Don't use underscores in your identifier names.  [readability/naming] [4]
Total errors found: 1035 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Yury Semikhatsky]

Comment on attachment 78795 [details]
[PATCH] Proposed change.

View in context: https://bugs.webkit.org/attachment.cgi?id=78795&action=review

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:1649
> +               7A563E5512DE32B000F4536D /* InjectedScriptSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A563E5412DE32B000F4536D /* InjectedScriptSource.h */; };

ditto

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:8053
> +               7A563E5412DE32B000F4536D /* InjectedScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptSource.h; sourceTree = "<group>"; };

ditto

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:12903
> +                               7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,

wrong alignment

> Source/WebCore/WebCore.xcodeproj/project.pbxproj:22299
> +                               7A563E5512DE32B000F4536D /* InjectedScriptSource.h in Headers */,

ditto

> Source/WebCore/inspector/InjectedScript.js:29
> +// This is a source file for InjectedScriptSource.h. Every time you modify it,

This should be done automatically during the build

[Pavel Feldman]

Created attachment 78814 [details]
[PATCH] Proposed change

[WebKit Review Bot]

Attachment 78814 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/CMakeLists.txt', u'Source/W..." exit_code: 1

Source/WebCore/inspector/xxd.pl:1:  One or more unexpected \r (^M) found; better to use only a \n  [whitespace/carriage_return] [1]
Suppressing further [whitespace/carriage_return] reports for this file.
Total errors found: 45 in 14 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Yury Semikhatsky]

Comment on attachment 78814 [details]
[PATCH] Proposed change

View in context: https://bugs.webkit.org/attachment.cgi?id=78814&action=review

> Source/WebCore/GNUmakefile.am:4789
> +	perl $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js $(GENSOURCES_WEBCORE)/InjectedScriptSource.h

weird alignment

[Pavel Feldman]

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	R	Source/WebCore/inspector/front-end/InjectedScript.js => Source/WebCore/inspector/InjectedScriptSource.js
	M	Source/WebCore/CMakeLists.txt
	M	Source/WebCore/ChangeLog
	M	Source/WebCore/DerivedSources.make
	M	Source/WebCore/GNUmakefile.am
	M	Source/WebCore/WebCore.gyp/WebCore.gyp
	M	Source/WebCore/WebCore.gypi
	M	Source/WebCore/WebCore.pro
	M	Source/WebCore/WebCore.vcproj/WebCore.vcproj
	M	Source/WebCore/WebCore.xcodeproj/project.pbxproj
	M	Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
	M	Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
	M	Source/WebCore/inspector/InjectedScriptHost.cpp
	M	Source/WebCore/inspector/InjectedScriptHost.h
	M	Source/WebCore/inspector/Inspector.idl
	M	Source/WebCore/inspector/InspectorController.cpp
	M	Source/WebCore/inspector/InspectorState.cpp
	M	Source/WebCore/inspector/InspectorState.h
	M	Source/WebCore/inspector/front-end/WebKit.qrc
	M	Source/WebCore/inspector/front-end/inspector.html
	M	Source/WebCore/inspector/front-end/inspector.js
	A	Source/WebCore/inspector/xxd.pl
	M	WebKit/chromium/ChangeLog
	M	WebKit/chromium/WebKit.grd
Committed r75715

[WebKit Review Bot]

http://trac.webkit.org/changeset/75715 might have broken Qt Linux Release minimal, Qt Linux ARMv5 Release, Qt Linux ARMv7 Release, Qt Windows 32-bit Release, and Qt Windows 32-bit Debug