<!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>[172897] 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/172897">172897</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-08-24 17:26:14 -0700 (Sun, 24 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
https://bugs.webkit.org/show_bug.cgi?id=136025
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
This workaround can be removed since it is no longer necessary.
* inspector/scripts/codegen/models.py:
(TypeReference.__init__):
(Type.raw_name):
(TypeDeclaration.__init__):
* inspector/scripts/tests/type-declaration-object-type.json: Remove related test input.
* inspector/scripts/tests/expected/type-declaration-object-type.json-result: Rebaseline.
Source/WebCore:
Rename DOM.RGBA to DOM.RGBAColor to avoid name clashes with headers on Windows CE.
This workaround used to be special-cased in the bindings generator.
Type names are not used in protocol messages, so this does not introduce legacy issues.
* inspector/protocol/DOM.json:
Source/WebInspectorUI:
Also rename DOM.RGBA in legacy protocol specifications.
* Versions/Inspector-iOS-6.0.json:
* Versions/Inspector-iOS-7.0.json:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsteststypedeclarationobjecttypejson">trunk/Source/JavaScriptCore/inspector/scripts/tests/type-declaration-object-type.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolDOMjson">trunk/Source/WebCore/inspector/protocol/DOM.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS60json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS70json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-24 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
+ https://bugs.webkit.org/show_bug.cgi?id=136025
+
+ Reviewed by Joseph Pecoraro.
+
+ This workaround can be removed since it is no longer necessary.
+
+ * inspector/scripts/codegen/models.py:
+ (TypeReference.__init__):
+ (Type.raw_name):
+ (TypeDeclaration.__init__):
+ * inspector/scripts/tests/type-declaration-object-type.json: Remove related test input.
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result: Rebaseline.
+
</ins><span class="cx"> 2014-08-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Do not copy large module source strings
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -55,14 +55,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-# FIXME: These should be converted into JSON properties, or renamed.
-_TYPES_NEEDING_RENAME_WORKAROUNDS = {
- 'RGBA': 'Rgba', # RGBA is reported to be conflicting with a define name in Windows CE.
- # For testing only.
- 'UnpleasantName': 'HappyName'
-}
-
-
</del><span class="cx"> class ParseException(Exception):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -110,7 +102,7 @@
</span><span class="cx"> class TypeReference:
</span><span class="cx"> def __init__(self, type_kind, referenced_type_name, enum_values, array_items):
</span><span class="cx"> self.type_kind = type_kind
</span><del>- self.referenced_type_name = _TYPES_NEEDING_RENAME_WORKAROUNDS.get(referenced_type_name, referenced_type_name)
</del><ins>+ self.referenced_type_name = referenced_type_name
</ins><span class="cx"> self.enum_values = enum_values
</span><span class="cx"> if array_items is None:
</span><span class="cx"> self.array_type_ref = None
</span><span class="lines">@@ -144,7 +136,7 @@
</span><span class="cx"> return self.qualified_name().__hash__()
</span><span class="cx">
</span><span class="cx"> def raw_name(self):
</span><del>- return _TYPES_NEEDING_RENAME_WORKAROUNDS.get(self._name, self._name)
</del><ins>+ return self._name
</ins><span class="cx">
</span><span class="cx"> # These methods should be overridden by subclasses.
</span><span class="cx"> def is_enum(self):
</span><span class="lines">@@ -505,7 +497,7 @@
</span><span class="cx">
</span><span class="cx"> class TypeDeclaration:
</span><span class="cx"> def __init__(self, type_name, type_ref, description, type_members):
</span><del>- self.type_name = _TYPES_NEEDING_RENAME_WORKAROUNDS.get(type_name, type_name)
</del><ins>+ self.type_name = type_name
</ins><span class="cx"> self.type_ref = type_ref
</span><span class="cx"> self.description = description
</span><span class="cx"> self.type_members = type_members
</span></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 (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -28,9 +28,6 @@
</span><span class="cx">
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><del>-
-// Test.
-InspectorBackend.registerCommand("Test.attemptCurse", [{"name": "curse", "type": "object", "optional": false}], ["censoredCurse"]);
</del><span class="cx"> ### End File: InspectorTestBackendCommands.js
</span><span class="cx">
</span><span class="cx"> ### Begin File: InspectorTestBackendDispatchers.h
</span><span class="lines">@@ -78,24 +75,6 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorTestBackendDispatcherHandler {
-public:
- virtual void attemptCurse(ErrorString*, const RefPtr<Inspector::InspectorObject>& in_curse, Inspector::TypeBuilder::OptOutput<String>* opt_out_censoredCurse) = 0;
-protected:
- virtual ~InspectorTestBackendDispatcherHandler();
-};
-
-class InspectorTestBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
-public:
- static PassRefPtr<InspectorTestBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorTestBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
-private:
- void attemptCurse(long callId, const Inspector::InspectorObject& message);
-private:
- InspectorTestBackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorTestBackendDispatcherHandler*);
- InspectorTestBackendDispatcherHandler* m_agent;
-};
-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="lines">@@ -145,55 +124,8 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorTestBackendDispatcherHandler::~InspectorTestBackendDispatcherHandler() { }
</del><span class="cx">
</span><del>-PassRefPtr<InspectorTestBackendDispatcher> InspectorTestBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorTestBackendDispatcherHandler* agent)
-{
- return adoptRef(new InspectorTestBackendDispatcher(backendDispatcher, agent));
-}
</del><span class="cx">
</span><del>-InspectorTestBackendDispatcher::InspectorTestBackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorTestBackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
- , m_agent(agent)
-{
- m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Test"), this);
-}
-
-void InspectorTestBackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
-{
- Ref<InspectorTestBackendDispatcher> protect(*this);
-
- if (method == "attemptCurse")
- attemptCurse(callId, *message.get());
- else
- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, String("'") + "Test" + '.' + method + "' was not found");
-}
-
-void InspectorTestBackendDispatcher::attemptCurse(long callId, const InspectorObject& message)
-{
- RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
- RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
- InspectorObject* paramsContainerPtr = paramsContainer.get();
- InspectorArray* protocolErrorsPtr = protocolErrors.get();
- RefPtr<Inspector::InspectorObject> in_curse = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("curse"), nullptr, protocolErrorsPtr);
- if (protocolErrors->length()) {
- String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Test.attemptCurse");
- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
- return;
- }
-
- ErrorString error;
- RefPtr<InspectorObject> result = InspectorObject::create();
- Inspector::TypeBuilder::OptOutput<String> out_censoredCurse;
- m_agent->attemptCurse(&error, in_curse, &out_censoredCurse);
-
- if (!error.length())
- if (out_censoredCurse.isAssigned())
- result->setString(ASCIILiteral("censoredCurse"), out_censoredCurse.getValue());
-
- m_backendDispatcher->sendResponse(callId, result.release(), error);
-}
-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="lines">@@ -358,7 +290,6 @@
</span><span class="cx"> #endif // ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> namespace Test {
</span><del>-class HappyName;
</del><span class="cx"> class ParameterBundle;
</span><span class="cx"> } // Test
</span><span class="cx"> // End of forward declarations.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsteststypedeclarationobjecttypejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/type-declaration-object-type.json (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/type-declaration-object-type.json 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/type-declaration-object-type.json 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -60,16 +60,6 @@
</span><span class="cx"> "description": "Test the generation of special behaviors that only apply to specific classes.",
</span><span class="cx"> "types": [
</span><span class="cx"> {
</span><del>- "id": "UnpleasantName",
- "description": "This type should be renamed to HappyName",
- "type": "object",
- "members": [
- { "name": "notes", "type": "string" },
- { "name": "timestamp", "type": "number" },
- { "name": "values", "type": "object" }
- ]
- },
- {
</del><span class="cx"> "id": "ParameterBundle",
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="lines">@@ -81,17 +71,6 @@
</span><span class="cx"> { "name": "error", "$ref": "Database.Error" }
</span><span class="cx"> ]
</span><span class="cx"> }
</span><del>- ],
- "commands": [
- {
- "name": "attemptCurse",
- "parameters": [
- { "name": "curse", "$ref": "UnpleasantName" }
- ],
- "returns": [
- { "name": "censoredCurse", "type": "string", "optional": true }
- ]
- }
</del><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/WebCore/ChangeLog 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-24 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
+ https://bugs.webkit.org/show_bug.cgi?id=136025
+
+ Reviewed by Joseph Pecoraro.
+
+ Rename DOM.RGBA to DOM.RGBAColor to avoid name clashes with headers on Windows CE.
+ This workaround used to be special-cased in the bindings generator.
+
+ Type names are not used in protocol messages, so this does not introduce legacy issues.
+
+ * inspector/protocol/DOM.json:
+
</ins><span class="cx"> 2014-08-24 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Toggle buttons visually broken with GTK+ 3.13.7
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolDOMjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/DOM.json (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/DOM.json 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/WebCore/inspector/protocol/DOM.json 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "id": "RGBA",
</del><ins>+ "id": "RGBAColor",
</ins><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "r", "type": "integer", "description": "The red component, in the [0-255] range." },
</span><span class="lines">@@ -120,10 +120,10 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "showInfo", "type": "boolean", "optional": true, "description": "Whether the node info tooltip should be shown (default: false)." },
</span><del>- { "name": "contentColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
- { "name": "paddingColor", "$ref": "RGBA", "optional": true, "description": "The padding highlight fill color (default: transparent)." },
- { "name": "borderColor", "$ref": "RGBA", "optional": true, "description": "The border highlight fill color (default: transparent)." },
- { "name": "marginColor", "$ref": "RGBA", "optional": true, "description": "The margin highlight fill color (default: transparent)." }
</del><ins>+ { "name": "contentColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
+ { "name": "paddingColor", "$ref": "RGBAColor", "optional": true, "description": "The padding highlight fill color (default: transparent)." },
+ { "name": "borderColor", "$ref": "RGBAColor", "optional": true, "description": "The border highlight fill color (default: transparent)." },
+ { "name": "marginColor", "$ref": "RGBAColor", "optional": true, "description": "The margin highlight fill color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Configuration data for the highlighting of page elements."
</span><span class="cx"> }
</span><span class="lines">@@ -313,8 +313,8 @@
</span><span class="cx"> { "name": "y", "type": "integer", "description": "Y coordinate" },
</span><span class="cx"> { "name": "width", "type": "integer", "description": "Rectangle width" },
</span><span class="cx"> { "name": "height", "type": "integer", "description": "Rectangle height" },
</span><del>- { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
- { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." },
</del><ins>+ { "name": "color", "$ref": "RGBAColor", "optional": true, "description": "The highlight fill color (default: transparent)." },
+ { "name": "outlineColor", "$ref": "RGBAColor", "optional": true, "description": "The highlight outline color (default: transparent)." },
</ins><span class="cx"> { "name": "usePageCoordinates", "type": "boolean", "optional": true, "description": "Indicates whether the provided parameters are in page coordinates or in viewport coordinates (the default)." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Highlights given rectangle. Coordinates are absolute with respect to the main frame viewport."
</span><span class="lines">@@ -323,8 +323,8 @@
</span><span class="cx"> "name": "highlightQuad",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "quad", "$ref": "Quad", "description": "Quad to highlight" },
</span><del>- { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
- { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." },
</del><ins>+ { "name": "color", "$ref": "RGBAColor", "optional": true, "description": "The highlight fill color (default: transparent)." },
+ { "name": "outlineColor", "$ref": "RGBAColor", "optional": true, "description": "The highlight outline color (default: transparent)." },
</ins><span class="cx"> { "name": "usePageCoordinates", "type": "boolean", "optional": true, "description": "Indicates whether the provided parameters are in page coordinates or in viewport coordinates (the default)." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Highlights given quad. Coordinates are absolute with respect to the main frame viewport."
</span><span class="lines">@@ -346,8 +346,8 @@
</span><span class="cx"> "name": "highlightFrame",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "frameId", "$ref": "Network.FrameId", "description": "Identifier of the frame to highlight." },
</span><del>- { "name": "contentColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
- { "name": "contentOutlineColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight outline color (default: transparent)." }
</del><ins>+ { "name": "contentColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
+ { "name": "contentOutlineColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight outline color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Highlights owner element of the frame with given id."
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-24 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
+ https://bugs.webkit.org/show_bug.cgi?id=136025
+
+ Reviewed by Joseph Pecoraro.
+
+ Also rename DOM.RGBA in legacy protocol specifications.
+
+ * Versions/Inspector-iOS-6.0.json:
+ * Versions/Inspector-iOS-7.0.json:
+
</ins><span class="cx"> 2014-08-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a button to enable paint flashing in the web inspector
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS60json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -1105,7 +1105,7 @@
</span><span class="cx"> "description": "DOM interaction is implemented in terms of mirror objects that represent the actual DOM nodes. DOMNode is a base node mirror type."
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "id": "RGBA",
</del><ins>+ "id": "RGBAColor",
</ins><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "r", "type": "integer", "description": "The red component, in the [0-255] range." },
</span><span class="lines">@@ -1120,10 +1120,10 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "showInfo", "type": "boolean", "optional": true, "description": "Whether the node info tooltip should be shown (default: false)." },
</span><del>- { "name": "contentColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
- { "name": "paddingColor", "$ref": "RGBA", "optional": true, "description": "The padding highlight fill color (default: transparent)." },
- { "name": "borderColor", "$ref": "RGBA", "optional": true, "description": "The border highlight fill color (default: transparent)." },
- { "name": "marginColor", "$ref": "RGBA", "optional": true, "description": "The margin highlight fill color (default: transparent)." }
</del><ins>+ { "name": "contentColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
+ { "name": "paddingColor", "$ref": "RGBAColor", "optional": true, "description": "The padding highlight fill color (default: transparent)." },
+ { "name": "borderColor", "$ref": "RGBAColor", "optional": true, "description": "The border highlight fill color (default: transparent)." },
+ { "name": "marginColor", "$ref": "RGBAColor", "optional": true, "description": "The margin highlight fill color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Configuration data for the highlighting of page elements."
</span><span class="cx"> }
</span><span class="lines">@@ -1300,8 +1300,8 @@
</span><span class="cx"> { "name": "y", "type": "integer", "description": "Y coordinate" },
</span><span class="cx"> { "name": "width", "type": "integer", "description": "Rectangle width" },
</span><span class="cx"> { "name": "height", "type": "integer", "description": "Rectangle height" },
</span><del>- { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
- { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." }
</del><ins>+ { "name": "color", "$ref": "RGBAColor", "optional": true, "description": "The highlight fill color (default: transparent)." },
+ { "name": "outlineColor", "$ref": "RGBAColor", "optional": true, "description": "The highlight outline color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Highlights given rectangle. Coordinates are absolute with respect to the main frame viewport."
</span><span class="cx"> },
</span><span class="lines">@@ -1321,8 +1321,8 @@
</span><span class="cx"> "name": "highlightFrame",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "frameId", "$ref": "Network.FrameId", "description": "Identifier of the frame to highlight." },
</span><del>- { "name": "contentColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
- { "name": "contentOutlineColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight outline color (default: transparent)." }
</del><ins>+ { "name": "contentColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
+ { "name": "contentOutlineColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight outline color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Highlights owner element of the frame with given id."
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS70json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json (172896 => 172897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2014-08-24 22:07:29 UTC (rev 172896)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2014-08-25 00:26:14 UTC (rev 172897)
</span><span class="lines">@@ -1340,7 +1340,7 @@
</span><span class="cx"> "description": "DOM interaction is implemented in terms of mirror objects that represent the actual DOM nodes. DOMNode is a base node mirror type."
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "id": "RGBA",
</del><ins>+ "id": "RGBAColor",
</ins><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "r", "type": "integer", "description": "The red component, in the [0-255] range." },
</span><span class="lines">@@ -1363,10 +1363,10 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "showInfo", "type": "boolean", "optional": true, "description": "Whether the node info tooltip should be shown (default: false)." },
</span><del>- { "name": "contentColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
- { "name": "paddingColor", "$ref": "RGBA", "optional": true, "description": "The padding highlight fill color (default: transparent)." },
- { "name": "borderColor", "$ref": "RGBA", "optional": true, "description": "The border highlight fill color (default: transparent)." },
- { "name": "marginColor", "$ref": "RGBA", "optional": true, "description": "The margin highlight fill color (default: transparent)." }
</del><ins>+ { "name": "contentColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
+ { "name": "paddingColor", "$ref": "RGBAColor", "optional": true, "description": "The padding highlight fill color (default: transparent)." },
+ { "name": "borderColor", "$ref": "RGBAColor", "optional": true, "description": "The border highlight fill color (default: transparent)." },
+ { "name": "marginColor", "$ref": "RGBAColor", "optional": true, "description": "The margin highlight fill color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Configuration data for the highlighting of page elements."
</span><span class="cx"> }
</span><span class="lines">@@ -1545,8 +1545,8 @@
</span><span class="cx"> { "name": "y", "type": "integer", "description": "Y coordinate" },
</span><span class="cx"> { "name": "width", "type": "integer", "description": "Rectangle width" },
</span><span class="cx"> { "name": "height", "type": "integer", "description": "Rectangle height" },
</span><del>- { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
- { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." },
</del><ins>+ { "name": "color", "$ref": "RGBAColor", "optional": true, "description": "The highlight fill color (default: transparent)." },
+ { "name": "outlineColor", "$ref": "RGBAColor", "optional": true, "description": "The highlight outline color (default: transparent)." },
</ins><span class="cx"> { "name": "usePageCoordinates", "type": "boolean", "optional": true, "description": "Indicates whether the provided parameters are in page coordinates or in viewport coordinates (the default)." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Highlights given rectangle. Coordinates are absolute with respect to the main frame viewport."
</span><span class="lines">@@ -1555,8 +1555,8 @@
</span><span class="cx"> "name": "highlightQuad",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "quad", "$ref": "Quad", "description": "Quad to highlight" },
</span><del>- { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
- { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." },
</del><ins>+ { "name": "color", "$ref": "RGBAColor", "optional": true, "description": "The highlight fill color (default: transparent)." },
+ { "name": "outlineColor", "$ref": "RGBAColor", "optional": true, "description": "The highlight outline color (default: transparent)." },
</ins><span class="cx"> { "name": "usePageCoordinates", "type": "boolean", "optional": true, "description": "Indicates whether the provided parameters are in page coordinates or in viewport coordinates (the default)." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Highlights given quad. Coordinates are absolute with respect to the main frame viewport."
</span><span class="lines">@@ -1578,8 +1578,8 @@
</span><span class="cx"> "name": "highlightFrame",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "frameId", "$ref": "Network.FrameId", "description": "Identifier of the frame to highlight." },
</span><del>- { "name": "contentColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
- { "name": "contentOutlineColor", "$ref": "RGBA", "optional": true, "description": "The content box highlight outline color (default: transparent)." }
</del><ins>+ { "name": "contentColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight fill color (default: transparent)." },
+ { "name": "contentOutlineColor", "$ref": "RGBAColor", "optional": true, "description": "The content box highlight outline color (default: transparent)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Highlights owner element of the frame with given id."
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>