Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (209221 => 209222)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1,3 +1,27 @@
+2016-12-01 Brian Burg <[email protected]>
+
+ Web Inspector: generated code should use a framework-style import for *ProtocolArrayConversions.h
+ https://bugs.webkit.org/show_bug.cgi?id=165281
+ <rdar://problem/29427778>
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py:
+ (ObjCProtocolTypeConversionsHeaderGenerator.generate_output):
+ * 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/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/expected/enum-values.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/same-type-id-different-domain.json-result:
+ * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+
2016-12-01 Geoffrey Garen <[email protected]>
SourceCodeKey should use unlinked source code
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2016-12-02 00:52:22 UTC (rev 209222)
@@ -30,7 +30,7 @@
from string import Template
from generator import Generator
-from models import EnumType
+from models import EnumType, Frameworks
from objc_generator import ObjCGenerator
from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
@@ -56,7 +56,7 @@
def generate_output(self):
headers = [
'"%s.h"' % self.protocol_name(),
- '"%sArrayConversions.h"' % ObjCGenerator.OBJC_STATIC_PREFIX,
+ Generator.string_for_file_include('%sArrayConversions.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
]
headers.sort()
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1416,8 +1416,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1271,8 +1271,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1258,8 +1258,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1053,8 +1053,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -985,8 +985,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1034,8 +1034,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -753,8 +753,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -884,8 +884,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -742,8 +742,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -831,8 +831,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -853,8 +853,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1284,8 +1284,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (209221 => 209222)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-12-02 00:47:45 UTC (rev 209221)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2016-12-02 00:52:22 UTC (rev 209222)
@@ -1207,8 +1207,8 @@
// DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
// by the script: Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py
-#import "RWIProtocolArrayConversions.h"
#import "TestProtocol.h"
+#import <WebInspector/RWIProtocolArrayConversions.h>
namespace Inspector {