[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
loislo at chromium.org
loislo at chromium.org
Wed Dec 22 12:38:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ec5ebeb76b2656ed530de24ad25778299f38879c
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 26 13:11:28 2010 +0000
2010-08-26 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
WebInspector: It would be better to rename setBool, pushBool and asBool accessors
to setBoolean, pushBoolean and asBoolean for better matching with the results of
JS typeof operator.
https://bugs.webkit.org/show_bug.cgi?id=44680
* bindings/js/ScriptProfile.cpp:
(WebCore::buildInspectorObjectFor):
* bindings/v8/ScriptProfile.cpp:
(WebCore::buildInspectorObjectFor):
* inspector/CodeGeneratorInspector.pm:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::buildObjectForCookie):
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForEventListener):
(WebCore::InspectorDOMAgent::populateObjectWithStyleProperties):
(WebCore::InspectorDOMAgent::buildObjectForStyleSheet):
(WebCore::InspectorDOMAgent::buildObjectForRule):
* inspector/InspectorDOMStorageResource.cpp:
(WebCore::InspectorDOMStorageResource::bind):
* inspector/InspectorResource.cpp:
(WebCore::InspectorResource::updateScriptObject):
* inspector/InspectorValues.cpp:
(WebCore::InspectorValue::asBoolean):
(WebCore::InspectorBasicValue::asBoolean):
(WebCore::InspectorBasicValue::asNumber):
(WebCore::InspectorBasicValue::writeJSON):
(WebCore::InspectorObject::getBoolean):
* inspector/InspectorValues.h:
(WebCore::InspectorValue::):
(WebCore::InspectorBasicValue::InspectorBasicValue):
(WebCore::InspectorObject::setBoolean):
(WebCore::InspectorArray::pushBoolean):
* inspector/ScriptBreakpoint.cpp:
(WebCore::ScriptBreakpoint::sourceBreakpointsFromInspectorObject):
(WebCore::ScriptBreakpoint::inspectorObjectFromSourceBreakpoints):
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createTimerInstallData):
(WebCore::TimelineRecordFactory::createResourceSendRequestData):
(WebCore::TimelineRecordFactory::createResourceFinishData):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66098 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 30693ab..ec329b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,47 @@
+2010-08-26 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ WebInspector: It would be better to rename setBool, pushBool and asBool accessors
+ to setBoolean, pushBoolean and asBoolean for better matching with the results of
+ JS typeof operator.
+ https://bugs.webkit.org/show_bug.cgi?id=44680
+
+ * bindings/js/ScriptProfile.cpp:
+ (WebCore::buildInspectorObjectFor):
+ * bindings/v8/ScriptProfile.cpp:
+ (WebCore::buildInspectorObjectFor):
+ * inspector/CodeGeneratorInspector.pm:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::buildObjectForCookie):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+ (WebCore::InspectorDOMAgent::populateObjectWithStyleProperties):
+ (WebCore::InspectorDOMAgent::buildObjectForStyleSheet):
+ (WebCore::InspectorDOMAgent::buildObjectForRule):
+ * inspector/InspectorDOMStorageResource.cpp:
+ (WebCore::InspectorDOMStorageResource::bind):
+ * inspector/InspectorResource.cpp:
+ (WebCore::InspectorResource::updateScriptObject):
+ * inspector/InspectorValues.cpp:
+ (WebCore::InspectorValue::asBoolean):
+ (WebCore::InspectorBasicValue::asBoolean):
+ (WebCore::InspectorBasicValue::asNumber):
+ (WebCore::InspectorBasicValue::writeJSON):
+ (WebCore::InspectorObject::getBoolean):
+ * inspector/InspectorValues.h:
+ (WebCore::InspectorValue::):
+ (WebCore::InspectorBasicValue::InspectorBasicValue):
+ (WebCore::InspectorObject::setBoolean):
+ (WebCore::InspectorArray::pushBoolean):
+ * inspector/ScriptBreakpoint.cpp:
+ (WebCore::ScriptBreakpoint::sourceBreakpointsFromInspectorObject):
+ (WebCore::ScriptBreakpoint::inspectorObjectFromSourceBreakpoints):
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createTimerInstallData):
+ (WebCore::TimelineRecordFactory::createResourceSendRequestData):
+ (WebCore::TimelineRecordFactory::createResourceFinishData):
+
2010-08-26 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Simon Hausmann.
diff --git a/WebCore/bindings/js/ScriptProfile.cpp b/WebCore/bindings/js/ScriptProfile.cpp
index 0eb2814..8731ec2 100644
--- a/WebCore/bindings/js/ScriptProfile.cpp
+++ b/WebCore/bindings/js/ScriptProfile.cpp
@@ -76,7 +76,7 @@ static PassRefPtr<InspectorObject> buildInspectorObjectFor(const JSC::ProfileNod
result->setNumber("totalTime", node->totalTime());
result->setNumber("selfTime", node->selfTime());
result->setNumber("numberOfCalls", node->numberOfCalls());
- result->setBool("visible", node->visible());
+ result->setBoolean("visible", node->visible());
result->setNumber("callUID", node->callIdentifier().hash());
RefPtr<InspectorArray> childrenArray = InspectorArray::create();
diff --git a/WebCore/bindings/v8/ScriptProfile.cpp b/WebCore/bindings/v8/ScriptProfile.cpp
index 95ac0de..85dbadb 100644
--- a/WebCore/bindings/v8/ScriptProfile.cpp
+++ b/WebCore/bindings/v8/ScriptProfile.cpp
@@ -65,7 +65,7 @@ static PassRefPtr<InspectorObject> buildInspectorObjectFor(const v8::CpuProfileN
result->setNumber("totalTime", node->GetTotalTime());
result->setNumber("selfTime", node->GetSelfTime());
result->setNumber("numberOfCalls", 0);
- result->setBool("visible", true);
+ result->setBoolean("visible", true);
result->setNumber("callUID", node->GetCallUid());
RefPtr<InspectorArray> children = InspectorArray::create();
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index 7223e9e..09af305 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -120,7 +120,7 @@ $typeTransform{"boolean"} = {
"defaultValue" => "false",
"forward" => "",
"header" => "",
- "JSONType" => "Bool"
+ "JSONType" => "Boolean"
};
$typeTransform{"void"} = {
"forward" => "",
@@ -354,7 +354,7 @@ sub generateBackendFunction
push(@function, " if ((callId || protocolErrors->length()) && m_inspectorController->hasFrontend()) {");
push(@function, " RefPtr<InspectorObject> responseMessage = InspectorObject::create();");
push(@function, " responseMessage->setNumber(\"seq\", callId);");
- push(@function, " responseMessage->setBool(\"success\", !protocolErrors->length());");
+ push(@function, " responseMessage->setBoolean(\"success\", !protocolErrors->length());");
push(@function, "");
push(@function, " if (protocolErrors->length())");
push(@function, " responseMessage->setArray(\"errors\", protocolErrors);");
@@ -385,7 +385,7 @@ void ${backendClassName}::reportProtocolError(const long callId, const String& m
message->setString("type", "error");
message->setString("domain", "inspectorProtocol");
message->setString("command", method);
- message->setBool("success", false);
+ message->setBoolean("success", false);
RefPtr<InspectorArray> errors = InspectorArray::create();
errors->pushString(errorText);
message->setArray("errors", errors);
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 890d599..7fb052c 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1337,9 +1337,9 @@ PassRefPtr<InspectorObject> InspectorController::buildObjectForCookie(const Cook
value->setString("path", cookie.path);
value->setNumber("expires", cookie.expires);
value->setNumber("size", (cookie.name.length() + cookie.value.length()));
- value->setBool("httpOnly", cookie.httpOnly);
- value->setBool("secure", cookie.secure);
- value->setBool("session", cookie.session);
+ value->setBoolean("httpOnly", cookie.httpOnly);
+ value->setBoolean("secure", cookie.secure);
+ value->setBoolean("session", cookie.session);
return value;
}
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index b8ae047..635769a 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -880,8 +880,8 @@ PassRefPtr<InspectorObject> InspectorDOMAgent::buildObjectForEventListener(const
RefPtr<EventListener> eventListener = registeredEventListener.listener;
RefPtr<InspectorObject> value = InspectorObject::create();
value->setString("type", eventType);
- value->setBool("useCapture", registeredEventListener.useCapture);
- value->setBool("isAttribute", eventListener->isAttribute());
+ value->setBoolean("useCapture", registeredEventListener.useCapture);
+ value->setBoolean("isAttribute", eventListener->isAttribute());
value->setNumber("nodeId", pushNodePathToFrontend(node));
value->setString("listenerBody", eventListenerHandlerBody(node->document(), eventListener.get()));
String sourceName;
@@ -1460,7 +1460,7 @@ void InspectorDOMAgent::populateObjectWithStyleProperties(CSSStyleDeclaration* s
String name = style->item(i);
property->setString("name", name);
property->setString("priority", style->getPropertyPriority(name));
- property->setBool("implicit", style->isPropertyImplicit(name));
+ property->setBoolean("implicit", style->isPropertyImplicit(name));
String shorthand = style->getPropertyShorthand(name);
property->setString("shorthand", shorthand);
if (!shorthand.isEmpty() && !foundShorthands.contains(shorthand)) {
@@ -1492,7 +1492,7 @@ PassRefPtr<InspectorObject> InspectorDOMAgent::buildObjectForStyleSheet(Document
RefPtr<InspectorObject> result = InspectorObject::create();
long id = cssStore()->bindStyleSheet(styleSheet);
result->setNumber("id", id);
- result->setBool("disabled", styleSheet->disabled());
+ result->setBoolean("disabled", styleSheet->disabled());
result->setString("href", styleSheet->href());
result->setString("title", styleSheet->title());
result->setNumber("documentElementId", m_documentNodeToIdMap.get(styleSheet->doc()));
@@ -1526,9 +1526,9 @@ PassRefPtr<InspectorObject> InspectorDOMAgent::buildObjectForRule(Document* owne
}
bool isUserAgent = parentStyleSheet && !parentStyleSheet->ownerNode() && parentStyleSheet->href().isEmpty();
bool isUser = parentStyleSheet && parentStyleSheet->ownerNode() && parentStyleSheet->ownerNode()->nodeName() == "#document";
- result->setBool("isUserAgent", isUserAgent);
- result->setBool("isUser", isUser);
- result->setBool("isViaInspector", rule->parentStyleSheet() == cssStore()->inspectorStyleSheet(ownerDocument, false));
+ result->setBoolean("isUserAgent", isUserAgent);
+ result->setBoolean("isUser", isUser);
+ result->setBoolean("isViaInspector", rule->parentStyleSheet() == cssStore()->inspectorStyleSheet(ownerDocument, false));
// Bind editable scripts only.
bool bind = !isUserAgent && !isUser;
diff --git a/WebCore/inspector/InspectorDOMStorageResource.cpp b/WebCore/inspector/InspectorDOMStorageResource.cpp
index 72b4e10..c8d76ba 100644
--- a/WebCore/inspector/InspectorDOMStorageResource.cpp
+++ b/WebCore/inspector/InspectorDOMStorageResource.cpp
@@ -71,7 +71,7 @@ void InspectorDOMStorageResource::bind(InspectorFrontend* frontend)
RefPtr<InspectorObject> jsonObject = InspectorObject::create();
jsonObject->setString("host", m_frame->document()->securityOrigin()->host());
- jsonObject->setBool("isLocalStorage", m_isLocalStorage);
+ jsonObject->setBoolean("isLocalStorage", m_isLocalStorage);
jsonObject->setNumber("id", m_id);
frontend->addDOMStorage(jsonObject);
}
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index ed07339..131ce95 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -190,10 +190,10 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
jsonObject->setString("lastPathComponent", m_requestURL.lastPathComponent());
RefPtr<InspectorObject> requestHeaders = buildHeadersObject(m_requestHeaderFields);
jsonObject->setObject("requestHeaders", requestHeaders);
- jsonObject->setBool("mainResource", m_isMainResource);
+ jsonObject->setBoolean("mainResource", m_isMainResource);
jsonObject->setString("requestMethod", m_requestMethod);
jsonObject->setString("requestFormData", m_requestFormData);
- jsonObject->setBool("didRequestChange", true);
+ jsonObject->setBoolean("didRequestChange", true);
}
if (m_changes.hasChange(ResponseChange)) {
@@ -205,27 +205,27 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
RefPtr<InspectorObject> responseHeaders = buildHeadersObject(m_responseHeaderFields);
jsonObject->setObject("responseHeaders", responseHeaders);
jsonObject->setNumber("connectionID", m_connectionID);
- jsonObject->setBool("connectionReused", m_connectionReused);
- jsonObject->setBool("cached", m_cached);
+ jsonObject->setBoolean("connectionReused", m_connectionReused);
+ jsonObject->setBoolean("cached", m_cached);
if (m_loadTiming && !m_cached)
jsonObject->setObject("timing", buildObjectForTiming(m_loadTiming.get()));
- jsonObject->setBool("didResponseChange", true);
+ jsonObject->setBoolean("didResponseChange", true);
}
if (m_changes.hasChange(TypeChange)) {
jsonObject->setNumber("type", static_cast<int>(type()));
- jsonObject->setBool("didTypeChange", true);
+ jsonObject->setBoolean("didTypeChange", true);
}
if (m_changes.hasChange(LengthChange)) {
jsonObject->setNumber("resourceSize", m_length);
- jsonObject->setBool("didLengthChange", true);
+ jsonObject->setBoolean("didLengthChange", true);
}
if (m_changes.hasChange(CompletionChange)) {
- jsonObject->setBool("failed", m_failed);
- jsonObject->setBool("finished", m_finished);
- jsonObject->setBool("didCompletionChange", true);
+ jsonObject->setBoolean("failed", m_failed);
+ jsonObject->setBoolean("finished", m_finished);
+ jsonObject->setBoolean("didCompletionChange", true);
}
if (m_changes.hasChange(TimingChange)) {
@@ -239,7 +239,7 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
jsonObject->setNumber("loadEventTime", m_loadEventTime);
if (m_domContentEventTime > 0)
jsonObject->setNumber("domContentEventTime", m_domContentEventTime);
- jsonObject->setBool("didTimingChange", true);
+ jsonObject->setBoolean("didTimingChange", true);
}
if (m_changes.hasChange(RedirectsChange)) {
diff --git a/WebCore/inspector/InspectorValues.cpp b/WebCore/inspector/InspectorValues.cpp
index a7c43a5..c96e953 100644
--- a/WebCore/inspector/InspectorValues.cpp
+++ b/WebCore/inspector/InspectorValues.cpp
@@ -474,7 +474,7 @@ inline void doubleQuoteString(const String& str, Vector<UChar>* dst)
} // anonymous namespace
-bool InspectorValue::asBool(bool*) const
+bool InspectorValue::asBoolean(bool*) const
{
return false;
}
@@ -555,7 +555,7 @@ void InspectorValue::writeJSON(Vector<UChar>* output) const
output->append(nullString, 4);
}
-bool InspectorBasicValue::asBool(bool* output) const
+bool InspectorBasicValue::asBoolean(bool* output) const
{
if (type() != TypeBoolean)
return false;
@@ -565,7 +565,7 @@ bool InspectorBasicValue::asBool(bool* output) const
bool InspectorBasicValue::asNumber(double* output) const
{
- if (type() != TypeDouble)
+ if (type() != TypeNumber)
return false;
*output = m_doubleValue;
return true;
@@ -573,7 +573,7 @@ bool InspectorBasicValue::asNumber(double* output) const
bool InspectorBasicValue::asNumber(long* output) const
{
- if (type() != TypeDouble)
+ if (type() != TypeNumber)
return false;
*output = static_cast<long>(m_doubleValue);
return true;
@@ -581,7 +581,7 @@ bool InspectorBasicValue::asNumber(long* output) const
bool InspectorBasicValue::asNumber(unsigned long* output) const
{
- if (type() != TypeDouble)
+ if (type() != TypeNumber)
return false;
*output = static_cast<unsigned long>(m_doubleValue);
return true;
@@ -589,7 +589,7 @@ bool InspectorBasicValue::asNumber(unsigned long* output) const
bool InspectorBasicValue::asNumber(unsigned int* output) const
{
- if (type() != TypeDouble)
+ if (type() != TypeNumber)
return false;
*output = static_cast<unsigned int>(m_doubleValue);
return true;
@@ -597,13 +597,13 @@ bool InspectorBasicValue::asNumber(unsigned int* output) const
void InspectorBasicValue::writeJSON(Vector<UChar>* output) const
{
- ASSERT(type() == TypeBoolean || type() == TypeDouble);
+ ASSERT(type() == TypeBoolean || type() == TypeNumber);
if (type() == TypeBoolean) {
if (m_boolValue)
output->append(trueString, 4);
else
output->append(falseString, 5);
- } else if (type() == TypeDouble) {
+ } else if (type() == TypeNumber) {
String value = String::format("%f", m_doubleValue);
value.replace(',', '.');
output->append(value.characters(), value.length());
@@ -633,12 +633,12 @@ PassRefPtr<InspectorObject> InspectorObject::asObject()
return this;
}
-bool InspectorObject::getBool(const String& name, bool* output) const
+bool InspectorObject::getBoolean(const String& name, bool* output) const
{
RefPtr<InspectorValue> value = get(name);
if (!value)
return false;
- return value->asBool(output);
+ return value->asBoolean(output);
}
bool InspectorObject::getNumber(const String& name, double* output) const
diff --git a/WebCore/inspector/InspectorValues.h b/WebCore/inspector/InspectorValues.h
index 473ad21..3dd9594 100644
--- a/WebCore/inspector/InspectorValues.h
+++ b/WebCore/inspector/InspectorValues.h
@@ -59,7 +59,7 @@ public:
typedef enum {
TypeNull = 0,
TypeBoolean,
- TypeDouble,
+ TypeNumber,
TypeString,
TypeObject,
TypeArray
@@ -67,7 +67,7 @@ public:
Type type() const { return m_type; }
- virtual bool asBool(bool* output) const;
+ virtual bool asBoolean(bool* output) const;
virtual bool asNumber(double* output) const;
virtual bool asNumber(long* output) const;
virtual bool asNumber(unsigned long* output) const;
@@ -109,7 +109,7 @@ public:
return adoptRef(new InspectorBasicValue(value));
}
- virtual bool asBool(bool* output) const;
+ virtual bool asBoolean(bool* output) const;
virtual bool asNumber(double* output) const;
virtual bool asNumber(long* output) const;
virtual bool asNumber(unsigned long* output) const;
@@ -119,8 +119,8 @@ public:
private:
explicit InspectorBasicValue(bool value) : InspectorValue(TypeBoolean), m_boolValue(value) { }
- explicit InspectorBasicValue(int value) : InspectorValue(TypeDouble), m_doubleValue((double)value) { }
- explicit InspectorBasicValue(double value) : InspectorValue(TypeDouble), m_doubleValue(value) { }
+ explicit InspectorBasicValue(int value) : InspectorValue(TypeNumber), m_doubleValue((double)value) { }
+ explicit InspectorBasicValue(double value) : InspectorValue(TypeNumber), m_doubleValue(value) { }
union {
bool m_boolValue;
@@ -169,7 +169,7 @@ public:
virtual bool asObject(RefPtr<InspectorObject>* output);
virtual PassRefPtr<InspectorObject> asObject();
- void setBool(const String& name, bool);
+ void setBoolean(const String& name, bool);
void setNumber(const String& name, double);
void setString(const String& name, const String&);
void setValue(const String& name, PassRefPtr<InspectorValue>);
@@ -177,7 +177,7 @@ public:
void setArray(const String& name, PassRefPtr<InspectorArray>);
const_iterator find(const String& name) const;
- bool getBool(const String& name, bool* output) const;
+ bool getBoolean(const String& name, bool* output) const;
bool getNumber(const String& name, double* output) const;
bool getString(const String& name, String* output) const;
PassRefPtr<InspectorObject> getObject(const String& name) const;
@@ -208,7 +208,7 @@ public:
virtual bool asArray(RefPtr<InspectorArray>* output);
virtual PassRefPtr<InspectorArray> asArray();
- void pushBool(bool);
+ void pushBoolean(bool);
void pushNumber(double);
void pushString(const String&);
void pushValue(PassRefPtr<InspectorValue>);
@@ -230,7 +230,7 @@ inline InspectorObject::const_iterator InspectorObject::find(const String& name)
return m_data.find(name);
}
-inline void InspectorObject::setBool(const String& name, bool value)
+inline void InspectorObject::setBoolean(const String& name, bool value)
{
setValue(name, InspectorBasicValue::create(value));
}
@@ -263,7 +263,7 @@ inline void InspectorObject::setArray(const String& name, PassRefPtr<InspectorAr
m_order.append(name);
}
-inline void InspectorArray::pushBool(bool value)
+inline void InspectorArray::pushBoolean(bool value)
{
m_data.append(InspectorBasicValue::create(value));
}
diff --git a/WebCore/inspector/ScriptBreakpoint.cpp b/WebCore/inspector/ScriptBreakpoint.cpp
index 24401f1..b7205a7 100644
--- a/WebCore/inspector/ScriptBreakpoint.cpp
+++ b/WebCore/inspector/ScriptBreakpoint.cpp
@@ -47,7 +47,7 @@ void ScriptBreakpoint::sourceBreakpointsFromInspectorObject(PassRefPtr<Inspector
continue;
bool enabled;
RefPtr<InspectorValue> enabledValue = breakpoint->get("enabled");
- if (!enabledValue || !enabledValue->asBool(&enabled))
+ if (!enabledValue || !enabledValue->asBoolean(&enabled))
continue;
String condition;
RefPtr<InspectorValue> conditionValue = breakpoint->get("condition");
@@ -62,7 +62,7 @@ PassRefPtr<InspectorObject> ScriptBreakpoint::inspectorObjectFromSourceBreakpoin
RefPtr<InspectorObject> breakpoints = InspectorObject::create();
for (SourceBreakpoints::const_iterator it = sourceBreakpoints.begin(); it != sourceBreakpoints.end(); ++it) {
RefPtr<InspectorObject> breakpoint = InspectorObject::create();
- breakpoint->setBool("enabled", it->second.enabled);
+ breakpoint->setBoolean("enabled", it->second.enabled);
breakpoint->setString("condition", it->second.condition);
breakpoints->setObject(String::number(it->first), breakpoint);
}
diff --git a/WebCore/inspector/TimelineRecordFactory.cpp b/WebCore/inspector/TimelineRecordFactory.cpp
index e1c2bbb..713d6bc 100644
--- a/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/WebCore/inspector/TimelineRecordFactory.cpp
@@ -87,7 +87,7 @@ PassRefPtr<InspectorObject> TimelineRecordFactory::createTimerInstallData(int ti
RefPtr<InspectorObject> data = InspectorObject::create();
data->setNumber("timerId", timerId);
data->setNumber("timeout", timeout);
- data->setBool("singleShot", singleShot);
+ data->setBoolean("singleShot", singleShot);
return data.release();
}
@@ -134,7 +134,7 @@ PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceSendRequestData
data->setNumber("identifier", identifier);
data->setString("url", request.url().string());
data->setString("requestMethod", request.httpMethod());
- data->setBool("isMainResource", isMainResource);
+ data->setBoolean("isMainResource", isMainResource);
return data.release();
}
@@ -152,7 +152,7 @@ PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceFinishData(unsi
{
RefPtr<InspectorObject> data = InspectorObject::create();
data->setNumber("identifier", identifier);
- data->setBool("didFail", didFail);
+ data->setBoolean("didFail", didFail);
return data.release();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list