Diff
Modified: trunk/LayoutTests/ChangeLog (201167 => 201168)
--- trunk/LayoutTests/ChangeLog 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/LayoutTests/ChangeLog 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1,3 +1,16 @@
+2016-05-19 Brian Burg <[email protected]>
+
+ Web Inspector: use a consistent prefix for injected scripts
+ https://bugs.webkit.org/show_bug.cgi?id=157715
+ <rdar://problem/26287188>
+
+ Reviewed by Timothy Hatcher.
+
+ Update how inspector tests check sourceURLs for internal scripts.
+
+ * inspector/debugger/scriptParsed.html:
+ * inspector/debugger/sourceURLs.html:
+
2016-05-18 Antti Koivisto <[email protected]>
Style resolution for explicitly inherited properties is inefficient
Modified: trunk/LayoutTests/inspector/debugger/scriptParsed.html (201167 => 201168)
--- trunk/LayoutTests/inspector/debugger/scriptParsed.html 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/LayoutTests/inspector/debugger/scriptParsed.html 2016-05-19 16:48:31 UTC (rev 201168)
@@ -50,11 +50,11 @@
}
function isInjectedScriptSourceScript(params) {
- return params.sourceURL === "__WebInspectorInjectedScript__";
+ return params.sourceURL.startsWith("__InjectedScript_") && params.sourceURL.endsWith(".js");
}
function isCommandLineAPISourceScript(params) {
- return params.sourceURL === "__WebInspectorCommandLineAPIModuleSource__";
+ return params.sourceURL.indexOf("CommandLineAPIModuleSource") !== -1;
}
suite.addTestCase({
Modified: trunk/LayoutTests/inspector/debugger/sourceURLs.html (201167 => 201168)
--- trunk/LayoutTests/inspector/debugger/sourceURLs.html 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/LayoutTests/inspector/debugger/sourceURLs.html 2016-05-19 16:48:31 UTC (rev 201168)
@@ -36,7 +36,7 @@
InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject) {
// Ignore named inspector internal scripts.
- if (messageObject.params.sourceURL && messageObject.params.sourceURL.startsWith("__WebInspector"))
+ if (messageObject.params.sourceURL && messageObject.params.sourceURL.startsWith("__InjectedScript_"))
return;
// Has a sourceURL, must be one of the valid ones.
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (201167 => 201168)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1273,7 +1273,7 @@
OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
MAIN_DEPENDENCY ${_javascript_CORE_DIR}/inspector/InjectedScriptSource.js
DEPENDS ${_javascript_Core_SCRIPTS_DIR}/xxd.pl ${_javascript_Core_SCRIPTS_DIR}/jsmin.py
- COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__WebInspectorInjectedScript__" > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
+ COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_InjectedScriptSource.js" > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/jsmin.py < ${_javascript_CORE_DIR}/inspector/InjectedScriptSource.js >> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js
COMMAND ${PERL_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/xxd.pl InjectedScriptSource_js ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h
VERBATIM)
Modified: trunk/Source/_javascript_Core/ChangeLog (201167 => 201168)
--- trunk/Source/_javascript_Core/ChangeLog 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1,3 +1,15 @@
+2016-05-19 Brian Burg <[email protected]>
+
+ Web Inspector: use a consistent prefix for injected scripts
+ https://bugs.webkit.org/show_bug.cgi?id=157715
+ <rdar://problem/26287188>
+
+ Reviewed by Timothy Hatcher.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * inspector/InjectedScriptSource.js:
+
2016-05-19 Csaba Osztrogonác <[email protected]>
[ARM] Remove redefined macro after r200606
Modified: trunk/Source/_javascript_Core/DerivedSources.make (201167 => 201168)
--- trunk/Source/_javascript_Core/DerivedSources.make 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/_javascript_Core/DerivedSources.make 2016-05-19 16:48:31 UTC (rev 201168)
@@ -251,7 +251,7 @@
$(PYTHON) $(_javascript_Core)/inspector/scripts/generate-inspector-protocol-bindings.py --framework _javascript_Core --outputDir . ./CombinedDomains.json
InjectedScriptSource.h : inspector/InjectedScriptSource.js $(_javascript_Core_SCRIPTS_DIR)/jsmin.py $(_javascript_Core_SCRIPTS_DIR)/xxd.pl
- echo "//# sourceURL=__WebInspectorInjectedScript__" > ./InjectedScriptSource.min.js
+ echo "//# sourceURL=__InjectedScript_InjectedScriptSource.js" > ./InjectedScriptSource.min.js
$(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/jsmin.py < $(_javascript_Core)/inspector/InjectedScriptSource.js >> ./InjectedScriptSource.min.js
$(PERL) $(_javascript_Core_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js ./InjectedScriptSource.min.js InjectedScriptSource.h
$(DELETE) InjectedScriptSource.min.js
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js (201167 => 201168)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2016-05-19 16:48:31 UTC (rev 201168)
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-//# sourceURL=__WebInspectorInjectedScript__
+//# sourceURL=__InjectedScript_InjectedScriptSource.js
(function (InjectedScriptHost, inspectedGlobalObject, injectedScriptId) {
Modified: trunk/Source/WebCore/CMakeLists.txt (201167 => 201168)
--- trunk/Source/WebCore/CMakeLists.txt 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-05-19 16:48:31 UTC (rev 201168)
@@ -3483,7 +3483,7 @@
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
MAIN_DEPENDENCY inspector/CommandLineAPIModuleSource.js
DEPENDS ${_javascript_Core_SCRIPTS_DIR}/xxd.pl ${_javascript_Core_SCRIPTS_DIR}/jsmin.py
- COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__WebInspectorCommandLineAPIModuleSource__" > ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
+ COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_CommandLineAPIModuleSource.js" > ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/inspector/CommandLineAPIModuleSource.js >> ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
COMMAND ${PERL_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/xxd.pl CommandLineAPIModuleSource_js ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h
VERBATIM)
Modified: trunk/Source/WebCore/ChangeLog (201167 => 201168)
--- trunk/Source/WebCore/ChangeLog 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebCore/ChangeLog 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1,3 +1,15 @@
+2016-05-18 Brian Burg <[email protected]>
+
+ Web Inspector: use a consistent prefix for injected scripts
+ https://bugs.webkit.org/show_bug.cgi?id=157715
+ <rdar://problem/26287188>
+
+ Reviewed by Timothy Hatcher.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * inspector/CommandLineAPIModuleSource.js:
+
2016-05-18 Jer Noble <[email protected]>
Playback controls should not be active for muted media elements.
Modified: trunk/Source/WebCore/DerivedSources.make (201167 => 201168)
--- trunk/Source/WebCore/DerivedSources.make 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebCore/DerivedSources.make 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1252,7 +1252,7 @@
all : CommandLineAPIModuleSource.h
CommandLineAPIModuleSource.h : CommandLineAPIModuleSource.js
- echo "//# sourceURL=__WebInspectorCommandLineAPIModuleSource__" > ./CommandLineAPIModuleSource.min.js
+ echo "//# sourceURL=__InjectedScript_CommandLineAPIModuleSource.js" > ./CommandLineAPIModuleSource.min.js
$(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/jsmin.py <$(WebCore)/inspector/CommandLineAPIModuleSource.js >> ./CommandLineAPIModuleSource.min.js
$(PERL) $(_javascript_Core_SCRIPTS_DIR)/xxd.pl CommandLineAPIModuleSource_js ./CommandLineAPIModuleSource.min.js CommandLineAPIModuleSource.h
$(DELETE) CommandLineAPIModuleSource.min.js
Modified: trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js (201167 => 201168)
--- trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js 2016-05-19 16:48:31 UTC (rev 201168)
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-//# sourceURL=__WebInspectorCommandLineAPIModuleSource__
+//# sourceURL=__InjectedScript_CommandLineAPIModuleSource.js
/**
* @param {InjectedScriptHost} InjectedScriptHost
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (201167 => 201168)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1299,10 +1299,19 @@
return url ="" "__WebInspectorConsoleEvaluation__";
}
+function isWebKitInjectedScript(url)
+{
+ return url && url.startsWith("__InjectedScript_") && url.endsWith(".js");
+}
+
function isWebKitInternalScript(url)
{
if (isWebInspectorConsoleEvaluationScript(url))
return false;
+
+ if (isWebKitInjectedScript(url))
+ return true;
+
return url && url.startsWith("__Web") && url.endsWith("__");
}
Modified: trunk/Source/WebKit2/CMakeLists.txt (201167 => 201168)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-05-19 16:48:31 UTC (rev 201168)
@@ -828,7 +828,7 @@
OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
MAIN_DEPENDENCY ${WEBKIT2_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js
DEPENDS ${_javascript_Core_SCRIPTS_DIR}/xxd.pl ${_javascript_Core_SCRIPTS_DIR}/jsmin.py
- COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__WebAutomationInjectedScript__" > ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
+ COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js" > ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/jsmin.py < ${WEBKIT2_DIR}/WebProcess/Automation/WebAutomationSessionProxy.js >> ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js
COMMAND ${PERL_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/xxd.pl WebAutomationSessionProxyScriptSource ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxy.min.js ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h
VERBATIM)
Modified: trunk/Source/WebKit2/ChangeLog (201167 => 201168)
--- trunk/Source/WebKit2/ChangeLog 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-19 16:48:31 UTC (rev 201168)
@@ -1,3 +1,15 @@
+2016-05-19 Brian Burg <[email protected]>
+
+ Web Inspector: use a consistent prefix for injected scripts
+ https://bugs.webkit.org/show_bug.cgi?id=157715
+ <rdar://problem/26287188>
+
+ Reviewed by Timothy Hatcher.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebProcess/Automation/WebAutomationSessionProxy.js:
+
2016-05-18 Anders Carlsson <[email protected]>
Add WKPreferencesRef getter/setter pair to set RTL mode
Modified: trunk/Source/WebKit2/DerivedSources.make (201167 => 201168)
--- trunk/Source/WebKit2/DerivedSources.make 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebKit2/DerivedSources.make 2016-05-19 16:48:31 UTC (rev 201168)
@@ -235,7 +235,7 @@
all : $(firstword $(AUTOMATION_PROTOCOL_OUTPUT_FILES))
%ScriptSource.h : %.js $(_javascript_Core_SCRIPTS_DIR)/jsmin.py $(_javascript_Core_SCRIPTS_DIR)/xxd.pl
- echo "//# sourceURL=__WebAutomationInjectedScript__" > $(basename $(notdir $<)).min.js
+ echo "//# sourceURL=__InjectedScript_$(notdir $<)" > $(basename $(notdir $<)).min.js
$(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/jsmin.py < $< >> $(basename $(notdir $<)).min.js
$(PERL) $(_javascript_Core_SCRIPTS_DIR)/xxd.pl $(basename $(notdir $<))ScriptSource $(basename $(notdir $<)).min.js $@
$(DELETE) $(basename $(notdir $<)).min.js
Modified: trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.js (201167 => 201168)
--- trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.js 2016-05-19 16:22:35 UTC (rev 201167)
+++ trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.js 2016-05-19 16:48:31 UTC (rev 201168)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-//# sourceURL=__WebAutomationInjectedScript__
+//# sourceURL=__InjectedScript_WebAutomationSessionProxy.js
(function (sessionIdentifier, evaluate, createUUID) {
