<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205415] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205415">205415</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-09-03 21:34:57 -0700 (Sat, 03 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: unify Main.html and Test.html sources and generate different copies with the preprocessor
https://bugs.webkit.org/show_bug.cgi?id=161212
<rdar://problem/28017961>
Reviewed by Joseph Pecoraro.
.:
Rearrange some CMake rules so most Inspector UI work is done in WebInspectorUI.
* Source/CMakeLists.txt: Add 'WebInspectorUI' subdirectory.
* Source/PlatformEfl.cmake:
- Move the rule to copy InspectorBackendCommands.js into WebInspectorUI/CMakeLists.txt.
- Add a FIXME to use the cross-port list of Inspector resources instead of copying everything.
- Add new dependency so generated WebInspectorUI files are made by web-inspector-resources.
- Copy over generated files Main.html and Test.html.
* Source/PlatformWin.cmake:
- Add a FIXME to use the cross-port list of Inspector resources instead of copying everything.
- Add new dependency so generated WebInspectorUI files are made by web-inspector-resources.
- Copy over generated files Main.html and Test.html.
* Source/cmake/WebKitFS.cmake:
- Set up WEBINSPECTORUI_DIR and use it.
- Move directory creation commands here from JavaScriptCore.
* Source/cmake/WebKitMacros.cmake:
Add a helper to turn a CMake list into a space-delimited string of elements.
Source/JavaScriptCore:
* CMakeLists.txt: Remove some unnecessary MAKE_DIRECTORY commands.
Source/WebInspectorUI:
Add a Derived Sources build phase to WebInspectorUI project. Generate
Test.html and Main.html from a combined Inspector.html.in which has preprocessor
macros to include/exclude files not needed by all main resource versions.
Similarly, start generating these Inspector files in WebInspectorUI/CMakeLists.txt.
Move platform-specific bundling commands into PlatformGTK.cmake.
* CMakeLists.txt: Added.
Set up a list of common frontend resources that specific ports can extend, such as
with their own port-specific image resources. This list is the input to port-specific
packaging/bundling scripts. Eventually, minification and concatenation should happen
independently of the specific port by constructing the list of resources dynamically.
To ensure resources are always generated in WebInspectorUI and accessible from WebKit2,
add a dummy target that is always out of date and depends on generated files, causing
them to be built.
Also create a macro to run the preprocessor over Inspector.html.in using various
preprocessor macro definitions. These are customizable by ports to control the
appearance of ENGINEERING_BUILD, which guards resources not meant for shipping builds.
* Configurations/WebInspectorUIFramework.xcconfig:
We need to use preprocessor.pm from WebCore. On Mac, this is a private header.
Teach xcodebuild how to compute WEBCORE_PRIVATE_HEADERS_DIR. This is copied
from WebKit2's configuration files.
* PlatformGTK.cmake: Added.
Add GTK image resources to the resource list. Generate GResource catalog and embedded
C file into DerivedSources. WebKit2 will copy over this file and compile it.
* Scripts/combine-resources.pl:
(concatenateFiles):
Remove the --strip option as this patch removes the only use of it.
* DerivedSources.make: Added.
Generate Test.html and Main.html from the new combined Inspector.html.in.
The 'preprocess_main_resource' rule was copied from WebCore's DerivedSources.make.
* Scripts/cssmin.py: Removed.
* Scripts/jsmin.py: Removed.
These scripts are copied from JavaScriptCore but nobody uses these copies. Remove them.
* Scripts/copy-user-interface-resources-dryrun.rb: Do some cleanup.
- Stage scripts from SRCROOT into the tmpdir so dryrun doesn't require
a previous build to process WebInspectorUI resources.
- Run DerivedSources.make before copying/processing resources.
- Add some environment variables for new phase and group by script affected.
- Add a comment to clarify what this script is simulating.
* Scripts/copy-user-interface-resources.pl:
- Use Main.html and Test.html from DerivedSources/ instead of SRCROOT.
- Copy over Main.html and Test.html manually if not combining resources.
- Remove the command to strip files from Debug/ for production. This is
now redundant with ENGINEERING_BUILD guards in Inspector.html.in.
- Use jsmin.py from JavaScriptCore instead of the local copy.
- Wrap all multi-argument 'system' invocations so they are readable.
* Scripts/generate-webinspectorui-derived-sources: Added.
Added boilerplate script to run DerivedSources.make for Mac port.
* Scripts/preprocess-main-resource.pl: Added.
Trivially invoke the preprocessor on $0 using the given defines.
* UserInterface/Inspector.html.in: Renamed from Source/WebInspectorUI/UserInterface/Main.html.
* UserInterface/Test.html: Removed.
Combine Test.html and Main.html into Inspector.html.in. Add these guards:
- INCLUDE_TEST_RESOURCES: for resources excluded from Main.html.
- INCLUDE_UI_RESOURCES: for resources excluded from model tests.
- ENGINEERING_BUILD: for resources not to be shipped (Debug/ directory).
* WebInspectorUI.xcodeproj/project.pbxproj:
- Add new aggregate target 'Derived Sources' to project 'WebInspectorUI'.
- Add dependency on 'Derived Sources' to WebInspectorUI.framework.
- Remove unused copies of jsmin.py and cssmin.py.
Source/WebKit2:
Rearrange CMake rules so that most Inspector UI work is done in WebInspectorUI.
* PlatformGTK.cmake:
- Move the list of Inspector resources into WebInspectorUI/CMakeLists.txt.
- Move generation of InspectorGResourceBundle into WebInspectorUI.
- Copy over InspectorGResourceBundle.c into WebKit2's Derived Sources before compiling.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceCMakeListstxt">trunk/Source/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformEflcmake">trunk/Source/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourcePlatformWincmake">trunk/Source/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsWebInspectorUIFrameworkxcconfig">trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscombineresourcespl">trunk/Source/WebInspectorUI/Scripts/combine-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcesdryrunrb">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj">trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFScmake">trunk/Source/cmake/WebKitFS.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUICMakeListstxt">trunk/Source/WebInspectorUI/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebInspectorUIDerivedSourcesmake">trunk/Source/WebInspectorUI/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebInspectorUIPlatformGTKcmake">trunk/Source/WebInspectorUI/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptsgeneratewebinspectoruiderivedsources">trunk/Source/WebInspectorUI/Scripts/generate-webinspectorui-derived-sources</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptspreprocessmainresourcepl">trunk/Source/WebInspectorUI/Scripts/preprocess-main-resource.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceInspectorhtmlin">trunk/Source/WebInspectorUI/UserInterface/Inspector.html.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIScriptscssminpy">trunk/Source/WebInspectorUI/Scripts/cssmin.py</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptsjsminpy">trunk/Source/WebInspectorUI/Scripts/jsmin.py</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTesthtml">trunk/Source/WebInspectorUI/UserInterface/Test.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/ChangeLog 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-09-01 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: unify Main.html and Test.html sources and generate different copies with the preprocessor
+ https://bugs.webkit.org/show_bug.cgi?id=161212
+ <rdar://problem/28017961>
+
+ Reviewed by Joseph Pecoraro.
+
+ Rearrange some CMake rules so most Inspector UI work is done in WebInspectorUI.
+
+ * Source/CMakeLists.txt: Add 'WebInspectorUI' subdirectory.
+ * Source/PlatformEfl.cmake:
+ - Move the rule to copy InspectorBackendCommands.js into WebInspectorUI/CMakeLists.txt.
+ - Add a FIXME to use the cross-port list of Inspector resources instead of copying everything.
+ - Add new dependency so generated WebInspectorUI files are made by web-inspector-resources.
+ - Copy over generated files Main.html and Test.html.
+
+ * Source/PlatformWin.cmake:
+ - Add a FIXME to use the cross-port list of Inspector resources instead of copying everything.
+ - Add new dependency so generated WebInspectorUI files are made by web-inspector-resources.
+ - Copy over generated files Main.html and Test.html.
+
+ * Source/cmake/WebKitFS.cmake:
+ - Set up WEBINSPECTORUI_DIR and use it.
+ - Move directory creation commands here from JavaScriptCore.
+
+ * Source/cmake/WebKitMacros.cmake:
+ Add a helper to turn a CMake list into a space-delimited string of elements.
+
+2016-09-01 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Update root .gitignore for latest WebKitLibraries
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161501
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/CMakeLists.txt (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/CMakeLists.txt 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/CMakeLists.txt 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> add_subdirectory(WebCore)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_WEBKIT OR ENABLE_WEBKIT2)
+ add_subdirectory(WebInspectorUI)
+endif ()
+
</ins><span class="cx"> if (ENABLE_WEBKIT)
</span><span class="cx"> add_subdirectory(WebKit)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1199,8 +1199,6 @@
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
</span><del>-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</del><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-01 Brian Burg <bburg@apple.com>
+
+ Web Inspector: unify Main.html and Test.html sources and generate different copies with the preprocessor
+ https://bugs.webkit.org/show_bug.cgi?id=161212
+ <rdar://problem/28017961>
+
+ Reviewed by Joseph Pecoraro.
+
+ * CMakeLists.txt: Remove some unnecessary MAKE_DIRECTORY commands.
+
</ins><span class="cx"> 2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Use ASCIILiteral in some more places
</span></span></pre></div>
<a id="trunkSourcePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformEfl.cmake (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformEfl.cmake 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/PlatformEfl.cmake 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,20 +1,15 @@
</span><span class="cx"> add_subdirectory(${WEBCORE_DIR}/platform/efl/DefaultTheme)
</span><span class="cx">
</span><del>-# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
-# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
- COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
-)
-
</del><ins>+# FIXME: This should move to Source/WebInspectorUI/PlatformWin.cmake and use the WebInspectorUI_RESOURCES list.
</ins><span class="cx"> add_custom_target(
</span><span class="cx"> web-inspector-resources ALL
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
</span><ins>+ COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Main.html ${WEB_INSPECTOR_DIR}/UserInterface
+ COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Test.html ${WEB_INSPECTOR_DIR}/UserInterface
</ins><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
</span><del>- DEPENDS JavaScriptCore WebCore ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
</del><ins>+ DEPENDS JavaScriptCore WebCore ${WebInspectorUI_RESOURCES}
</ins><span class="cx"> WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
</span><span class="cx"> )
</span><span class="cx"> install(DIRECTORY "${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}"
</span></span></pre></div>
<a id="trunkSourcePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformWin.cmake (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformWin.cmake 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/PlatformWin.cmake 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,13 +1,15 @@
</span><del>-set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
</del><span class="cx"> set(WEB_INSPECTOR_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/WebInspectorUI)
</span><span class="cx">
</span><ins>+# FIXME: This should move to Source/WebInspectorUI/PlatformWin.cmake and use the WebInspectorUI_RESOURCES list.
</ins><span class="cx"> add_custom_target(
</span><span class="cx"> web-inspector-resources ALL
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
</span><del>- COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
</del><ins>+ COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
+ COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Main.html ${WEB_INSPECTOR_DIR}/UserInterface
+ COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Test.html ${WEB_INSPECTOR_DIR}/UserInterface
</ins><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
</span><del>- DEPENDS JavaScriptCore WebCore
</del><ins>+ DEPENDS JavaScriptCore WebCore generate-inspector-resources
</ins><span class="cx"> WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUICMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/CMakeLists.txt (0 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/CMakeLists.txt (rev 0)
+++ trunk/Source/WebInspectorUI/CMakeLists.txt 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+set_property(DIRECTORY . PROPERTY FOLDER "WebInspectorUI")
+
+# FIXME: Mac CMake needs to additionally include image resources in PlatformMac.cmake.
+file(GLOB_RECURSE WebInspectorUI_RESOURCES
+ ${WEBINSPECTORUI_DIR}/UserInterface/*.html
+ ${WEBINSPECTORUI_DIR}/UserInterface/*.js
+ ${WEBINSPECTORUI_DIR}/UserInterface/*.css
+)
+
+set(WebInspectorUI_DERIVED_SOURCES
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Main.html
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Test.html
+)
+list(APPEND WebInspectorUI_RESOURCES ${WebInspectorUI_DERIVED_SOURCES})
+
+# This variable is a hook for ports to toggle ENGINEERING_BUILD=1 based on some condition.
+set(COMMON_RESOURCE_DEFINES)
+
+# Copy InspectorBackendCommands.js from JavaScriptCore to WebInspectorUI.
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
+ COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+set(MAIN_RESOURCE_DEFINES
+ ${COMMON_RESOURCE_DEFINES}
+ INCLUDE_UI_RESOURCES=1
+)
+
+set(TEST_RESOURCE_DEFINES
+ ${COMMON_RESOURCE_DEFINES}
+ INCLUDE_TEST_RESOURCES=1
+)
+
+macro(PROCESS_INSPECTOR_MAIN_RESOURCE _defines _out_file)
+ TO_LIST_WITH_SPACES("${_defines}" _defines_with_space_separator)
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/${_out_file}
+ MAIN_DEPENDENCY ${WEBINSPECTORUI_DIR}/Scripts/preprocess-main-resource.pl
+ DEPENDS ${WEBINSPECTORUI_DIR}/UserInterface/Inspector.html.in
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBINSPECTORUI_DIR}/Scripts/preprocess-main-resource.pl --defines="${_defines_with_space_separator}" ${WEBINSPECTORUI_DIR}/UserInterface/Inspector.html.in > ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/${_out_file}
+ )
+endmacro()
+
+PROCESS_INSPECTOR_MAIN_RESOURCE("${MAIN_RESOURCE_DEFINES}" Main.html)
+PROCESS_INSPECTOR_MAIN_RESOURCE("${TEST_RESOURCE_DEFINES}" Test.html)
+
+# Force generation of derived sources here since they are eventually needed by WebKit2.
+# They can't be generated in WebKit2 because WebInspectorUI_RESOURCES is out of scope.
+add_custom_target(generate-inspector-resources ALL
+ DEPENDS ${WebInspectorUI_RESOURCES}
+)
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2016-09-01 Brian Burg <bburg@apple.com>
+
+ Web Inspector: unify Main.html and Test.html sources and generate different copies with the preprocessor
+ https://bugs.webkit.org/show_bug.cgi?id=161212
+ <rdar://problem/28017961>
+
+ Reviewed by Joseph Pecoraro.
+
+ Add a Derived Sources build phase to WebInspectorUI project. Generate
+ Test.html and Main.html from a combined Inspector.html.in which has preprocessor
+ macros to include/exclude files not needed by all main resource versions.
+
+ Similarly, start generating these Inspector files in WebInspectorUI/CMakeLists.txt.
+ Move platform-specific bundling commands into PlatformGTK.cmake.
+
+ * CMakeLists.txt: Added.
+ Set up a list of common frontend resources that specific ports can extend, such as
+ with their own port-specific image resources. This list is the input to port-specific
+ packaging/bundling scripts. Eventually, minification and concatenation should happen
+ independently of the specific port by constructing the list of resources dynamically.
+
+ To ensure resources are always generated in WebInspectorUI and accessible from WebKit2,
+ add a dummy target that is always out of date and depends on generated files, causing
+ them to be built.
+
+ Also create a macro to run the preprocessor over Inspector.html.in using various
+ preprocessor macro definitions. These are customizable by ports to control the
+ appearance of ENGINEERING_BUILD, which guards resources not meant for shipping builds.
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+ We need to use preprocessor.pm from WebCore. On Mac, this is a private header.
+ Teach xcodebuild how to compute WEBCORE_PRIVATE_HEADERS_DIR. This is copied
+ from WebKit2's configuration files.
+
+ * PlatformGTK.cmake: Added.
+ Add GTK image resources to the resource list. Generate GResource catalog and embedded
+ C file into DerivedSources. WebKit2 will copy over this file and compile it.
+
+ * Scripts/combine-resources.pl:
+ (concatenateFiles):
+ Remove the --strip option as this patch removes the only use of it.
+
+ * DerivedSources.make: Added.
+ Generate Test.html and Main.html from the new combined Inspector.html.in.
+ The 'preprocess_main_resource' rule was copied from WebCore's DerivedSources.make.
+
+ * Scripts/cssmin.py: Removed.
+ * Scripts/jsmin.py: Removed.
+ These scripts are copied from JavaScriptCore but nobody uses these copies. Remove them.
+
+ * Scripts/copy-user-interface-resources-dryrun.rb: Do some cleanup.
+ - Stage scripts from SRCROOT into the tmpdir so dryrun doesn't require
+ a previous build to process WebInspectorUI resources.
+ - Run DerivedSources.make before copying/processing resources.
+ - Add some environment variables for new phase and group by script affected.
+ - Add a comment to clarify what this script is simulating.
+
+ * Scripts/copy-user-interface-resources.pl:
+ - Use Main.html and Test.html from DerivedSources/ instead of SRCROOT.
+ - Copy over Main.html and Test.html manually if not combining resources.
+ - Remove the command to strip files from Debug/ for production. This is
+ now redundant with ENGINEERING_BUILD guards in Inspector.html.in.
+ - Use jsmin.py from JavaScriptCore instead of the local copy.
+ - Wrap all multi-argument 'system' invocations so they are readable.
+
+ * Scripts/generate-webinspectorui-derived-sources: Added.
+ Added boilerplate script to run DerivedSources.make for Mac port.
+
+ * Scripts/preprocess-main-resource.pl: Added.
+ Trivially invoke the preprocessor on $0 using the given defines.
+
+ * UserInterface/Inspector.html.in: Renamed from Source/WebInspectorUI/UserInterface/Main.html.
+ * UserInterface/Test.html: Removed.
+ Combine Test.html and Main.html into Inspector.html.in. Add these guards:
+ - INCLUDE_TEST_RESOURCES: for resources excluded from Main.html.
+ - INCLUDE_UI_RESOURCES: for resources excluded from model tests.
+ - ENGINEERING_BUILD: for resources not to be shipped (Debug/ directory).
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+ - Add new aggregate target 'Derived Sources' to project 'WebInspectorUI'.
+ - Add dependency on 'Derived Sources' to WebInspectorUI.framework.
+ - Remove unused copies of jsmin.py and cssmin.py.
+
</ins><span class="cx"> 2016-09-03 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Change Cmd-D from kill line to selecting next occurrence
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsWebInspectorUIFrameworkxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -30,4 +30,15 @@
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx">
</span><ins>+UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
+UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
+UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
+UMBRELLA_FRAMEWORKS_DIR_Production[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+UMBRELLA_FRAMEWORKS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
+
+WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+
</ins><span class="cx"> SKIP_INSTALL[sdk=iphone*] = YES;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIDerivedSourcesmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/DerivedSources.make (0 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/DerivedSources.make (rev 0)
+++ trunk/Source/WebInspectorUI/DerivedSources.make 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+# Copyright (C) 2016 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+VPATH = \
+ $(WebInspectorUI) \
+#
+
+PERL = perl
+
+# For Perl modules whose directory needs to be added to Perl's search path.
+COMMON_SCRIPTS = \
+ $(WEBCORE_PRIVATE_HEADERS_DIR)/preprocessor.pm \
+#
+
+SCRIPTS = \
+ $(COMMON_SCRIPTS) \
+ $(WebInspectorUI)/Scripts/preprocess-main-resource.pl \
+#
+
+.PHONY : all
+
+PROCESSED_RESOURCE_FILES = \
+ Main.html \
+ Test.html \
+#
+
+COMMON_RESOURCE_DEFINES=$(ENGINEERING_BUILD_DEFINES)
+TEST_RESOURCE_DEFINES=INCLUDE_TEST_RESOURCES $(COMMON_RESOURCE_DEFINES)
+MAIN_RESOURCE_DEFINES=INCLUDE_UI_RESOURCES $(COMMON_RESOURCE_DEFINES)
+
+all: \
+ $(PROCESSED_RESOURCE_FILES) \
+#
+
+preprocess_main_resource = $(PERL) $(addprefix -I , $(sort $(dir $(1)))) $(WebInspectorUI)/Scripts/preprocess-main-resource.pl
+
+Main.html : $(WebInspectorUI)/UserInterface/Inspector.html.in $(SCRIPTS)
+ $(call preprocess_main_resource, $(COMMON_SCRIPTS)) --defines="$(MAIN_RESOURCE_DEFINES)" $< > $@
+
+Test.html : $(WebInspectorUI)/UserInterface/Inspector.html.in $(SCRIPTS)
+ $(call preprocess_main_resource, $(COMMON_SCRIPTS)) --defines="$(TEST_RESOURCE_DEFINES)" $< > $@
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIPlatformGTKcmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/PlatformGTK.cmake (0 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/PlatformGTK.cmake (rev 0)
+++ trunk/Source/WebInspectorUI/PlatformGTK.cmake 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+file(GLOB WebInspectorUI_GTK_RESOURCES
+ ${WEBINSPECTORUI_DIR}/UserInterface/Images/gtk/*.png
+ ${WEBINSPECTORUI_DIR}/UserInterface/Images/gtk/*.svg
+)
+
+list(APPEND WebInspectorUI_RESOURCES
+ ${WebInspectorUI_GTK_RESOURCES}
+)
+
+# In developer mode, include resources that shouldn't be included in shipping builds.
+if (DEVELOPER_MODE)
+ list(APPEND COMMON_RESOURCE_DEFINES ENGINEERING_BUILD=1)
+endif ()
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.xml
+ DEPENDS ${WebInspectorUI_RESOURCES} ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
+ COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.xml ${WebInspectorUI_RESOURCES}
+ VERBATIM
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
+ DEPENDS ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.xml
+ COMMAND glib-compile-resources --generate --sourcedir=${WEBINSPECTORUI_DIR} --sourcedir=${DERIVED_SOURCES_WEBINSPECTORUI_DIR} --target=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.xml
+ VERBATIM
+)
+
+# Force the bundle to be generated. WebKit2 will copy it into its own Derived Sources directory and build it.
+add_custom_target(package-inspector-resources ALL
+ DEPENDS ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
+)
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscombineresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/combine-resources.pl (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/combine-resources.pl 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/Scripts/combine-resources.pl 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> our $derivedSourcesDirectory;
</span><span class="cx"> our $htmlDirectory;
</span><span class="cx"> our $htmlFile;
</span><del>-our $strip;
</del><span class="cx">
</span><span class="cx"> GetOptions('output-dir=s' => \$outputDirectory,
</span><span class="cx"> 'output-script-name=s' => \$outputScriptName,
</span><span class="lines">@@ -43,11 +42,10 @@
</span><span class="cx"> 'derived-sources-dir=s' => \$derivedSourcesDirectory,
</span><span class="cx"> 'input-dir=s' => \$inputDirectory,
</span><span class="cx"> 'input-html-dir=s' => \$htmlDirectory,
</span><del>- 'input-html=s' => \$htmlFile,
- 'strip' => \$strip);
</del><ins>+ 'input-html=s' => \$htmlFile);
</ins><span class="cx">
</span><del>-unless (defined $htmlFile and defined $derivedSourcesDirectory and defined $outputDirectory and (defined $strip or defined $outputScriptName or defined $outputStylesheetName)) {
- print "Usage: $0 --input-html <path> --derived-sources-dir <path> --output-dir <path> [--output-script-name <name>] [--output-style-name <name>] [--strip]\n";
</del><ins>+unless (defined $htmlFile and defined $derivedSourcesDirectory and defined $outputDirectory and (defined $outputScriptName or defined $outputStylesheetName)) {
+ print "Usage: $0 --input-html <path> --derived-sources-dir <path> --output-dir <path> [--output-script-name <name>] [--output-style-name <name>]\n";
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,17 +88,12 @@
</span><span class="cx"> # Don't use \s so we can control the newlines we consume.
</span><span class="cx"> my $replacementExpression = "([\t ]*)" . $tagExpression . "[\t ]*\n+";
</span><span class="cx">
</span><del>- if (defined $strip) {
- # Just strip all occurrences of the pattern.
- $headContents =~ s/$replacementExpression//gi;
- } else {
- # Replace the first occurrence with a token so we can inject the concatenated tag in the same place
- # as the first file that got consolidated. This makes sure we preserve some order if there are other
- # items in the head that we didn't consolidate.
- $headContents =~ s/$replacementExpression/$1%CONCATENATED%\n/i;
- $headContents =~ s/$replacementExpression//gi;
- $headContents =~ s/%CONCATENATED%/$concatenatedTag/;
- }
</del><ins>+ # Replace the first occurrence with a token so we can inject the concatenated tag in the same place
+ # as the first file that got consolidated. This makes sure we preserve some order if there are other
+ # items in the head that we didn't consolidate.
+ $headContents =~ s/$replacementExpression/$1%CONCATENATED%\n/i;
+ $headContents =~ s/$replacementExpression//gi;
+ $headContents =~ s/%CONCATENATED%/$concatenatedTag/;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $inputDirectoryPattern = "(?!External\/)(?!Workers\/)[^\"]*";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcesdryrunrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -31,27 +31,49 @@
</span><span class="cx"> exit 1
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+JAVASCRIPTCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "JavaScriptCore")
+WEBCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "WebCore")
</ins><span class="cx"> WEB_INSPECTOR_PATH = File.expand_path File.join(File.dirname(__FILE__), "..")
</span><ins>+GENERATE_DERIVED_SOURCES_PATH = File.join WEB_INSPECTOR_PATH, "Scripts", "generate-webinspectorui-derived-sources"
</ins><span class="cx"> COPY_USER_INTERFACE_RESOURCES_PATH = File.join WEB_INSPECTOR_PATH, "Scripts", "copy-user-interface-resources.pl"
</span><span class="cx">
</span><ins>+# This script simulates processing user interface resources located in SRCROOT.
+# It places processed files in the specified output directory. This is most similar
+# to an isolated OBJROOT since it includes DerivedSources. It doesn't place files
+# into their DSTROOT locations, such as inside of WebInspectorUI.framework.
</ins><span class="cx"> $output_directory = File.expand_path ARGV[0]
</span><ins>+$start_directory = FileUtils.pwd
</ins><span class="cx">
</span><span class="cx"> Dir.mktmpdir do |tmpdir|
</span><span class="cx">
</span><span class="cx"> # Create the output directory if needed.
</span><span class="cx"> FileUtils.mkdir_p $output_directory
</span><del>-
</del><ins>+
</ins><span class="cx"> # Create empty derived sources expected to exist.
</span><span class="cx"> FileUtils.touch(File.join(tmpdir, 'InspectorBackendCommands.js'))
</span><del>-
- # Setup the environment and run.
- ENV["DERIVED_SOURCES_DIR"] = tmpdir
</del><ins>+
+ # Stage some scripts expected to be in various framework PrivateHeaders.
</ins><span class="cx"> ENV["JAVASCRIPTCORE_PRIVATE_HEADERS_DIR"] = tmpdir
</span><ins>+ ENV["WEBCORE_PRIVATE_HEADERS_DIR"] = tmpdir
+ FileUtils.cp(File.join(JAVASCRIPTCORE_PATH, "Scripts", "cssmin.py"), tmpdir)
+ FileUtils.cp(File.join(JAVASCRIPTCORE_PATH, "Scripts", "jsmin.py"), tmpdir)
+ FileUtils.cp(File.join(WEBCORE_PATH, "bindings", "scripts", "preprocessor.pm"), tmpdir)
+
+ # Setup the environment and generate derived sources.
</ins><span class="cx"> ENV["SRCROOT"] = WEB_INSPECTOR_PATH
</span><ins>+ ENV["BUILT_PRODUCTS_DIR"] = $output_directory
+ ENV["ACTION"] = "install"
+ FileUtils.cd $start_directory
+ system(GENERATE_DERIVED_SOURCES_PATH) or raise "Failed to generate derived sources."
+
+ # Setup the environment and combine/process/stage resources.
+ ENV["DERIVED_SOURCES_DIR"] = File.join($output_directory, "DerivedSources", "WebInspectorUI")
</ins><span class="cx"> ENV["TARGET_BUILD_DIR"] = $output_directory
</span><span class="cx"> ENV["UNLOCALIZED_RESOURCES_FOLDER_PATH"] = ""
</span><span class="cx"> ENV["COMBINE_INSPECTOR_RESOURCES"] = "YES"
</span><span class="cx"> ENV["COMBINE_TEST_RESOURCES"] = "YES"
</span><del>- exec COPY_USER_INTERFACE_RESOURCES_PATH
</del><ins>+ ENV["FORCE_TOOL_INSTALL"] = "NO"
+ FileUtils.cd $start_directory
+ system(COPY_USER_INTERFACE_RESOURCES_PATH) or raise "Failed to process user interface resources."
</ins><span class="cx">
</span><span class="cx"> end
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> my $inspectorLicense = <<'EOF';
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Matt Lilek. All rights reserved.
</span><span class="cx"> * Copyright (C) 2008-2009 Anthony Ricaud <rik@webkit.org>
</span><span class="cx"> * Copyright (C) 2009-2010 Joseph Pecoraro. All rights reserved.
</span><span class="lines">@@ -135,6 +135,7 @@
</span><span class="cx"> my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
</span><span class="cx"> my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
</span><span class="cx"> my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
</span><ins>+my $sharedScriptsRoot = File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'});
</ins><span class="cx"> my $uiRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'UserInterface');
</span><span class="cx"> my $targetResourcePath = File::Spec->catdir($ENV{'TARGET_BUILD_DIR'}, $ENV{'UNLOCALIZED_RESOURCES_FOLDER_PATH'});
</span><span class="cx"> my $protocolDir = File::Spec->catdir($targetResourcePath, 'Protocol');
</span><span class="lines">@@ -161,6 +162,9 @@
</span><span class="cx"> # We may then proceed to include combined & optimized resources which will output mostly to different paths
</span><span class="cx"> # but overwrite Main.html / Main.js with optimized versions.
</span><span class="cx"> ditto($uiRoot, $targetResourcePath);
</span><ins>+ copy(File::Spec->catfile($derivedSourcesDir, "Main.html"), $targetResourcePath) or die "Copy of Main.html failed: $!";
+ copy(File::Spec->catfile($derivedSourcesDir, "Test.html"), $targetResourcePath) or die "Copy of Test.html failed: $!";
+ unlink File::Spec->catfile($targetResourcePath, "Inspector.html.in");
</ins><span class="cx">
</span><span class="cx"> # Also force combining test resources for tool installs.
</span><span class="cx"> $shouldCombineTest = 1;
</span><span class="lines">@@ -167,25 +171,49 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($shouldCombineMain) {
</span><del>- # Remove Debug JavaScript and CSS files in Production builds.
- system($perl, $combineResourcesCmd, '--input-dir', 'Debug', '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Debug.js', '--output-style-name', 'Debug.css', '--strip');
-
</del><span class="cx"> # Combine the JavaScript and CSS files in Production builds into single files (Main.js and Main.css).
</span><span class="cx"> my $derivedSourcesMainHTML = File::Spec->catfile($derivedSourcesDir, 'Main.html');
</span><del>- system($perl, $combineResourcesCmd, '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
</del><ins>+ system($perl, $combineResourcesCmd,
+ '--input-html', $derivedSourcesMainHTML,
+ '--input-html-dir', $uiRoot,
+ '--derived-sources-dir', $derivedSourcesDir,
+ '--output-dir', $derivedSourcesDir,
+ '--output-script-name', 'Main.js',
+ '--output-style-name', 'Main.css');
</ins><span class="cx">
</span><span class="cx"> # Combine the CodeMirror JavaScript and CSS files in Production builds into single files (CodeMirror.js and CodeMirror.css).
</span><del>- system($perl, $combineResourcesCmd, '--input-dir', 'External/CodeMirror', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'CodeMirror.js', '--output-style-name', 'CodeMirror.css');
</del><ins>+ system($perl, $combineResourcesCmd,
+ '--input-dir', 'External/CodeMirror',
+ '--input-html', $derivedSourcesMainHTML,
+ '--input-html-dir', $uiRoot,
+ '--derived-sources-dir', $derivedSourcesDir,
+ '--output-dir', $derivedSourcesDir,
+ '--output-script-name', 'CodeMirror.js',
+ '--output-style-name', 'CodeMirror.css');
</ins><span class="cx">
</span><span class="cx"> # Combine the Esprima JavaScript files in Production builds into a single file (Esprima.js).
</span><del>- system($perl, $combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Esprima.js');
</del><ins>+ system($perl, $combineResourcesCmd,
+ '--input-dir', 'External/Esprima',
+ '--input-html', $derivedSourcesMainHTML,
+ '--input-html-dir', $uiRoot,
+ '--derived-sources-dir', $derivedSourcesDir,
+ '--output-dir', $derivedSourcesDir,
+ '--output-script-name', 'Esprima.js');
</ins><span class="cx">
</span><span class="cx"> # Combine the ESLint JavaScript files in Production builds into a single file (ESLint.js).
</span><del>- system($perl, $combineResourcesCmd, '--input-dir', 'External/ESLint', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'ESLint.js');
</del><ins>+ system($perl, $combineResourcesCmd,
+ '--input-dir', 'External/ESLint',
+ '--input-html', $derivedSourcesMainHTML,
+ '--input-html-dir', $uiRoot,
+ '--derived-sources-dir', $derivedSourcesDir,
+ '--output-dir', $derivedSourcesDir,
+ '--output-script-name', 'ESLint.js');
</ins><span class="cx">
</span><span class="cx"> # Remove console.assert calls from the Main.js file.
</span><span class="cx"> my $derivedSourcesMainJS = File::Spec->catfile($derivedSourcesDir, 'Main.js');
</span><del>- system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-script', $derivedSourcesMainJS, '--output-script', $derivedSourcesMainJS);
</del><ins>+ system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'),
+ '--input-script', $derivedSourcesMainJS,
+ '--output-script', $derivedSourcesMainJS);
</ins><span class="cx">
</span><span class="cx"> # Fix Image URLs in the Main.css file by removing the "../".
</span><span class="cx"> my $derivedSourcesMainCSS = File::Spec->catfile($derivedSourcesDir, 'Main.css');
</span><span class="lines">@@ -222,8 +250,8 @@
</span><span class="cx"> seedFile($targetESLintJS, $eslintLicense);
</span><span class="cx">
</span><span class="cx"> # Minify the Main.js and Main.css files, with Main.js appending to the license that was exported above.
</span><del>- my $jsMinScript = File::Spec->catfile($scriptsRoot, 'jsmin.py');
- my $cssMinScript = File::Spec->catfile($scriptsRoot, 'cssmin.py');
</del><ins>+ my $jsMinScript = File::Spec->catfile($sharedScriptsRoot, 'jsmin.py');
+ my $cssMinScript = File::Spec->catfile($sharedScriptsRoot, 'cssmin.py');
</ins><span class="cx"> system(qq("$python" "$jsMinScript" < "$derivedSourcesMainJS" >> "$targetMainJS")) and die "Failed to minify $derivedSourcesMainJS: $!";
</span><span class="cx"> system(qq("$python" "$cssMinScript" < "$derivedSourcesMainCSS" >> "$targetMainCSS")) and die "Failed to minify $derivedSourcesMainCSS: $!";
</span><span class="cx">
</span><span class="lines">@@ -257,41 +285,60 @@
</span><span class="cx"> ditto(File::Spec->catfile($uiRoot, 'Workers'), $workersDir);
</span><span class="cx">
</span><span class="cx"> # Remove console.assert calls from the Worker js files.
</span><del>- system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-directory', $workersDir);
</del><ins>+ system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'),
+ '--input-directory', $workersDir);
</ins><span class="cx">
</span><span class="cx"> # Fix import references in Workers directories. This rewrites "../../External/script.js" import paths to their new locations.
</span><del>- system($perl, File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'), '--input-directory', $workersDir) and die "Failed to update Worker imports for optimized builds.";
</del><ins>+ system($perl, File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'),
+ '--input-directory', $workersDir)
+ and die "Failed to update Worker imports for optimized builds.";
</ins><span class="cx"> } else {
</span><span class="cx"> # Keep the files separate for engineering builds.
</span><span class="cx"> ditto($uiRoot, $targetResourcePath);
</span><ins>+ copy(File::Spec->catfile($derivedSourcesDir, 'Main.html'), File::Spec->catfile($targetResourcePath, 'Main.html')) or die "Copy of Main.html failed: $!";
+ copy(File::Spec->catfile($derivedSourcesDir, 'Test.html'), File::Spec->catfile($targetResourcePath, 'Test.html')) or die "Copy of Test.html failed: $!";;
+ unlink File::Spec->catfile($targetResourcePath, 'Inspector.html.in');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($shouldCombineTest) {
</span><ins>+ my $derivedSourcesTestHTML = File::Spec->catfile($derivedSourcesDir, 'Test.html');
+
</ins><span class="cx"> # Combine the JavaScript files for testing into a single file (TestCombined.js).
</span><del>- system($perl, $combineResourcesCmd, '--input-html', File::Spec->catfile($uiRoot, 'Test.html'), '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestCombined.js', '--output-style-name', 'TestCombined.css');
</del><ins>+ system($perl, $combineResourcesCmd,
+ '--input-html', $derivedSourcesTestHTML,
+ '--input-html-dir', $uiRoot,
+ '--derived-sources-dir', $derivedSourcesDir,
+ '--output-dir', $derivedSourcesDir,
+ '--output-script-name', 'TestCombined.js',
+ '--output-style-name', 'TestCombined.css');
</ins><span class="cx">
</span><del>- my $derivedSourcesTestHTML = File::Spec->catfile($derivedSourcesDir, 'Test.html');
- my $derivedSourcesTestJS = File::Spec->catfile($derivedSourcesDir, 'TestCombined.js');
</del><ins>+ my $derivedSourcesTestCombinedJS = File::Spec->catfile($derivedSourcesDir, 'TestCombined.js');
</ins><span class="cx"> # Combine the Esprima JavaScript files for testing into a single file (Esprima.js).
</span><del>- system($perl, $combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesTestHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestEsprima.js');
</del><ins>+ system($perl, $combineResourcesCmd,
+ '--input-dir', 'External/Esprima',
+ '--input-html', $derivedSourcesTestHTML,
+ '--input-html-dir', $uiRoot,
+ '--derived-sources-dir', $derivedSourcesDir,
+ '--output-dir', $derivedSourcesDir,
+ '--output-script-name', 'TestEsprima.js');
</ins><span class="cx">
</span><span class="cx"> # Export the license into TestCombined.js.
</span><span class="cx"> my $targetTestJS = File::Spec->catfile($targetResourcePath, 'TestCombined.js');
</span><span class="cx"> seedFile($targetTestJS, $inspectorLicense);
</span><span class="cx">
</span><ins>+ # Append TestCombined.js to the license that was exported above.
+ appendFile($targetTestJS, $derivedSourcesTestCombinedJS);
+
</ins><span class="cx"> # Export the license into Esprima.js.
</span><span class="cx"> my $targetEsprimaJS = File::Spec->catfile($targetResourcePath, 'TestEsprima.js');
</span><span class="cx"> seedFile($targetEsprimaJS, $esprimaLicense);
</span><span class="cx">
</span><del>- # Append TestCombined.js to the license that was exported above.
- appendFile($targetTestJS, $derivedSourcesTestJS);
-
</del><span class="cx"> # Append Esprima.js to the license that was exported above.
</span><span class="cx"> my $derivedSourcesEsprimaJS = File::Spec->catfile($derivedSourcesDir, 'TestEsprima.js');
</span><span class="cx"> appendFile($targetEsprimaJS, $derivedSourcesEsprimaJS);
</span><span class="cx">
</span><span class="cx"> # Copy over Test.html.
</span><del>- copy($derivedSourcesTestHTML, File::Spec->catfile($targetResourcePath, 'Test.html'));
</del><ins>+ copy($derivedSourcesTestHTML, File::Spec->catfile($targetResourcePath, 'Test.html')) or die "Copy of Test.html failed: $!";
</ins><span class="cx">
</span><span class="cx"> # Copy the Legacy directory.
</span><span class="cx"> ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscssminpy"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/Scripts/cssmin.py (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/cssmin.py 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/Scripts/cssmin.py 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-#!/usr/bin/python
-
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-import re
-
-def cssminify(css):
- rules = (
- (r"\/\*.*?\*\/", ""), # delete comments
- (r"\n", ""), # delete new lines
- (r"\s+", " "), # change multiple spaces to one space
- (r"\s?([;{},~>!])\s?", r"\1"), # delete space where it is not needed
- (r":\s", ":"), # delete spaces after colons, but not before. E.g. do not break selectors "a :focus", "b :matches(...)", "c :not(...)" where the leading space is significant
- (r"\s?([-+])(?:\s(?![0-9(])(?!var))", r"\1"), # delete whitespace around + and - when not followed by a number, paren, or var(). E.g. strip for selector "a + b" but not "calc(a + b)" which requires spaces.
- (r";}", "}") # change ';}' to '}' because the semicolon is not needed
- )
-
- css = css.replace("\r\n", "\n")
- for rule in rules:
- css = re.compile(rule[0], re.MULTILINE | re.UNICODE | re.DOTALL).sub(rule[1], css)
- return css
-
-if __name__ == "__main__":
- import sys
- if sys.version_info[0] == 3 and sys.stdin.encoding != 'UTF-8':
- import io
- sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='UTF-8')
- sys.stdout.write(cssminify(sys.stdin.read()))
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptsgeneratewebinspectoruiderivedsourcesfromrev205414trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcesdryrunrb"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/Scripts/generate-webinspectorui-derived-sources (from rev 205414, trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb) (0 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/generate-webinspectorui-derived-sources (rev 0)
+++ trunk/Source/WebInspectorUI/Scripts/generate-webinspectorui-derived-sources 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+#!/bin/sh
+
+# Copyright (C) 2016 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebInspectorUI"
+cd "${BUILT_PRODUCTS_DIR}/DerivedSources/WebInspectorUI"
+
+export WebInspectorUI="${SRCROOT}"
+
+/bin/ln -sfh "${WEBCORE_PRIVATE_HEADERS_DIR}" WebCorePrivateHeaders
+export WebCore_SCRIPTS_DIR="WebCorePrivateHeaders"
+
+if [ ! $CC ]; then
+ export CC="`xcrun -find clang`"
+fi
+
+if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" ]; then
+ make --no-builtin-rules -f "${WebInspectorUI}/DerivedSources.make" -j `/usr/sbin/sysctl -n hw.activecpu`
+fi
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptsjsminpy"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/Scripts/jsmin.py (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/jsmin.py 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/Scripts/jsmin.py 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,238 +0,0 @@
</span><del>-# This code is original from jsmin by Douglas Crockford, it was translated to
-# Python by Baruch Even. It was rewritten by Dave St.Germain for speed.
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2013 Dave St.Germain
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-
-import sys
-is_3 = sys.version_info >= (3, 0)
-if is_3:
- import io
-else:
- import StringIO
- try:
- import cStringIO
- except ImportError:
- cStringIO = None
-
-
-__all__ = ['jsmin', 'JavascriptMinify']
-__version__ = '2.0.9'
-
-
-def jsmin(js):
- """
- returns a minified version of the javascript string
- """
- if not is_3:
- if cStringIO and not isinstance(js, unicode):
- # strings can use cStringIO for a 3x performance
- # improvement, but unicode (in python2) cannot
- klass = cStringIO.StringIO
- else:
- klass = StringIO.StringIO
- else:
- klass = io.StringIO
- ins = klass(js)
- outs = klass()
- JavascriptMinify(ins, outs).minify()
- return outs.getvalue()
-
-
-class JavascriptMinify(object):
- """
- Minify an input stream of javascript, writing
- to an output stream
- """
-
- def __init__(self, instream=None, outstream=None):
- self.ins = instream
- self.outs = outstream
-
- def minify(self, instream=None, outstream=None):
- if instream and outstream:
- self.ins, self.outs = instream, outstream
-
- self.is_return = False
- self.return_buf = ''
-
- def write(char):
- # all of this is to support literal regular expressions.
- # sigh
- if char in 'return':
- self.return_buf += char
- self.is_return = self.return_buf == 'return'
- self.outs.write(char)
- if self.is_return:
- self.return_buf = ''
-
- read = self.ins.read
-
- space_strings = "abcdefghijklmnopqrstuvwxyz"\
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$\\"
- starters, enders = '{[(+-', '}])+-"\''
- newlinestart_strings = starters + space_strings
- newlineend_strings = enders + space_strings
- do_newline = False
- do_space = False
- escape_slash_count = 0
- doing_single_comment = False
- previous_before_comment = ''
- doing_multi_comment = False
- in_re = False
- in_quote = ''
- quote_buf = []
-
- previous = read(1)
- if previous == '\\':
- escape_slash_count += 1
- next1 = read(1)
- if previous == '/':
- if next1 == '/':
- doing_single_comment = True
- elif next1 == '*':
- doing_multi_comment = True
- previous = next1
- next1 = read(1)
- else:
- write(previous)
- elif not previous:
- return
- elif previous >= '!':
- if previous in "'\"":
- in_quote = previous
- write(previous)
- previous_non_space = previous
- else:
- previous_non_space = ' '
- if not next1:
- return
-
- while 1:
- next2 = read(1)
- if not next2:
- last = next1.strip()
- if not (doing_single_comment or doing_multi_comment)\
- and last not in ('', '/'):
- if in_quote:
- write(''.join(quote_buf))
- write(last)
- break
- if doing_multi_comment:
- if next1 == '*' and next2 == '/':
- doing_multi_comment = False
- next2 = read(1)
- elif doing_single_comment:
- if next1 in '\r\n':
- doing_single_comment = False
- while next2 in '\r\n':
- next2 = read(1)
- if not next2:
- break
- if previous_before_comment in ')}]':
- do_newline = True
- elif previous_before_comment in space_strings:
- write('\n')
- elif in_quote:
- quote_buf.append(next1)
-
- if next1 == in_quote:
- numslashes = 0
- for c in reversed(quote_buf[:-1]):
- if c != '\\':
- break
- else:
- numslashes += 1
- if numslashes % 2 == 0:
- in_quote = ''
- write(''.join(quote_buf))
- elif next1 in '\r\n':
- if previous_non_space in newlineend_strings \
- or previous_non_space > '~':
- while 1:
- if next2 < '!':
- next2 = read(1)
- if not next2:
- break
- else:
- if next2 in newlinestart_strings \
- or next2 > '~' or next2 == '/':
- do_newline = True
- break
- elif next1 < '!' and not in_re:
- if (previous_non_space in space_strings \
- or previous_non_space > '~') \
- and (next2 in space_strings or next2 > '~'):
- do_space = True
- elif previous_non_space in '-+' and next2 == previous_non_space:
- # protect against + ++ or - -- sequences
- do_space = True
- elif self.is_return and next2 == '/':
- # returning a regex...
- write(' ')
- elif next1 == '/':
- if do_space:
- write(' ')
- if in_re:
- if previous != '\\' or (not escape_slash_count % 2) or next2 in 'gimy':
- in_re = False
- write('/')
- elif next2 == '/':
- doing_single_comment = True
- previous_before_comment = previous_non_space
- elif next2 == '*':
- doing_multi_comment = True
- previous = next1
- next1 = next2
- next2 = read(1)
- else:
- in_re = previous_non_space in '(,=:[?!&|' or self.is_return # literal regular expression
- write('/')
- else:
- if do_space:
- do_space = False
- write(' ')
- if do_newline:
- write('\n')
- do_newline = False
-
- write(next1)
- if not in_re and next1 in "'\"`":
- in_quote = next1
- quote_buf = []
-
- previous = next1
- next1 = next2
-
- if previous >= '!':
- previous_non_space = previous
-
- if previous == '\\':
- escape_slash_count += 1
- else:
- escape_slash_count = 0
-
-if __name__ == '__main__':
- minifier = JavascriptMinify(sys.stdin, sys.stdout)
- minifier.minify()
- sys.stdout.write('\n')
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptspreprocessmainresourcepl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Scripts/preprocess-main-resource.pl (0 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/preprocess-main-resource.pl (rev 0)
+++ trunk/Source/WebInspectorUI/Scripts/preprocess-main-resource.pl 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+#!/usr/bin/perl -w
+
+# Copyright (C) 2016 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+use strict;
+use Getopt::Long;
+use preprocessor;
+
+my $usage = "Usage: $0 --defines=\"...\" FILENAME.html.in\n";
+
+my $defines;
+GetOptions('defines=s' => \$defines) or die $usage;
+
+my $input = shift or die $usage;
+die "Need to provide an HTML file as input." unless $input =~ /(\w+)\.html\.in$/;
+
+print applyPreprocessor($input, $defines);
</ins><span class="cx">Property changes on: trunk/Source/WebInspectorUI/Scripts/preprocess-main-resource.pl
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<ins>+*
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebInspectorUIUserInterfaceInspectorhtmlinfromrev205414trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/UserInterface/Inspector.html.in (from rev 205414, trunk/Source/WebInspectorUI/UserInterface/Main.html) (0 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Inspector.html.in (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Inspector.html.in 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -0,0 +1,778 @@
</span><ins>+<!--
+ * Copyright (C) 2013, 2014, 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+#if !INCLUDE_TEST_RESOURCES
+ <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource:; connect-src * ws:; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
+#endif
+
+#if INCLUDE_UI_RESOURCES
+ <link rel="stylesheet" href="External/CodeMirror/codemirror.css">
+
+ <link rel="stylesheet" href="Views/ApplicationCacheFrameContentView.css">
+ <link rel="stylesheet" href="Views/ApplicationCacheIcons.css">
+ <link rel="stylesheet" href="Views/BezierEditor.css">
+ <link rel="stylesheet" href="Views/BoxModelDetailsSectionRow.css">
+ <link rel="stylesheet" href="Views/BreakpointActionView.css">
+ <link rel="stylesheet" href="Views/BreakpointPopoverController.css">
+ <link rel="stylesheet" href="Views/BreakpointTreeElement.css">
+ <link rel="stylesheet" href="Views/ButtonNavigationItem.css">
+ <link rel="stylesheet" href="Views/ButtonToolbarItem.css">
+ <link rel="stylesheet" href="Views/CSSStyleDeclarationSection.css">
+ <link rel="stylesheet" href="Views/CSSStyleDeclarationTextEditor.css">
+ <link rel="stylesheet" href="Views/CSSStyleDetailsSidebarPanel.css">
+ <link rel="stylesheet" href="Views/CallFrameIcons.css">
+ <link rel="stylesheet" href="Views/CallFrameView.css">
+ <link rel="stylesheet" href="Views/ChartDetailsSectionRow.css">
+ <link rel="stylesheet" href="Views/CircleChart.css">
+ <link rel="stylesheet" href="Views/ClusterContentView.css">
+ <link rel="stylesheet" href="Views/CodeMirrorOverrides.css">
+ <link rel="stylesheet" href="Views/ColorPicker.css">
+ <link rel="stylesheet" href="Views/ColorWheel.css">
+ <link rel="stylesheet" href="Views/CompletionSuggestionsView.css">
+ <link rel="stylesheet" href="Views/ComputedStyleDetailsPanel.css">
+ <link rel="stylesheet" href="Views/ConsoleMessageView.css">
+ <link rel="stylesheet" href="Views/ConsolePrompt.css">
+ <link rel="stylesheet" href="Views/ContentBrowser.css">
+ <link rel="stylesheet" href="Views/ContentBrowserTabContentView.css">
+ <link rel="stylesheet" href="Views/ContentFlowIcon.css">
+ <link rel="stylesheet" href="Views/ContentView.css">
+ <link rel="stylesheet" href="Views/ContentViewContainer.css">
+ <link rel="stylesheet" href="Views/ControlToolbarItem.css">
+ <link rel="stylesheet" href="Views/CookieIcon.css">
+ <link rel="stylesheet" href="Views/CookieStorageContentView.css">
+ <link rel="stylesheet" href="Views/DOMStorageContentView.css">
+ <link rel="stylesheet" href="Views/DOMStorageIcons.css">
+ <link rel="stylesheet" href="Views/DOMTreeContentView.css">
+ <link rel="stylesheet" href="Views/DOMTreeDataGrid.css">
+ <link rel="stylesheet" href="Views/DOMTreeOutline.css">
+ <link rel="stylesheet" href="Views/DashboardContainerView.css">
+ <link rel="stylesheet" href="Views/DataGrid.css">
+ <link rel="stylesheet" href="Views/DatabaseContentView.css">
+ <link rel="stylesheet" href="Views/DatabaseIcon.css">
+ <link rel="stylesheet" href="Views/DatabaseTableContentView.css">
+ <link rel="stylesheet" href="Views/DatabaseTableIcon.css">
+ <link rel="stylesheet" href="Views/DebuggerDashboardView.css">
+ <link rel="stylesheet" href="Views/DebuggerSidebarPanel.css">
+ <link rel="stylesheet" href="Views/DefaultDashboardView.css">
+ <link rel="stylesheet" href="Views/DetailsSection.css">
+ <link rel="stylesheet" href="Views/DividerNavigationItem.css">
+ <link rel="stylesheet" href="Views/Editing.css">
+ <link rel="stylesheet" href="Views/EventListenerSectionGroup.css">
+ <link rel="stylesheet" href="Views/ErrorObjectView.css">
+ <link rel="stylesheet" href="Views/FilterBar.css">
+ <link rel="stylesheet" href="Views/FindBanner.css">
+ <link rel="stylesheet" href="Views/FlexibleSpaceNavigationItem.css">
+ <link rel="stylesheet" href="Views/FolderIcon.css">
+ <link rel="stylesheet" href="Views/FontResourceContentView.css">
+ <link rel="stylesheet" href="Views/FormattedValue.css">
+ <link rel="stylesheet" href="Views/GoToLineDialog.css">
+ <link rel="stylesheet" href="Views/GradientEditor.css">
+ <link rel="stylesheet" href="Views/GradientSlider.css">
+ <link rel="stylesheet" href="Views/HeapAllocationsTimelineOverviewGraph.css">
+ <link rel="stylesheet" href="Views/HeapAllocationsTimelineView.css">
+ <link rel="stylesheet" href="Views/HeapSnapshotInstancesContentView.css">
+ <link rel="stylesheet" href="Views/HierarchicalPathComponent.css">
+ <link rel="stylesheet" href="Views/HoverMenu.css">
+ <link rel="stylesheet" href="Views/ImageResourceContentView.css">
+ <link rel="stylesheet" href="Views/IndeterminateProgressSpinner.css">
+ <link rel="stylesheet" href="Views/IndexedDatabaseObjectStoreContentView.css">
+ <link rel="stylesheet" href="Views/InlineSwatch.css">
+ <link rel="stylesheet" href="Views/IssueTreeElement.css">
+ <link rel="stylesheet" href="Views/LayerTreeDetailsSidebarPanel.css">
+ <link rel="stylesheet" href="Views/LayoutTimelineOverviewGraph.css">
+ <link rel="stylesheet" href="Views/LayoutTimelineView.css">
+ <link rel="stylesheet" href="Views/LogContentView.css">
+ <link rel="stylesheet" href="Views/LogIcon.css">
+ <link rel="stylesheet" href="Views/MemoryCategoryView.css">
+ <link rel="stylesheet" href="Views/MemoryTimelineOverviewGraph.css">
+ <link rel="stylesheet" href="Views/MemoryTimelineView.css">
+ <link rel="stylesheet" href="Views/Main.css">
+ <link rel="stylesheet" href="Views/NavigationBar.css">
+ <link rel="stylesheet" href="Views/NavigationSidebarPanel.css">
+ <link rel="stylesheet" href="Views/NetworkGridContentView.css">
+ <link rel="stylesheet" href="Views/NetworkSidebarPanel.css">
+ <link rel="stylesheet" href="Views/NetworkTimelineOverviewGraph.css">
+ <link rel="stylesheet" href="Views/NetworkTimelineView.css">
+ <link rel="stylesheet" href="Views/NewTabContentView.css">
+ <link rel="stylesheet" href="Views/ObjectPreviewView.css">
+ <link rel="stylesheet" href="Views/ObjectTreeArrayIndexTreeElement.css">
+ <link rel="stylesheet" href="Views/ObjectTreeMapEntryTreeElement.css">
+ <link rel="stylesheet" href="Views/ObjectTreePropertyTreeElement.css">
+ <link rel="stylesheet" href="Views/ObjectTreeView.css">
+ <link rel="stylesheet" href="Views/OpenResourceDialog.css">
+ <link rel="stylesheet" href="Views/OverviewTimelineView.css">
+ <link rel="stylesheet" href="Views/PathComponentIcons.css">
+ <link rel="stylesheet" href="Views/Popover.css">
+ <link rel="stylesheet" href="Views/ProbeDetailsSidebarPanel.css">
+ <link rel="stylesheet" href="Views/ProbeSetDataGrid.css">
+ <link rel="stylesheet" href="Views/ProfileView.css">
+ <link rel="stylesheet" href="Views/QuickConsole.css">
+ <link rel="stylesheet" href="Views/RadioButtonNavigationItem.css">
+ <link rel="stylesheet" href="Views/RenderingFrameTimelineOverviewGraph.css">
+ <link rel="stylesheet" href="Views/RenderingFrameTimelineView.css">
+ <link rel="stylesheet" href="Views/ReplayDashboardView.css">
+ <link rel="stylesheet" href="Views/Resizer.css">
+ <link rel="stylesheet" href="Views/ResourceIcons.css">
+ <link rel="stylesheet" href="Views/ResourceSidebarPanel.css">
+ <link rel="stylesheet" href="Views/ResourceTreeElement.css">
+ <link rel="stylesheet" href="Views/RulesStyleDetailsPanel.css">
+ <link rel="stylesheet" href="Views/ScopeBar.css">
+ <link rel="stylesheet" href="Views/ScopeChainDetailsSidebarPanel.css">
+ <link rel="stylesheet" href="Views/ScopeRadioButtonNavigationItem.css">
+ <link rel="stylesheet" href="Views/ScriptContentView.css">
+ <link rel="stylesheet" href="Views/ScriptDetailsTimelineView.css">
+ <link rel="stylesheet" href="Views/ScriptTimelineOverviewGraph.css">
+ <link rel="stylesheet" href="Views/SearchBar.css">
+ <link rel="stylesheet" href="Views/SearchIcons.css">
+ <link rel="stylesheet" href="Views/SearchSidebarPanel.css">
+ <link rel="stylesheet" href="Views/Sidebar.css">
+ <link rel="stylesheet" href="Views/SidebarPanel.css">
+ <link rel="stylesheet" href="Views/Slider.css">
+ <link rel="stylesheet" href="Views/SourceCodeTextEditor.css">
+ <link rel="stylesheet" href="Views/SpringEditor.css">
+ <link rel="stylesheet" href="Views/StackTraceView.css">
+ <link rel="stylesheet" href="Views/StorageSidebarPanel.css">
+ <link rel="stylesheet" href="Views/StyleRuleIcons.css">
+ <link rel="stylesheet" href="Views/SyntaxHighlightingDefaultTheme.css">
+ <link rel="stylesheet" href="Views/TabBar.css">
+ <link rel="stylesheet" href="Views/TabBrowser.css">
+ <link rel="stylesheet" href="Views/TextContentView.css">
+ <link rel="stylesheet" href="Views/TextEditor.css">
+ <link rel="stylesheet" href="Views/TextNavigationItem.css">
+ <link rel="stylesheet" href="Views/TextResourceContentView.css">
+ <link rel="stylesheet" href="Views/TextToggleButtonNavigationItem.css">
+ <link rel="stylesheet" href="Views/TimelineDataGrid.css">
+ <link rel="stylesheet" href="Views/TimelineIcons.css">
+ <link rel="stylesheet" href="Views/TimelineOverview.css">
+ <link rel="stylesheet" href="Views/TimelineRecordBar.css">
+ <link rel="stylesheet" href="Views/TimelineRecordFrame.css">
+ <link rel="stylesheet" href="Views/TimelineRecordingContentView.css">
+ <link rel="stylesheet" href="Views/TimelineRuler.css">
+ <link rel="stylesheet" href="Views/TimelineTabContentView.css">
+ <link rel="stylesheet" href="Views/TimelineView.css">
+ <link rel="stylesheet" href="Views/Toolbar.css">
+ <link rel="stylesheet" href="Views/TreeElementStatusButton.css">
+ <link rel="stylesheet" href="Views/TreeOutline.css">
+ <link rel="stylesheet" href="Views/TypeTokenView.css">
+ <link rel="stylesheet" href="Views/TypeTreeElement.css">
+ <link rel="stylesheet" href="Views/TypeTreeView.css">
+ <link rel="stylesheet" href="Views/Variables.css">
+ <link rel="stylesheet" href="Views/VisualStyleBackgroundPicker.css">
+ <link rel="stylesheet" href="Views/VisualStyleColorPicker.css">
+ <link rel="stylesheet" href="Views/VisualStyleCommaSeparatedKeywordEditor.css">
+ <link rel="stylesheet" href="Views/VisualStyleDetailsPanel.css">
+ <link rel="stylesheet" href="Views/VisualStyleKeywordCheckbox.css">
+ <link rel="stylesheet" href="Views/VisualStyleKeywordIconList.css">
+ <link rel="stylesheet" href="Views/VisualStyleNumberInputBox.css">
+ <link rel="stylesheet" href="Views/VisualStylePropertyEditor.css">
+ <link rel="stylesheet" href="Views/VisualStylePropertyEditorLink.css">
+ <link rel="stylesheet" href="Views/VisualStyleRelativeNumberSlider.css">
+ <link rel="stylesheet" href="Views/VisualStyleSelectorSection.css">
+ <link rel="stylesheet" href="Views/VisualStyleSelectorTreeItem.css">
+ <link rel="stylesheet" href="Views/VisualStyleTabbedPropertiesRow.css">
+ <link rel="stylesheet" href="Views/VisualStyleTimingEditor.css">
+ <link rel="stylesheet" href="Views/VisualStyleUnitSlider.css">
+
+ <link rel="stylesheet" href="Controllers/CodeMirrorCompletionController.css">
+ <link rel="stylesheet" href="Controllers/CodeMirrorDragToAdjustNumberController.css">
+ <link rel="stylesheet" href="Controllers/CodeMirrorTokenTrackingController.css">
+#endif // INCLUDE_UI_RESOURCES
+
+#if ENGINEERING_BUILD && !INCLUDE_TEST_RESOURCES
+ <link rel="stylesheet" href="Debug/UncaughtExceptionReporter.css">
+ <script src="Debug/UncaughtExceptionReporter.js"></script>
+#endif
+
+ <script src="External/CodeMirror/codemirror.js"></script>
+
+ <script src="External/CodeMirror/css.js"></script>
+ <script src="External/CodeMirror/htmlmixed.js"></script>
+ <script src="External/CodeMirror/javascript.js"></script>
+
+#if INCLUDE_UI_RESOURCES
+ <script src="External/CodeMirror/clojure.js"></script>
+ <script src="External/CodeMirror/closebrackets.js"></script>
+ <script src="External/CodeMirror/coffeescript.js"></script>
+ <script src="External/CodeMirror/comment.js"></script>
+ <script src="External/CodeMirror/livescript.js"></script>
+ <script src="External/CodeMirror/matchbrackets.js"></script>
+ <script src="External/CodeMirror/overlay.js"></script>
+ <script src="External/CodeMirror/placeholder.js"></script>
+ <script src="External/CodeMirror/runmode.js"></script>
+ <script src="External/CodeMirror/sass.js"></script>
+ <script src="External/CodeMirror/searchcursor.js"></script>
+ <script src="External/CodeMirror/sql.js"></script>
+ <script src="External/CodeMirror/sublime.js"></script>
+ <script src="External/CodeMirror/xml.js"></script>
+#endif
+
+ <script src="External/Esprima/esprima.js"></script>
+
+ <script src="Base/WebInspector.js"></script>
+ <script src="Base/InspectorFrontendHostStub.js"></script>
+ <script src="Base/Platform.js"></script>
+ <script src="Base/LinkedList.js"></script>
+ <script src="Base/ListMultimap.js"></script>
+ <script src="Base/Object.js"></script>
+
+#if INCLUDE_TEST_RESOURCES
+ <script src="Test/TestHarness.js"></script>
+ <script src="Test/FrontendTestHarness.js"></script>
+ <script src="Test/TestSuite.js"></script>
+ <script src="Test/Test.js"></script>
+#else
+ <script src="Base/Main.js"></script>
+#endif
+
+ <script src="Base/DOMUtilities.js"></script>
+ <script src="Base/EventListener.js"></script>
+ <script src="Base/EventListenerSet.js"></script>
+ <script src="Base/ImageUtilities.js"></script>
+ <script src="Base/LoadLocalizedStrings.js"></script>
+ <script src="Base/MIMETypeUtilities.js"></script>
+ <script src="Base/URLUtilities.js"></script>
+ <script src="Base/Utilities.js"></script>
+ <script src="Base/Setting.js"></script>
+ <script src="Base/YieldableTask.js"></script>
+
+ <script src="Protocol/ProtocolTracer.js"></script>
+ <script src="Protocol/LoggingProtocolTracer.js"></script>
+
+ <script src="Protocol/ApplicationCacheObserver.js"></script>
+ <script src="Protocol/CSSObserver.js"></script>
+ <script src="Protocol/ConsoleObserver.js"></script>
+ <script src="Protocol/DOMObserver.js"></script>
+ <script src="Protocol/DOMStorageObserver.js"></script>
+ <script src="Protocol/DatabaseObserver.js"></script>
+ <script src="Protocol/DebuggerObserver.js"></script>
+ <script src="Protocol/HeapObserver.js"></script>
+ <script src="Protocol/InspectorBackend.js"></script>
+ <script src="Protocol/InspectorFrontendAPI.js"></script>
+ <script src="Protocol/InspectorObserver.js"></script>
+ <script src="Protocol/LayerTreeObserver.js"></script>
+ <script src="Protocol/LoadInspectorBackendCommands.js"></script>
+ <script src="Protocol/MemoryObserver.js"></script>
+ <script src="Protocol/MessageDispatcher.js"></script>
+ <script src="Protocol/NetworkObserver.js"></script>
+ <script src="Protocol/PageObserver.js"></script>
+ <script src="Protocol/RemoteObject.js"></script>
+ <script src="Protocol/ReplayObserver.js"></script>
+ <script src="Protocol/RuntimeObserver.js"></script>
+ <script src="Protocol/ScriptProfilerObserver.js"></script>
+ <script src="Protocol/TimelineObserver.js"></script>
+
+ <script src="Models/BreakpointAction.js"></script>
+ <script src="Models/ConsoleMessage.js"></script>
+ <script src="Models/Instrument.js"></script>
+ <script src="Models/SourceCode.js"></script>
+ <script src="Models/SourceCodeLocation.js"></script>
+ <script src="Models/Timeline.js"></script>
+ <script src="Models/TimelineRange.js"></script>
+ <script src="Models/TimelineRecord.js"></script>
+
+ <script src="Models/AnalyzerMessage.js"></script>
+ <script src="Models/ApplicationCacheFrame.js"></script>
+ <script src="Models/ApplicationCacheManifest.js"></script>
+ <script src="Models/BackForwardEntry.js"></script>
+ <script src="Models/Branch.js"></script>
+ <script src="Models/Breakpoint.js"></script>
+ <script src="Models/CallingContextTree.js"></script>
+ <script src="Models/CallingContextTreeNode.js"></script>
+ <script src="Models/CSSCompletions.js"></script>
+ <script src="Models/CSSKeywordCompletions.js"></script>
+ <script src="Models/CSSMedia.js"></script>
+ <script src="Models/CSSProperty.js"></script>
+ <script src="Models/CSSRule.js"></script>
+ <script src="Models/CSSSelector.js"></script>
+ <script src="Models/CSSStyleDeclaration.js"></script>
+ <script src="Models/CSSStyleSheet.js"></script>
+ <script src="Models/CallFrame.js"></script>
+ <script src="Models/CollectionEntry.js"></script>
+ <script src="Models/CollectionEntryPreview.js"></script>
+ <script src="Models/Color.js"></script>
+ <script src="Models/ConsoleCommandResultMessage.js"></script>
+ <script src="Models/ContentFlow.js"></script>
+ <script src="Models/CookieStorageObject.js"></script>
+ <script src="Models/DOMNode.js"></script>
+ <script src="Models/DOMNodeStyles.js"></script>
+ <script src="Models/DOMSearchMatchObject.js"></script>
+ <script src="Models/DOMStorageObject.js"></script>
+ <script src="Models/DOMTree.js"></script>
+ <script src="Models/DatabaseObject.js"></script>
+ <script src="Models/DatabaseTableObject.js"></script>
+ <script src="Models/DebuggerDashboard.js"></script>
+ <script src="Models/DefaultDashboard.js"></script>
+ <script src="Models/ExecutionContext.js"></script>
+ <script src="Models/ExecutionContextList.js"></script>
+ <script src="Models/FPSInstrument.js"></script>
+ <script src="Models/Frame.js"></script>
+ <script src="Models/GarbageCollection.js"></script>
+ <script src="Models/Geometry.js"></script>
+ <script src="Models/Gradient.js"></script>
+ <script src="Models/HeapAllocationsInstrument.js"></script>
+ <script src="Models/HeapAllocationsTimelineRecord.js"></script>
+ <script src="Models/HeapSnapshotRootPath.js"></script>
+ <script src="Models/IndexedDatabase.js"></script>
+ <script src="Models/IndexedDatabaseObjectStore.js"></script>
+ <script src="Models/IndexedDatabaseObjectStoreIndex.js"></script>
+ <script src="Models/IssueMessage.js"></script>
+ <script src="Models/KeyboardShortcut.js"></script>
+ <script src="Models/LayoutInstrument.js"></script>
+ <script src="Models/LayoutTimelineRecord.js"></script>
+ <script src="Models/LazySourceCodeLocation.js"></script>
+ <script src="Models/LineWidget.js"></script>
+ <script src="Models/LogObject.js"></script>
+ <script src="Models/MemoryCategory.js"></script>
+ <script src="Models/MemoryInstrument.js"></script>
+ <script src="Models/MemoryPressureEvent.js"></script>
+ <script src="Models/MemoryTimeline.js"></script>
+ <script src="Models/MemoryTimelineRecord.js"></script>
+ <script src="Models/NativeFunctionParameters.js"></script>
+ <script src="Models/NetworkInstrument.js"></script>
+ <script src="Models/NetworkTimeline.js"></script>
+ <script src="Models/ObjectPreview.js"></script>
+ <script src="Models/Probe.js"></script>
+ <script src="Models/ProbeSet.js"></script>
+ <script src="Models/ProbeSetDataFrame.js"></script>
+ <script src="Models/ProbeSetDataTable.js"></script>
+ <script src="Models/Profile.js"></script>
+ <script src="Models/ProfileNode.js"></script>
+ <script src="Models/ProfileNodeCall.js"></script>
+ <script src="Models/PropertyDescriptor.js"></script>
+ <script src="Models/PropertyPath.js"></script>
+ <script src="Models/PropertyPreview.js"></script>
+ <script src="Models/RenderingFrameTimelineRecord.js"></script>
+ <script src="Models/ReplayDashboard.js"></script>
+ <script src="Models/ReplaySession.js"></script>
+ <script src="Models/ReplaySessionSegment.js"></script>
+ <script src="Models/Resource.js"></script>
+ <script src="Models/ResourceCollection.js"></script>
+ <script src="Models/ResourceQueryMatch.js"></script>
+ <script src="Models/ResourceQueryResult.js"></script>
+ <script src="Models/ResourceTimelineRecord.js"></script>
+ <script src="Models/ResourceTimingData.js"></script>
+ <script src="Models/Revision.js"></script>
+ <script src="Models/ScopeChainNode.js"></script>
+ <script src="Models/Script.js"></script>
+ <script src="Models/ScriptInstrument.js"></script>
+ <script src="Models/ScriptSyntaxTree.js"></script>
+ <script src="Models/ScriptTimelineRecord.js"></script>
+ <script src="Models/SourceCodePosition.js"></script>
+ <script src="Models/SourceCodeRevision.js"></script>
+ <script src="Models/SourceCodeSearchMatchObject.js"></script>
+ <script src="Models/SourceCodeTextRange.js"></script>
+ <script src="Models/SourceCodeTimeline.js"></script>
+ <script src="Models/SourceMap.js"></script>
+ <script src="Models/SourceMapResource.js"></script>
+ <script src="Models/StackTrace.js"></script>
+ <script src="Models/StructureDescription.js"></script>
+ <script src="Models/TextMarker.js"></script>
+ <script src="Models/TextRange.js"></script>
+ <script src="Models/TimelineMarker.js"></script>
+ <script src="Models/TimelineRecording.js"></script>
+ <script src="Models/TypeDescription.js"></script>
+ <script src="Models/TypeSet.js"></script>
+ <script src="Models/WrappedPromise.js"></script>
+
+ <script src="Proxies/FormatterWorkerProxy.js"></script>
+ <script src="Proxies/HeapSnapshotDiffProxy.js"></script>
+ <script src="Proxies/HeapSnapshotEdgeProxy.js"></script>
+ <script src="Proxies/HeapSnapshotNodeProxy.js"></script>
+ <script src="Proxies/HeapSnapshotProxy.js"></script>
+ <script src="Proxies/HeapSnapshotWorkerProxy.js"></script>
+
+ <script src="Views/CodeMirrorAdditions.js"></script>
+ <script src="Views/CodeMirrorFormatters.js"></script>
+
+#if INCLUDE_UI_RESOURCES
+ <script src="Views/View.js"></script>
+
+ <script src="Views/ConsoleCommandView.js"></script>
+ <script src="Views/ConsoleMessageView.js"></script>
+ <script src="Views/ContentView.js"></script>
+ <script src="Views/DataGrid.js"></script>
+ <script src="Views/DataGridNode.js"></script>
+ <script src="Views/DetailsSectionRow.js"></script>
+ <script src="Views/Dialog.js"></script>
+ <script src="Views/HierarchicalPathComponent.js"></script>
+ <script src="Views/NavigationItem.js"></script>
+ <script src="Views/SidebarPanel.js"></script>
+ <script src="Views/StyleDetailsPanel.js"></script>
+ <script src="Views/TabBar.js"></script>
+ <script src="Views/TabBarItem.js"></script>
+ <script src="Views/TabBrowser.js"></script>
+ <script src="Views/TextEditor.js"></script>
+ <script src="Views/TimelineOverviewGraph.js"></script>
+ <script src="Views/TimelineView.js"></script>
+ <script src="Views/TreeElement.js"></script>
+ <script src="Views/TreeOutline.js"></script>
+
+ <script src="Views/ButtonNavigationItem.js"></script>
+ <script src="Views/DatabaseUserQueryViewBase.js"></script>
+ <script src="Views/DatabaseUserQueryErrorView.js"></script>
+ <script src="Views/DatabaseUserQuerySuccessView.js"></script>
+ <script src="Views/DOMTreeContentView.js"></script>
+ <script src="Views/DetailsSidebarPanel.js"></script>
+ <script src="Views/GeneralTreeElement.js"></script>
+ <script src="Views/NavigationSidebarPanel.js"></script>
+ <script src="Views/ResourceContentView.js"></script>
+ <script src="Views/TabContentView.js"></script>
+ <script src="Views/TimelineDataGrid.js"></script>
+ <script src="Views/TimelineDataGridNode.js"></script>
+
+ <script src="Views/ContentBrowserTabContentView.js"></script>
+ <script src="Views/DOMDetailsSidebarPanel.js"></script>
+ <script src="Views/FolderTreeElement.js"></script>
+ <script src="Views/FolderizedTreeElement.js"></script>
+ <script src="Views/NetworkTabContentView.js"></script>
+ <script src="Views/NewTabContentView.js"></script>
+ <script src="Views/ObjectTreeBaseTreeElement.js"></script>
+ <script src="Views/SourceCodeTreeElement.js"></script>
+ <script src="Views/StorageTreeElement.js"></script>
+ <script src="Views/TimelineDataGridNodePathComponent.js"></script>
+ <script src="Views/TimelineOverview.js"></script>
+ <script src="Views/TimelineRecordTreeElement.js"></script>
+ <script src="Views/TimelineTreeElement.js"></script>
+
+ <script src="Views/ConsoleTabContentView.js"></script>
+ <script src="Views/DebuggerTabContentView.js"></script>
+ <script src="Views/DebuggerTreeElement.js"></script>
+ <script src="Views/ElementsTabContentView.js"></script>
+ <script src="Views/ResourceTreeElement.js"></script>
+ <script src="Views/ResourcesTabContentView.js"></script>
+ <script src="Views/SearchTabContentView.js"></script>
+ <script src="Views/SettingsTabContentView.js"></script>
+ <script src="Views/StorageTabContentView.js"></script>
+ <script src="Views/TimelineTabContentView.js"></script>
+
+ <script src="Views/DetailsSection.js"></script>
+ <script src="Views/DetailsSectionDataGridRow.js"></script>
+ <script src="Views/DetailsSectionGroup.js"></script>
+ <script src="Views/DetailsSectionSimpleRow.js"></script>
+ <script src="Views/DetailsSectionTextRow.js"></script>
+
+ <script src="Views/ActivateButtonNavigationItem.js"></script>
+ <script src="Views/ActivateButtonToolbarItem.js"></script>
+ <script src="Views/ApplicationCacheDetailsSidebarPanel.js"></script>
+ <script src="Views/ApplicationCacheFrameContentView.js"></script>
+ <script src="Views/ApplicationCacheFrameTreeElement.js"></script>
+ <script src="Views/ApplicationCacheManifestTreeElement.js"></script>
+ <script src="Views/BezierEditor.js"></script>
+ <script src="Views/BoxModelDetailsSectionRow.js"></script>
+ <script src="Views/BreakpointActionView.js"></script>
+ <script src="Views/BreakpointTreeElement.js"></script>
+ <script src="Views/ButtonToolbarItem.js"></script>
+ <script src="Views/CSSStyleDeclarationSection.js"></script>
+ <script src="Views/CSSStyleDeclarationTextEditor.js"></script>
+ <script src="Views/CSSStyleDetailsSidebarPanel.js"></script>
+ <script src="Views/CallFrameTreeElement.js"></script>
+ <script src="Views/CallFrameView.js"></script>
+ <script src="Views/ChartDetailsSectionRow.js"></script>
+ <script src="Views/CircleChart.js"></script>
+ <script src="Views/ClusterContentView.js"></script>
+ <script src="Views/CodeMirrorEditor.js"></script>
+ <script src="Views/CodeMirrorTextMarkers.js"></script>
+ <script src="Views/ColorPicker.js"></script>
+ <script src="Views/ColorWheel.js"></script>
+ <script src="Views/CompletionSuggestionsView.js"></script>
+ <script src="Views/ComputedStyleDetailsPanel.js"></script>
+ <script src="Views/ConsoleGroup.js"></script>
+ <script src="Views/ConsolePrompt.js"></script>
+ <script src="Views/ConsoleSession.js"></script>
+ <script src="Views/ContentBrowser.js"></script>
+ <script src="Views/ContentFlowDOMTreeContentView.js"></script>
+ <script src="Views/ContentFlowTreeElement.js"></script>
+ <script src="Views/ContentViewContainer.js"></script>
+ <script src="Views/ContextMenu.js"></script>
+ <script src="Views/ContextMenuUtilities.js"></script>
+ <script src="Views/ControlToolbarItem.js"></script>
+ <script src="Views/CookieStorageContentView.js"></script>
+ <script src="Views/CookieStorageTreeElement.js"></script>
+ <script src="Views/DOMNodeDetailsSidebarPanel.js"></script>
+ <script src="Views/DOMStorageContentView.js"></script>
+ <script src="Views/DOMStorageTreeElement.js"></script>
+ <script src="Views/DOMTreeDataGrid.js"></script>
+ <script src="Views/DOMTreeDataGridNode.js"></script>
+ <script src="Views/DOMTreeElement.js"></script>
+ <script src="Views/DOMTreeElementPathComponent.js"></script>
+ <script src="Views/DOMTreeOutline.js"></script>
+ <script src="Views/DOMTreeUpdater.js"></script>
+ <script src="Views/DashboardContainerView.js"></script>
+ <script src="Views/DashboardView.js"></script>
+ <script src="Views/DatabaseContentView.js"></script>
+ <script src="Views/DatabaseHostTreeElement.js"></script>
+ <script src="Views/DatabaseTableContentView.js"></script>
+ <script src="Views/DatabaseTableTreeElement.js"></script>
+ <script src="Views/DatabaseTreeElement.js"></script>
+ <script src="Views/DebuggerDashboardView.js"></script>
+ <script src="Views/DebuggerSidebarPanel.js"></script>
+ <script src="Views/DefaultDashboardView.js"></script>
+ <script src="Views/DividerNavigationItem.js"></script>
+ <script src="Views/EditingSupport.js"></script>
+ <script src="Views/ErrorObjectView.js"></script>
+ <script src="Views/EventListenerSection.js"></script>
+ <script src="Views/EventListenerSectionGroup.js"></script>
+ <script src="Views/FilterBar.js"></script>
+ <script src="Views/FilterBarButton.js"></script>
+ <script src="Views/FilterBarNavigationItem.js"></script>
+ <script src="Views/FindBanner.js"></script>
+ <script src="Views/FlexibleSpaceNavigationItem.js"></script>
+ <script src="Views/FontResourceContentView.js"></script>
+ <script src="Views/FormattedValue.js"></script>
+ <script src="Views/FrameDOMTreeContentView.js"></script>
+ <script src="Views/FrameTreeElement.js"></script>
+ <script src="Views/GeneralTreeElementPathComponent.js"></script>
+ <script src="Views/GenericResourceContentView.js"></script>
+ <script src="Views/GoToLineDialog.js"></script>
+ <script src="Views/GradientEditor.js"></script>
+ <script src="Views/GradientSlider.js"></script>
+ <script src="Views/HeapAllocationsTimelineDataGridNode.js"></script>
+ <script src="Views/HeapAllocationsTimelineDataGridNodePathComponent.js"></script>
+ <script src="Views/HeapAllocationsTimelineOverviewGraph.js"></script>
+ <script src="Views/HeapAllocationsTimelineView.js"></script>
+ <script src="Views/HeapSnapshotClassDataGridNode.js"></script>
+ <script src="Views/HeapSnapshotClusterContentView.js"></script>
+ <script src="Views/HeapSnapshotContentView.js"></script>
+ <script src="Views/HeapSnapshotDataGridTree.js"></script>
+ <script src="Views/HeapSnapshotInstanceDataGridNode.js"></script>
+ <script src="Views/HeapSnapshotInstanceFetchMoreDataGridNode.js"></script>
+ <script src="Views/HierarchicalPathNavigationItem.js"></script>
+ <script src="Views/HoverMenu.js"></script>
+ <script src="Views/ImageResourceContentView.js"></script>
+ <script src="Views/IndeterminateProgressSpinner.js"></script>
+ <script src="Views/IndexedDatabaseDetailsSidebarPanel.js"></script>
+ <script src="Views/IndexedDatabaseEntryDataGridNode.js"></script>
+ <script src="Views/IndexedDatabaseHostTreeElement.js"></script>
+ <script src="Views/IndexedDatabaseObjectStoreContentView.js"></script>
+ <script src="Views/IndexedDatabaseObjectStoreIndexTreeElement.js"></script>
+ <script src="Views/IndexedDatabaseObjectStoreTreeElement.js"></script>
+ <script src="Views/IndexedDatabaseTreeElement.js"></script>
+ <script src="Views/InlineSwatch.js"></script>
+ <script src="Views/IssueTreeElement.js"></script>
+ <script src="Views/LayerTreeDataGridNode.js"></script>
+ <script src="Views/LayerTreeDetailsSidebarPanel.js"></script>
+ <script src="Views/LayoutTimelineDataGrid.js"></script>
+ <script src="Views/LayoutTimelineDataGridNode.js"></script>
+ <script src="Views/LayoutTimelineOverviewGraph.js"></script>
+ <script src="Views/LayoutTimelineView.js"></script>
+ <script src="Views/LineChart.js"></script>
+ <script src="Views/LogContentView.js"></script>
+ <script src="Views/LogTreeElement.js"></script>
+ <script src="Views/MemoryCategoryView.js"></script>
+ <script src="Views/MemoryTimelineOverviewGraph.js"></script>
+ <script src="Views/MemoryTimelineView.js"></script>
+ <script src="Views/MultipleScopeBarItem.js"></script>
+ <script src="Views/NavigationBar.js"></script>
+ <script src="Views/NetworkGridContentView.js"></script>
+ <script src="Views/NetworkSidebarPanel.js"></script>
+ <script src="Views/NetworkTimelineOverviewGraph.js"></script>
+ <script src="Views/NetworkTimelineView.js"></script>
+ <script src="Views/ObjectPreviewView.js"></script>
+ <script src="Views/ObjectPropertiesDetailSectionRow.js"></script>
+ <script src="Views/ObjectTreeArrayIndexTreeElement.js"></script>
+ <script src="Views/ObjectTreeMapEntryTreeElement.js"></script>
+ <script src="Views/ObjectTreePropertyTreeElement.js"></script>
+ <script src="Views/ObjectTreeSetIndexTreeElement.js"></script>
+ <script src="Views/ObjectTreeView.js"></script>
+ <script src="Views/OpenResourceDialog.js"></script>
+ <script src="Views/OverviewTimelineView.js"></script>
+ <script src="Views/Popover.js"></script>
+ <script src="Views/ProbeDetailsSidebarPanel.js"></script>
+ <script src="Views/ProbeSetDataGrid.js"></script>
+ <script src="Views/ProbeSetDataGridNode.js"></script>
+ <script src="Views/ProbeSetDetailsSection.js"></script>
+ <script src="Views/ProfileDataGridNode.js"></script>
+ <script src="Views/ProfileDataGridTree.js"></script>
+ <script src="Views/ProfileNodeDataGridNode.js"></script>
+ <script src="Views/ProfileNodeTreeElement.js"></script>
+ <script src="Views/ProfileView.js"></script>
+ <script src="Views/QuickConsole.js"></script>
+ <script src="Views/QuickConsoleNavigationBar.js"></script>
+ <script src="Views/RadioButtonNavigationItem.js"></script>
+ <script src="Views/RenderingFrameTimelineDataGridNode.js"></script>
+ <script src="Views/RenderingFrameTimelineOverviewGraph.js"></script>
+ <script src="Views/RenderingFrameTimelineView.js"></script>
+ <script src="Views/ReplayDashboardView.js"></script>
+ <script src="Views/Resizer.js"></script>
+ <script src="Views/ResourceClusterContentView.js"></script>
+ <script src="Views/ResourceDetailsSidebarPanel.js"></script>
+ <script src="Views/ResourceSidebarPanel.js"></script>
+ <script src="Views/ResourceTimelineDataGridNode.js"></script>
+ <script src="Views/RulesStyleDetailsPanel.js"></script>
+ <script src="Views/ScopeBar.js"></script>
+ <script src="Views/ScopeBarItem.js"></script>
+ <script src="Views/ScopeChainDetailsSidebarPanel.js"></script>
+ <script src="Views/ScopeRadioButtonNavigationItem.js"></script>
+ <script src="Views/ScriptClusterTimelineView.js"></script>
+ <script src="Views/ScriptContentView.js"></script>
+ <script src="Views/ScriptDetailsTimelineView.js"></script>
+ <script src="Views/ScriptProfileTimelineView.js"></script>
+ <script src="Views/ScriptTimelineDataGrid.js"></script>
+ <script src="Views/ScriptTimelineDataGridNode.js"></script>
+ <script src="Views/ScriptTimelineOverviewGraph.js"></script>
+ <script src="Views/ScriptTreeElement.js"></script>
+ <script src="Views/SearchBar.js"></script>
+ <script src="Views/SearchResultTreeElement.js"></script>
+ <script src="Views/SearchSidebarPanel.js"></script>
+ <script src="Views/Sidebar.js"></script>
+ <script src="Views/Slider.js"></script>
+ <script src="Views/SourceCodeTextEditor.js"></script>
+ <script src="Views/SourceCodeTimelineTimelineDataGridNode.js"></script>
+ <script src="Views/SourceCodeTimelineTreeElement.js"></script>
+ <script src="Views/SourceMapResourceTreeElement.js"></script>
+ <script src="Views/SpringEditor.js"></script>
+ <script src="Views/StackTraceView.js"></script>
+ <script src="Views/StackedLineChart.js"></script>
+ <script src="Views/StorageSidebarPanel.js"></script>
+ <script src="Views/SyntaxHighlightingSupport.js"></script>
+ <script src="Views/TextContentView.js"></script>
+ <script src="Views/TextNavigationItem.js"></script>
+ <script src="Views/TextResourceContentView.js"></script>
+ <script src="Views/TimelineRecordBar.js"></script>
+ <script src="Views/TimelineRecordFrame.js"></script>
+ <script src="Views/TimelineRecordingContentView.js"></script>
+ <script src="Views/TimelineRecordingProgressView.js"></script>
+ <script src="Views/TimelineRuler.js"></script>
+ <script src="Views/ToggleButtonNavigationItem.js"></script>
+ <script src="Views/TextToggleButtonNavigationItem.js"></script>
+ <script src="Views/ToggleControlToolbarItem.js"></script>
+ <script src="Views/Toolbar.js"></script>
+ <script src="Views/TreeElementStatusButton.js"></script>
+ <script src="Views/TreeOutlineDataGridSynchronizer.js"></script>
+ <script src="Views/TypeTokenView.js"></script>
+ <script src="Views/TypeTreeElement.js"></script>
+ <script src="Views/TypeTreeView.js"></script>
+
+ <script src="Views/VisualStyleDetailsPanel.js"></script>
+ <script src="Views/VisualStylePropertyEditor.js"></script>
+ <script src="Views/VisualStyleBackgroundPicker.js"></script>
+ <script src="Views/VisualStyleBasicInput.js"></script>
+ <script src="Views/VisualStyleColorPicker.js"></script>
+ <script src="Views/VisualStyleCommaSeparatedKeywordEditor.js"></script>
+ <script src="Views/VisualStyleFontFamilyListEditor.js"></script>
+ <script src="Views/VisualStyleFontFamilyTreeElement.js"></script>
+ <script src="Views/VisualStyleKeywordCheckbox.js"></script>
+ <script src="Views/VisualStyleKeywordIconList.js"></script>
+ <script src="Views/VisualStyleKeywordPicker.js"></script>
+ <script src="Views/VisualStyleNumberInputBox.js"></script>
+ <script src="Views/VisualStylePropertyCombiner.js"></script>
+ <script src="Views/VisualStylePropertyEditorLink.js"></script>
+ <script src="Views/VisualStylePropertyNameInput.js"></script>
+ <script src="Views/VisualStyleRelativeNumberSlider.js"></script>
+ <script src="Views/VisualStyleSelectorSection.js"></script>
+ <script src="Views/VisualStyleSelectorTreeItem.js"></script>
+ <script src="Views/VisualStyleTabbedPropertiesRow.js"></script>
+ <script src="Views/VisualStyleTimingEditor.js"></script>
+ <script src="Views/VisualStyleURLInput.js"></script>
+ <script src="Views/VisualStyleUnitSlider.js"></script>
+#endif // INCLUDE_UI_RESOURCES
+
+ <script src="Controllers/Formatter.js"></script>
+ <script src="Controllers/FormatterSourceMap.js"></script>
+ <script src="Controllers/ResourceQueryController.js"></script>
+
+ <script src="Controllers/AnalyzerManager.js"></script>
+ <script src="Controllers/ApplicationCacheManager.js"></script>
+ <script src="Controllers/BranchManager.js"></script>
+ <script src="Controllers/CSSStyleManager.js"></script>
+ <script src="Controllers/CSSStyleManager.js"></script>
+ <script src="Controllers/DashboardManager.js"></script>
+ <script src="Controllers/DebuggerManager.js"></script>
+ <script src="Controllers/DOMTreeManager.js"></script>
+ <script src="Controllers/FrameResourceManager.js"></script>
+ <script src="Controllers/HeapManager.js"></script>
+ <script src="Controllers/IssueManager.js"></script>
+ <script src="Controllers/LayerTreeManager.js"></script>
+ <script src="Controllers/LogManager.js"></script>
+ <script src="Controllers/MemoryManager.js"></script>
+ <script src="Controllers/ProbeManager.js"></script>
+ <script src="Controllers/ReplayManager.js"></script>
+ <script src="Controllers/RuntimeManager.js"></script>
+ <script src="Controllers/SourceMapManager.js"></script>
+ <script src="Controllers/StorageManager.js"></script>
+ <script src="Controllers/TimelineManager.js"></script>
+
+#if INCLUDE_UI_RESOURCES
+ <script src="Controllers/Annotator.js"></script>
+ <script src="Controllers/CodeMirrorEditingController.js"></script>
+
+ <script src="Controllers/BasicBlockAnnotator.js"></script>
+ <script src="Controllers/BreakpointPopoverController.js"></script>
+ <script src="Controllers/CodeMirrorColorEditingController.js"></script>
+ <script src="Controllers/CodeMirrorCompletionController.js"></script>
+ <script src="Controllers/CodeMirrorBezierEditingController.js"></script>
+ <script src="Controllers/CodeMirrorDragToAdjustNumberController.js"></script>
+ <script src="Controllers/CodeMirrorGradientEditingController.js"></script>
+ <script src="Controllers/CodeMirrorSpringEditingController.js"></script>
+ <script src="Controllers/CodeMirrorTokenTrackingController.js"></script>
+ <script src="Controllers/CodeMirrorTextKillController.js"></script>
+ <script src="Controllers/DragToAdjustController.js"></script>
+ <script src="Controllers/JavaScriptLogViewController.js"></script>
+ <script src="Controllers/JavaScriptRuntimeCompletionProvider.js"></script>
+ <script src="Controllers/TypeTokenAnnotator.js"></script>
+ <script src="Controllers/VisualStyleCompletionsController.js"></script>
+#endif
+
+ <script src="Workers/Formatter/FormatterContentBuilder.js"></script>
+
+#if ENGINEERING_BUILD
+ <script src="Debug/Bootstrap.js"></script>
+ <script src="Debug/CapturingProtocolTracer.js"></script>
+ <script src="Debug/ProtocolTrace.js"></script>
+#endif
+
+ <script>
+ WebInspector.loaded();
+
+#if INCLUDE_TEST_RESOURCES
+ // Debug logging is synchronous on the test page.
+ InspectorTest.forceDebugLogging = false;
+
+ // Tee all TestHarness commands to stderr from within the Inspector.
+ InspectorTest.dumpActivityToSystemConsole = false;
+
+ // Best used in combination with dumpActivityToSystemConsole.
+ InspectorBackend.dumpInspectorProtocolMessages = false;
+#endif
+ </script>
+</head>
+<body>
+<div id="docked-resizer"></div>
+<div id="toolbar"></div>
+<div id="tab-bar"></div>
+<div id="main">
+ <div id="navigation-sidebar"></div>
+ <div id="content">
+ <div id="tab-browser"></div>
+ <div id="split-content-browser" class="hidden"></div>
+ <div id="quick-console"></div>
+ </div>
+ <div id="details-sidebar"></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Main.html (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,742 +0,0 @@
</span><del>-<!--
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
--->
-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource:; connect-src * ws:; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
-
- <link rel="stylesheet" href="External/CodeMirror/codemirror.css">
-
- <link rel="stylesheet" href="Views/ApplicationCacheFrameContentView.css">
- <link rel="stylesheet" href="Views/ApplicationCacheIcons.css">
- <link rel="stylesheet" href="Views/BezierEditor.css">
- <link rel="stylesheet" href="Views/BoxModelDetailsSectionRow.css">
- <link rel="stylesheet" href="Views/BreakpointActionView.css">
- <link rel="stylesheet" href="Views/BreakpointPopoverController.css">
- <link rel="stylesheet" href="Views/BreakpointTreeElement.css">
- <link rel="stylesheet" href="Views/ButtonNavigationItem.css">
- <link rel="stylesheet" href="Views/ButtonToolbarItem.css">
- <link rel="stylesheet" href="Views/CSSStyleDeclarationSection.css">
- <link rel="stylesheet" href="Views/CSSStyleDeclarationTextEditor.css">
- <link rel="stylesheet" href="Views/CSSStyleDetailsSidebarPanel.css">
- <link rel="stylesheet" href="Views/CallFrameIcons.css">
- <link rel="stylesheet" href="Views/CallFrameView.css">
- <link rel="stylesheet" href="Views/ChartDetailsSectionRow.css">
- <link rel="stylesheet" href="Views/CircleChart.css">
- <link rel="stylesheet" href="Views/ClusterContentView.css">
- <link rel="stylesheet" href="Views/CodeMirrorOverrides.css">
- <link rel="stylesheet" href="Views/ColorPicker.css">
- <link rel="stylesheet" href="Views/ColorWheel.css">
- <link rel="stylesheet" href="Views/CompletionSuggestionsView.css">
- <link rel="stylesheet" href="Views/ComputedStyleDetailsPanel.css">
- <link rel="stylesheet" href="Views/ConsoleMessageView.css">
- <link rel="stylesheet" href="Views/ConsolePrompt.css">
- <link rel="stylesheet" href="Views/ContentBrowser.css">
- <link rel="stylesheet" href="Views/ContentBrowserTabContentView.css">
- <link rel="stylesheet" href="Views/ContentFlowIcon.css">
- <link rel="stylesheet" href="Views/ContentView.css">
- <link rel="stylesheet" href="Views/ContentViewContainer.css">
- <link rel="stylesheet" href="Views/ControlToolbarItem.css">
- <link rel="stylesheet" href="Views/CookieIcon.css">
- <link rel="stylesheet" href="Views/CookieStorageContentView.css">
- <link rel="stylesheet" href="Views/DOMStorageContentView.css">
- <link rel="stylesheet" href="Views/DOMStorageIcons.css">
- <link rel="stylesheet" href="Views/DOMTreeContentView.css">
- <link rel="stylesheet" href="Views/DOMTreeDataGrid.css">
- <link rel="stylesheet" href="Views/DOMTreeOutline.css">
- <link rel="stylesheet" href="Views/DashboardContainerView.css">
- <link rel="stylesheet" href="Views/DataGrid.css">
- <link rel="stylesheet" href="Views/DatabaseContentView.css">
- <link rel="stylesheet" href="Views/DatabaseIcon.css">
- <link rel="stylesheet" href="Views/DatabaseTableContentView.css">
- <link rel="stylesheet" href="Views/DatabaseTableIcon.css">
- <link rel="stylesheet" href="Views/DebuggerDashboardView.css">
- <link rel="stylesheet" href="Views/DebuggerSidebarPanel.css">
- <link rel="stylesheet" href="Views/DefaultDashboardView.css">
- <link rel="stylesheet" href="Views/DetailsSection.css">
- <link rel="stylesheet" href="Views/DividerNavigationItem.css">
- <link rel="stylesheet" href="Views/Editing.css">
- <link rel="stylesheet" href="Views/EventListenerSectionGroup.css">
- <link rel="stylesheet" href="Views/ErrorObjectView.css">
- <link rel="stylesheet" href="Views/FilterBar.css">
- <link rel="stylesheet" href="Views/FindBanner.css">
- <link rel="stylesheet" href="Views/FlexibleSpaceNavigationItem.css">
- <link rel="stylesheet" href="Views/FolderIcon.css">
- <link rel="stylesheet" href="Views/FontResourceContentView.css">
- <link rel="stylesheet" href="Views/FormattedValue.css">
- <link rel="stylesheet" href="Views/GoToLineDialog.css">
- <link rel="stylesheet" href="Views/GradientEditor.css">
- <link rel="stylesheet" href="Views/GradientSlider.css">
- <link rel="stylesheet" href="Views/HeapAllocationsTimelineOverviewGraph.css">
- <link rel="stylesheet" href="Views/HeapAllocationsTimelineView.css">
- <link rel="stylesheet" href="Views/HeapSnapshotInstancesContentView.css">
- <link rel="stylesheet" href="Views/HierarchicalPathComponent.css">
- <link rel="stylesheet" href="Views/HoverMenu.css">
- <link rel="stylesheet" href="Views/ImageResourceContentView.css">
- <link rel="stylesheet" href="Views/IndeterminateProgressSpinner.css">
- <link rel="stylesheet" href="Views/IndexedDatabaseObjectStoreContentView.css">
- <link rel="stylesheet" href="Views/InlineSwatch.css">
- <link rel="stylesheet" href="Views/IssueTreeElement.css">
- <link rel="stylesheet" href="Views/LayerTreeDetailsSidebarPanel.css">
- <link rel="stylesheet" href="Views/LayoutTimelineOverviewGraph.css">
- <link rel="stylesheet" href="Views/LayoutTimelineView.css">
- <link rel="stylesheet" href="Views/LogContentView.css">
- <link rel="stylesheet" href="Views/LogIcon.css">
- <link rel="stylesheet" href="Views/MemoryCategoryView.css">
- <link rel="stylesheet" href="Views/MemoryTimelineOverviewGraph.css">
- <link rel="stylesheet" href="Views/MemoryTimelineView.css">
- <link rel="stylesheet" href="Views/Main.css">
- <link rel="stylesheet" href="Views/NavigationBar.css">
- <link rel="stylesheet" href="Views/NavigationSidebarPanel.css">
- <link rel="stylesheet" href="Views/NetworkGridContentView.css">
- <link rel="stylesheet" href="Views/NetworkSidebarPanel.css">
- <link rel="stylesheet" href="Views/NetworkTimelineOverviewGraph.css">
- <link rel="stylesheet" href="Views/NetworkTimelineView.css">
- <link rel="stylesheet" href="Views/NewTabContentView.css">
- <link rel="stylesheet" href="Views/ObjectPreviewView.css">
- <link rel="stylesheet" href="Views/ObjectTreeArrayIndexTreeElement.css">
- <link rel="stylesheet" href="Views/ObjectTreeMapEntryTreeElement.css">
- <link rel="stylesheet" href="Views/ObjectTreePropertyTreeElement.css">
- <link rel="stylesheet" href="Views/ObjectTreeView.css">
- <link rel="stylesheet" href="Views/OpenResourceDialog.css">
- <link rel="stylesheet" href="Views/OverviewTimelineView.css">
- <link rel="stylesheet" href="Views/PathComponentIcons.css">
- <link rel="stylesheet" href="Views/Popover.css">
- <link rel="stylesheet" href="Views/ProbeDetailsSidebarPanel.css">
- <link rel="stylesheet" href="Views/ProbeSetDataGrid.css">
- <link rel="stylesheet" href="Views/ProfileView.css">
- <link rel="stylesheet" href="Views/QuickConsole.css">
- <link rel="stylesheet" href="Views/RadioButtonNavigationItem.css">
- <link rel="stylesheet" href="Views/RenderingFrameTimelineOverviewGraph.css">
- <link rel="stylesheet" href="Views/RenderingFrameTimelineView.css">
- <link rel="stylesheet" href="Views/ReplayDashboardView.css">
- <link rel="stylesheet" href="Views/Resizer.css">
- <link rel="stylesheet" href="Views/ResourceIcons.css">
- <link rel="stylesheet" href="Views/ResourceSidebarPanel.css">
- <link rel="stylesheet" href="Views/ResourceTreeElement.css">
- <link rel="stylesheet" href="Views/RulesStyleDetailsPanel.css">
- <link rel="stylesheet" href="Views/ScopeBar.css">
- <link rel="stylesheet" href="Views/ScopeChainDetailsSidebarPanel.css">
- <link rel="stylesheet" href="Views/ScopeRadioButtonNavigationItem.css">
- <link rel="stylesheet" href="Views/ScriptContentView.css">
- <link rel="stylesheet" href="Views/ScriptDetailsTimelineView.css">
- <link rel="stylesheet" href="Views/ScriptTimelineOverviewGraph.css">
- <link rel="stylesheet" href="Views/SearchBar.css">
- <link rel="stylesheet" href="Views/SearchIcons.css">
- <link rel="stylesheet" href="Views/SearchSidebarPanel.css">
- <link rel="stylesheet" href="Views/Sidebar.css">
- <link rel="stylesheet" href="Views/SidebarPanel.css">
- <link rel="stylesheet" href="Views/Slider.css">
- <link rel="stylesheet" href="Views/SourceCodeTextEditor.css">
- <link rel="stylesheet" href="Views/SpringEditor.css">
- <link rel="stylesheet" href="Views/StackTraceView.css">
- <link rel="stylesheet" href="Views/StorageSidebarPanel.css">
- <link rel="stylesheet" href="Views/StyleRuleIcons.css">
- <link rel="stylesheet" href="Views/SyntaxHighlightingDefaultTheme.css">
- <link rel="stylesheet" href="Views/TabBar.css">
- <link rel="stylesheet" href="Views/TabBrowser.css">
- <link rel="stylesheet" href="Views/TextContentView.css">
- <link rel="stylesheet" href="Views/TextEditor.css">
- <link rel="stylesheet" href="Views/TextNavigationItem.css">
- <link rel="stylesheet" href="Views/TextResourceContentView.css">
- <link rel="stylesheet" href="Views/TextToggleButtonNavigationItem.css">
- <link rel="stylesheet" href="Views/TimelineDataGrid.css">
- <link rel="stylesheet" href="Views/TimelineIcons.css">
- <link rel="stylesheet" href="Views/TimelineOverview.css">
- <link rel="stylesheet" href="Views/TimelineRecordBar.css">
- <link rel="stylesheet" href="Views/TimelineRecordFrame.css">
- <link rel="stylesheet" href="Views/TimelineRecordingContentView.css">
- <link rel="stylesheet" href="Views/TimelineRuler.css">
- <link rel="stylesheet" href="Views/TimelineTabContentView.css">
- <link rel="stylesheet" href="Views/TimelineView.css">
- <link rel="stylesheet" href="Views/Toolbar.css">
- <link rel="stylesheet" href="Views/TreeElementStatusButton.css">
- <link rel="stylesheet" href="Views/TreeOutline.css">
- <link rel="stylesheet" href="Views/TypeTokenView.css">
- <link rel="stylesheet" href="Views/TypeTreeElement.css">
- <link rel="stylesheet" href="Views/TypeTreeView.css">
- <link rel="stylesheet" href="Views/Variables.css">
- <link rel="stylesheet" href="Views/VisualStyleBackgroundPicker.css">
- <link rel="stylesheet" href="Views/VisualStyleColorPicker.css">
- <link rel="stylesheet" href="Views/VisualStyleCommaSeparatedKeywordEditor.css">
- <link rel="stylesheet" href="Views/VisualStyleDetailsPanel.css">
- <link rel="stylesheet" href="Views/VisualStyleKeywordCheckbox.css">
- <link rel="stylesheet" href="Views/VisualStyleKeywordIconList.css">
- <link rel="stylesheet" href="Views/VisualStyleNumberInputBox.css">
- <link rel="stylesheet" href="Views/VisualStylePropertyEditor.css">
- <link rel="stylesheet" href="Views/VisualStylePropertyEditorLink.css">
- <link rel="stylesheet" href="Views/VisualStyleRelativeNumberSlider.css">
- <link rel="stylesheet" href="Views/VisualStyleSelectorSection.css">
- <link rel="stylesheet" href="Views/VisualStyleSelectorTreeItem.css">
- <link rel="stylesheet" href="Views/VisualStyleTabbedPropertiesRow.css">
- <link rel="stylesheet" href="Views/VisualStyleTimingEditor.css">
- <link rel="stylesheet" href="Views/VisualStyleUnitSlider.css">
-
- <link rel="stylesheet" href="Controllers/CodeMirrorCompletionController.css">
- <link rel="stylesheet" href="Controllers/CodeMirrorDragToAdjustNumberController.css">
- <link rel="stylesheet" href="Controllers/CodeMirrorTokenTrackingController.css">
-
- <link rel="stylesheet" href="Debug/UncaughtExceptionReporter.css">
-
- <script src="Debug/UncaughtExceptionReporter.js"></script>
-
- <script src="External/CodeMirror/codemirror.js"></script>
-
- <script src="External/CodeMirror/clojure.js"></script>
- <script src="External/CodeMirror/closebrackets.js"></script>
- <script src="External/CodeMirror/coffeescript.js"></script>
- <script src="External/CodeMirror/comment.js"></script>
- <script src="External/CodeMirror/css.js"></script>
- <script src="External/CodeMirror/htmlmixed.js"></script>
- <script src="External/CodeMirror/javascript.js"></script>
- <script src="External/CodeMirror/livescript.js"></script>
- <script src="External/CodeMirror/matchbrackets.js"></script>
- <script src="External/CodeMirror/overlay.js"></script>
- <script src="External/CodeMirror/placeholder.js"></script>
- <script src="External/CodeMirror/runmode.js"></script>
- <script src="External/CodeMirror/sass.js"></script>
- <script src="External/CodeMirror/searchcursor.js"></script>
- <script src="External/CodeMirror/sql.js"></script>
- <script src="External/CodeMirror/sublime.js"></script>
- <script src="External/CodeMirror/xml.js"></script>
-
- <script src="External/Esprima/esprima.js"></script>
-
- <script src="Base/WebInspector.js"></script>
- <script src="Base/InspectorFrontendHostStub.js"></script>
- <script src="Base/Platform.js"></script>
- <script src="Base/LinkedList.js"></script>
- <script src="Base/ListMultimap.js"></script>
- <script src="Base/Object.js"></script>
-
- <script src="Base/DOMUtilities.js"></script>
- <script src="Base/EventListener.js"></script>
- <script src="Base/EventListenerSet.js"></script>
- <script src="Base/ImageUtilities.js"></script>
- <script src="Base/LoadLocalizedStrings.js"></script>
- <script src="Base/MIMETypeUtilities.js"></script>
- <script src="Base/URLUtilities.js"></script>
- <script src="Base/Utilities.js"></script>
- <script src="Base/Setting.js"></script>
- <script src="Base/YieldableTask.js"></script>
-
- <script src="Protocol/ProtocolTracer.js"></script>
- <script src="Protocol/LoggingProtocolTracer.js"></script>
-
- <script src="Protocol/ApplicationCacheObserver.js"></script>
- <script src="Protocol/CSSObserver.js"></script>
- <script src="Protocol/ConsoleObserver.js"></script>
- <script src="Protocol/DOMObserver.js"></script>
- <script src="Protocol/DOMStorageObserver.js"></script>
- <script src="Protocol/DatabaseObserver.js"></script>
- <script src="Protocol/DebuggerObserver.js"></script>
- <script src="Protocol/HeapObserver.js"></script>
- <script src="Protocol/InspectorBackend.js"></script>
- <script src="Protocol/InspectorFrontendAPI.js"></script>
- <script src="Protocol/InspectorObserver.js"></script>
- <script src="Protocol/LayerTreeObserver.js"></script>
- <script src="Protocol/LoadInspectorBackendCommands.js"></script>
- <script src="Protocol/MemoryObserver.js"></script>
- <script src="Protocol/MessageDispatcher.js"></script>
- <script src="Protocol/NetworkObserver.js"></script>
- <script src="Protocol/PageObserver.js"></script>
- <script src="Protocol/RemoteObject.js"></script>
- <script src="Protocol/ReplayObserver.js"></script>
- <script src="Protocol/RuntimeObserver.js"></script>
- <script src="Protocol/ScriptProfilerObserver.js"></script>
- <script src="Protocol/TimelineObserver.js"></script>
-
- <script src="Models/BreakpointAction.js"></script>
- <script src="Models/ConsoleMessage.js"></script>
- <script src="Models/Instrument.js"></script>
- <script src="Models/SourceCode.js"></script>
- <script src="Models/SourceCodeLocation.js"></script>
- <script src="Models/Timeline.js"></script>
- <script src="Models/TimelineRange.js"></script>
- <script src="Models/TimelineRecord.js"></script>
-
- <script src="Models/AnalyzerMessage.js"></script>
- <script src="Models/ApplicationCacheFrame.js"></script>
- <script src="Models/ApplicationCacheManifest.js"></script>
- <script src="Models/BackForwardEntry.js"></script>
- <script src="Models/Branch.js"></script>
- <script src="Models/Breakpoint.js"></script>
- <script src="Models/CallingContextTree.js"></script>
- <script src="Models/CallingContextTreeNode.js"></script>
- <script src="Models/CSSCompletions.js"></script>
- <script src="Models/CSSKeywordCompletions.js"></script>
- <script src="Models/CSSMedia.js"></script>
- <script src="Models/CSSProperty.js"></script>
- <script src="Models/CSSRule.js"></script>
- <script src="Models/CSSSelector.js"></script>
- <script src="Models/CSSStyleDeclaration.js"></script>
- <script src="Models/CSSStyleSheet.js"></script>
- <script src="Models/CallFrame.js"></script>
- <script src="Models/CollectionEntry.js"></script>
- <script src="Models/CollectionEntryPreview.js"></script>
- <script src="Models/Color.js"></script>
- <script src="Models/ConsoleCommandResultMessage.js"></script>
- <script src="Models/ContentFlow.js"></script>
- <script src="Models/CookieStorageObject.js"></script>
- <script src="Models/DOMNode.js"></script>
- <script src="Models/DOMNodeStyles.js"></script>
- <script src="Models/DOMSearchMatchObject.js"></script>
- <script src="Models/DOMStorageObject.js"></script>
- <script src="Models/DOMTree.js"></script>
- <script src="Models/DatabaseObject.js"></script>
- <script src="Models/DatabaseTableObject.js"></script>
- <script src="Models/DebuggerDashboard.js"></script>
- <script src="Models/DefaultDashboard.js"></script>
- <script src="Models/ExecutionContext.js"></script>
- <script src="Models/ExecutionContextList.js"></script>
- <script src="Models/FPSInstrument.js"></script>
- <script src="Models/Frame.js"></script>
- <script src="Models/GarbageCollection.js"></script>
- <script src="Models/Geometry.js"></script>
- <script src="Models/Gradient.js"></script>
- <script src="Models/HeapAllocationsInstrument.js"></script>
- <script src="Models/HeapAllocationsTimelineRecord.js"></script>
- <script src="Models/HeapSnapshotRootPath.js"></script>
- <script src="Models/IndexedDatabase.js"></script>
- <script src="Models/IndexedDatabaseObjectStore.js"></script>
- <script src="Models/IndexedDatabaseObjectStoreIndex.js"></script>
- <script src="Models/IssueMessage.js"></script>
- <script src="Models/KeyboardShortcut.js"></script>
- <script src="Models/LayoutInstrument.js"></script>
- <script src="Models/LayoutTimelineRecord.js"></script>
- <script src="Models/LazySourceCodeLocation.js"></script>
- <script src="Models/LineWidget.js"></script>
- <script src="Models/LogObject.js"></script>
- <script src="Models/MemoryCategory.js"></script>
- <script src="Models/MemoryInstrument.js"></script>
- <script src="Models/MemoryPressureEvent.js"></script>
- <script src="Models/MemoryTimeline.js"></script>
- <script src="Models/MemoryTimelineRecord.js"></script>
- <script src="Models/NativeFunctionParameters.js"></script>
- <script src="Models/NetworkInstrument.js"></script>
- <script src="Models/NetworkTimeline.js"></script>
- <script src="Models/ObjectPreview.js"></script>
- <script src="Models/Probe.js"></script>
- <script src="Models/ProbeSet.js"></script>
- <script src="Models/ProbeSetDataFrame.js"></script>
- <script src="Models/ProbeSetDataTable.js"></script>
- <script src="Models/Profile.js"></script>
- <script src="Models/ProfileNode.js"></script>
- <script src="Models/ProfileNodeCall.js"></script>
- <script src="Models/PropertyDescriptor.js"></script>
- <script src="Models/PropertyPath.js"></script>
- <script src="Models/PropertyPreview.js"></script>
- <script src="Models/RenderingFrameTimelineRecord.js"></script>
- <script src="Models/ReplayDashboard.js"></script>
- <script src="Models/ReplaySession.js"></script>
- <script src="Models/ReplaySessionSegment.js"></script>
- <script src="Models/Resource.js"></script>
- <script src="Models/ResourceCollection.js"></script>
- <script src="Models/ResourceQueryMatch.js"></script>
- <script src="Models/ResourceQueryResult.js"></script>
- <script src="Models/ResourceTimelineRecord.js"></script>
- <script src="Models/ResourceTimingData.js"></script>
- <script src="Models/Revision.js"></script>
- <script src="Models/ScopeChainNode.js"></script>
- <script src="Models/Script.js"></script>
- <script src="Models/ScriptInstrument.js"></script>
- <script src="Models/ScriptSyntaxTree.js"></script>
- <script src="Models/ScriptTimelineRecord.js"></script>
- <script src="Models/SourceCodePosition.js"></script>
- <script src="Models/SourceCodeRevision.js"></script>
- <script src="Models/SourceCodeSearchMatchObject.js"></script>
- <script src="Models/SourceCodeTextRange.js"></script>
- <script src="Models/SourceCodeTimeline.js"></script>
- <script src="Models/SourceMap.js"></script>
- <script src="Models/SourceMapResource.js"></script>
- <script src="Models/StackTrace.js"></script>
- <script src="Models/StructureDescription.js"></script>
- <script src="Models/TextMarker.js"></script>
- <script src="Models/TextRange.js"></script>
- <script src="Models/TimelineMarker.js"></script>
- <script src="Models/TimelineRecording.js"></script>
- <script src="Models/TypeDescription.js"></script>
- <script src="Models/TypeSet.js"></script>
- <script src="Models/WrappedPromise.js"></script>
-
- <script src="Proxies/FormatterWorkerProxy.js"></script>
- <script src="Proxies/HeapSnapshotDiffProxy.js"></script>
- <script src="Proxies/HeapSnapshotEdgeProxy.js"></script>
- <script src="Proxies/HeapSnapshotNodeProxy.js"></script>
- <script src="Proxies/HeapSnapshotProxy.js"></script>
- <script src="Proxies/HeapSnapshotWorkerProxy.js"></script>
-
- <script src="Views/View.js"></script>
-
- <script src="Views/ConsoleCommandView.js"></script>
- <script src="Views/ConsoleMessageView.js"></script>
- <script src="Views/ContentView.js"></script>
- <script src="Views/DataGrid.js"></script>
- <script src="Views/DataGridNode.js"></script>
- <script src="Views/DetailsSectionRow.js"></script>
- <script src="Views/Dialog.js"></script>
- <script src="Views/HierarchicalPathComponent.js"></script>
- <script src="Views/NavigationItem.js"></script>
- <script src="Views/SidebarPanel.js"></script>
- <script src="Views/StyleDetailsPanel.js"></script>
- <script src="Views/TabBar.js"></script>
- <script src="Views/TabBarItem.js"></script>
- <script src="Views/TabBrowser.js"></script>
- <script src="Views/TextEditor.js"></script>
- <script src="Views/TimelineOverviewGraph.js"></script>
- <script src="Views/TimelineView.js"></script>
- <script src="Views/TreeElement.js"></script>
- <script src="Views/TreeOutline.js"></script>
-
- <script src="Views/ButtonNavigationItem.js"></script>
- <script src="Views/DatabaseUserQueryViewBase.js"></script>
- <script src="Views/DatabaseUserQueryErrorView.js"></script>
- <script src="Views/DatabaseUserQuerySuccessView.js"></script>
- <script src="Views/DOMTreeContentView.js"></script>
- <script src="Views/DetailsSidebarPanel.js"></script>
- <script src="Views/GeneralTreeElement.js"></script>
- <script src="Views/NavigationSidebarPanel.js"></script>
- <script src="Views/ResourceContentView.js"></script>
- <script src="Views/TabContentView.js"></script>
- <script src="Views/TimelineDataGrid.js"></script>
- <script src="Views/TimelineDataGridNode.js"></script>
-
- <script src="Views/ContentBrowserTabContentView.js"></script>
- <script src="Views/DOMDetailsSidebarPanel.js"></script>
- <script src="Views/FolderTreeElement.js"></script>
- <script src="Views/FolderizedTreeElement.js"></script>
- <script src="Views/NetworkTabContentView.js"></script>
- <script src="Views/NewTabContentView.js"></script>
- <script src="Views/ObjectTreeBaseTreeElement.js"></script>
- <script src="Views/SourceCodeTreeElement.js"></script>
- <script src="Views/StorageTreeElement.js"></script>
- <script src="Views/TimelineDataGridNodePathComponent.js"></script>
- <script src="Views/TimelineOverview.js"></script>
- <script src="Views/TimelineRecordTreeElement.js"></script>
- <script src="Views/TimelineTreeElement.js"></script>
-
- <script src="Views/ConsoleTabContentView.js"></script>
- <script src="Views/DebuggerTabContentView.js"></script>
- <script src="Views/DebuggerTreeElement.js"></script>
- <script src="Views/ElementsTabContentView.js"></script>
- <script src="Views/ResourceTreeElement.js"></script>
- <script src="Views/ResourcesTabContentView.js"></script>
- <script src="Views/SearchTabContentView.js"></script>
- <script src="Views/SettingsTabContentView.js"></script>
- <script src="Views/StorageTabContentView.js"></script>
- <script src="Views/TimelineTabContentView.js"></script>
-
- <script src="Views/DetailsSection.js"></script>
- <script src="Views/DetailsSectionDataGridRow.js"></script>
- <script src="Views/DetailsSectionGroup.js"></script>
- <script src="Views/DetailsSectionSimpleRow.js"></script>
- <script src="Views/DetailsSectionTextRow.js"></script>
-
- <script src="Views/ActivateButtonNavigationItem.js"></script>
- <script src="Views/ActivateButtonToolbarItem.js"></script>
- <script src="Views/ApplicationCacheDetailsSidebarPanel.js"></script>
- <script src="Views/ApplicationCacheFrameContentView.js"></script>
- <script src="Views/ApplicationCacheFrameTreeElement.js"></script>
- <script src="Views/ApplicationCacheManifestTreeElement.js"></script>
- <script src="Views/BezierEditor.js"></script>
- <script src="Views/BoxModelDetailsSectionRow.js"></script>
- <script src="Views/BreakpointActionView.js"></script>
- <script src="Views/BreakpointTreeElement.js"></script>
- <script src="Views/ButtonToolbarItem.js"></script>
- <script src="Views/CSSStyleDeclarationSection.js"></script>
- <script src="Views/CSSStyleDeclarationTextEditor.js"></script>
- <script src="Views/CSSStyleDetailsSidebarPanel.js"></script>
- <script src="Views/CallFrameTreeElement.js"></script>
- <script src="Views/CallFrameView.js"></script>
- <script src="Views/ChartDetailsSectionRow.js"></script>
- <script src="Views/CircleChart.js"></script>
- <script src="Views/ClusterContentView.js"></script>
- <script src="Views/CodeMirrorAdditions.js"></script>
- <script src="Views/CodeMirrorEditor.js"></script>
- <script src="Views/CodeMirrorFormatters.js"></script>
- <script src="Views/CodeMirrorTextMarkers.js"></script>
- <script src="Views/ColorPicker.js"></script>
- <script src="Views/ColorWheel.js"></script>
- <script src="Views/CompletionSuggestionsView.js"></script>
- <script src="Views/ComputedStyleDetailsPanel.js"></script>
- <script src="Views/ConsoleGroup.js"></script>
- <script src="Views/ConsolePrompt.js"></script>
- <script src="Views/ConsoleSession.js"></script>
- <script src="Views/ContentBrowser.js"></script>
- <script src="Views/ContentFlowDOMTreeContentView.js"></script>
- <script src="Views/ContentFlowTreeElement.js"></script>
- <script src="Views/ContentViewContainer.js"></script>
- <script src="Views/ContextMenu.js"></script>
- <script src="Views/ContextMenuUtilities.js"></script>
- <script src="Views/ControlToolbarItem.js"></script>
- <script src="Views/CookieStorageContentView.js"></script>
- <script src="Views/CookieStorageTreeElement.js"></script>
- <script src="Views/DOMNodeDetailsSidebarPanel.js"></script>
- <script src="Views/DOMStorageContentView.js"></script>
- <script src="Views/DOMStorageTreeElement.js"></script>
- <script src="Views/DOMTreeDataGrid.js"></script>
- <script src="Views/DOMTreeDataGridNode.js"></script>
- <script src="Views/DOMTreeElement.js"></script>
- <script src="Views/DOMTreeElementPathComponent.js"></script>
- <script src="Views/DOMTreeOutline.js"></script>
- <script src="Views/DOMTreeUpdater.js"></script>
- <script src="Views/DashboardContainerView.js"></script>
- <script src="Views/DashboardView.js"></script>
- <script src="Views/DatabaseContentView.js"></script>
- <script src="Views/DatabaseHostTreeElement.js"></script>
- <script src="Views/DatabaseTableContentView.js"></script>
- <script src="Views/DatabaseTableTreeElement.js"></script>
- <script src="Views/DatabaseTreeElement.js"></script>
- <script src="Views/DebuggerDashboardView.js"></script>
- <script src="Views/DebuggerSidebarPanel.js"></script>
- <script src="Views/DefaultDashboardView.js"></script>
- <script src="Views/DividerNavigationItem.js"></script>
- <script src="Views/EditingSupport.js"></script>
- <script src="Views/ErrorObjectView.js"></script>
- <script src="Views/EventListenerSection.js"></script>
- <script src="Views/EventListenerSectionGroup.js"></script>
- <script src="Views/FilterBar.js"></script>
- <script src="Views/FilterBarButton.js"></script>
- <script src="Views/FilterBarNavigationItem.js"></script>
- <script src="Views/FindBanner.js"></script>
- <script src="Views/FlexibleSpaceNavigationItem.js"></script>
- <script src="Views/FontResourceContentView.js"></script>
- <script src="Views/FormattedValue.js"></script>
- <script src="Views/FrameDOMTreeContentView.js"></script>
- <script src="Views/FrameTreeElement.js"></script>
- <script src="Views/GeneralTreeElementPathComponent.js"></script>
- <script src="Views/GenericResourceContentView.js"></script>
- <script src="Views/GoToLineDialog.js"></script>
- <script src="Views/GradientEditor.js"></script>
- <script src="Views/GradientSlider.js"></script>
- <script src="Views/HeapAllocationsTimelineDataGridNode.js"></script>
- <script src="Views/HeapAllocationsTimelineDataGridNodePathComponent.js"></script>
- <script src="Views/HeapAllocationsTimelineOverviewGraph.js"></script>
- <script src="Views/HeapAllocationsTimelineView.js"></script>
- <script src="Views/HeapSnapshotClassDataGridNode.js"></script>
- <script src="Views/HeapSnapshotClusterContentView.js"></script>
- <script src="Views/HeapSnapshotContentView.js"></script>
- <script src="Views/HeapSnapshotDataGridTree.js"></script>
- <script src="Views/HeapSnapshotInstanceDataGridNode.js"></script>
- <script src="Views/HeapSnapshotInstanceFetchMoreDataGridNode.js"></script>
- <script src="Views/HierarchicalPathNavigationItem.js"></script>
- <script src="Views/HoverMenu.js"></script>
- <script src="Views/ImageResourceContentView.js"></script>
- <script src="Views/IndeterminateProgressSpinner.js"></script>
- <script src="Views/IndexedDatabaseDetailsSidebarPanel.js"></script>
- <script src="Views/IndexedDatabaseEntryDataGridNode.js"></script>
- <script src="Views/IndexedDatabaseHostTreeElement.js"></script>
- <script src="Views/IndexedDatabaseObjectStoreContentView.js"></script>
- <script src="Views/IndexedDatabaseObjectStoreIndexTreeElement.js"></script>
- <script src="Views/IndexedDatabaseObjectStoreTreeElement.js"></script>
- <script src="Views/IndexedDatabaseTreeElement.js"></script>
- <script src="Views/InlineSwatch.js"></script>
- <script src="Views/IssueTreeElement.js"></script>
- <script src="Views/LayerTreeDataGridNode.js"></script>
- <script src="Views/LayerTreeDetailsSidebarPanel.js"></script>
- <script src="Views/LayoutTimelineDataGrid.js"></script>
- <script src="Views/LayoutTimelineDataGridNode.js"></script>
- <script src="Views/LayoutTimelineOverviewGraph.js"></script>
- <script src="Views/LayoutTimelineView.js"></script>
- <script src="Views/LineChart.js"></script>
- <script src="Views/LogContentView.js"></script>
- <script src="Views/LogTreeElement.js"></script>
- <script src="Views/MemoryCategoryView.js"></script>
- <script src="Views/MemoryTimelineOverviewGraph.js"></script>
- <script src="Views/MemoryTimelineView.js"></script>
- <script src="Views/MultipleScopeBarItem.js"></script>
- <script src="Views/NavigationBar.js"></script>
- <script src="Views/NetworkGridContentView.js"></script>
- <script src="Views/NetworkSidebarPanel.js"></script>
- <script src="Views/NetworkTimelineOverviewGraph.js"></script>
- <script src="Views/NetworkTimelineView.js"></script>
- <script src="Views/ObjectPreviewView.js"></script>
- <script src="Views/ObjectPropertiesDetailSectionRow.js"></script>
- <script src="Views/ObjectTreeArrayIndexTreeElement.js"></script>
- <script src="Views/ObjectTreeMapEntryTreeElement.js"></script>
- <script src="Views/ObjectTreePropertyTreeElement.js"></script>
- <script src="Views/ObjectTreeSetIndexTreeElement.js"></script>
- <script src="Views/ObjectTreeView.js"></script>
- <script src="Views/OpenResourceDialog.js"></script>
- <script src="Views/OverviewTimelineView.js"></script>
- <script src="Views/Popover.js"></script>
- <script src="Views/ProbeDetailsSidebarPanel.js"></script>
- <script src="Views/ProbeSetDataGrid.js"></script>
- <script src="Views/ProbeSetDataGridNode.js"></script>
- <script src="Views/ProbeSetDetailsSection.js"></script>
- <script src="Views/ProfileDataGridNode.js"></script>
- <script src="Views/ProfileDataGridTree.js"></script>
- <script src="Views/ProfileNodeDataGridNode.js"></script>
- <script src="Views/ProfileNodeTreeElement.js"></script>
- <script src="Views/ProfileView.js"></script>
- <script src="Views/QuickConsole.js"></script>
- <script src="Views/QuickConsoleNavigationBar.js"></script>
- <script src="Views/RadioButtonNavigationItem.js"></script>
- <script src="Views/RenderingFrameTimelineDataGridNode.js"></script>
- <script src="Views/RenderingFrameTimelineOverviewGraph.js"></script>
- <script src="Views/RenderingFrameTimelineView.js"></script>
- <script src="Views/ReplayDashboardView.js"></script>
- <script src="Views/Resizer.js"></script>
- <script src="Views/ResourceClusterContentView.js"></script>
- <script src="Views/ResourceDetailsSidebarPanel.js"></script>
- <script src="Views/ResourceSidebarPanel.js"></script>
- <script src="Views/ResourceTimelineDataGridNode.js"></script>
- <script src="Views/RulesStyleDetailsPanel.js"></script>
- <script src="Views/ScopeBar.js"></script>
- <script src="Views/ScopeBarItem.js"></script>
- <script src="Views/ScopeChainDetailsSidebarPanel.js"></script>
- <script src="Views/ScopeRadioButtonNavigationItem.js"></script>
- <script src="Views/ScriptClusterTimelineView.js"></script>
- <script src="Views/ScriptContentView.js"></script>
- <script src="Views/ScriptDetailsTimelineView.js"></script>
- <script src="Views/ScriptProfileTimelineView.js"></script>
- <script src="Views/ScriptTimelineDataGrid.js"></script>
- <script src="Views/ScriptTimelineDataGridNode.js"></script>
- <script src="Views/ScriptTimelineOverviewGraph.js"></script>
- <script src="Views/ScriptTreeElement.js"></script>
- <script src="Views/SearchBar.js"></script>
- <script src="Views/SearchResultTreeElement.js"></script>
- <script src="Views/SearchSidebarPanel.js"></script>
- <script src="Views/Sidebar.js"></script>
- <script src="Views/Slider.js"></script>
- <script src="Views/SourceCodeTextEditor.js"></script>
- <script src="Views/SourceCodeTimelineTimelineDataGridNode.js"></script>
- <script src="Views/SourceCodeTimelineTreeElement.js"></script>
- <script src="Views/SourceMapResourceTreeElement.js"></script>
- <script src="Views/SpringEditor.js"></script>
- <script src="Views/StackTraceView.js"></script>
- <script src="Views/StackedLineChart.js"></script>
- <script src="Views/StorageSidebarPanel.js"></script>
- <script src="Views/SyntaxHighlightingSupport.js"></script>
- <script src="Views/TextContentView.js"></script>
- <script src="Views/TextNavigationItem.js"></script>
- <script src="Views/TextResourceContentView.js"></script>
- <script src="Views/TimelineRecordBar.js"></script>
- <script src="Views/TimelineRecordFrame.js"></script>
- <script src="Views/TimelineRecordingContentView.js"></script>
- <script src="Views/TimelineRecordingProgressView.js"></script>
- <script src="Views/TimelineRuler.js"></script>
- <script src="Views/ToggleButtonNavigationItem.js"></script>
- <script src="Views/TextToggleButtonNavigationItem.js"></script>
- <script src="Views/ToggleControlToolbarItem.js"></script>
- <script src="Views/Toolbar.js"></script>
- <script src="Views/TreeElementStatusButton.js"></script>
- <script src="Views/TreeOutlineDataGridSynchronizer.js"></script>
- <script src="Views/TypeTokenView.js"></script>
- <script src="Views/TypeTreeElement.js"></script>
- <script src="Views/TypeTreeView.js"></script>
-
- <script src="Views/VisualStyleDetailsPanel.js"></script>
- <script src="Views/VisualStylePropertyEditor.js"></script>
- <script src="Views/VisualStyleBackgroundPicker.js"></script>
- <script src="Views/VisualStyleBasicInput.js"></script>
- <script src="Views/VisualStyleColorPicker.js"></script>
- <script src="Views/VisualStyleCommaSeparatedKeywordEditor.js"></script>
- <script src="Views/VisualStyleFontFamilyListEditor.js"></script>
- <script src="Views/VisualStyleFontFamilyTreeElement.js"></script>
- <script src="Views/VisualStyleKeywordCheckbox.js"></script>
- <script src="Views/VisualStyleKeywordIconList.js"></script>
- <script src="Views/VisualStyleKeywordPicker.js"></script>
- <script src="Views/VisualStyleNumberInputBox.js"></script>
- <script src="Views/VisualStylePropertyCombiner.js"></script>
- <script src="Views/VisualStylePropertyEditorLink.js"></script>
- <script src="Views/VisualStylePropertyNameInput.js"></script>
- <script src="Views/VisualStyleRelativeNumberSlider.js"></script>
- <script src="Views/VisualStyleSelectorSection.js"></script>
- <script src="Views/VisualStyleSelectorTreeItem.js"></script>
- <script src="Views/VisualStyleTabbedPropertiesRow.js"></script>
- <script src="Views/VisualStyleTimingEditor.js"></script>
- <script src="Views/VisualStyleURLInput.js"></script>
- <script src="Views/VisualStyleUnitSlider.js"></script>
-
- <script src="Controllers/Annotator.js"></script>
- <script src="Controllers/CodeMirrorEditingController.js"></script>
-
- <script src="Controllers/AnalyzerManager.js"></script>
- <script src="Controllers/ApplicationCacheManager.js"></script>
- <script src="Controllers/BasicBlockAnnotator.js"></script>
- <script src="Controllers/BranchManager.js"></script>
- <script src="Controllers/BreakpointPopoverController.js"></script>
- <script src="Controllers/CSSStyleManager.js"></script>
- <script src="Controllers/CodeMirrorColorEditingController.js"></script>
- <script src="Controllers/CodeMirrorCompletionController.js"></script>
- <script src="Controllers/CodeMirrorBezierEditingController.js"></script>
- <script src="Controllers/CodeMirrorDragToAdjustNumberController.js"></script>
- <script src="Controllers/CodeMirrorGradientEditingController.js"></script>
- <script src="Controllers/CodeMirrorSpringEditingController.js"></script>
- <script src="Controllers/CodeMirrorTokenTrackingController.js"></script>
- <script src="Controllers/CodeMirrorTextKillController.js"></script>
- <script src="Controllers/DOMTreeManager.js"></script>
- <script src="Controllers/DashboardManager.js"></script>
- <script src="Controllers/DebuggerManager.js"></script>
- <script src="Controllers/DragToAdjustController.js"></script>
- <script src="Controllers/Formatter.js"></script>
- <script src="Controllers/FormatterSourceMap.js"></script>
- <script src="Controllers/FrameResourceManager.js"></script>
- <script src="Controllers/HeapManager.js"></script>
- <script src="Controllers/IssueManager.js"></script>
- <script src="Controllers/JavaScriptLogViewController.js"></script>
- <script src="Controllers/JavaScriptRuntimeCompletionProvider.js"></script>
- <script src="Controllers/LayerTreeManager.js"></script>
- <script src="Controllers/LogManager.js"></script>
- <script src="Controllers/MemoryManager.js"></script>
- <script src="Controllers/ProbeManager.js"></script>
- <script src="Controllers/ReplayManager.js"></script>
- <script src="Controllers/ResourceQueryController.js"></script>
- <script src="Controllers/RuntimeManager.js"></script>
- <script src="Controllers/SourceMapManager.js"></script>
- <script src="Controllers/StorageManager.js"></script>
- <script src="Controllers/TimelineManager.js"></script>
- <script src="Controllers/TypeTokenAnnotator.js"></script>
- <script src="Controllers/VisualStyleCompletionsController.js"></script>
-
- <script src="Workers/Formatter/FormatterContentBuilder.js"></script>
-
- <script src="Base/Main.js"></script>
-
- <script src="Debug/Bootstrap.js"></script>
- <script src="Debug/CapturingProtocolTracer.js"></script>
- <script src="Debug/ProtocolTrace.js"></script>
-
- <script>
- WebInspector.loaded();
- </script>
-</head>
-<body>
-<div id="docked-resizer"></div>
-<div id="toolbar"></div>
-<div id="tab-bar"></div>
-<div id="main">
- <div id="navigation-sidebar"></div>
- <div id="content">
- <div id="tab-browser"></div>
- <div id="split-content-browser" class="hidden"></div>
- <div id="quick-console"></div>
- </div>
- <div id="details-sidebar"></div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTesthtml"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Test.html (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,207 +0,0 @@
</span><del>-<!--
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <!--
- These resources should match the order and groups used in Main.html.
- -->
- <script src="External/CodeMirror/codemirror.js"></script>
- <script src="External/CodeMirror/css.js"></script>
- <script src="External/CodeMirror/htmlmixed.js"></script>
- <script src="External/CodeMirror/javascript.js"></script>
- <script src="External/Esprima/esprima.js"></script>
-
- <script src="Base/WebInspector.js"></script>
- <script src="Base/InspectorFrontendHostStub.js"></script>
- <script src="Base/LinkedList.js"></script>
- <script src="Base/ListMultimap.js"></script>
- <script src="Base/Object.js"></script>
-
- <script src="Test/TestHarness.js"></script>
- <script src="Test/FrontendTestHarness.js"></script>
- <script src="Test/TestSuite.js"></script>
-
- <script src="Test/Test.js"></script>
-
- <script src="Base/DOMUtilities.js"></script>
- <script src="Base/EventListener.js"></script>
- <script src="Base/EventListenerSet.js"></script>
- <script src="Base/URLUtilities.js"></script>
- <script src="Base/Utilities.js"></script>
- <script src="Base/Setting.js"></script>
- <script src="Base/YieldableTask.js"></script>
-
- <script src="Protocol/ProtocolTracer.js"></script>
- <script src="Protocol/LoggingProtocolTracer.js"></script>
-
- <script src="Protocol/InspectorBackend.js"></script>
- <script src="Protocol/InspectorFrontendAPI.js"></script>
- <script src="Protocol/LoadInspectorBackendCommands.js"></script>
- <script src="Protocol/MessageDispatcher.js"></script>
-
- <script src="Protocol/InspectorObserver.js"></script>
- <script src="Protocol/CSSObserver.js"></script>
- <script src="Protocol/ConsoleObserver.js"></script>
- <script src="Protocol/DOMObserver.js"></script>
- <script src="Protocol/DOMStorageObserver.js"></script>
- <script src="Protocol/DebuggerObserver.js"></script>
- <script src="Protocol/HeapObserver.js"></script>
- <script src="Protocol/NetworkObserver.js"></script>
- <script src="Protocol/PageObserver.js"></script>
- <script src="Protocol/RemoteObject.js"></script>
- <script src="Protocol/ReplayObserver.js"></script>
- <script src="Protocol/RuntimeObserver.js"></script>
- <script src="Protocol/TimelineObserver.js"></script>
-
- <script src="Models/BreakpointAction.js"></script>
- <script src="Models/ConsoleMessage.js"></script>
- <script src="Models/Instrument.js"></script>
- <script src="Models/SourceCode.js"></script>
- <script src="Models/SourceCodeLocation.js"></script>
- <script src="Models/Timeline.js"></script>
- <script src="Models/TimelineRange.js"></script>
- <script src="Models/TimelineRecord.js"></script>
-
- <script src="Models/Breakpoint.js"></script>
- <script src="Models/CSSCompletions.js"></script>
- <script src="Models/CSSKeywordCompletions.js"></script>
- <script src="Models/CSSMedia.js"></script>
- <script src="Models/CSSProperty.js"></script>
- <script src="Models/CSSRule.js"></script>
- <script src="Models/CSSSelector.js"></script>
- <script src="Models/CSSStyleDeclaration.js"></script>
- <script src="Models/CSSStyleSheet.js"></script>
- <script src="Models/CallFrame.js"></script>
- <script src="Models/CallingContextTree.js"></script>
- <script src="Models/CallingContextTreeNode.js"></script>
- <script src="Models/CollectionEntry.js"></script>
- <script src="Models/CollectionEntryPreview.js"></script>
- <script src="Models/Color.js"></script>
- <script src="Models/ConsoleCommandResultMessage.js"></script>
- <script src="Models/ContentFlow.js"></script>
- <script src="Models/CookieStorageObject.js"></script>
- <script src="Models/DOMNode.js"></script>
- <script src="Models/DOMNodeStyles.js"></script>
- <script src="Models/DOMStorageObject.js"></script>
- <script src="Models/DOMTree.js"></script>
- <script src="Models/ExecutionContext.js"></script>
- <script src="Models/ExecutionContextList.js"></script>
- <script src="Models/FPSInstrument.js"></script>
- <script src="Models/Frame.js"></script>
- <script src="Models/GarbageCollection.js"></script>
- <script src="Models/Geometry.js"></script>
- <script src="Models/HeapAllocationsInstrument.js"></script>
- <script src="Models/HeapAllocationsTimelineRecord.js"></script>
- <script src="Models/IndexedDatabase.js"></script>
- <script src="Models/IndexedDatabaseObjectStore.js"></script>
- <script src="Models/IndexedDatabaseObjectStoreIndex.js"></script>
- <script src="Models/IssueMessage.js"></script>
- <script src="Models/LayoutInstrument.js"></script>
- <script src="Models/LayoutTimelineRecord.js"></script>
- <script src="Models/LazySourceCodeLocation.js"></script>
- <script src="Models/MemoryCategory.js"></script>
- <script src="Models/MemoryInstrument.js"></script>
- <script src="Models/MemoryTimeline.js"></script>
- <script src="Models/MemoryTimelineRecord.js"></script>
- <script src="Models/NetworkInstrument.js"></script>
- <script src="Models/NetworkTimeline.js"></script>
- <script src="Models/ObjectPreview.js"></script>
- <script src="Models/Probe.js"></script>
- <script src="Models/ProbeSet.js"></script>
- <script src="Models/ProbeSetDataFrame.js"></script>
- <script src="Models/ProbeSetDataTable.js"></script>
- <script src="Models/Profile.js"></script>
- <script src="Models/ProfileNode.js"></script>
- <script src="Models/ProfileNodeCall.js"></script>
- <script src="Models/PropertyDescriptor.js"></script>
- <script src="Models/PropertyPreview.js"></script>
- <script src="Models/RenderingFrameTimelineRecord.js"></script>
- <script src="Models/ReplaySession.js"></script>
- <script src="Models/ReplaySessionSegment.js"></script>
- <script src="Models/Resource.js"></script>
- <script src="Models/ResourceCollection.js"></script>
- <script src="Models/ResourceQueryMatch.js"></script>
- <script src="Models/ResourceQueryResult.js"></script>
- <script src="Models/ResourceTimelineRecord.js"></script>
- <script src="Models/ResourceTimingData.js"></script>
- <script src="Models/Revision.js"></script>
- <script src="Models/ScopeChainNode.js"></script>
- <script src="Models/Script.js"></script>
- <script src="Models/ScriptInstrument.js"></script>
- <script src="Models/ScriptSyntaxTree.js"></script>
- <script src="Models/ScriptTimelineRecord.js"></script>
- <script src="Models/SourceCodeRevision.js"></script>
- <script src="Models/SourceCodeTimeline.js"></script>
- <script src="Models/SourceMapResource.js"></script>
- <script src="Models/StackTrace.js"></script>
- <script src="Models/TextRange.js"></script>
- <script src="Models/TimelineMarker.js"></script>
- <script src="Models/TimelineRecording.js"></script>
-
- <script src="Proxies/FormatterWorkerProxy.js"></script>
- <script src="Proxies/HeapSnapshotDiffProxy.js"></script>
- <script src="Proxies/HeapSnapshotEdgeProxy.js"></script>
- <script src="Proxies/HeapSnapshotNodeProxy.js"></script>
- <script src="Proxies/HeapSnapshotProxy.js"></script>
- <script src="Proxies/HeapSnapshotWorkerProxy.js"></script>
-
- <script src="Controllers/CSSStyleManager.js"></script>
- <script src="Controllers/DOMTreeManager.js"></script>
- <script src="Controllers/DebuggerManager.js"></script>
- <script src="Controllers/FrameResourceManager.js"></script>
- <script src="Controllers/HeapManager.js"></script>
- <script src="Controllers/IssueManager.js"></script>
- <script src="Controllers/LogManager.js"></script>
- <script src="Controllers/MemoryManager.js"></script>
- <script src="Controllers/ProbeManager.js"></script>
- <script src="Controllers/ReplayManager.js"></script>
- <script src="Controllers/RuntimeManager.js"></script>
- <script src="Controllers/StorageManager.js"></script>
- <script src="Controllers/TimelineManager.js"></script>
-
- <script src="Controllers/Formatter.js"></script>
- <script src="Controllers/ResourceQueryController.js"></script>
- <script src="Workers/Formatter/FormatterContentBuilder.js"></script>
- <script src="Views/CodeMirrorAdditions.js"></script>
- <script src="Views/CodeMirrorFormatters.js"></script>
-
- <script type="text/javascript">
- WebInspector.loaded();
-
- // Debug logging is synchronous on the test page.
- InspectorTest.forceDebugLogging = false;
-
- // Tee all TestHarness commands to stderr from within the Inspector.
- InspectorTest.dumpActivityToSystemConsole = false;
-
- // Best used in combination with dumpActivityToSystemConsole.
- InspectorBackend.dumpInspectorProtocolMessages = false;
- </script>
-</head>
-<body>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -6,14 +6,36 @@
</span><span class="cx"> objectVersion = 46;
</span><span class="cx"> objects = {
</span><span class="cx">
</span><ins>+/* Begin PBXAggregateTarget section */
+ 99E9A7F21D70BAD300C247A6 /* Derived Sources */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 99E9A7F31D70BAD300C247A6 /* Build configuration list for PBXAggregateTarget "Derived Sources" */;
+ buildPhases = (
+ 99E9A7F91D70BAF600C247A6 /* Generate Derived Sources */,
+ );
+ dependencies = (
+ );
+ name = "Derived Sources";
+ productName = "Derived Sources";
+ };
+/* End PBXAggregateTarget section */
+
</ins><span class="cx"> /* Begin PBXBuildFile section */
</span><span class="cx"> 1C60FF1614E6E3F7006CD77D /* localizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 1C60FF1314E6E35D006CD77D /* localizedStrings.js */; };
</span><span class="cx"> 1C78EE1717611340002F6AA5 /* WebInspectorUI.c in Sources */ = {isa = PBXBuildFile; fileRef = 1C78EE1617611340002F6AA5 /* WebInspectorUI.c */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><ins>+/* Begin PBXContainerItemProxy section */
+ 99E9A7F71D70BADD00C247A6 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = A54C224D148B23DE00373FA3 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 99E9A7F21D70BAD300C247A6;
+ remoteInfo = "Derived Sources";
+ };
+/* End PBXContainerItemProxy section */
+
</ins><span class="cx"> /* Begin PBXFileReference section */
</span><del>- 1C435CAC14E7B287004E10EA /* cssmin.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = cssmin.py; sourceTree = "<group>"; };
- 1C435CAD14E7B287004E10EA /* jsmin.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = jsmin.py; sourceTree = "<group>"; };
</del><span class="cx"> 1C60FE2F14E5F3CD006CD77D /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1C60FE3214E5F3CD006CD77D /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -54,8 +76,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> 1C60FF1914E73C64006CD77D /* combine-resources.pl */,
</span><span class="cx"> 1C60FFE114E79B0F006CD77D /* copy-user-interface-resources.pl */,
</span><del>- 1C435CAC14E7B287004E10EA /* cssmin.py */,
- 1C435CAD14E7B287004E10EA /* jsmin.py */,
</del><span class="cx"> 1C60FF1A14E73DCA006CD77D /* remove-console-asserts.pl */,
</span><span class="cx"> );
</span><span class="cx"> path = Scripts;
</span><span class="lines">@@ -95,6 +115,7 @@
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><ins>+ 99E9A7F81D70BADD00C247A6 /* PBXTargetDependency */,
</ins><span class="cx"> );
</span><span class="cx"> name = WebInspectorUI;
</span><span class="cx"> productName = WebInspector;
</span><span class="lines">@@ -110,6 +131,12 @@
</span><span class="cx"> LastSwiftUpdateCheck = 0700;
</span><span class="cx"> LastUpgradeCheck = 0700;
</span><span class="cx"> ORGANIZATIONNAME = Apple;
</span><ins>+ TargetAttributes = {
+ 99E9A7F21D70BAD300C247A6 = {
+ CreatedOnToolsVersion = 8.0;
+ ProvisioningStyle = Automatic;
+ };
+ };
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.2";
</span><span class="lines">@@ -124,6 +151,7 @@
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><span class="cx"> A54C2256148B23DF00373FA3 /* WebInspectorUI */,
</span><ins>+ 99E9A7F21D70BAD300C247A6 /* Derived Sources */,
</ins><span class="cx"> );
</span><span class="cx"> };
</span><span class="cx"> /* End PBXProject section */
</span><span class="lines">@@ -146,8 +174,22 @@
</span><span class="cx"> name = "Copy User Interface Resources";
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"";
</del><ins>+ shellScript = "# This is defined differently for Make/xcodebuild vs CMake ports.\nDERIVED_SOURCES_DIR=\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebInspectorUI\"\n\n/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"";
</ins><span class="cx"> };
</span><ins>+ 99E9A7F91D70BAF600C247A6 /* Generate Derived Sources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Generate Derived Sources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "GENERATE_DERIVED_SOURCES_PATH=\"${SRCROOT}/Scripts/generate-webinspectorui-derived-sources\"\n[[ -x \"${GENERATE_DERIVED_SOURCES_PATH}\" ]] && exec \"${GENERATE_DERIVED_SOURCES_PATH}\"\nexit 0\n";
+ };
</ins><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXSourcesBuildPhase section */
</span><span class="lines">@@ -161,6 +203,14 @@
</span><span class="cx"> };
</span><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><ins>+/* Begin PBXTargetDependency section */
+ 99E9A7F81D70BADD00C247A6 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 99E9A7F21D70BAD300C247A6 /* Derived Sources */;
+ targetProxy = 99E9A7F71D70BADD00C247A6 /* PBXContainerItemProxy */;
+ };
+/* End PBXTargetDependency section */
+
</ins><span class="cx"> /* Begin PBXVariantGroup section */
</span><span class="cx"> 1C60FF1314E6E35D006CD77D /* localizedStrings.js */ = {
</span><span class="cx"> isa = PBXVariantGroup;
</span><span class="lines">@@ -188,6 +238,30 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><ins>+ 99E9A7F41D70BAD300C247A6 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 99E9A7F51D70BAD300C247A6 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+ 99E9A7F61D70BAD300C247A6 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Production;
+ };
</ins><span class="cx"> A54C226A148B23DF00373FA3 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */;
</span><span class="lines">@@ -221,6 +295,16 @@
</span><span class="cx"> /* End XCBuildConfiguration section */
</span><span class="cx">
</span><span class="cx"> /* Begin XCConfigurationList section */
</span><ins>+ 99E9A7F31D70BAD300C247A6 /* Build configuration list for PBXAggregateTarget "Derived Sources" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 99E9A7F41D70BAD300C247A6 /* Debug */,
+ 99E9A7F51D70BAD300C247A6 /* Release */,
+ 99E9A7F61D70BAD300C247A6 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
</ins><span class="cx"> A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-01 Brian Burg <bburg@apple.com>
+
+ Web Inspector: unify Main.html and Test.html sources and generate different copies with the preprocessor
+ https://bugs.webkit.org/show_bug.cgi?id=161212
+ <rdar://problem/28017961>
+
+ Reviewed by Joseph Pecoraro.
+
+ Rearrange CMake rules so that most Inspector UI work is done in WebInspectorUI.
+
+ * PlatformGTK.cmake:
+ - Move the list of Inspector resources into WebInspectorUI/CMakeLists.txt.
+ - Move generation of InspectorGResourceBundle into WebInspectorUI.
+ - Copy over InspectorGResourceBundle.c into WebKit2's Derived Sources before compiling.
+
</ins><span class="cx"> 2016-09-03 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor the heuristic for showing media controls to take all media sessions into account
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -552,7 +552,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_DERIVED_SOURCES
</span><del>- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
</del><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
</span><span class="cx">
</span><span class="lines">@@ -963,42 +962,6 @@
</span><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.h
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(InspectorFiles
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/ESLint/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/Esprima/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Protocol/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Proxies/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Test/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.css
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/Formatter/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
-)
-
-file(GLOB InspectorFilesDependencies
- ${InspectorFiles}
-)
-
-# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
-# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
- COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
-)
-
</del><span class="cx"> # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
</span><span class="cx"> list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
</span><span class="cx"> "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
</span><span class="lines">@@ -1146,22 +1109,6 @@
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
- DEPENDS ${InspectorFilesDependencies}
- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
- COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
- VERBATIM
-)
-
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
- DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
- COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI --sourcedir=${DERIVED_SOURCES_WEBINSPECTORUI_DIR} --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
- VERBATIM
-)
-
-add_custom_command(
</del><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
</span><span class="cx"> DEPENDS ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html
</span><span class="lines">@@ -1189,6 +1136,15 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
+ DEPENDS ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
+ COMMAND cp ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectrGResourceBundle.c
+)
+list(APPEND WebKit2_DERIVED_SOURCES
+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
+)
+
</ins><span class="cx"> file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.xml
</span><span class="cx"> "<?xml version=1.0 encoding=UTF-8?>\n"
</span><span class="cx"> "<gresources>\n"
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFScmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFS.cmake (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFS.cmake 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/cmake/WebKitFS.cmake 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -10,6 +10,9 @@
</span><span class="cx"> if (NOT WEBCORE_DIR)
</span><span class="cx"> set(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
</span><span class="cx"> endif ()
</span><ins>+if (NOT WEBINSPECTORUI_DIR)
+ set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
+endif ()
</ins><span class="cx"> if (NOT WEBKIT_DIR)
</span><span class="cx"> set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
</span><span class="cx"> endif ()
</span><span class="lines">@@ -32,6 +35,7 @@
</span><span class="cx"> set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
</span><span class="cx">
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</ins><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
</span><span class="cx">
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (205414 => 205415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-09-04 00:38:25 UTC (rev 205414)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-09-04 04:34:57 UTC (rev 205415)
</span><span class="lines">@@ -373,3 +373,12 @@
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><span class="cx"> endmacro()
</span><ins>+
+# Converts a CMake list to a string containing elements separated by spaces.
+macro(TO_LIST_WITH_SPACES _in_list _out_string)
+ set(${_out_string} "")
+ foreach (_item ${_in_list})
+ set(${_out_string} "${${_out_string}} ${_item}")
+ endforeach ()
+ string(STRIP "${${_out_string}}" ${_out_string})
+endmacro()
</ins></span></pre>
</div>
</div>
</body>
</html>