<!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>[197658] trunk/Source/JavaScriptCore</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/197658">197658</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-03-06 19:52:19 -0800 (Sun, 06 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: the protocol generator should have separate prefix options for Objective-C classes and filenames
https://bugs.webkit.org/show_bug.cgi?id=155101
<rdar://problem/25000053>
Reviewed by Timothy Hatcher.
It should be possible to generate Objective-C protocol types without prefixing all class names.
The prefixes are only necessary when the generated files are part of a framework, but this isn't
how the generated Objective-C frontend files are used.
Add a separate framework setting and switch over code to use the 'protocol_group' in filenames,
and the 'objc_prefix' for Objective-C enum and class prefixes.
No tests need to be rebaselined because tests always set the protocol_group and objc_prefix
to the same value.
* inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py:
(ObjCBackendDispatcherHeaderGenerator.output_filename):
* inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py:
(ObjCConfigurationImplementationGenerator.output_filename):
(ObjCConfigurationImplementationGenerator.generate_output):
* inspector/scripts/codegen/generate_objc_configuration_header.py:
(ObjCConfigurationHeaderGenerator.output_filename):
(ObjCConfigurationHeaderGenerator.generate_output):
(ObjCConfigurationHeaderGenerator._generate_configuration_interface_for_domains):
* inspector/scripts/codegen/generate_objc_configuration_implementation.py:
(ObjCBackendDispatcherImplementationGenerator.output_filename):
(ObjCBackendDispatcherImplementationGenerator.generate_output):
(ObjCBackendDispatcherImplementationGenerator._generate_configuration_implementation_for_domains):
* inspector/scripts/codegen/generate_objc_conversion_helpers.py:
(ObjCConversionHelpersGenerator.output_filename):
* inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
(ObjCFrontendDispatcherImplementationGenerator.output_filename):
(ObjCFrontendDispatcherImplementationGenerator.generate_output):
* inspector/scripts/codegen/generate_objc_header.py:
(ObjCHeaderGenerator.output_filename):
* inspector/scripts/codegen/generate_objc_internal_header.py:
(ObjCInternalHeaderGenerator.output_filename):
(ObjCInternalHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
(ObjCProtocolTypesImplementationGenerator.output_filename):
(ObjCProtocolTypesImplementationGenerator.generate_output):
* inspector/scripts/codegen/models.py:
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator):
(ObjCGenerator.protocol_name):
(ObjCGenerator.objc_prefix):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_conversion_helperspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_internal_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -1,5 +1,55 @@
</span><span class="cx"> 2016-03-06 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: the protocol generator should have separate prefix options for Objective-C classes and filenames
+ https://bugs.webkit.org/show_bug.cgi?id=155101
+ <rdar://problem/25000053>
+
+ Reviewed by Timothy Hatcher.
+
+ It should be possible to generate Objective-C protocol types without prefixing all class names.
+ The prefixes are only necessary when the generated files are part of a framework, but this isn't
+ how the generated Objective-C frontend files are used.
+
+ Add a separate framework setting and switch over code to use the 'protocol_group' in filenames,
+ and the 'objc_prefix' for Objective-C enum and class prefixes.
+
+ No tests need to be rebaselined because tests always set the protocol_group and objc_prefix
+ to the same value.
+
+ * inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py:
+ (ObjCBackendDispatcherHeaderGenerator.output_filename):
+ * inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py:
+ (ObjCConfigurationImplementationGenerator.output_filename):
+ (ObjCConfigurationImplementationGenerator.generate_output):
+ * inspector/scripts/codegen/generate_objc_configuration_header.py:
+ (ObjCConfigurationHeaderGenerator.output_filename):
+ (ObjCConfigurationHeaderGenerator.generate_output):
+ (ObjCConfigurationHeaderGenerator._generate_configuration_interface_for_domains):
+ * inspector/scripts/codegen/generate_objc_configuration_implementation.py:
+ (ObjCBackendDispatcherImplementationGenerator.output_filename):
+ (ObjCBackendDispatcherImplementationGenerator.generate_output):
+ (ObjCBackendDispatcherImplementationGenerator._generate_configuration_implementation_for_domains):
+ * inspector/scripts/codegen/generate_objc_conversion_helpers.py:
+ (ObjCConversionHelpersGenerator.output_filename):
+ * inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
+ (ObjCFrontendDispatcherImplementationGenerator.output_filename):
+ (ObjCFrontendDispatcherImplementationGenerator.generate_output):
+ * inspector/scripts/codegen/generate_objc_header.py:
+ (ObjCHeaderGenerator.output_filename):
+ * inspector/scripts/codegen/generate_objc_internal_header.py:
+ (ObjCInternalHeaderGenerator.output_filename):
+ (ObjCInternalHeaderGenerator.generate_output):
+ * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+ (ObjCProtocolTypesImplementationGenerator.output_filename):
+ (ObjCProtocolTypesImplementationGenerator.generate_output):
+ * inspector/scripts/codegen/models.py:
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator):
+ (ObjCGenerator.protocol_name):
+ (ObjCGenerator.objc_prefix):
+
+2016-03-06 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Unreviewed, rebaseline inspector protocol generator tests after r197563.
</span><span class="cx">
</span><span class="cx"> * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sBackendDispatchers.h' % self.objc_prefix()
</del><ins>+ return '%sBackendDispatchers.h' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def domains_to_generate(self):
</span><span class="cx"> return filter(ObjCGenerator.should_generate_domain_command_handler_filter(self.model()), Generator.domains_to_generate(self))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -44,20 +44,20 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sBackendDispatchers.mm' % self.objc_prefix()
</del><ins>+ return '%sBackendDispatchers.mm' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def domains_to_generate(self):
</span><span class="cx"> return filter(ObjCGenerator.should_generate_domain_command_handler_filter(self.model()), Generator.domains_to_generate(self))
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><del>- '"%sInternal.h"' % self.objc_prefix(),
- '"%sEnumConversionHelpers.h"' % self.objc_prefix(),
</del><ins>+ '"%sInternal.h"' % self.protocol_name(),
+ '"%sEnumConversionHelpers.h"' % self.protocol_name(),
</ins><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><del>- 'primaryInclude': '"%sBackendDispatchers.h"' % self.objc_prefix(),
</del><ins>+ 'primaryInclude': '"%sBackendDispatchers.h"' % self.protocol_name(),
</ins><span class="cx"> 'secondaryIncludes': '\n'.join(['#include %s' % header for header in secondary_headers]),
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sConfiguration.h' % self.objc_prefix()
</del><ins>+ return '%sConfiguration.h' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = [
</span><del>- '<WebInspector/%s.h>' % self.objc_prefix(),
</del><ins>+ '<WebInspector/%s.h>' % self.protocol_name(),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> def _generate_configuration_interface_for_domains(self, domains):
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append('__attribute__((visibility ("default")))')
</span><del>- lines.append('@interface %sConfiguration : NSObject' % self.objc_prefix())
</del><ins>+ lines.append('@interface %sConfiguration : NSObject' % self.protocol_name())
</ins><span class="cx"> for domain in domains:
</span><span class="cx"> lines.extend(self._generate_properties_for_domain(domain))
</span><span class="cx"> lines.append('@end')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sConfiguration.mm' % self.objc_prefix()
</del><ins>+ return '%sConfiguration.mm' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><del>- '"%sInternal.h"' % self.objc_prefix(),
- '"%sBackendDispatchers.h"' % self.objc_prefix(),
</del><ins>+ '"%sInternal.h"' % self.protocol_name(),
+ '"%sBackendDispatchers.h"' % self.protocol_name(),
</ins><span class="cx"> '<JavaScriptCore/AlternateDispatchableAgent.h>',
</span><span class="cx"> '<JavaScriptCore/AugmentableInspectorController.h>',
</span><span class="cx"> '<JavaScriptCore/InspectorAlternateBackendDispatchers.h>',
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><del>- 'primaryInclude': '"%sConfiguration.h"' % self.objc_prefix(),
</del><ins>+ 'primaryInclude': '"%sConfiguration.h"' % self.protocol_name(),
</ins><span class="cx"> 'secondaryIncludes': '\n'.join(['#import %s' % header for header in secondary_headers]),
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> def _generate_configuration_implementation_for_domains(self, domains):
</span><span class="cx"> lines = []
</span><del>- lines.append('@implementation %sConfiguration' % self.objc_prefix())
</del><ins>+ lines.append('@implementation %sConfiguration' % self.protocol_name())
</ins><span class="cx"> lines.append('{')
</span><span class="cx"> lines.append(' AugmentableInspectorController* _controller;')
</span><span class="cx"> lines.extend(self._generate_ivars(domains))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_conversion_helperspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_conversion_helpers.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sEnumConversionHelpers.h' % self.objc_prefix()
</del><ins>+ return '%sEnumConversionHelpers.h' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def domains_to_generate(self):
</span><span class="cx"> return filter(ObjCGenerator.should_generate_domain_types_filter(self.model()), Generator.domains_to_generate(self))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -42,19 +42,19 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sEventDispatchers.mm' % self.objc_prefix()
</del><ins>+ return '%sEventDispatchers.mm' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def domains_to_generate(self):
</span><span class="cx"> return filter(ObjCGenerator.should_generate_domain_event_dispatcher_filter(self.model()), Generator.domains_to_generate(self))
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><del>- '"%sEnumConversionHelpers.h"' % self.objc_prefix(),
</del><ins>+ '"%sEnumConversionHelpers.h"' % self.protocol_name(),
</ins><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><del>- 'primaryInclude': '"%sInternal.h"' % self.objc_prefix(),
</del><ins>+ 'primaryInclude': '"%sInternal.h"' % self.protocol_name(),
</ins><span class="cx"> 'secondaryIncludes': '\n'.join(['#import %s' % header for header in secondary_headers]),
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%s.h' % self.objc_prefix()
</del><ins>+ return '%s.h' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = set([
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_internal_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sInternal.h' % self.objc_prefix()
</del><ins>+ return '%sInternal.h' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = set([
</span><del>- '"%s.h"' % self.objc_prefix(),
- '"%sJSONObjectPrivate.h"' % self.objc_prefix(),
</del><ins>+ '"%s.h"' % self.protocol_name(),
+ '"%sJSONObjectPrivate.h"' % self.protocol_name(),
</ins><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> '<JavaScriptCore/AugmentableInspectorController.h>',
</span><span class="cx"> ])
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -48,21 +48,21 @@
</span><span class="cx"> ObjCGenerator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><span class="cx"> def output_filename(self):
</span><del>- return '%sTypes.mm' % self.objc_prefix()
</del><ins>+ return '%sTypes.mm' % self.protocol_name()
</ins><span class="cx">
</span><span class="cx"> def domains_to_generate(self):
</span><span class="cx"> return filter(ObjCGenerator.should_generate_domain_types_filter(self.model()), Generator.domains_to_generate(self))
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><del>- '"%sEnumConversionHelpers.h"' % self.objc_prefix(),
</del><ins>+ '"%sEnumConversionHelpers.h"' % self.protocol_name(),
</ins><span class="cx"> Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
</span><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> '<wtf/Assertions.h>',
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> # The FooProtocolInternal.h header is only needed to declare the backend-side event dispatcher bindings.
</span><del>- primaryIncludeName = self.objc_prefix()
</del><ins>+ primaryIncludeName = self.protocol_name()
</ins><span class="cx"> if self.get_generator_setting('generate_backend', False):
</span><span class="cx"> primaryIncludeName += 'Internal'
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -46,14 +46,16 @@
</span><span class="cx"> "alternate_dispatchers": True,
</span><span class="cx"> },
</span><span class="cx"> "WebKit": {
</span><del>- "objc_prefix": "Automation",
</del><ins>+ "protocol_group": "Automation",
</ins><span class="cx"> },
</span><span class="cx"> "WebInspector": {
</span><ins>+ "protocol_group": "RWI",
</ins><span class="cx"> "objc_prefix": "RWI",
</span><span class="cx"> },
</span><span class="cx"> # Used for code generator tests.
</span><span class="cx"> "Test": {
</span><span class="cx"> "alternate_dispatchers": True,
</span><ins>+ "protocol_group": "Test",
</ins><span class="cx"> "objc_prefix": "Test",
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py (197657 => 197658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-07 03:37:09 UTC (rev 197657)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py 2016-03-07 03:52:19 UTC (rev 197658)
</span><span class="lines">@@ -92,9 +92,19 @@
</span><span class="cx"> def __init__(self, model, input_filepath):
</span><span class="cx"> Generator.__init__(self, model, input_filepath)
</span><span class="cx">
</span><ins>+ # The 'protocol name' is used to prefix filenames for a protocol group (a set of domains generated together).
+ def protocol_name(self):
+ protocol_group = self.model().framework.setting('protocol_group', '')
+ return '%s%s' % (protocol_group, ObjCGenerator.OBJC_SHARED_PREFIX)
+
+ # The 'ObjC prefix' is used to prefix Objective-C class names and enums with a
+ # framework-specific prefix. It is separate from filename prefixes.
</ins><span class="cx"> def objc_prefix(self):
</span><del>- framework_prefix = self.model().framework.setting('objc_prefix', '')
- return '%s%s' % (framework_prefix, ObjCGenerator.OBJC_SHARED_PREFIX)
</del><ins>+ framework_prefix = self.model().framework.setting('objc_prefix', None)
+ if not framework_prefix:
+ return ''
+ else:
+ return '%s%s' % (framework_prefix, ObjCGenerator.OBJC_SHARED_PREFIX)
</ins><span class="cx">
</span><span class="cx"> # Adjust identifier names that collide with ObjC keywords.
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>