<!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>[174941] releases/WebKitGTK/webkit-2.6/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/174941">174941</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 03:30:58 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174094">r174094</a> - Web Inspector: InspectorValues should use references for out parameters
https://bugs.webkit.org/show_bug.cgi?id=137190
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
Use references for out parameters in asType() and getType() methods.
Also convert to references in some miscellaneous code where we don't
expect or handle null values.
Remove variants of asObject() and asArray() that return a nullable RefPtr.
Now, client code is forced to use out parameters and check for cast failure.
Iron out control flow in some functions and fix some style issues.
* inspector/InjectedScript.cpp:
(Inspector::InjectedScript::getFunctionDetails):
(Inspector::InjectedScript::wrapObject):
(Inspector::InjectedScript::wrapTable):
* inspector/InjectedScriptBase.cpp:
(Inspector::InjectedScriptBase::makeEvalCall):
* inspector/InjectedScriptManager.cpp:
(Inspector::InjectedScriptManager::injectedScriptForObjectId): Simplify control flow.
* inspector/InspectorBackendDispatcher.cpp:
(Inspector::InspectorBackendDispatcher::dispatch):
(Inspector::getPropertyValue):
(Inspector::AsMethodBridges::asInteger):
(Inspector::AsMethodBridges::asDouble):
(Inspector::AsMethodBridges::asString):
(Inspector::AsMethodBridges::asBoolean):
(Inspector::AsMethodBridges::asObject):
(Inspector::AsMethodBridges::asArray):
* inspector/InspectorProtocolTypes.h:
(Inspector::Protocol::BindingTraits<Protocol::Array<T>>::runtimeCast):
(Inspector::Protocol::BindingTraits<Protocol::Array<T>>::assertValueHasExpectedType):
* inspector/InspectorValues.cpp: Use more by-reference out parameters. Add more spacing.
(Inspector::InspectorValue::asBoolean):
(Inspector::InspectorValue::asDouble):
(Inspector::InspectorValue::asInteger):
(Inspector::InspectorValue::asString):
(Inspector::InspectorValue::asValue):
(Inspector::InspectorValue::asObject):
(Inspector::InspectorValue::asArray):
(Inspector::InspectorValue::parseJSON):
(Inspector::InspectorValue::toJSONString):
(Inspector::InspectorValue::writeJSON):
(Inspector::InspectorBasicValue::asBoolean):
(Inspector::InspectorBasicValue::asDouble):
(Inspector::InspectorBasicValue::asInteger):
(Inspector::InspectorBasicValue::writeJSON):
(Inspector::InspectorString::asString):
(Inspector::InspectorString::writeJSON):
(Inspector::InspectorObjectBase::asObject):
(Inspector::InspectorObjectBase::openAccessors):
(Inspector::InspectorObjectBase::getBoolean):
(Inspector::InspectorObjectBase::getString):
(Inspector::InspectorObjectBase::getObject):
(Inspector::InspectorObjectBase::getArray):
(Inspector::InspectorObjectBase::writeJSON):
(Inspector::InspectorArrayBase::asArray):
(Inspector::InspectorArrayBase::writeJSON):
* inspector/InspectorValues.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::breakpointActionsFromProtocol):
(Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
(Inspector::parseLocation):
(Inspector::InspectorDebuggerAgent::setBreakpoint):
(Inspector::InspectorDebuggerAgent::continueToLocation):
(Inspector::InspectorDebuggerAgent::didParseSource):
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
* inspector/scripts/codegen/generate_protocol_types_implementation.py:
(ProtocolTypesImplementationGenerator):
(ProtocolTypesImplementationGenerator._generate_assertion_for_enum):
* inspector/scripts/codegen/generator_templates.py:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
* replay/EncodedValue.cpp:
(JSC::EncodedValue::asObject):
(JSC::EncodedValue::asArray):
(JSC::EncodedValue::convertTo<bool>):
(JSC::EncodedValue::convertTo<double>):
(JSC::EncodedValue::convertTo<float>):
(JSC::EncodedValue::convertTo<int32_t>):
(JSC::EncodedValue::convertTo<int64_t>):
(JSC::EncodedValue::convertTo<uint32_t>):
(JSC::EncodedValue::convertTo<uint64_t>):
(JSC::EncodedValue::convertTo<String>):
Source/WebCore:
Clean up some call sites to explicitly check for cast success, and simplify
some exceptional control flows.
No new tests, no behavior changed.
* inspector/CommandLineAPIHost.cpp:
(WebCore::CommandLineAPIHost::inspectImpl):
* inspector/InspectorCSSAgent.cpp:
(WebCore::computePseudoClassMask):
* inspector/InspectorDOMAgent.cpp:
(WebCore::parseColor):
(WebCore::parseConfigColor):
(WebCore::parseQuad):
(WebCore::InspectorDOMAgent::performSearch):
(WebCore::InspectorDOMAgent::highlightConfigFromInspectorObject):
(WebCore::InspectorDOMAgent::innerHighlightQuad):
(WebCore::InspectorDOMAgent::highlightFrame):
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::findStorageArea):
* inspector/InspectorIndexedDBAgent.cpp: Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
* inspector/InspectorReplayAgent.cpp:
(WebCore::InspectorReplayAgent::replayToPosition):
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::willSendRequest):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyle::styleWithProperties):
* inspector/InspectorStyleSheet.h:
(WebCore::InspectorCSSId::InspectorCSSId):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::startFromConsole):
(WebCore::InspectorTimelineAgent::stopFromConsole):
* inspector/InspectorWorkerAgent.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInjectedScriptcpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScript.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInjectedScriptBasecpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInjectedScriptManagercpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorBackendDispatchercpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorProtocolTypesh">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorValuescpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorValuesh">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorscriptscodegengenerate_protocol_types_implementationpy">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCorereplayEncodedValuecpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/replay/EncodedValue.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorCommandLineAPIHostcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/CommandLineAPIHost.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorCSSAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorDOMAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorDOMStorageAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorIndexedDBAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorPageAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorReplayAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorReplayAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorResourceAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorStyleSheetcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorStyleSheeth">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorTimelineAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorWorkerAgentcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -1,3 +1,92 @@
</span><ins>+2014-09-29 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: InspectorValues should use references for out parameters
+ https://bugs.webkit.org/show_bug.cgi?id=137190
+
+ Reviewed by Joseph Pecoraro.
+
+ Use references for out parameters in asType() and getType() methods.
+ Also convert to references in some miscellaneous code where we don't
+ expect or handle null values.
+
+ Remove variants of asObject() and asArray() that return a nullable RefPtr.
+ Now, client code is forced to use out parameters and check for cast failure.
+
+ Iron out control flow in some functions and fix some style issues.
+
+ * inspector/InjectedScript.cpp:
+ (Inspector::InjectedScript::getFunctionDetails):
+ (Inspector::InjectedScript::wrapObject):
+ (Inspector::InjectedScript::wrapTable):
+ * inspector/InjectedScriptBase.cpp:
+ (Inspector::InjectedScriptBase::makeEvalCall):
+ * inspector/InjectedScriptManager.cpp:
+ (Inspector::InjectedScriptManager::injectedScriptForObjectId): Simplify control flow.
+ * inspector/InspectorBackendDispatcher.cpp:
+ (Inspector::InspectorBackendDispatcher::dispatch):
+ (Inspector::getPropertyValue):
+ (Inspector::AsMethodBridges::asInteger):
+ (Inspector::AsMethodBridges::asDouble):
+ (Inspector::AsMethodBridges::asString):
+ (Inspector::AsMethodBridges::asBoolean):
+ (Inspector::AsMethodBridges::asObject):
+ (Inspector::AsMethodBridges::asArray):
+ * inspector/InspectorProtocolTypes.h:
+ (Inspector::Protocol::BindingTraits<Protocol::Array<T>>::runtimeCast):
+ (Inspector::Protocol::BindingTraits<Protocol::Array<T>>::assertValueHasExpectedType):
+ * inspector/InspectorValues.cpp: Use more by-reference out parameters. Add more spacing.
+ (Inspector::InspectorValue::asBoolean):
+ (Inspector::InspectorValue::asDouble):
+ (Inspector::InspectorValue::asInteger):
+ (Inspector::InspectorValue::asString):
+ (Inspector::InspectorValue::asValue):
+ (Inspector::InspectorValue::asObject):
+ (Inspector::InspectorValue::asArray):
+ (Inspector::InspectorValue::parseJSON):
+ (Inspector::InspectorValue::toJSONString):
+ (Inspector::InspectorValue::writeJSON):
+ (Inspector::InspectorBasicValue::asBoolean):
+ (Inspector::InspectorBasicValue::asDouble):
+ (Inspector::InspectorBasicValue::asInteger):
+ (Inspector::InspectorBasicValue::writeJSON):
+ (Inspector::InspectorString::asString):
+ (Inspector::InspectorString::writeJSON):
+ (Inspector::InspectorObjectBase::asObject):
+ (Inspector::InspectorObjectBase::openAccessors):
+ (Inspector::InspectorObjectBase::getBoolean):
+ (Inspector::InspectorObjectBase::getString):
+ (Inspector::InspectorObjectBase::getObject):
+ (Inspector::InspectorObjectBase::getArray):
+ (Inspector::InspectorObjectBase::writeJSON):
+ (Inspector::InspectorArrayBase::asArray):
+ (Inspector::InspectorArrayBase::writeJSON):
+ * inspector/InspectorValues.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::breakpointActionsFromProtocol):
+ (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
+ (Inspector::parseLocation):
+ (Inspector::InspectorDebuggerAgent::setBreakpoint):
+ (Inspector::InspectorDebuggerAgent::continueToLocation):
+ (Inspector::InspectorDebuggerAgent::didParseSource):
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
+ * inspector/scripts/codegen/generate_protocol_types_implementation.py:
+ (ProtocolTypesImplementationGenerator):
+ (ProtocolTypesImplementationGenerator._generate_assertion_for_enum):
+ * inspector/scripts/codegen/generator_templates.py:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+ * replay/EncodedValue.cpp:
+ (JSC::EncodedValue::asObject):
+ (JSC::EncodedValue::asArray):
+ (JSC::EncodedValue::convertTo<bool>):
+ (JSC::EncodedValue::convertTo<double>):
+ (JSC::EncodedValue::convertTo<float>):
+ (JSC::EncodedValue::convertTo<int32_t>):
+ (JSC::EncodedValue::convertTo<int64_t>):
+ (JSC::EncodedValue::convertTo<uint32_t>):
+ (JSC::EncodedValue::convertTo<uint64_t>):
+ (JSC::EncodedValue::convertTo<String>):
+
</ins><span class="cx"> 2014-09-21 Saam Barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: fix TypeSet hierarchy in TypeTokenView
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInjectedScriptcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScript.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> RefPtr<InspectorValue> resultValue;
</span><span class="cx"> makeCall(function, &resultValue);
</span><span class="cx"> if (!resultValue || resultValue->type() != InspectorValue::Type::Object) {
</span><del>- if (!resultValue->asString(errorString))
</del><ins>+ if (!resultValue->asString(*errorString))
</ins><span class="cx"> *errorString = ASCIILiteral("Internal error");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -172,8 +172,11 @@
</span><span class="cx"> if (hadException)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
- return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
</del><ins>+ RefPtr<InspectorObject> resultObject;
+ bool castSucceeded = r.toInspectorValue(scriptState())->asObject(resultObject);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
+
+ return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(resultObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
</span><span class="lines">@@ -192,8 +195,11 @@
</span><span class="cx"> if (hadException)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
- return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
</del><ins>+ RefPtr<InspectorObject> resultObject;
+ bool castSucceeded = r.toInspectorValue(scriptState())->asObject(resultObject);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
+
+ return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(resultObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue InjectedScript::findObjectById(const String& objectId) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInjectedScriptBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -124,25 +124,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result->type() == InspectorValue::Type::String) {
</span><del>- result->asString(errorString);
</del><ins>+ result->asString(*errorString);
</ins><span class="cx"> ASSERT(errorString->length());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<InspectorObject> resultPair = result->asObject();
- if (!resultPair) {
</del><ins>+ RefPtr<InspectorObject> resultPair;
+ if (!result->asObject(resultPair)) {
</ins><span class="cx"> *errorString = ASCIILiteral("Internal error: result is not an Object");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<InspectorObject> resultObj = resultPair->getObject(ASCIILiteral("result"));
</del><ins>+ RefPtr<InspectorObject> resultObject = resultPair->getObject(ASCIILiteral("result"));
</ins><span class="cx"> bool wasThrownVal = false;
</span><del>- if (!resultObj || !resultPair->getBoolean(ASCIILiteral("wasThrown"), &wasThrownVal)) {
</del><ins>+ if (!resultObject || !resultPair->getBoolean(ASCIILiteral("wasThrown"), wasThrownVal)) {
</ins><span class="cx"> *errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *objectResult = BindingTraits<Protocol::Runtime::RemoteObject>::runtimeCast(resultObj);
</del><ins>+ *objectResult = BindingTraits<Protocol::Runtime::RemoteObject>::runtimeCast(resultObject);
</ins><span class="cx"> *wasThrown = wasThrownVal;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInjectedScriptManagercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -94,15 +94,19 @@
</span><span class="cx">
</span><span class="cx"> InjectedScript InjectedScriptManager::injectedScriptForObjectId(const String& objectId)
</span><span class="cx"> {
</span><del>- RefPtr<InspectorValue> parsedObjectId = InspectorValue::parseJSON(objectId);
- if (parsedObjectId && parsedObjectId->type() == InspectorValue::Type::Object) {
- long injectedScriptId = 0;
- bool success = parsedObjectId->asObject()->getInteger(ASCIILiteral("injectedScriptId"), &injectedScriptId);
- if (success)
- return m_idToInjectedScript.get(injectedScriptId);
- }
</del><ins>+ RefPtr<InspectorValue> parsedObjectId;
+ if (!InspectorValue::parseJSON(objectId, parsedObjectId))
+ return InjectedScript();
</ins><span class="cx">
</span><del>- return InjectedScript();
</del><ins>+ RefPtr<InspectorObject> resultObject;
+ if (!parsedObjectId->asObject(resultObject))
+ return InjectedScript();
+
+ long injectedScriptId = 0;
+ if (!resultObject->getInteger(ASCIILiteral("injectedScriptId"), injectedScriptId))
+ return InjectedScript();
+
+ return m_idToInjectedScript.get(injectedScriptId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedScriptManager::discardInjectedScripts()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -78,14 +78,14 @@
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorBackendDispatcher> protect(*this);
</span><span class="cx">
</span><del>- RefPtr<InspectorValue> parsedMessage = InspectorValue::parseJSON(message);
- if (!parsedMessage) {
</del><ins>+ RefPtr<InspectorValue> parsedMessage;
+ if (!InspectorValue::parseJSON(message, parsedMessage)) {
</ins><span class="cx"> reportProtocolError(nullptr, ParseError, ASCIILiteral("Message must be in JSON format"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<InspectorObject> messageObject = parsedMessage->asObject();
- if (!messageObject) {
</del><ins>+ RefPtr<InspectorObject> messageObject;
+ if (!parsedMessage->asObject(messageObject)) {
</ins><span class="cx"> reportProtocolError(nullptr, InvalidRequest, ASCIILiteral("Message must be a JSONified object"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long callId = 0;
</span><del>- if (!callIdValue->asInteger(&callId)) {
</del><ins>+ if (!callIdValue->asInteger(callId)) {
</ins><span class="cx"> reportProtocolError(nullptr, InvalidRequest, ASCIILiteral("The type of 'id' property must be integer"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String method;
</span><del>- if (!methodValue->asString(&method)) {
</del><ins>+ if (!methodValue->asString(method)) {
</ins><span class="cx"> reportProtocolError(&callId, InvalidRequest, ASCIILiteral("The type of 'method' property must be string"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ReturnValueType, typename ValueType, typename DefaultValueType>
</span><del>-static ReturnValueType getPropertyValue(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors, DefaultValueType defaultValue, bool (*asMethod)(InspectorValue*, ValueType*), const char* typeName)
</del><ins>+static ReturnValueType getPropertyValue(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors, DefaultValueType defaultValue, bool (*asMethod)(InspectorValue&, ValueType&), const char* typeName)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(protocolErrors);
</span><span class="cx">
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!asMethod(valueIterator->value.get(), &value)) {
</del><ins>+ if (!asMethod(*valueIterator->value, value)) {
</ins><span class="cx"> protocolErrors->pushString(String::format("Parameter '%s' has wrong type. It must be '%s'.", name.utf8().data(), typeName));
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="lines">@@ -221,12 +221,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct AsMethodBridges {
</span><del>- static bool asInteger(InspectorValue* value, int* output) { return value->asInteger(output); }
- static bool asDouble(InspectorValue* value, double* output) { return value->asDouble(output); }
- static bool asString(InspectorValue* value, String* output) { return value->asString(output); }
- static bool asBoolean(InspectorValue* value, bool* output) { return value->asBoolean(output); }
- static bool asObject(InspectorValue* value, RefPtr<InspectorObject>* output) { return value->asObject(output); }
- static bool asArray(InspectorValue* value, RefPtr<InspectorArray>* output) { return value->asArray(output); }
</del><ins>+ static bool asInteger(InspectorValue& value, int& output) { return value.asInteger(output); }
+ static bool asDouble(InspectorValue& value, double& output) { return value.asDouble(output); }
+ static bool asString(InspectorValue& value, String& output) { return value.asString(output); }
+ static bool asBoolean(InspectorValue& value, bool& output) { return value.asBoolean(output); }
+ static bool asObject(InspectorValue& value, RefPtr<InspectorObject>& output) { return value.asObject(output); }
+ static bool asArray(InspectorValue& value, RefPtr<InspectorArray>& output) { return value.asArray(output); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> int InspectorBackendDispatcher::getInteger(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorProtocolTypesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> static PassRefPtr<Array<T>> runtimeCast(PassRefPtr<InspectorValue> value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorArray> array;
</span><del>- bool castRes = value->asArray(&array);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ bool castSucceeded = value->asArray(array);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> assertValueHasExpectedType(array.get());
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="lines">@@ -227,8 +227,8 @@
</span><span class="cx"> static void assertValueHasExpectedType(InspectorValue* value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorArray> array;
</span><del>- bool castRes = value->asArray(&array);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ bool castSucceeded = value->asArray(array);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx"> for (unsigned i = 0; i < array->length(); i++)
</span><span class="cx"> BindingTraits<T>::assertValueHasExpectedType(array->get(i).get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorValuescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2014 University of Washington. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -63,8 +64,10 @@
</span><span class="cx"> bool parseConstToken(const UChar* start, const UChar* end, const UChar** tokenEnd, const char* token)
</span><span class="cx"> {
</span><span class="cx"> while (start < end && *token != '\0' && *start++ == *token++) { }
</span><ins>+
</ins><span class="cx"> if (*token != '\0')
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> *tokenEnd = start;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -73,16 +76,20 @@
</span><span class="cx"> {
</span><span class="cx"> if (start == end)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> bool haveLeadingZero = '0' == *start;
</span><span class="cx"> int length = 0;
</span><span class="cx"> while (start < end && '0' <= *start && *start <= '9') {
</span><span class="cx"> ++start;
</span><span class="cx"> ++length;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (!length)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> if (!canHaveLeadingZeros && length > 1 && haveLeadingZero)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> *tokenEnd = start;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -93,12 +100,14 @@
</span><span class="cx"> // According to RFC4627, a valid number is: [minus] int [frac] [exp]
</span><span class="cx"> if (start == end)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> UChar c = *start;
</span><span class="cx"> if ('-' == c)
</span><span class="cx"> ++start;
</span><span class="cx">
</span><span class="cx"> if (!readInt(start, end, &start, false))
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> if (start == end) {
</span><span class="cx"> *tokenEnd = start;
</span><span class="cx"> return true;
</span><span class="lines">@@ -140,11 +149,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (end - start < digits)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> for (int i = 0; i < digits; ++i) {
</span><span class="cx"> UChar c = *start++;
</span><span class="cx"> if (!(('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')))
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> *tokenEnd = start;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -183,6 +194,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -246,6 +258,7 @@
</span><span class="cx"> return STRING;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return INVALID_TOKEN;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,16 +270,17 @@
</span><span class="cx"> return c - 'A' + 10;
</span><span class="cx"> if ('a' <= c && c <= 'f')
</span><span class="cx"> return c - 'a' + 10;
</span><ins>+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool decodeString(const UChar* start, const UChar* end, StringBuilder* output)
</del><ins>+bool decodeString(const UChar* start, const UChar* end, StringBuilder& output)
</ins><span class="cx"> {
</span><span class="cx"> while (start < end) {
</span><span class="cx"> UChar c = *start++;
</span><span class="cx"> if ('\\' != c) {
</span><del>- output->append(c);
</del><ins>+ output.append(c);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> c = *start++;
</span><span class="lines">@@ -308,24 +322,28 @@
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- output->append(c);
</del><ins>+ output.append(c);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool decodeString(const UChar* start, const UChar* end, String* output)
</del><ins>+bool decodeString(const UChar* start, const UChar* end, String& output)
</ins><span class="cx"> {
</span><span class="cx"> if (start == end) {
</span><del>- *output = "";
</del><ins>+ output = emptyString();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (start > end)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> StringBuilder buffer;
</span><span class="cx"> buffer.reserveCapacity(end - start);
</span><del>- if (!decodeString(start, end, &buffer))
</del><ins>+ if (!decodeString(start, end, buffer))
</ins><span class="cx"> return false;
</span><del>- *output = buffer.toString();
</del><ins>+
+ output = buffer.toString();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -360,7 +378,7 @@
</span><span class="cx"> }
</span><span class="cx"> case STRING: {
</span><span class="cx"> String value;
</span><del>- bool ok = decodeString(tokenStart + 1, tokenEnd - 1, &value);
</del><ins>+ bool ok = decodeString(tokenStart + 1, tokenEnd - 1, value);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return nullptr;
</span><span class="cx"> result = InspectorString::create(value);
</span><span class="lines">@@ -402,7 +420,7 @@
</span><span class="cx"> if (token != STRING)
</span><span class="cx"> return nullptr;
</span><span class="cx"> String key;
</span><del>- if (!decodeString(tokenStart + 1, tokenEnd - 1, &key))
</del><ins>+ if (!decodeString(tokenStart + 1, tokenEnd - 1, key))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> start = tokenEnd;
</span><span class="cx">
</span><span class="lines">@@ -444,25 +462,25 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool escapeChar(UChar c, StringBuilder* dst)
</del><ins>+inline bool escapeChar(UChar c, StringBuilder& dst)
</ins><span class="cx"> {
</span><span class="cx"> switch (c) {
</span><del>- case '\b': dst->append("\\b", 2); break;
- case '\f': dst->append("\\f", 2); break;
- case '\n': dst->append("\\n", 2); break;
- case '\r': dst->append("\\r", 2); break;
- case '\t': dst->append("\\t", 2); break;
- case '\\': dst->append("\\\\", 2); break;
- case '"': dst->append("\\\"", 2); break;
</del><ins>+ case '\b': dst.appendLiteral("\\b"); break;
+ case '\f': dst.appendLiteral("\\f"); break;
+ case '\n': dst.appendLiteral("\\n"); break;
+ case '\r': dst.appendLiteral("\\r"); break;
+ case '\t': dst.appendLiteral("\\t"); break;
+ case '\\': dst.appendLiteral("\\\\"); break;
+ case '"': dst.appendLiteral("\\\""); break;
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void doubleQuoteString(const String& str, StringBuilder* dst)
</del><ins>+inline void doubleQuoteString(const String& str, StringBuilder& dst)
</ins><span class="cx"> {
</span><del>- dst->append('"');
</del><ins>+ dst.append('"');
</ins><span class="cx"> for (unsigned i = 0; i < str.length(); ++i) {
</span><span class="cx"> UChar c = str[i];
</span><span class="cx"> if (!escapeChar(c, dst)) {
</span><span class="lines">@@ -470,203 +488,206 @@
</span><span class="cx"> // 1. Escaping <, > to prevent script execution.
</span><span class="cx"> // 2. Technically, we could also pass through c > 126 as UTF8, but this
</span><span class="cx"> // is also optional. It would also be a pain to implement here.
</span><del>- dst->append(String::format("\\u%04X", c));
</del><ins>+ dst.append(String::format("\\u%04X", c));
</ins><span class="cx"> } else
</span><del>- dst->append(c);
</del><ins>+ dst.append(c);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- dst->append('"');
</del><ins>+ dst.append('"');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // anonymous namespace
</span><span class="cx">
</span><del>-bool InspectorValue::asBoolean(bool*) const
</del><ins>+bool InspectorValue::asBoolean(bool&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asDouble(double*) const
</del><ins>+bool InspectorValue::asDouble(double&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asDouble(float*) const
</del><ins>+bool InspectorValue::asDouble(float&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(int*) const
</del><ins>+bool InspectorValue::asInteger(int&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(unsigned*) const
</del><ins>+bool InspectorValue::asInteger(unsigned&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(long*) const
</del><ins>+bool InspectorValue::asInteger(long&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(long long*) const
</del><ins>+bool InspectorValue::asInteger(long long&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(unsigned long*) const
</del><ins>+bool InspectorValue::asInteger(unsigned long&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asInteger(unsigned long long*) const
</del><ins>+bool InspectorValue::asInteger(unsigned long long&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asString(String*) const
</del><ins>+bool InspectorValue::asString(String&) const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asValue(RefPtr<InspectorValue>* output)
</del><ins>+bool InspectorValue::asValue(RefPtr<InspectorValue>& output)
</ins><span class="cx"> {
</span><del>- *output = this;
</del><ins>+ output = this;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asObject(RefPtr<InspectorObject>*)
</del><ins>+bool InspectorValue::asObject(RefPtr<InspectorObject>&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorValue::asArray(RefPtr<InspectorArray>*)
</del><ins>+bool InspectorValue::asArray(RefPtr<InspectorArray>&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InspectorObject> InspectorValue::asObject()
</del><ins>+bool InspectorValue::parseJSON(const String& jsonInput, RefPtr<InspectorValue>& output)
</ins><span class="cx"> {
</span><del>- return nullptr;
-}
-
-PassRefPtr<InspectorArray> InspectorValue::asArray()
-{
- return nullptr;
-}
-
-PassRefPtr<InspectorValue> InspectorValue::parseJSON(const String& json)
-{
</del><span class="cx"> // FIXME: This whole file should just use StringView instead of UChar/length and avoid upconverting.
</span><del>- auto characters = StringView(json).upconvertedCharacters();
</del><ins>+ auto characters = StringView(jsonInput).upconvertedCharacters();
</ins><span class="cx"> const UChar* start = characters;
</span><del>- const UChar* end = start + json.length();
</del><ins>+ const UChar* end = start + jsonInput.length();
</ins><span class="cx"> const UChar* tokenEnd;
</span><del>- RefPtr<InspectorValue> value = buildValue(start, end, &tokenEnd, 0);
- if (!value || tokenEnd != end)
- return nullptr;
- return value.release();
</del><ins>+ RefPtr<InspectorValue> result = buildValue(start, end, &tokenEnd, 0);
+ if (!result || tokenEnd != end)
+ return false;
+
+ output = result.release();
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String InspectorValue::toJSONString() const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> result.reserveCapacity(512);
</span><del>- writeJSON(&result);
</del><ins>+ writeJSON(result);
</ins><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorValue::writeJSON(StringBuilder* output) const
</del><ins>+void InspectorValue::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == Type::Null);
</span><del>- output->append(nullString, 4);
</del><ins>+
+ output.appendLiteral("null");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asBoolean(bool* output) const
</del><ins>+bool InspectorBasicValue::asBoolean(bool& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Boolean)
</span><span class="cx"> return false;
</span><del>- *output = m_boolValue;
</del><ins>+
+ output = m_booleanValue;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asDouble(double* output) const
</del><ins>+bool InspectorBasicValue::asDouble(double& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = m_doubleValue;
</del><ins>+
+ output = m_doubleValue;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asDouble(float* output) const
</del><ins>+bool InspectorBasicValue::asDouble(float& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<float>(m_doubleValue);
</del><ins>+
+ output = static_cast<float>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asInteger(int* output) const
</del><ins>+bool InspectorBasicValue::asInteger(int& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<int>(m_doubleValue);
</del><ins>+
+ output = static_cast<int>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asInteger(unsigned* output) const
</del><ins>+bool InspectorBasicValue::asInteger(unsigned& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<unsigned>(m_doubleValue);
</del><ins>+
+ output = static_cast<unsigned>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asInteger(long* output) const
</del><ins>+bool InspectorBasicValue::asInteger(long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<long>(m_doubleValue);
</del><ins>+
+ output = static_cast<long>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asInteger(long long* output) const
</del><ins>+bool InspectorBasicValue::asInteger(long long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<long long>(m_doubleValue);
</del><ins>+
+ output = static_cast<long long>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asInteger(unsigned long* output) const
</del><ins>+bool InspectorBasicValue::asInteger(unsigned long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<unsigned long>(m_doubleValue);
</del><ins>+
+ output = static_cast<unsigned long>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBasicValue::asInteger(unsigned long long* output) const
</del><ins>+bool InspectorBasicValue::asInteger(unsigned long long& output) const
</ins><span class="cx"> {
</span><span class="cx"> if (type() != Type::Integer && type() != Type::Double)
</span><span class="cx"> return false;
</span><del>- *output = static_cast<unsigned long long>(m_doubleValue);
</del><ins>+
+ output = static_cast<unsigned long long>(m_doubleValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBasicValue::writeJSON(StringBuilder* output) const
</del><ins>+void InspectorBasicValue::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(type() == Type::Boolean || type() == Type::Double || type() == Type::Integer);
</span><ins>+
</ins><span class="cx"> if (type() == Type::Boolean) {
</span><del>- if (m_boolValue)
- output->append(trueString, 4);
</del><ins>+ if (m_booleanValue)
+ output.appendLiteral("true");
</ins><span class="cx"> else
</span><del>- output->append(falseString, 5);
</del><ins>+ output.appendLiteral("false");
</ins><span class="cx"> } else if (type() == Type::Double || type() == Type::Integer) {
</span><span class="cx"> NumberToLStringBuffer buffer;
</span><span class="cx"> if (!std::isfinite(m_doubleValue)) {
</span><del>- output->append(nullString, 4);
</del><ins>+ output.appendLiteral("null");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> DecimalNumber decimal = m_doubleValue;
</span><span class="lines">@@ -675,23 +696,23 @@
</span><span class="cx"> // Not enough room for decimal. Use exponential format.
</span><span class="cx"> if (decimal.bufferLengthForStringExponential() > WTF::NumberToStringBufferLength) {
</span><span class="cx"> // Fallback for an abnormal case if it's too little even for exponential.
</span><del>- output->append("NaN", 3);
</del><ins>+ output.appendLiteral("NaN");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> length = decimal.toStringExponential(buffer, WTF::NumberToStringBufferLength);
</span><span class="cx"> } else
</span><span class="cx"> length = decimal.toStringDecimal(buffer, WTF::NumberToStringBufferLength);
</span><del>- output->append(buffer, length);
</del><ins>+ output.append(buffer, length);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorString::asString(String* output) const
</del><ins>+bool InspectorString::asString(String& output) const
</ins><span class="cx"> {
</span><del>- *output = m_stringValue;
</del><ins>+ output = m_stringValue;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorString::writeJSON(StringBuilder* output) const
</del><ins>+void InspectorString::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(type() == Type::String);
</span><span class="cx"> doubleQuoteString(m_stringValue, output);
</span><span class="lines">@@ -701,33 +722,31 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorObjectBase::asObject(RefPtr<InspectorObject>* output)
</del><ins>+bool InspectorObjectBase::asObject(RefPtr<InspectorObject>& output)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(sizeof(InspectorObject) == sizeof(InspectorObjectBase), cannot_cast);
</span><del>- *output = static_cast<InspectorObject*>(this);
</del><ins>+
+ output = static_cast<InspectorObject*>(this);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InspectorObject> InspectorObjectBase::asObject()
-{
- return openAccessors();
-}
-
</del><span class="cx"> InspectorObject* InspectorObjectBase::openAccessors()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(sizeof(InspectorObject) == sizeof(InspectorObjectBase), cannot_cast);
</span><ins>+
</ins><span class="cx"> return static_cast<InspectorObject*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorObjectBase::getBoolean(const String& name, bool* output) const
</del><ins>+bool InspectorObjectBase::getBoolean(const String& name, bool& output) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> value = get(name);
</span><span class="cx"> if (!value)
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> return value->asBoolean(output);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorObjectBase::getString(const String& name, String* output) const
</del><ins>+bool InspectorObjectBase::getString(const String& name, String& output) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> value = get(name);
</span><span class="cx"> if (!value)
</span><span class="lines">@@ -740,7 +759,10 @@
</span><span class="cx"> PassRefPtr<InspectorValue> value = get(name);
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><del>- return value->asObject();
</del><ins>+
+ RefPtr<InspectorObject> result;
+ value->asObject(result);
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<InspectorArray> InspectorObjectBase::getArray(const String& name) const
</span><span class="lines">@@ -748,7 +770,10 @@
</span><span class="cx"> PassRefPtr<InspectorValue> value = get(name);
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><del>- return value->asArray();
</del><ins>+
+ RefPtr<InspectorArray> result;
+ value->asArray(result);
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<InspectorValue> InspectorObjectBase::get(const String& name) const
</span><span class="lines">@@ -770,19 +795,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorObjectBase::writeJSON(StringBuilder* output) const
</del><ins>+void InspectorObjectBase::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><del>- output->append('{');
</del><ins>+ output.append('{');
</ins><span class="cx"> for (size_t i = 0; i < m_order.size(); ++i) {
</span><span class="cx"> Dictionary::const_iterator it = m_data.find(m_order[i]);
</span><span class="cx"> ASSERT(it != m_data.end());
</span><span class="cx"> if (i)
</span><del>- output->append(',');
</del><ins>+ output.append(',');
</ins><span class="cx"> doubleQuoteString(it->key, output);
</span><del>- output->append(':');
</del><ins>+ output.append(':');
</ins><span class="cx"> it->value->writeJSON(output);
</span><span class="cx"> }
</span><del>- output->append('}');
</del><ins>+ output.append('}');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorObjectBase::InspectorObjectBase()
</span><span class="lines">@@ -796,28 +821,22 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorArrayBase::asArray(RefPtr<InspectorArray>* output)
</del><ins>+bool InspectorArrayBase::asArray(RefPtr<InspectorArray>& output)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(sizeof(InspectorArrayBase) == sizeof(InspectorArray), cannot_cast);
</span><del>- *output = static_cast<InspectorArray*>(this);
</del><ins>+ output = static_cast<InspectorArray*>(this);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InspectorArray> InspectorArrayBase::asArray()
</del><ins>+void InspectorArrayBase::writeJSON(StringBuilder& output) const
</ins><span class="cx"> {
</span><del>- COMPILE_ASSERT(sizeof(InspectorArrayBase) == sizeof(InspectorArray), cannot_cast);
- return static_cast<InspectorArray*>(this);
-}
-
-void InspectorArrayBase::writeJSON(StringBuilder* output) const
-{
- output->append('[');
</del><ins>+ output.append('[');
</ins><span class="cx"> for (Vector<RefPtr<InspectorValue>>::const_iterator it = m_data.begin(); it != m_data.end(); ++it) {
</span><span class="cx"> if (it != m_data.begin())
</span><del>- output->append(',');
</del><ins>+ output.append(',');
</ins><span class="cx"> (*it)->writeJSON(output);
</span><span class="cx"> }
</span><del>- output->append(']');
</del><ins>+ output.append(']');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorArrayBase::InspectorArrayBase()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorInspectorValuesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.h (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.h 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/InspectorValues.h 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2009 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2014 University of Washington. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -69,26 +70,24 @@
</span><span class="cx">
</span><span class="cx"> bool isNull() const { return m_type == Type::Null; }
</span><span class="cx">
</span><del>- virtual bool asBoolean(bool* output) const;
- virtual bool asInteger(int* output) const;
- virtual bool asInteger(unsigned* output) const;
- virtual bool asInteger(long* output) const;
- virtual bool asInteger(long long* output) const;
- virtual bool asInteger(unsigned long* output) const;
- virtual bool asInteger(unsigned long long* output) const;
- virtual bool asDouble(double* output) const;
- virtual bool asDouble(float* output) const;
- virtual bool asString(String* output) const;
- virtual bool asValue(RefPtr<InspectorValue>* output);
- virtual bool asObject(RefPtr<InspectorObject>* output);
- virtual bool asArray(RefPtr<InspectorArray>* output);
- virtual PassRefPtr<InspectorObject> asObject();
- virtual PassRefPtr<InspectorArray> asArray();
</del><ins>+ virtual bool asBoolean(bool&) const;
+ virtual bool asInteger(int&) const;
+ virtual bool asInteger(unsigned&) const;
+ virtual bool asInteger(long&) const;
+ virtual bool asInteger(long long&) const;
+ virtual bool asInteger(unsigned long&) const;
+ virtual bool asInteger(unsigned long long&) const;
+ virtual bool asDouble(double&) const;
+ virtual bool asDouble(float&) const;
+ virtual bool asString(String&) const;
+ virtual bool asValue(RefPtr<InspectorValue>&);
+ virtual bool asObject(RefPtr<InspectorObject>&);
+ virtual bool asArray(RefPtr<InspectorArray>&);
</ins><span class="cx">
</span><del>- static PassRefPtr<InspectorValue> parseJSON(const String& json);
</del><ins>+ static bool parseJSON(const String& jsonInput, RefPtr<InspectorValue>& output);
</ins><span class="cx">
</span><span class="cx"> String toJSONString() const;
</span><del>- virtual void writeJSON(StringBuilder* output) const;
</del><ins>+ virtual void writeJSON(StringBuilder& output) const;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit InspectorValue(Type type) : m_type(type) { }
</span><span class="lines">@@ -104,24 +103,24 @@
</span><span class="cx"> static PassRefPtr<InspectorBasicValue> create(int);
</span><span class="cx"> static PassRefPtr<InspectorBasicValue> create(double);
</span><span class="cx">
</span><del>- virtual bool asBoolean(bool* output) const override;
</del><ins>+ virtual bool asBoolean(bool&) const override;
</ins><span class="cx"> // Numbers from the frontend are always parsed as doubles, so we allow
</span><span class="cx"> // clients to convert to integral values with this function.
</span><del>- virtual bool asInteger(int* output) const override;
- virtual bool asInteger(unsigned* output) const override;
- virtual bool asInteger(long* output) const override;
- virtual bool asInteger(long long* output) const override;
- virtual bool asInteger(unsigned long* output) const override;
- virtual bool asInteger(unsigned long long* output) const override;
- virtual bool asDouble(double* output) const override;
- virtual bool asDouble(float* output) const override;
</del><ins>+ virtual bool asInteger(int&) const override;
+ virtual bool asInteger(unsigned&) const override;
+ virtual bool asInteger(long&) const override;
+ virtual bool asInteger(long long&) const override;
+ virtual bool asInteger(unsigned long&) const override;
+ virtual bool asInteger(unsigned long long&) const override;
+ virtual bool asDouble(double&) const override;
+ virtual bool asDouble(float&) const override;
</ins><span class="cx">
</span><del>- virtual void writeJSON(StringBuilder* output) const override;
</del><ins>+ virtual void writeJSON(StringBuilder& output) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit InspectorBasicValue(bool value)
</span><span class="cx"> : InspectorValue(Type::Boolean)
</span><del>- , m_boolValue(value) { }
</del><ins>+ , m_booleanValue(value) { }
</ins><span class="cx">
</span><span class="cx"> explicit InspectorBasicValue(int value)
</span><span class="cx"> : InspectorValue(Type::Integer)
</span><span class="lines">@@ -132,7 +131,7 @@
</span><span class="cx"> , m_doubleValue(value) { }
</span><span class="cx">
</span><span class="cx"> union {
</span><del>- bool m_boolValue;
</del><ins>+ bool m_booleanValue;
</ins><span class="cx"> double m_doubleValue;
</span><span class="cx"> };
</span><span class="cx"> };
</span><span class="lines">@@ -142,9 +141,9 @@
</span><span class="cx"> static PassRefPtr<InspectorString> create(const String&);
</span><span class="cx"> static PassRefPtr<InspectorString> create(const char*);
</span><span class="cx">
</span><del>- virtual bool asString(String* output) const override;
</del><ins>+ virtual bool asString(String& output) const override;
</ins><span class="cx">
</span><del>- virtual void writeJSON(StringBuilder* output) const override;
</del><ins>+ virtual void writeJSON(StringBuilder& output) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit InspectorString(const String& value)
</span><span class="lines">@@ -166,13 +165,12 @@
</span><span class="cx"> typedef Dictionary::iterator iterator;
</span><span class="cx"> typedef Dictionary::const_iterator const_iterator;
</span><span class="cx">
</span><del>- virtual PassRefPtr<InspectorObject> asObject() override;
</del><span class="cx"> InspectorObject* openAccessors();
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorObjectBase();
</span><span class="cx">
</span><del>- virtual bool asObject(RefPtr<InspectorObject>* output) override;
</del><ins>+ virtual bool asObject(RefPtr<InspectorObject>& output) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: use templates to reduce the amount of duplicated set*() methods.
</span><span class="cx"> void setBoolean(const String& name, bool);
</span><span class="lines">@@ -187,15 +185,15 @@
</span><span class="cx"> const_iterator find(const String& name) const;
</span><span class="cx">
</span><span class="cx"> // FIXME: use templates to reduce the amount of duplicated get*() methods.
</span><del>- bool getBoolean(const String& name, bool* output) const;
- template<class T> bool getDouble(const String& name, T* output) const
</del><ins>+ bool getBoolean(const String& name, bool& output) const;
+ template<class T> bool getDouble(const String& name, T& output) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> value = get(name);
</span><span class="cx"> if (!value)
</span><span class="cx"> return false;
</span><span class="cx"> return value->asDouble(output);
</span><span class="cx"> }
</span><del>- template<class T> bool getInteger(const String& name, T* output) const
</del><ins>+ template<class T> bool getInteger(const String& name, T& output) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> value = get(name);
</span><span class="cx"> if (!value)
</span><span class="lines">@@ -203,14 +201,14 @@
</span><span class="cx"> return value->asInteger(output);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool getString(const String& name, String* output) const;
</del><ins>+ bool getString(const String& name, String& output) const;
</ins><span class="cx"> PassRefPtr<InspectorObject> getObject(const String& name) const;
</span><span class="cx"> PassRefPtr<InspectorArray> getArray(const String& name) const;
</span><span class="cx"> PassRefPtr<InspectorValue> get(const String& name) const;
</span><span class="cx">
</span><span class="cx"> void remove(const String& name);
</span><span class="cx">
</span><del>- virtual void writeJSON(StringBuilder* output) const override;
</del><ins>+ virtual void writeJSON(StringBuilder& output) const override;
</ins><span class="cx">
</span><span class="cx"> iterator begin() { return m_data.begin(); }
</span><span class="cx"> iterator end() { return m_data.end(); }
</span><span class="lines">@@ -264,14 +262,12 @@
</span><span class="cx"> typedef Vector<RefPtr<InspectorValue>>::iterator iterator;
</span><span class="cx"> typedef Vector<RefPtr<InspectorValue>>::const_iterator const_iterator;
</span><span class="cx">
</span><del>- virtual PassRefPtr<InspectorArray> asArray() override;
-
</del><span class="cx"> unsigned length() const { return m_data.size(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorArrayBase();
</span><span class="cx">
</span><del>- virtual bool asArray(RefPtr<InspectorArray>* output) override;
</del><ins>+ virtual bool asArray(RefPtr<InspectorArray>&) override;
</ins><span class="cx">
</span><span class="cx"> void pushBoolean(bool);
</span><span class="cx"> void pushInteger(int);
</span><span class="lines">@@ -283,7 +279,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<InspectorValue> get(size_t index);
</span><span class="cx">
</span><del>- virtual void writeJSON(StringBuilder* output) const override;
</del><ins>+ virtual void writeJSON(StringBuilder& output) const override;
</ins><span class="cx">
</span><span class="cx"> iterator begin() { return m_data.begin(); }
</span><span class="cx"> iterator end() { return m_data.end(); }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -208,13 +208,13 @@
</span><span class="cx"> for (unsigned i = 0; i < actionsLength; ++i) {
</span><span class="cx"> RefPtr<InspectorValue> value = actions->get(i);
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><del>- if (!value->asObject(&object)) {
</del><ins>+ if (!value->asObject(object)) {
</ins><span class="cx"> *errorString = ASCIILiteral("BreakpointAction of incorrect type, expected object");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String typeString;
</span><del>- if (!object->getString(ASCIILiteral("type"), &typeString)) {
</del><ins>+ if (!object->getString(ASCIILiteral("type"), typeString)) {
</ins><span class="cx"> *errorString = ASCIILiteral("BreakpointAction had type missing");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -228,10 +228,10 @@
</span><span class="cx"> // Specifying an identifier is optional. They are used to correlate probe samples
</span><span class="cx"> // in the frontend across multiple backend probe actions and segregate object groups.
</span><span class="cx"> int identifier = 0;
</span><del>- object->getInteger(ASCIILiteral("id"), &identifier);
</del><ins>+ object->getInteger(ASCIILiteral("id"), identifier);
</ins><span class="cx">
</span><span class="cx"> String data;
</span><del>- object->getString(ASCIILiteral("data"), &data);
</del><ins>+ object->getString(ASCIILiteral("data"), data);
</ins><span class="cx">
</span><span class="cx"> result->append(ScriptBreakpointAction(type, identifier, data));
</span><span class="cx"> }
</span><span class="lines">@@ -261,8 +261,8 @@
</span><span class="cx"> bool autoContinue = false;
</span><span class="cx"> RefPtr<InspectorArray> actions;
</span><span class="cx"> if (options) {
</span><del>- (*options)->getString(ASCIILiteral("condition"), &condition);
- (*options)->getBoolean(ASCIILiteral("autoContinue"), &autoContinue);
</del><ins>+ (*options)->getString(ASCIILiteral("condition"), condition);
+ (*options)->getBoolean(ASCIILiteral("autoContinue"), autoContinue);
</ins><span class="cx"> actions = (*options)->getArray(ASCIILiteral("actions"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -285,18 +285,18 @@
</span><span class="cx"> *outBreakpointIdentifier = breakpointIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool parseLocation(ErrorString* errorString, InspectorObject* location, JSC::SourceID* sourceID, unsigned* lineNumber, unsigned* columnNumber)
</del><ins>+static bool parseLocation(ErrorString* errorString, InspectorObject& location, JSC::SourceID& sourceID, unsigned& lineNumber, unsigned& columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> String scriptIDStr;
</span><del>- if (!location->getString(ASCIILiteral("scriptId"), &scriptIDStr) || !location->getInteger(ASCIILiteral("lineNumber"), lineNumber)) {
- *sourceID = JSC::noSourceID;
</del><ins>+ if (!location.getString(ASCIILiteral("scriptId"), scriptIDStr) || !location.getInteger(ASCIILiteral("lineNumber"), lineNumber)) {
+ sourceID = JSC::noSourceID;
</ins><span class="cx"> *errorString = ASCIILiteral("scriptId and lineNumber are required.");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *sourceID = scriptIDStr.toIntPtr();
- *columnNumber = 0;
- location->getInteger(ASCIILiteral("columnNumber"), columnNumber);
</del><ins>+ sourceID = scriptIDStr.toIntPtr();
+ columnNumber = 0;
+ location.getInteger(ASCIILiteral("columnNumber"), columnNumber);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -305,15 +305,15 @@
</span><span class="cx"> JSC::SourceID sourceID;
</span><span class="cx"> unsigned lineNumber;
</span><span class="cx"> unsigned columnNumber;
</span><del>- if (!parseLocation(errorString, location.get(), &sourceID, &lineNumber, &columnNumber))
</del><ins>+ if (!parseLocation(errorString, *location, sourceID, lineNumber, columnNumber))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String condition = emptyString();
</span><span class="cx"> bool autoContinue = false;
</span><span class="cx"> RefPtr<InspectorArray> actions;
</span><span class="cx"> if (options) {
</span><del>- (*options)->getString(ASCIILiteral("condition"), &condition);
- (*options)->getBoolean(ASCIILiteral("autoContinue"), &autoContinue);
</del><ins>+ (*options)->getString(ASCIILiteral("condition"), condition);
+ (*options)->getBoolean(ASCIILiteral("autoContinue"), autoContinue);
</ins><span class="cx"> actions = (*options)->getArray(ASCIILiteral("actions"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> JSC::SourceID sourceID;
</span><span class="cx"> unsigned lineNumber;
</span><span class="cx"> unsigned columnNumber;
</span><del>- if (!parseLocation(errorString, location.get(), &sourceID, &lineNumber, &columnNumber))
</del><ins>+ if (!parseLocation(errorString, *location, sourceID, lineNumber, columnNumber))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ScriptBreakpoint breakpoint(lineNumber, columnNumber, "", false);
</span><span class="lines">@@ -593,18 +593,22 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto it = m_javaScriptBreakpoints.begin(), end = m_javaScriptBreakpoints.end(); it != end; ++it) {
</span><del>- RefPtr<InspectorObject> breakpointObject = it->value->asObject();
</del><ins>+ RefPtr<InspectorObject> breakpointObject;
+ if (!it->value->asObject(breakpointObject))
+ return;
+
</ins><span class="cx"> bool isRegex;
</span><del>- breakpointObject->getBoolean(ASCIILiteral("isRegex"), &isRegex);
</del><ins>+ breakpointObject->getBoolean(ASCIILiteral("isRegex"), isRegex);
</ins><span class="cx"> String url;
</span><del>- breakpointObject->getString(ASCIILiteral("url"), &url);
</del><ins>+ breakpointObject->getString(ASCIILiteral("url"), url);
</ins><span class="cx"> if (!matches(scriptURL, url, isRegex))
</span><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> ScriptBreakpoint breakpoint;
</span><del>- breakpointObject->getInteger(ASCIILiteral("lineNumber"), &breakpoint.lineNumber);
- breakpointObject->getInteger(ASCIILiteral("columnNumber"), &breakpoint.columnNumber);
- breakpointObject->getString(ASCIILiteral("condition"), &breakpoint.condition);
- breakpointObject->getBoolean(ASCIILiteral("autoContinue"), &breakpoint.autoContinue);
</del><ins>+ breakpointObject->getInteger(ASCIILiteral("lineNumber"), breakpoint.lineNumber);
+ breakpointObject->getInteger(ASCIILiteral("columnNumber"), breakpoint.columnNumber);
+ breakpointObject->getString(ASCIILiteral("condition"), breakpoint.condition);
+ breakpointObject->getBoolean(ASCIILiteral("autoContinue"), breakpoint.autoContinue);
</ins><span class="cx"> ErrorString errorString;
</span><span class="cx"> RefPtr<InspectorArray> actions = breakpointObject->getArray(ASCIILiteral("actions"));
</span><span class="cx"> if (!breakpointActionsFromProtocol(&errorString, actions, &breakpoint.actions)) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> for (size_t i = 0; i < locations->length(); i++) {
</span><span class="cx"> RefPtr<Inspector::InspectorValue> value = locations->get(i);
</span><span class="cx"> RefPtr<InspectorObject> location;
</span><del>- if (!value->asObject(&location)) {
</del><ins>+ if (!value->asObject(location)) {
</ins><span class="cx"> *errorString = ASCIILiteral("Array of TypeLocation objects has an object that does not have type of TypeLocation.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -221,9 +221,9 @@
</span><span class="cx"> int descriptor;
</span><span class="cx"> String sourceIDAsString;
</span><span class="cx"> int divot;
</span><del>- location->getInteger(ASCIILiteral("typeInformationDescriptor"), &descriptor);
- location->getString(ASCIILiteral("sourceID"), &sourceIDAsString);
- location->getInteger(ASCIILiteral("divot"), &divot);
</del><ins>+ location->getInteger(ASCIILiteral("typeInformationDescriptor"), descriptor);
+ location->getString(ASCIILiteral("sourceID"), sourceIDAsString);
+ location->getInteger(ASCIILiteral("divot"), divot);
</ins><span class="cx">
</span><span class="cx"> bool okay;
</span><span class="cx"> TypeLocation* typeLocation = vm.typeProfiler()->findLocation(divot, sourceIDAsString.toIntPtrStrict(&okay), static_cast<TypeProfilerSearchDescriptor>(descriptor));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorscriptscodegengenerate_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> lines.append('void BindingTraits<%s>::assertValueHasExpectedType(Inspector::InspectorValue* value)' % (Generator.protocol_type_string_for_type(object_declaration.type)))
</span><span class="cx"> lines.append("""{
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><del>- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);""")
</del><ins>+ bool castSucceeded = value->asObject(object);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);""")
</ins><span class="cx"> for type_member in required_members:
</span><span class="cx"> args = {
</span><span class="cx"> 'memberName': type_member.member_name,
</span><span class="lines">@@ -172,11 +172,11 @@
</span><span class="cx"> lines.append('#if !ASSERT_DISABLED')
</span><span class="cx"> lines.append('void %s(Inspector::InspectorValue* value)' % Generator.assertion_method_for_type_member(enum_member, object_declaration))
</span><span class="cx"> lines.append('{')
</span><del>- lines.append(' String s;')
- lines.append(' bool cast_res = value->asString(&s);')
- lines.append(' ASSERT(cast_res);')
</del><ins>+ lines.append(' String result;')
+ lines.append(' bool castSucceeded = value->asString(result);')
+ lines.append(' ASSERT(castSucceeded);')
</ins><span class="cx">
</span><del>- assert_condition = ' || '.join(['s == "%s"' % enum_value for enum_value in enum_member.type.enum_values()])
</del><ins>+ assert_condition = ' || '.join(['result == "%s"' % enum_value for enum_value in enum_member.type.enum_values()])
</ins><span class="cx"> lines.append(' ASSERT(%s);' % assert_condition)
</span><span class="cx"> lines.append('}')
</span><span class="cx"> lines.append('#endif // !ASSERT_DISABLED')
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -253,14 +253,14 @@
</span><span class="cx"> ProtocolObjectRuntimeCast = (
</span><span class="cx"> """PassRefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::InspectorObject> object;
- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ RefPtr<Inspector::InspectorObject> result;
+ bool castSucceeded = value->asObject(result);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><del>- BindingTraits<${objectType}>::assertValueHasExpectedType(object.get());
</del><ins>+ BindingTraits<${objectType}>::assertValueHasExpectedType(result.get());
</ins><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> COMPILE_ASSERT(sizeof(${objectType}) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
</span><del>- return static_cast<${objectType}*>(static_cast<Inspector::InspectorObjectBase*>(object.get()));
</del><ins>+ return static_cast<${objectType}*>(static_cast<Inspector::InspectorObjectBase*>(result.get()));
</ins><span class="cx"> }
</span><span class="cx"> """
</span><span class="cx"> )
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -620,10 +620,10 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><del>- String s;
- bool cast_res = value->asString(&s);
- ASSERT(cast_res);
- ASSERT(s == "Ducks" || s == "Hens" || s == "Crows" || s == "Flamingos");
</del><ins>+ String result;
+ bool castSucceeded = value->asString(result);
+ ASSERT(castSucceeded);
+ ASSERT(result == "Ducks" || result == "Hens" || result == "Crows" || result == "Flamingos");
</ins><span class="cx"> }
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><span class="lines">@@ -631,8 +631,8 @@
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><del>- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ bool castSucceeded = value->asObject(object);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx"> {
</span><span class="cx"> InspectorObject::iterator stringPos = object->find(ASCIILiteral("string"));
</span><span class="cx"> ASSERT(stringPos != object->end());
</span><span class="lines">@@ -667,14 +667,14 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::InspectorObject> object;
- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ RefPtr<Inspector::InspectorObject> result;
+ bool castSucceeded = value->asObject(result);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><del>- BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
</del><ins>+ BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(result.get());
</ins><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> COMPILE_ASSERT(sizeof(Inspector::Protocol::Test::TypeNeedingCast) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
</span><del>- return static_cast<Inspector::Protocol::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(object.get()));
</del><ins>+ return static_cast<Inspector::Protocol::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(result.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -682,8 +682,8 @@
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><del>- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ bool castSucceeded = value->asObject(object);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx">
</span><span class="cx"> int foundPropertiesCount = 0;
</span><span class="cx"> {
</span><span class="lines">@@ -702,8 +702,8 @@
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><del>- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);
</del><ins>+ bool castSucceeded = value->asObject(object);
+ ASSERT_UNUSED(castSucceeded, castSucceeded);
</ins><span class="cx">
</span><span class="cx"> int foundPropertiesCount = 0;
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCorereplayEncodedValuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/replay/EncodedValue.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/replay/EncodedValue.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/replay/EncodedValue.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> PassRefPtr<InspectorObject> EncodedValue::asObject()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> result;
</span><del>- bool castSucceeded = m_value->asObject(&result);
</del><ins>+ bool castSucceeded = m_value->asObject(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result.release();
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> PassRefPtr<InspectorArray> EncodedValue::asArray()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorArray> result;
</span><del>- bool castSucceeded = m_value->asArray(&result);
</del><ins>+ bool castSucceeded = m_value->asArray(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result.release();
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> template<> bool EncodedValue::convertTo<bool>()
</span><span class="cx"> {
</span><span class="cx"> bool result;
</span><del>- bool castSucceeded = m_value->asBoolean(&result);
</del><ins>+ bool castSucceeded = m_value->asBoolean(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> template<> double EncodedValue::convertTo<double>()
</span><span class="cx"> {
</span><span class="cx"> double result;
</span><del>- bool castSucceeded = m_value->asDouble(&result);
</del><ins>+ bool castSucceeded = m_value->asDouble(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> template<> float EncodedValue::convertTo<float>()
</span><span class="cx"> {
</span><span class="cx"> float result;
</span><del>- bool castSucceeded = m_value->asDouble(&result);
</del><ins>+ bool castSucceeded = m_value->asDouble(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> template<> int32_t EncodedValue::convertTo<int32_t>()
</span><span class="cx"> {
</span><span class="cx"> int32_t result;
</span><del>- bool castSucceeded = m_value->asInteger(&result);
</del><ins>+ bool castSucceeded = m_value->asInteger(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> template<> int64_t EncodedValue::convertTo<int64_t>()
</span><span class="cx"> {
</span><span class="cx"> int64_t result;
</span><del>- bool castSucceeded = m_value->asInteger(&result);
</del><ins>+ bool castSucceeded = m_value->asInteger(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> template<> uint32_t EncodedValue::convertTo<uint32_t>()
</span><span class="cx"> {
</span><span class="cx"> uint32_t result;
</span><del>- bool castSucceeded = m_value->asInteger(&result);
</del><ins>+ bool castSucceeded = m_value->asInteger(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> template<> uint64_t EncodedValue::convertTo<uint64_t>()
</span><span class="cx"> {
</span><span class="cx"> uint64_t result;
</span><del>- bool castSucceeded = m_value->asInteger(&result);
</del><ins>+ bool castSucceeded = m_value->asInteger(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> template<> String EncodedValue::convertTo<String>()
</span><span class="cx"> {
</span><span class="cx"> String result;
</span><del>- bool castSucceeded = m_value->asString(&result);
</del><ins>+ bool castSucceeded = m_value->asString(result);
</ins><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-09-29 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: InspectorValues should use references for out parameters
+ https://bugs.webkit.org/show_bug.cgi?id=137190
+
+ Reviewed by Joseph Pecoraro.
+
+ Clean up some call sites to explicitly check for cast success, and simplify
+ some exceptional control flows.
+
+ No new tests, no behavior changed.
+
+ * inspector/CommandLineAPIHost.cpp:
+ (WebCore::CommandLineAPIHost::inspectImpl):
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::computePseudoClassMask):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::parseColor):
+ (WebCore::parseConfigColor):
+ (WebCore::parseQuad):
+ (WebCore::InspectorDOMAgent::performSearch):
+ (WebCore::InspectorDOMAgent::highlightConfigFromInspectorObject):
+ (WebCore::InspectorDOMAgent::innerHighlightQuad):
+ (WebCore::InspectorDOMAgent::highlightFrame):
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::findStorageArea):
+ * inspector/InspectorIndexedDBAgent.cpp: Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL.
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
+ * inspector/InspectorReplayAgent.cpp:
+ (WebCore::InspectorReplayAgent::replayToPosition):
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::willSendRequest):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyle::styleWithProperties):
+ * inspector/InspectorStyleSheet.h:
+ (WebCore::InspectorCSSId::InspectorCSSId):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::startFromConsole):
+ (WebCore::InspectorTimelineAgent::stopFromConsole):
+ * inspector/InspectorWorkerAgent.cpp:
+
</ins><span class="cx"> 2014-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GLIB] Add API to GMainLoopSource to schedule sources after a delay in microseconds
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/CommandLineAPIHost.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -94,10 +94,15 @@
</span><span class="cx">
</span><span class="cx"> void CommandLineAPIHost::inspectImpl(PassRefPtr<InspectorValue> object, PassRefPtr<InspectorValue> hints)
</span><span class="cx"> {
</span><del>- if (m_inspectorAgent) {
- RefPtr<Inspector::Protocol::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(object);
- m_inspectorAgent->inspect(remoteObject, hints->asObject());
- }
</del><ins>+ if (!m_inspectorAgent)
+ return;
+
+ RefPtr<InspectorObject> hintsObject;
+ if (!hints->asObject(hintsObject))
+ return;
+
+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(object);
+ m_inspectorAgent->inspect(remoteObject.release(), hintsObject.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CommandLineAPIHost::getEventListenersImpl(Node* node, Vector<EventListenerInfo>& listenersArray)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorCSSAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> for (size_t i = 0; i < pseudoClassArray->length(); ++i) {
</span><span class="cx"> RefPtr<InspectorValue> pseudoClassValue = pseudoClassArray->get(i);
</span><span class="cx"> String pseudoClass;
</span><del>- bool success = pseudoClassValue->asString(&pseudoClass);
</del><ins>+ bool success = pseudoClassValue->asString(pseudoClass);
</ins><span class="cx"> if (!success)
</span><span class="cx"> continue;
</span><span class="cx"> if (pseudoClass == active)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -111,23 +111,19 @@
</span><span class="cx"> static const size_t maxTextSize = 10000;
</span><span class="cx"> static const UChar ellipsisUChar[] = { 0x2026, 0 };
</span><span class="cx">
</span><del>-static Color parseColor(const RefPtr<InspectorObject>* colorObject)
</del><ins>+static Color parseColor(const PassRefPtr<InspectorObject> colorObject)
</ins><span class="cx"> {
</span><del>- if (!colorObject || !(*colorObject))
</del><ins>+ if (!colorObject)
</ins><span class="cx"> return Color::transparent;
</span><span class="cx">
</span><span class="cx"> int r;
</span><span class="cx"> int g;
</span><span class="cx"> int b;
</span><del>- bool success = (*colorObject)->getInteger("r", &r);
- success |= (*colorObject)->getInteger("g", &g);
- success |= (*colorObject)->getInteger("b", &b);
- if (!success)
</del><ins>+ if (!colorObject->getInteger("r", r) || !colorObject->getInteger("g", g) || !colorObject->getInteger("b", b))
</ins><span class="cx"> return Color::transparent;
</span><span class="cx">
</span><span class="cx"> double a;
</span><del>- success = (*colorObject)->getDouble("a", &a);
- if (!success)
</del><ins>+ if (!colorObject->getDouble("a", a))
</ins><span class="cx"> return Color(r, g, b);
</span><span class="cx">
</span><span class="cx"> // Clamp alpha to the [0..1] range.
</span><span class="lines">@@ -142,7 +138,7 @@
</span><span class="cx"> static Color parseConfigColor(const String& fieldName, InspectorObject* configObject)
</span><span class="cx"> {
</span><span class="cx"> const RefPtr<InspectorObject> colorObject = configObject->getObject(fieldName);
</span><del>- return parseColor(&colorObject);
</del><ins>+ return parseColor(colorObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool parseQuad(const RefPtr<InspectorArray>& quadArray, FloatQuad* quad)
</span><span class="lines">@@ -154,7 +150,7 @@
</span><span class="cx"> if (quadArray->length() != coordinatesInQuad)
</span><span class="cx"> return false;
</span><span class="cx"> for (size_t i = 0; i < coordinatesInQuad; ++i) {
</span><del>- if (!quadArray->get(i)->asDouble(coordinates + i))
</del><ins>+ if (!quadArray->get(i)->asDouble(*(coordinates + i)))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> quad->setP1(FloatPoint(coordinates[0], coordinates[1]));
</span><span class="lines">@@ -899,7 +895,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> int nodeId = 0;
</span><del>- if (!nodeValue->asInteger(&nodeId)) {
</del><ins>+ if (!nodeValue->asInteger(nodeId)) {
</ins><span class="cx"> *errorString = "Invalid nodeIds item type. Expecting integer types.";
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1045,7 +1041,7 @@
</span><span class="cx">
</span><span class="cx"> auto highlightConfig = std::make_unique<HighlightConfig>();
</span><span class="cx"> bool showInfo = false; // Default: false (do not show a tooltip).
</span><del>- highlightInspectorObject->getBoolean("showInfo", &showInfo);
</del><ins>+ highlightInspectorObject->getBoolean("showInfo", showInfo);
</ins><span class="cx"> highlightConfig->showInfo = showInfo;
</span><span class="cx"> highlightConfig->content = parseConfigColor("contentColor", highlightInspectorObject);
</span><span class="cx"> highlightConfig->contentOutline = parseConfigColor("contentOutlineColor", highlightInspectorObject);
</span><span class="lines">@@ -1079,8 +1075,8 @@
</span><span class="cx"> void InspectorDOMAgent::innerHighlightQuad(std::unique_ptr<FloatQuad> quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</span><span class="cx"> {
</span><span class="cx"> auto highlightConfig = std::make_unique<HighlightConfig>();
</span><del>- highlightConfig->content = parseColor(color);
- highlightConfig->contentOutline = parseColor(outlineColor);
</del><ins>+ highlightConfig->content = parseColor(*color);
+ highlightConfig->contentOutline = parseColor(*outlineColor);
</ins><span class="cx"> highlightConfig->usePageCoordinates = usePageCoordinates ? *usePageCoordinates : false;
</span><span class="cx"> m_overlay->highlightQuad(WTF::move(quad), *highlightConfig);
</span><span class="cx"> }
</span><span class="lines">@@ -1107,18 +1103,14 @@
</span><span class="cx"> m_overlay->highlightNode(node, *highlightConfig);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::highlightFrame(
- ErrorString*,
- const String& frameId,
- const RefPtr<InspectorObject>* color,
- const RefPtr<InspectorObject>* outlineColor)
</del><ins>+void InspectorDOMAgent::highlightFrame(ErrorString*, const String& frameId, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->frameForId(frameId);
</span><span class="cx"> if (frame && frame->ownerElement()) {
</span><span class="cx"> auto highlightConfig = std::make_unique<HighlightConfig>();
</span><span class="cx"> highlightConfig->showInfo = true; // Always show tooltips for frames.
</span><del>- highlightConfig->content = parseColor(color);
- highlightConfig->contentOutline = parseColor(outlineColor);
</del><ins>+ highlightConfig->content = parseColor(*color);
+ highlightConfig->contentOutline = parseColor(*outlineColor);
</ins><span class="cx"> m_overlay->highlightNode(frame->ownerElement(), *highlightConfig);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -186,9 +186,9 @@
</span><span class="cx"> {
</span><span class="cx"> String securityOrigin;
</span><span class="cx"> bool isLocalStorage = false;
</span><del>- bool success = storageId->getString("securityOrigin", &securityOrigin);
</del><ins>+ bool success = storageId->getString("securityOrigin", securityOrigin);
</ins><span class="cx"> if (success)
</span><del>- success = storageId->getBoolean("isLocalStorage", &isLocalStorage);
</del><ins>+ success = storageId->getBoolean("isLocalStorage", isLocalStorage);
</ins><span class="cx"> if (!success) {
</span><span class="cx"> if (errorString)
</span><span class="cx"> *errorString = "Invalid storageId format";
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> using Inspector::Protocol::Array;
</span><span class="lines">@@ -326,36 +327,36 @@
</span><span class="cx"> RefPtr<IDBKey> idbKey;
</span><span class="cx">
</span><span class="cx"> String type;
</span><del>- if (!key->getString("type", &type))
</del><ins>+ if (!key->getString("type", type))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(String, number, (ASCIILiteral("number")));
- DEPRECATED_DEFINE_STATIC_LOCAL(String, string, (ASCIILiteral("string")));
- DEPRECATED_DEFINE_STATIC_LOCAL(String, date, (ASCIILiteral("date")));
- DEPRECATED_DEFINE_STATIC_LOCAL(String, array, (ASCIILiteral("array")));
</del><ins>+ NeverDestroyed<const String> numberType(ASCIILiteral("number"));
+ NeverDestroyed<const String> stringType(ASCIILiteral("string"));
+ NeverDestroyed<const String> dateType(ASCIILiteral("date"));
+ NeverDestroyed<const String> arrayType(ASCIILiteral("array"));
</ins><span class="cx">
</span><del>- if (type == number) {
</del><ins>+ if (type == numberType) {
</ins><span class="cx"> double number;
</span><del>- if (!key->getDouble("number", &number))
</del><ins>+ if (!key->getDouble("number", number))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> idbKey = IDBKey::createNumber(number);
</span><del>- } else if (type == string) {
</del><ins>+ } else if (type == stringType) {
</ins><span class="cx"> String string;
</span><del>- if (!key->getString("string", &string))
</del><ins>+ if (!key->getString("string", string))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> idbKey = IDBKey::createString(string);
</span><del>- } else if (type == date) {
</del><ins>+ } else if (type == dateType) {
</ins><span class="cx"> double date;
</span><del>- if (!key->getDouble("date", &date))
</del><ins>+ if (!key->getDouble("date", date))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> idbKey = IDBKey::createDate(date);
</span><del>- } else if (type == array) {
</del><ins>+ } else if (type == arrayType) {
</ins><span class="cx"> IDBKey::KeyArray keyArray;
</span><span class="cx"> RefPtr<InspectorArray> array = key->getArray("array");
</span><span class="cx"> for (size_t i = 0; i < array->length(); ++i) {
</span><span class="cx"> RefPtr<InspectorValue> value = array->get(i);
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><del>- if (!value->asObject(&object))
</del><ins>+ if (!value->asObject(object))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> keyArray.append(idbKeyFromInspectorObject(object.get()));
</span><span class="cx"> }
</span><span class="lines">@@ -379,12 +380,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> bool lowerOpen;
</span><del>- if (!keyRange->getBoolean("lowerOpen", &lowerOpen))
</del><ins>+ if (!keyRange->getBoolean("lowerOpen", lowerOpen))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> IDBKeyRange::LowerBoundType lowerBoundType = lowerOpen ? IDBKeyRange::LowerBoundOpen : IDBKeyRange::LowerBoundClosed;
</span><span class="cx">
</span><span class="cx"> bool upperOpen;
</span><del>- if (!keyRange->getBoolean("upperOpen", &upperOpen))
</del><ins>+ if (!keyRange->getBoolean("upperOpen", upperOpen))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> IDBKeyRange::UpperBoundType upperBoundType = upperOpen ? IDBKeyRange::UpperBoundOpen : IDBKeyRange::UpperBoundClosed;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorPageAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -739,7 +739,7 @@
</span><span class="cx"> if (m_scriptsToEvaluateOnLoad) {
</span><span class="cx"> for (auto& keyValuePair : *m_scriptsToEvaluateOnLoad) {
</span><span class="cx"> String scriptText;
</span><del>- if (keyValuePair.value->asString(&scriptText))
</del><ins>+ if (keyValuePair.value->asString(scriptText))
</ins><span class="cx"> frame->script().executeScript(scriptText);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorReplayAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorReplayAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorReplayAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -340,12 +340,12 @@
</span><span class="cx"> void InspectorReplayAgent::replayToPosition(ErrorString* errorString, const RefPtr<InspectorObject>& positionObject, bool fastReplay)
</span><span class="cx"> {
</span><span class="cx"> ReplayPosition position;
</span><del>- if (!positionObject->getInteger(ASCIILiteral("segmentOffset"), &position.segmentOffset)) {
</del><ins>+ if (!positionObject->getInteger(ASCIILiteral("segmentOffset"), position.segmentOffset)) {
</ins><span class="cx"> *errorString = ASCIILiteral("Couldn't decode ReplayPosition segment offset provided to ReplayAgent.replayToPosition.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!positionObject->getInteger(ASCIILiteral("inputOffset"), &position.inputOffset)) {
</del><ins>+ if (!positionObject->getInteger(ASCIILiteral("inputOffset"), position.inputOffset)) {
</ins><span class="cx"> *errorString = ASCIILiteral("Couldn't decode ReplayPosition input offset provided to ReplayAgent.replayToPosition.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorResourceAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> InspectorObject::const_iterator end = m_extraRequestHeaders->end();
</span><span class="cx"> for (InspectorObject::const_iterator it = m_extraRequestHeaders->begin(); it != end; ++it) {
</span><span class="cx"> String value;
</span><del>- if (it->value->asString(&value))
</del><ins>+ if (it->value->asString(value))
</ins><span class="cx"> request.setHTTPHeaderField(it->key, value);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -572,8 +572,8 @@
</span><span class="cx"> HashMap<String, RefPtr<Inspector::Protocol::CSS::CSSProperty>>::iterator activeIt = propertyNameToPreviousActiveProperty.find(canonicalPropertyName);
</span><span class="cx"> if (activeIt != propertyNameToPreviousActiveProperty.end()) {
</span><span class="cx"> if (propertyEntry.parsedOk) {
</span><del>- bool successPriority = activeIt->value->getString(Inspector::Protocol::CSS::CSSProperty::Priority, &previousPriority);
- bool successStatus = activeIt->value->getString(Inspector::Protocol::CSS::CSSProperty::Status, &previousStatus);
</del><ins>+ bool successPriority = activeIt->value->getString(Inspector::Protocol::CSS::CSSProperty::Priority, previousPriority);
+ bool successStatus = activeIt->value->getString(Inspector::Protocol::CSS::CSSProperty::Status, previousStatus);
</ins><span class="cx"> if (successStatus && previousStatus != "inactive") {
</span><span class="cx"> if (propertyEntry.important || !successPriority) // Priority not set == "not important".
</span><span class="cx"> shouldInactivate = true;
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> bool previousParsedOk;
</span><del>- bool success = activeIt->value->getBoolean(Inspector::Protocol::CSS::CSSProperty::ParsedOk, &previousParsedOk);
</del><ins>+ bool success = activeIt->value->getBoolean(Inspector::Protocol::CSS::CSSProperty::ParsedOk, previousParsedOk);
</ins><span class="cx"> if (success && !previousParsedOk)
</span><span class="cx"> shouldInactivate = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorStyleSheeth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.h (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.h 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorStyleSheet.h 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -65,11 +65,11 @@
</span><span class="cx">
</span><span class="cx"> explicit InspectorCSSId(RefPtr<Inspector::InspectorObject> value)
</span><span class="cx"> {
</span><del>- if (!value->getString("styleSheetId", &m_styleSheetId))
</del><ins>+ if (!value->getString("styleSheetId", m_styleSheetId))
</ins><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> RefPtr<Inspector::InspectorValue> ordinalValue = value->get("ordinal");
</span><del>- if (!ordinalValue || !ordinalValue->asInteger(&m_ordinal))
</del><ins>+ if (!ordinalValue || !ordinalValue->asInteger(m_ordinal))
</ins><span class="cx"> m_styleSheetId = "";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorTimelineAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> if (!title.isEmpty()) {
</span><span class="cx"> for (const TimelineRecordEntry& record : m_pendingConsoleProfileRecords) {
</span><span class="cx"> String recordTitle;
</span><del>- record.data->getString(ASCIILiteral("title"), &recordTitle);
</del><ins>+ record.data->getString(ASCIILiteral("title"), recordTitle);
</ins><span class="cx"> if (recordTitle == title)
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> const TimelineRecordEntry& record = m_pendingConsoleProfileRecords[i];
</span><span class="cx">
</span><span class="cx"> String recordTitle;
</span><del>- record.data->getString(ASCIILiteral("title"), &recordTitle);
</del><ins>+ record.data->getString(ASCIILiteral("title"), recordTitle);
</ins><span class="cx">
</span><span class="cx"> if (title.isEmpty() || recordTitle == title) {
</span><span class="cx"> RefPtr<JSC::Profile> profile = stopProfiling(exec, title);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorWorkerAgent.cpp (174940 => 174941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2014-10-21 10:18:13 UTC (rev 174940)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2014-10-21 10:30:58 UTC (rev 174941)
</span><span class="lines">@@ -82,14 +82,16 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // WorkerGlobalScopeProxy::PageInspector implementation
</span><del>- virtual void dispatchMessageFromWorker(const String& message) override
</del><ins>+ virtual void dispatchMessageFromWorker(const String& messageString) override
</ins><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value = InspectorValue::parseJSON(message);
- if (!value)
</del><ins>+ RefPtr<InspectorValue> parsedMessage;
+ if (!InspectorValue::parseJSON(messageString, parsedMessage))
</ins><span class="cx"> return;
</span><del>- RefPtr<InspectorObject> messageObject = value->asObject();
- if (!messageObject)
</del><ins>+
+ RefPtr<InspectorObject> messageObject;
+ if (!parsedMessage->asObject(messageObject))
</ins><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> m_frontendDispatcher->dispatchMessageFromWorker(m_id, messageObject);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>