<!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>[172980] trunk/Source</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/172980">172980</a></dd>

<dt>Author</dt> <dd>burg@cs.washington.edu</dd>

<dt>Date</dt> <dd>2014-08-26 15:38:36 -0700 (Tue, 26 Aug 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: put feature flags for Inspector domains in the protocol specification

https://bugs.webkit.org/show_bug.cgi?id=136027

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

Remove the hardcoded map of domains to feature guards, and instead parse it from the specification.

Test: inspector/scripts/tests/generate-domains-with-feature-guards.json

* inspector/scripts/codegen/generator.py:

(Generator.wrap_with_guard_for_domain):

* inspector/scripts/codegen/models.py:

(Protocol.parse_domain):

(Domain.__init__):

(Domains):

* inspector/scripts/tests/generate-domains-with-feature-guards.json: Added.

* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:

* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:

* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:

* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:

* inspector/scripts/tests/expected/type-declaration-object-type.json-result:

Source/WebCore:

Add 'featureGuard' settings to wrap domains with ENABLE macros.

No new tests. No behavior was changed.

* inspector/protocol/Database.json:

* inspector/protocol/IndexedDB.json:

* inspector/protocol/Replay.json:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreinspectorprotocolDatabasejson">trunk/Source/WebCore/inspector/protocol/Database.json</a></li>

<li><a href="#trunkSourceWebCoreinspectorprotocolIndexedDBjson">trunk/Source/WebCore/inspector/protocol/IndexedDB.json</a></li>

<li><a href="#trunkSourceWebCoreinspectorprotocolReplayjson">trunk/Source/WebCore/inspector/protocol/Replay.json</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsgeneratedomainswithfeatureguardsjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/generate-domains-with-feature-guards.json</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/ChangeLog        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -1,3 +1,27 @@

</span><ins>+2014-08-26  Brian J. Burg  &lt;burg@cs.washington.edu&gt;

+

+        Web Inspector: put feature flags for Inspector domains in the protocol specification

+        https://bugs.webkit.org/show_bug.cgi?id=136027

+

+        Reviewed by Timothy Hatcher.

+

+        Remove the hardcoded map of domains to feature guards, and instead parse it from the specification.

+

+        Test: inspector/scripts/tests/generate-domains-with-feature-guards.json

+

+        * inspector/scripts/codegen/generator.py:

+        (Generator.wrap_with_guard_for_domain):

+        * inspector/scripts/codegen/models.py:

+        (Protocol.parse_domain):

+        (Domain.__init__):

+        (Domains):

+        * inspector/scripts/tests/generate-domains-with-feature-guards.json: Added.

+        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:

+        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:

+        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:

+        * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:

+        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:

+

</ins><span class="cx"> 2014-08-26  Andy Estes  &lt;aestes@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [Cocoa] Some projects are incorrectly installed to $BUILT_PRODUCTS_DIR

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -47,13 +47,6 @@

</span><span class="cx">     'any': 'Inspector::InspectorValue'

</span><span class="cx"> }

</span><span class="cx"> 

<del>-# FIXME: This should be converted into a property on the domain in JSON.

-_DOMAIN_TO_CPP_GUARD_MAP = {

-    'Database': &quot;ENABLE(SQL_DATABASE)&quot;,

-    'IndexedDB': &quot;ENABLE(INDEXED_DATABASE)&quot;,

-    'Replay': &quot;ENABLE(WEB_REPLAY)&quot;,

-}

-

</del><span class="cx"> _ALWAYS_UPPERCASED_ENUM_VALUE_SUBSTRINGS = set(['API', 'CSS', 'DOM', 'HTML', 'XHR', 'XML'])

</span><span class="cx"> 

<span class="cx"> # These objects are built manually by creating and setting InspectorValues.

</span><span class="lines">@@ -209,7 +202,7 @@

<span class="cx">     # Miscellaneous text manipulation routines.

</span><span class="cx">     @staticmethod

</span><span class="cx">     def wrap_with_guard_for_domain(domain, text):

</span><del>-        guard = _DOMAIN_TO_CPP_GUARD_MAP.get(domain.domain_name)

</del><ins>+        guard = domain.feature_guard

</ins><span class="cx">         if guard is not None:

</span><span class="cx">             lines = [

</span><span class="cx">                 '#if %s' % guard,

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -318,7 +318,7 @@

</span><span class="cx">                 raise ParseException(&quot;Malformed domain specification: events is not an array&quot;)

</span><span class="cx">             events.extend([self.parse_event(event) for event in json['events']])

</span><span class="cx"> 

</span><del>-        self.domains.append(Domain(json['domain'], json.get('description', &quot;&quot;), isSupplemental, types, commands, events))

</del><ins>+        self.domains.append(Domain(json['domain'], json.get('description', &quot;&quot;), json.get(&quot;featureGuard&quot;), isSupplemental, types, commands, events))

</ins><span class="cx"> 

</span><span class="cx">     def parse_type_declaration(self, json):

</span><span class="cx">         check_for_required_properties(['id', 'type'], json, &quot;type&quot;)

</span><span class="lines">@@ -469,9 +469,10 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> class Domain:

</span><del>-    def __init__(self, domain_name, description, isSupplemental, type_declarations, commands, events):

</del><ins>+    def __init__(self, domain_name, description, feature_guard, isSupplemental, type_declarations, commands, events):

</ins><span class="cx">         self.domain_name = domain_name

</span><span class="cx">         self.description = description

</span><ins>+        self.feature_guard = feature_guard

</ins><span class="cx">         self.is_supplemental = isSupplemental

</span><span class="cx">         self.type_declarations = type_declarations

</span><span class="cx">         self.commands = commands

</span><span class="lines">@@ -492,7 +493,7 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> class Domains:

</span><del>-    GLOBAL = Domain(&quot;&quot;, &quot;The global domain, in which primitive types are implicitly declared.&quot;, True, [], [], [])

</del><ins>+    GLOBAL = Domain(&quot;&quot;, &quot;The global domain, in which primitive types are implicitly declared.&quot;, None, True, [], [], [])

</ins><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> class TypeDeclaration:

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -83,7 +83,6 @@

</span><span class="cx"> 

</span><span class="cx"> typedef String ErrorString;

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> class InspectorDatabaseBackendDispatcherHandler {

</span><span class="cx"> public:

<span class="cx">     // Named after parameter 'screenColor' while generating command/event executeSQLSyncOptionalReturnValues.

</span><span class="lines">@@ -116,9 +115,7 @@

</span><span class="cx"> protected:

</span><span class="cx">     virtual ~InspectorDatabaseBackendDispatcherHandler();

</span><span class="cx"> };

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> class InspectorDatabaseBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {

</span><span class="cx"> public:

</span><span class="cx">     static PassRefPtr&lt;InspectorDatabaseBackendDispatcher&gt; create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);

</span><span class="lines">@@ -132,7 +129,6 @@

</span><span class="cx">     InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);

</span><span class="cx">     InspectorDatabaseBackendDispatcherHandler* m_agent;

</span><span class="cx"> };

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><span class="lines">@@ -183,11 +179,8 @@

</span><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> InspectorDatabaseBackendDispatcherHandler::~InspectorDatabaseBackendDispatcherHandler() { }

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> PassRefPtr&lt;InspectorDatabaseBackendDispatcher&gt; InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)

</span><span class="cx"> {

</span><span class="cx">     return adoptRef(new InspectorDatabaseBackendDispatcher(backendDispatcher, agent));

</span><span class="lines">@@ -401,7 +394,6 @@

</span><span class="cx">         return;

</span><span class="cx">     }

</span><span class="cx"> }

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><span class="lines">@@ -556,22 +548,18 @@

</span><span class="cx"> namespace Protocol {

</span><span class="cx"> 

<span class="cx"> // Forward declarations.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> class Error;

</span><span class="cx"> enum class PrimaryColors;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> // End of forward declarations.

</span><span class="cx"> 

</span><span class="cx"> 

<span class="cx"> // Typedefs.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /* Unique identifier of Database object. */

</span><span class="cx"> typedef int DatabaseId;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> // End of typedefs.

</span><span class="cx"> 

</span><span class="cx"> String getTestEnumConstantValue(int code);

</span><span class="lines">@@ -581,7 +569,6 @@

</span><span class="cx">     return getTestEnumConstantValue(static_cast&lt;int&gt;(enumValue));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /*  */

</span><span class="cx"> enum class PrimaryColors {

</span><span class="lines">@@ -658,7 +645,6 @@

</span><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -80,7 +80,6 @@

</span><span class="cx"> 

</span><span class="cx"> typedef String ErrorString;

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> class InspectorDatabaseBackendDispatcherHandler {

</span><span class="cx"> public:

<span class="cx">     // Named after parameter 'screenColor' while generating command/event executeAllOptionalParameters.

</span><span class="lines">@@ -101,9 +100,7 @@

</span><span class="cx"> protected:

</span><span class="cx">     virtual ~InspectorDatabaseBackendDispatcherHandler();

</span><span class="cx"> };

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> class InspectorDatabaseBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {

</span><span class="cx"> public:

</span><span class="cx">     static PassRefPtr&lt;InspectorDatabaseBackendDispatcher&gt; create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);

</span><span class="lines">@@ -115,7 +112,6 @@

</span><span class="cx">     InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);

</span><span class="cx">     InspectorDatabaseBackendDispatcherHandler* m_agent;

</span><span class="cx"> };

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><span class="lines">@@ -166,11 +162,8 @@

</span><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> InspectorDatabaseBackendDispatcherHandler::~InspectorDatabaseBackendDispatcherHandler() { }

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> PassRefPtr&lt;InspectorDatabaseBackendDispatcher&gt; InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)

</span><span class="cx"> {

</span><span class="cx">     return adoptRef(new InspectorDatabaseBackendDispatcher(backendDispatcher, agent));

</span><span class="lines">@@ -308,7 +301,6 @@

</span><span class="cx">     }

</span><span class="cx">     m_backendDispatcher-&gt;sendResponse(callId, result.release(), error);

</span><span class="cx"> }

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><span class="lines">@@ -463,22 +455,18 @@

</span><span class="cx"> namespace Protocol {

</span><span class="cx"> 

<span class="cx"> // Forward declarations.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> class Error;

</span><span class="cx"> enum class PrimaryColors;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> // End of forward declarations.

</span><span class="cx"> 

</span><span class="cx"> 

<span class="cx"> // Typedefs.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /* Unique identifier of Database object. */

</span><span class="cx"> typedef int DatabaseId;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> // End of typedefs.

</span><span class="cx"> 

</span><span class="cx"> String getTestEnumConstantValue(int code);

</span><span class="lines">@@ -488,7 +476,6 @@

</span><span class="cx">     return getTestEnumConstantValue(static_cast&lt;int&gt;(enumValue));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /*  */

</span><span class="cx"> enum class PrimaryColors {

</span><span class="lines">@@ -565,7 +552,6 @@

</span><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -183,7 +183,6 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> class InspectorDatabaseFrontendDispatcher {

</span><span class="cx"> public:

</span><span class="cx">     InspectorDatabaseFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }

</span><span class="lines">@@ -192,7 +191,6 @@

</span><span class="cx"> private:

</span><span class="cx">     InspectorFrontendChannel* m_inspectorFrontendChannel;

</span><span class="cx"> };

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><span class="lines">@@ -241,7 +239,6 @@

</span><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(PassRefPtr&lt;Inspector::Protocol::Array&lt;String&gt;&gt; columnNames, const String* const notes, const double* const timestamp, PassRefPtr&lt;Inspector::InspectorObject&gt; values, PassRefPtr&lt;Inspector::InspectorValue&gt; payload, PassRefPtr&lt;Inspector::Protocol::Database::Error&gt; sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor)

</span><span class="cx"> {

</span><span class="cx">     RefPtr&lt;InspectorObject&gt; jsonMessage = InspectorObject::create();

</span><span class="lines">@@ -285,7 +282,6 @@

</span><span class="cx"> 

</span><span class="cx">     m_inspectorFrontendChannel-&gt;sendMessageToFrontend(jsonMessage-&gt;toJSONString());

</span><span class="cx"> }

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><span class="lines">@@ -341,23 +337,19 @@

</span><span class="cx"> namespace Protocol {

</span><span class="cx"> 

<span class="cx"> // Forward declarations.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> class Error;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> // End of forward declarations.

</span><span class="cx"> 

</span><span class="cx"> 

<span class="cx"> // Typedefs.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /* Unique identifier of Database object. */

</span><span class="cx"> typedef String DatabaseId;

</span><span class="cx"> 

</span><span class="cx"> typedef String PrimaryColors;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> // End of typedefs.

</span><span class="cx"> 

</span><span class="cx"> String getTestEnumConstantValue(int code);

</span><span class="lines">@@ -367,7 +359,6 @@

</span><span class="cx">     return getTestEnumConstantValue(static_cast&lt;int&gt;(enumValue));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /* Database error. */

</span><span class="cx"> class Error : public Inspector::InspectorObjectBase {

</span><span class="lines">@@ -438,7 +429,6 @@

</span><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresultfromrev172979trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>

<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (from rev 172979, trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result) (0 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result                                (rev 0)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -0,0 +1,523 @@

</span><ins>+### Begin File: InspectorTestBackendCommands.js

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+// Network1.

+InspectorBackend.registerCommand(&quot;Network1.loadResource&quot;, [], []);

+

+// Network3.

+InspectorBackend.registerNetwork3Dispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, &quot;Network3&quot;);

+InspectorBackend.registerEvent(&quot;Network3.resourceLoaded&quot;, []);

+### End File: InspectorTestBackendCommands.js

+

+### Begin File: InspectorTestBackendDispatchers.h

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#ifndef InspectorTestBackendDispatchers_h

+#define InspectorTestBackendDispatchers_h

+

+#if ENABLE(INSPECTOR)

+

+#include &quot;InspectorTestProtocolTypes.h&quot;

+#include &lt;inspector/InspectorBackendDispatcher.h&gt;

+#include &lt;wtf/PassRefPtr.h&gt;

+#include &lt;wtf/text/WTFString.h&gt;

+

+namespace Inspector {

+

+typedef String ErrorString;

+

+#if PLATFORM(WEB_COMMANDS)

+class InspectorNetwork1BackendDispatcherHandler {

+public:

+    virtual void loadResource(ErrorString*) = 0;

+protected:

+    virtual ~InspectorNetwork1BackendDispatcherHandler();

+};

+#endif // PLATFORM(WEB_COMMANDS)

+

+#if PLATFORM(WEB_COMMANDS)

+class InspectorNetwork1BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {

+public:

+    static PassRefPtr&lt;InspectorNetwork1BackendDispatcher&gt; create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);

+    virtual void dispatch(long callId, const String&amp; method, PassRefPtr&lt;Inspector::InspectorObject&gt; message) override;

+private:

+    void loadResource(long callId, const Inspector::InspectorObject&amp; message);

+private:

+    InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);

+    InspectorNetwork1BackendDispatcherHandler* m_agent;

+};

+#endif // PLATFORM(WEB_COMMANDS)

+

+} // namespace Inspector

+

+#endif // ENABLE(INSPECTOR)

+

+#endif // !defined(InspectorTestBackendDispatchers_h)

+### End File: InspectorTestBackendDispatchers.h

+

+### Begin File: InspectorTestBackendDispatchers.cpp

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#include &quot;config.h&quot;

+#include &quot;InspectorTestBackendDispatchers.h&quot;

+

+#if ENABLE(INSPECTOR)

+

+#include &lt;inspector/InspectorFrontendChannel.h&gt;

+#include &lt;inspector/InspectorValues.h&gt;

+#include &lt;wtf/text/CString.h&gt;

+

+namespace Inspector {

+

+#if PLATFORM(WEB_COMMANDS)

+InspectorNetwork1BackendDispatcherHandler::~InspectorNetwork1BackendDispatcherHandler() { }

+#endif // PLATFORM(WEB_COMMANDS)

+

+#if PLATFORM(WEB_COMMANDS)

+PassRefPtr&lt;InspectorNetwork1BackendDispatcher&gt; InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)

+{

+    return adoptRef(new InspectorNetwork1BackendDispatcher(backendDispatcher, agent));

+}

+

+InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)

+    : InspectorSupplementalBackendDispatcher(backendDispatcher)

+    , m_agent(agent)

+{

+    m_backendDispatcher-&gt;registerDispatcherForDomain(ASCIILiteral(&quot;Network1&quot;), this);

+}

+

+void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String&amp; method, PassRefPtr&lt;InspectorObject&gt; message)

+{

+    Ref&lt;InspectorNetwork1BackendDispatcher&gt; protect(*this);

+

+    if (method == &quot;loadResource&quot;)

+        loadResource(callId, *message.get());

+    else

+        m_backendDispatcher-&gt;reportProtocolError(&amp;callId, InspectorBackendDispatcher::MethodNotFound, String(&quot;'&quot;) + &quot;Network1&quot; + '.' + method + &quot;' was not found&quot;);

+}

+

+void InspectorNetwork1BackendDispatcher::loadResource(long callId, const InspectorObject&amp;)

+{

+    ErrorString error;

+    RefPtr&lt;InspectorObject&gt; result = InspectorObject::create();

+    m_agent-&gt;loadResource(&amp;error);

+

+    m_backendDispatcher-&gt;sendResponse(callId, result.release(), error);

+}

+#endif // PLATFORM(WEB_COMMANDS)

+

+} // namespace Inspector

+

+#endif // ENABLE(INSPECTOR)

+

+### End File: InspectorTestBackendDispatchers.cpp

+

+### Begin File: InspectorTestFrontendDispatchers.h

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#ifndef InspectorTestFrontendDispatchers_h

+#define InspectorTestFrontendDispatchers_h

+

+#if ENABLE(INSPECTOR)

+

+#include &quot;InspectorTestProtocolTypes.h&quot;

+#include &lt;inspector/InspectorFrontendChannel.h&gt;

+#include &lt;inspector/InspectorValues.h&gt;

+#include &lt;wtf/PassRefPtr.h&gt;

+#include &lt;wtf/text/WTFString.h&gt;

+

+namespace Inspector {

+

+

+

+#if PLATFORM(WEB_EVENTS)

+class InspectorNetwork3FrontendDispatcher {

+public:

+    InspectorNetwork3FrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }

+    void resourceLoaded();

+private:

+    InspectorFrontendChannel* m_inspectorFrontendChannel;

+};

+#endif // PLATFORM(WEB_EVENTS)

+

+} // namespace Inspector

+

+#endif // ENABLE(INSPECTOR)

+

+#endif // !defined(InspectorTestFrontendDispatchers_h)

+### End File: InspectorTestFrontendDispatchers.h

+

+### Begin File: InspectorTestFrontendDispatchers.cpp

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#include &quot;config.h&quot;

+#include &quot;InspectorTestFrontendDispatchers.h&quot;

+

+#if ENABLE(INSPECTOR)

+

+#include &lt;wtf/text/CString.h&gt;

+

+namespace Inspector {

+

+#if PLATFORM(WEB_EVENTS)

+void InspectorNetwork3FrontendDispatcher::resourceLoaded()

+{

+    RefPtr&lt;InspectorObject&gt; jsonMessage = InspectorObject::create();

+    jsonMessage-&gt;setString(ASCIILiteral(&quot;method&quot;), ASCIILiteral(&quot;Network3.resourceLoaded&quot;));

+

+    m_inspectorFrontendChannel-&gt;sendMessageToFrontend(jsonMessage-&gt;toJSONString());

+}

+#endif // PLATFORM(WEB_EVENTS)

+

+} // namespace Inspector

+

+#endif // ENABLE(INSPECTOR)

+

+### End File: InspectorTestFrontendDispatchers.cpp

+

+### Begin File: InspectorTestProtocolTypes.h

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#ifndef InspectorTestProtocolTypes_h

+#define InspectorTestProtocolTypes_h

+

+#if ENABLE(INSPECTOR)

+

+#include &lt;inspector/InspectorJSProtocolTypes.h&gt;

+#include &lt;inspector/InspectorProtocolTypes.h&gt;

+#include &lt;wtf/Assertions.h&gt;

+#include &lt;wtf/PassRefPtr.h&gt;

+

+namespace Inspector {

+

+

+

+namespace Protocol {

+

+// Forward declarations.

+#if PLATFORM(WEB_TYPES)

+namespace Network2 {

+class NetworkError;

+} // Network2

+#endif // PLATFORM(WEB_TYPES)

+// End of forward declarations.

+

+

+

+

+String getTestEnumConstantValue(int code);

+

+template&lt;typename T&gt; String getTestEnumConstantValue(T enumValue)

+{

+    return getTestEnumConstantValue(static_cast&lt;int&gt;(enumValue));

+}

+

+#if PLATFORM(WEB_TYPES)

+namespace Network2 {

+class NetworkError : public Inspector::InspectorObjectBase {

+public:

+    enum {

+        NoFieldsSet = 0,

+        MessageSet = 1 &lt;&lt; 0,

+        CodeSet = 1 &lt;&lt; 1,

+        AllFieldsSet = (MessageSet | CodeSet)

+    };

+

+    template&lt;int STATE&gt;

+    class Builder {

+    private:

+        RefPtr&lt;Inspector::InspectorObject&gt; m_result;

+

+        template&lt;int STEP&gt; Builder&lt;STATE | STEP&gt;&amp; castState()

+        {

+            return *reinterpret_cast&lt;Builder&lt;STATE | STEP&gt;*&gt;(this);

+        }

+

+        Builder(PassRefPtr&lt;/*NetworkError*/Inspector::InspectorObject&gt; ptr)

+        {

+            COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);

+            m_result = ptr;

+        }

+        friend class NetworkError;

+    public:

+

+        Builder&lt;STATE | MessageSet&gt;&amp; setMessage(const String&amp; value)

+        {

+            COMPILE_ASSERT(!(STATE &amp; MessageSet), property_message_already_set);

+            m_result-&gt;setString(ASCIILiteral(&quot;message&quot;), value);

+            return castState&lt;MessageSet&gt;();

+        }

+

+        Builder&lt;STATE | CodeSet&gt;&amp; setCode(int value)

+        {

+            COMPILE_ASSERT(!(STATE &amp; CodeSet), property_code_already_set);

+            m_result-&gt;setNumber(ASCIILiteral(&quot;code&quot;), value);

+            return castState&lt;CodeSet&gt;();

+        }

+

+        operator RefPtr&lt;NetworkError&gt;&amp; ()

+        {

+            COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);

+            COMPILE_ASSERT(sizeof(NetworkError) == sizeof(Inspector::InspectorObject), cannot_cast);

+            return *reinterpret_cast&lt;RefPtr&lt;NetworkError&gt;*&gt;(&amp;m_result);

+        }

+

+        PassRefPtr&lt;NetworkError&gt; release()

+        {

+            return RefPtr&lt;NetworkError&gt;(*this).release();

+        }

+    };

+

+    /*

+     * Synthetic constructor:

+     * RefPtr&lt;NetworkError&gt; result = NetworkError::create()

+     *     .setMessage(...)

+     *     .setCode(...);

+     */

+    static Builder&lt;NoFieldsSet&gt; create()

+    {

+        return Builder&lt;NoFieldsSet&gt;(Inspector::InspectorObject::create());

+    }

+    typedef Inspector::Protocol::StructItemTraits ItemTraits;

+};

+

+} // Network2

+#endif // PLATFORM(WEB_TYPES)

+

+

+

+} // namespace Protocol

+

+} // namespace Inspector

+

+#endif // ENABLE(INSPECTOR)

+

+#endif // !defined(InspectorTestProtocolTypes_h)

+### End File: InspectorTestProtocolTypes.h

+

+### Begin File: InspectorTestProtocolTypes.cpp

+/*

+ * Copyright (C) 2013 Google Inc. All rights reserved.

+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

+ * Copyright (C) 2014 University of Washington. 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.

+ */

+

+// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json

+// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

+

+#include &quot;config.h&quot;

+#include &quot;InspectorTestProtocolTypes.h&quot;

+

+#if ENABLE(INSPECTOR)

+

+#include &lt;wtf/text/CString.h&gt;

+

+namespace Inspector {

+

+namespace Protocol {

+

+static const char* const enum_constant_values[] = {

+};

+

+String getTestEnumConstantValue(int code) {

+    return enum_constant_values[code];

+}

+

+

+

+} // namespace Protocol

+

+} // namespace Inspector

+

+#endif // ENABLE(INSPECTOR)

+

+### End File: InspectorTestProtocolTypes.cpp

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -279,7 +279,6 @@

</span><span class="cx"> namespace Protocol {

</span><span class="cx"> 

<span class="cx"> // Forward declarations.

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> class DummyObject;

</span><span class="cx"> class Error;

</span><span class="lines">@@ -287,7 +286,6 @@

</span><span class="cx"> class OptionalParameterBundle;

</span><span class="cx"> class ParameterBundle;

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> namespace Test {

</span><span class="cx"> class ParameterBundle;

</span><span class="lines">@@ -304,7 +302,6 @@

</span><span class="cx">     return getTestEnumConstantValue(static_cast&lt;int&gt;(enumValue));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-#if ENABLE(SQL_DATABASE)

</del><span class="cx"> namespace Database {

</span><span class="cx"> /* Database error. */

</span><span class="cx"> class Error : public Inspector::InspectorObjectBase {

</span><span class="lines">@@ -652,7 +649,6 @@

</span><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // Database

</span><del>-#endif // ENABLE(SQL_DATABASE)

</del><span class="cx"> 

</span><span class="cx"> namespace Test {

</span><span class="cx"> class ParameterBundle : public Inspector::InspectorObjectBase {

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsgeneratedomainswithfeatureguardsjson"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/generate-domains-with-feature-guards.json (0 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/generate-domains-with-feature-guards.json                                (rev 0)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/generate-domains-with-feature-guards.json        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -0,0 +1,36 @@

</span><ins>+[

+{

+    &quot;domain&quot;: &quot;Network1&quot;,

+    &quot;featureGuard&quot;: &quot;PLATFORM(WEB_COMMANDS)&quot;,

+    &quot;commands&quot;: [

+        {

+            &quot;name&quot;: &quot;loadResource&quot;,

+            &quot;description&quot;: &quot;Loads a resource in the context of a frame on the inspected page without cross origin checks.&quot;

+        }

+    ]

+},

+{

+    &quot;domain&quot;: &quot;Network2&quot;,

+    &quot;featureGuard&quot;: &quot;PLATFORM(WEB_TYPES)&quot;,

+    &quot;types&quot;: [

+        {

+            &quot;id&quot;: &quot;NetworkError&quot;,

+            &quot;type&quot;: &quot;object&quot;,

+            &quot;properties&quot;: [

+                { &quot;name&quot;: &quot;message&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;Error message.&quot; },

+                { &quot;name&quot;: &quot;code&quot;, &quot;type&quot;: &quot;integer&quot;, &quot;description&quot;: &quot;Error code.&quot; }

+            ]

+        }

+    ]

+},

+{

+    &quot;domain&quot;: &quot;Network3&quot;,

+    &quot;featureGuard&quot;: &quot;PLATFORM(WEB_EVENTS)&quot;,

+    &quot;events&quot;: [

+        {

+            &quot;name&quot;: &quot;resourceLoaded&quot;,

+            &quot;description&quot;: &quot;A resource was loaded.&quot;

+        }

+    ]

+}

+]

</ins></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/WebCore/ChangeLog        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -1,3 +1,18 @@

</span><ins>+2014-08-26  Brian J. Burg  &lt;burg@cs.washington.edu&gt;

+

+        Web Inspector: put feature flags for Inspector domains in the protocol specification

+        https://bugs.webkit.org/show_bug.cgi?id=136027

+

+        Reviewed by Timothy Hatcher.

+

+        Add 'featureGuard' settings to wrap domains with ENABLE macros.

+

+        No new tests. No behavior was changed.

+

+        * inspector/protocol/Database.json:

+        * inspector/protocol/IndexedDB.json:

+        * inspector/protocol/Replay.json:

+

</ins><span class="cx"> 2014-08-26  Andy Estes  &lt;aestes@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [Cocoa] Some projects are incorrectly installed to $BUILT_PRODUCTS_DIR

</span></span></pre></div>

<a id="trunkSourceWebCoreinspectorprotocolDatabasejson"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Database.json (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/inspector/protocol/Database.json        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/WebCore/inspector/protocol/Database.json        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -1,5 +1,6 @@

</span><span class="cx"> {

</span><span class="cx">     &quot;domain&quot;: &quot;Database&quot;,

</span><ins>+    &quot;featureGuard&quot;: &quot;ENABLE(SQL_DATABASE)&quot;,

</ins><span class="cx">     &quot;types&quot;: [

</span><span class="cx">         {

</span><span class="cx">             &quot;id&quot;: &quot;DatabaseId&quot;,

</span></span></pre></div>

<a id="trunkSourceWebCoreinspectorprotocolIndexedDBjson"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/IndexedDB.json (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/inspector/protocol/IndexedDB.json        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/WebCore/inspector/protocol/IndexedDB.json        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -1,5 +1,6 @@

</span><span class="cx"> {

</span><span class="cx">     &quot;domain&quot;: &quot;IndexedDB&quot;,

</span><ins>+    &quot;featureGuard&quot;: &quot;ENABLE(INDEXED_DATABASE)&quot;,

</ins><span class="cx">     &quot;types&quot;: [

</span><span class="cx">         {

</span><span class="cx">             &quot;id&quot;: &quot;DatabaseWithObjectStores&quot;,

</span></span></pre></div>

<a id="trunkSourceWebCoreinspectorprotocolReplayjson"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Replay.json (172979 => 172980)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/inspector/protocol/Replay.json        2014-08-26 22:36:19 UTC (rev 172979)

+++ trunk/Source/WebCore/inspector/protocol/Replay.json        2014-08-26 22:38:36 UTC (rev 172980)

</span><span class="lines">@@ -1,6 +1,7 @@

</span><span class="cx"> {

</span><span class="cx">     &quot;domain&quot;: &quot;Replay&quot;,

</span><span class="cx">     &quot;description&quot;: &quot;Controls web replay, and manages recording sessions and segments.&quot;,

</span><ins>+    &quot;featureGuard&quot;: &quot;ENABLE(WEB_REPLAY)&quot;,

</ins><span class="cx">     &quot;types&quot;: [

</span><span class="cx">         {

</span><span class="cx">             &quot;id&quot;: &quot;SessionIdentifier&quot;, &quot;description&quot;: &quot;Unique replay session identifier.&quot;,

</span></span></pre>

</div>

</div>

</body>

</html>