[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
yurys at chromium.org
yurys at chromium.org
Wed Apr 7 23:58:41 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 063a33c52bc6e08802e06870c5d7cf6d4386ffa8
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 27 11:12:44 2009 +0000
2009-11-27 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Instead of generating negative identifiers for cached resources in
InspectorController and extending identifier type from 'unsigned long' to 'long
long' reuse progress tracker from the inspected page to generate those
identifiers. It guarantees that InspectorResources have unique ids since
all of them are generated by that progress tracker.
Added a couple new overloaded methods to Script* objects that accept
long and unsigned long arguments. These types of argumens have already
been passed as long long.
https://bugs.webkit.org/show_bug.cgi?id=31921
* bindings/js/ScriptFunctionCall.cpp:
(WebCore::ScriptFunctionCall::appendArgument):
* bindings/js/ScriptFunctionCall.h:
* bindings/js/ScriptObject.cpp:
(WebCore::ScriptObject::set):
* bindings/js/ScriptObject.h:
* bindings/v8/ScriptFunctionCall.cpp:
(WebCore::ScriptFunctionCall::appendArgument):
* bindings/v8/ScriptFunctionCall.h:
* bindings/v8/ScriptObject.cpp:
(WebCore::ScriptObject::set):
* bindings/v8/ScriptObject.h:
* inspector/InspectorBackend.cpp:
(WebCore::InspectorBackend::dispatchOnInjectedScript):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::getTrackedResource):
(WebCore::InspectorController::didLoadResourceFromMemoryCache): Use inspected page's ProgressTracker to generate unique identifiers for cached resources in InspectorController.
* inspector/InspectorController.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForNode):
(WebCore::InspectorDOMAgent::buildObjectForEventListener):
* inspector/InspectorFrontend.cpp:
(WebCore::InspectorFrontend::addResource):
(WebCore::InspectorFrontend::updateResource):
(WebCore::InspectorFrontend::removeResource):
(WebCore::InspectorFrontend::updateFocusedNode):
* inspector/InspectorFrontend.h:
* inspector/InspectorResource.cpp:
(WebCore::InspectorResource::InspectorResource):
(WebCore::InspectorResource::createCached):
* inspector/InspectorResource.h: Change InspectorResource identifier type from 'long long' to 'unsigned long'.
(WebCore::InspectorResource::create):
(WebCore::InspectorResource::identifier):
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createResourceSendRequestRecord):
(WebCore::TimelineRecordFactory::createResourceReceiveResponseRecord):
(WebCore::TimelineRecordFactory::createResourceFinishRecord):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51439 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c39872..858cda9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,58 @@
+2009-11-27 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Instead of generating negative identifiers for cached resources in
+ InspectorController and extending identifier type from 'unsigned long' to 'long
+ long' reuse progress tracker from the inspected page to generate those
+ identifiers. It guarantees that InspectorResources have unique ids since
+ all of them are generated by that progress tracker.
+
+ Added a couple new overloaded methods to Script* objects that accept
+ long and unsigned long arguments. These types of argumens have already
+ been passed as long long.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31921
+
+ * bindings/js/ScriptFunctionCall.cpp:
+ (WebCore::ScriptFunctionCall::appendArgument):
+ * bindings/js/ScriptFunctionCall.h:
+ * bindings/js/ScriptObject.cpp:
+ (WebCore::ScriptObject::set):
+ * bindings/js/ScriptObject.h:
+ * bindings/v8/ScriptFunctionCall.cpp:
+ (WebCore::ScriptFunctionCall::appendArgument):
+ * bindings/v8/ScriptFunctionCall.h:
+ * bindings/v8/ScriptObject.cpp:
+ (WebCore::ScriptObject::set):
+ * bindings/v8/ScriptObject.h:
+ * inspector/InspectorBackend.cpp:
+ (WebCore::InspectorBackend::dispatchOnInjectedScript):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::getTrackedResource):
+ (WebCore::InspectorController::didLoadResourceFromMemoryCache): Use inspected page's ProgressTracker to generate unique identifiers for cached resources in InspectorController.
+ * inspector/InspectorController.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+ * inspector/InspectorFrontend.cpp:
+ (WebCore::InspectorFrontend::addResource):
+ (WebCore::InspectorFrontend::updateResource):
+ (WebCore::InspectorFrontend::removeResource):
+ (WebCore::InspectorFrontend::updateFocusedNode):
+ * inspector/InspectorFrontend.h:
+ * inspector/InspectorResource.cpp:
+ (WebCore::InspectorResource::InspectorResource):
+ (WebCore::InspectorResource::createCached):
+ * inspector/InspectorResource.h: Change InspectorResource identifier type from 'long long' to 'unsigned long'.
+ (WebCore::InspectorResource::create):
+ (WebCore::InspectorResource::identifier):
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createResourceSendRequestRecord):
+ (WebCore::TimelineRecordFactory::createResourceReceiveResponseRecord):
+ (WebCore::TimelineRecordFactory::createResourceFinishRecord):
+
2009-11-26 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
diff --git a/WebCore/bindings/js/ScriptFunctionCall.cpp b/WebCore/bindings/js/ScriptFunctionCall.cpp
index 91b2a57..34ef635 100644
--- a/WebCore/bindings/js/ScriptFunctionCall.cpp
+++ b/WebCore/bindings/js/ScriptFunctionCall.cpp
@@ -80,6 +80,12 @@ void ScriptFunctionCall::appendArgument(JSC::JSValue argument)
m_arguments.append(argument);
}
+void ScriptFunctionCall::appendArgument(long argument)
+{
+ JSLock lock(SilenceAssertionsOnly);
+ m_arguments.append(jsNumber(m_exec, argument));
+}
+
void ScriptFunctionCall::appendArgument(long long argument)
{
JSLock lock(SilenceAssertionsOnly);
@@ -92,6 +98,12 @@ void ScriptFunctionCall::appendArgument(unsigned int argument)
m_arguments.append(jsNumber(m_exec, argument));
}
+void ScriptFunctionCall::appendArgument(unsigned long argument)
+{
+ JSLock lock(SilenceAssertionsOnly);
+ m_arguments.append(jsNumber(m_exec, argument));
+}
+
void ScriptFunctionCall::appendArgument(int argument)
{
JSLock lock(SilenceAssertionsOnly);
diff --git a/WebCore/bindings/js/ScriptFunctionCall.h b/WebCore/bindings/js/ScriptFunctionCall.h
index 079ac21..e10c758 100644
--- a/WebCore/bindings/js/ScriptFunctionCall.h
+++ b/WebCore/bindings/js/ScriptFunctionCall.h
@@ -57,8 +57,10 @@ namespace WebCore {
void appendArgument(const String&);
void appendArgument(const JSC::UString&);
void appendArgument(JSC::JSValue);
+ void appendArgument(long);
void appendArgument(long long);
void appendArgument(unsigned int);
+ void appendArgument(unsigned long);
void appendArgument(int);
void appendArgument(bool);
ScriptValue call(bool& hadException, bool reportExceptions = true);
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp
index f14145e..c8ffcc1 100644
--- a/WebCore/bindings/js/ScriptObject.cpp
+++ b/WebCore/bindings/js/ScriptObject.cpp
@@ -90,6 +90,14 @@ bool ScriptObject::set(const char* name, double value)
return handleException(m_scriptState);
}
+bool ScriptObject::set(const char* name, long value)
+{
+ JSLock lock(SilenceAssertionsOnly);
+ PutPropertySlot slot;
+ jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
+ return handleException(m_scriptState);
+}
+
bool ScriptObject::set(const char* name, long long value)
{
JSLock lock(SilenceAssertionsOnly);
@@ -114,6 +122,14 @@ bool ScriptObject::set(const char* name, unsigned value)
return handleException(m_scriptState);
}
+bool ScriptObject::set(const char* name, unsigned long value)
+{
+ JSLock lock(SilenceAssertionsOnly);
+ PutPropertySlot slot;
+ jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
+ return handleException(m_scriptState);
+}
+
bool ScriptObject::set(const char* name, bool value)
{
JSLock lock(SilenceAssertionsOnly);
diff --git a/WebCore/bindings/js/ScriptObject.h b/WebCore/bindings/js/ScriptObject.h
index 31381f3..b6dcaaa 100644
--- a/WebCore/bindings/js/ScriptObject.h
+++ b/WebCore/bindings/js/ScriptObject.h
@@ -50,9 +50,11 @@ namespace WebCore {
bool set(const char* name, const ScriptObject&);
bool set(const char* name, const String&);
bool set(const char* name, double);
+ bool set(const char* name, long);
bool set(const char* name, long long);
bool set(const char* name, int);
bool set(const char* name, unsigned);
+ bool set(const char* name, unsigned long);
bool set(const char* name, bool);
static ScriptObject createNew(ScriptState*);
diff --git a/WebCore/bindings/v8/ScriptFunctionCall.cpp b/WebCore/bindings/v8/ScriptFunctionCall.cpp
index 9ff6b8c..7930b7b 100644
--- a/WebCore/bindings/v8/ScriptFunctionCall.cpp
+++ b/WebCore/bindings/v8/ScriptFunctionCall.cpp
@@ -74,6 +74,12 @@ void ScriptFunctionCall::appendArgument(const String& argument)
m_arguments.append(v8String(argument));
}
+void ScriptFunctionCall::appendArgument(long argument)
+{
+ ScriptScope scope(m_scriptState);
+ m_arguments.append(v8::Number::New(argument));
+}
+
void ScriptFunctionCall::appendArgument(long long argument)
{
ScriptScope scope(m_scriptState);
@@ -86,6 +92,12 @@ void ScriptFunctionCall::appendArgument(unsigned int argument)
m_arguments.append(v8::Number::New(argument));
}
+void ScriptFunctionCall::appendArgument(unsigned long argument)
+{
+ ScriptScope scope(m_scriptState);
+ m_arguments.append(v8::Number::New(argument));
+}
+
void ScriptFunctionCall::appendArgument(int argument)
{
ScriptScope scope(m_scriptState);
diff --git a/WebCore/bindings/v8/ScriptFunctionCall.h b/WebCore/bindings/v8/ScriptFunctionCall.h
index 8365a4e..c46dbe8 100644
--- a/WebCore/bindings/v8/ScriptFunctionCall.h
+++ b/WebCore/bindings/v8/ScriptFunctionCall.h
@@ -50,8 +50,10 @@ namespace WebCore {
void appendArgument(const ScriptString&);
void appendArgument(const ScriptValue&);
void appendArgument(const String&);
+ void appendArgument(long);
void appendArgument(long long);
void appendArgument(unsigned int);
+ void appendArgument(unsigned long);
void appendArgument(int);
void appendArgument(bool);
ScriptValue call(bool& hadException, bool reportExceptions = true);
diff --git a/WebCore/bindings/v8/ScriptObject.cpp b/WebCore/bindings/v8/ScriptObject.cpp
index 334e3ab..1e9d024 100644
--- a/WebCore/bindings/v8/ScriptObject.cpp
+++ b/WebCore/bindings/v8/ScriptObject.cpp
@@ -83,6 +83,13 @@ bool ScriptObject::set(const char* name, double value)
return scope.success();
}
+bool ScriptObject::set(const char* name, long value)
+{
+ ScriptScope scope(m_scriptState);
+ v8Object()->Set(v8::String::New(name), v8::Number::New(value));
+ return scope.success();
+}
+
bool ScriptObject::set(const char* name, long long value)
{
ScriptScope scope(m_scriptState);
@@ -104,6 +111,13 @@ bool ScriptObject::set(const char* name, unsigned value)
return scope.success();
}
+bool ScriptObject::set(const char* name, unsigned long value)
+{
+ ScriptScope scope(m_scriptState);
+ v8Object()->Set(v8::String::New(name), v8::Number::New(value));
+ return scope.success();
+}
+
bool ScriptObject::set(const char* name, bool value)
{
ScriptScope scope(m_scriptState);
diff --git a/WebCore/bindings/v8/ScriptObject.h b/WebCore/bindings/v8/ScriptObject.h
index f741f89..21823e4 100644
--- a/WebCore/bindings/v8/ScriptObject.h
+++ b/WebCore/bindings/v8/ScriptObject.h
@@ -51,9 +51,11 @@ namespace WebCore {
bool set(const char* name, const ScriptObject&);
bool set(const char* name, const String&);
bool set(const char* name, double);
+ bool set(const char* name, long);
bool set(const char* name, long long);
bool set(const char* name, int);
bool set(const char* name, unsigned);
+ bool set(const char* name, unsigned long);
bool set(const char* name, bool);
static ScriptObject createNew(ScriptState*);
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index e51d7e7..13dac73 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -414,7 +414,7 @@ void InspectorBackend::dispatchOnInjectedScript(long callId, const String& metho
function.appendArgument(methodName);
function.appendArgument(arguments);
if (async)
- function.appendArgument(static_cast<int>(callId));
+ function.appendArgument(callId);
bool hadException = false;
ScriptValue result = function.call(hadException);
if (async)
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index ddb13d2..6d87b25 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -62,6 +62,7 @@
#include "InspectorResource.h"
#include "JavaScriptProfile.h"
#include "Page.h"
+#include "ProgressTracker.h"
#include "Range.h"
#include "RenderInline.h"
#include "ResourceRequest.h"
@@ -128,7 +129,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
, m_scriptState(0)
, m_windowVisible(false)
, m_showAfterVisible(CurrentPanel)
- , m_nextIdentifier(-2)
, m_groupLevel(0)
, m_searchingForNode(false)
, m_previousMessage(0)
@@ -841,7 +841,7 @@ void InspectorController::removeResource(InspectorResource* resource)
}
}
-InspectorResource* InspectorController::getTrackedResource(long long identifier)
+InspectorResource* InspectorController::getTrackedResource(unsigned long identifier)
{
if (!enabled())
return 0;
@@ -871,7 +871,7 @@ void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader* loader,
if (!isMainResource && !m_resourceTrackingEnabled)
return;
- RefPtr<InspectorResource> resource = InspectorResource::createCached(m_nextIdentifier--, loader, cachedResource);
+ RefPtr<InspectorResource> resource = InspectorResource::createCached(m_inspectedPage->progress()->createUniqueIdentifier() , loader, cachedResource);
if (isMainResource) {
m_mainResource = resource;
@@ -1609,7 +1609,7 @@ void InspectorController::didEvaluateForTestInFrontend(long callId, const String
ScriptObject window;
ScriptGlobalObject::get(scriptState, "window", window);
ScriptFunctionCall function(scriptState, window, "didEvaluateForTestInFrontend");
- function.appendArgument(static_cast<int>(callId));
+ function.appendArgument(callId);
function.appendArgument(jsonResult);
function.call();
}
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 22bd076..7b638c3 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -91,7 +91,7 @@ class InspectorController
#endif
{
public:
- typedef HashMap<long long, RefPtr<InspectorResource> > ResourcesMap;
+ typedef HashMap<unsigned long, RefPtr<InspectorResource> > ResourcesMap;
typedef HashMap<RefPtr<Frame>, ResourcesMap*> FrameResourcesMap;
typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
@@ -343,7 +343,7 @@ private:
void addResource(InspectorResource*);
void removeResource(InspectorResource*);
- InspectorResource* getTrackedResource(long long identifier);
+ InspectorResource* getTrackedResource(unsigned long identifier);
void pruneResources(ResourcesMap*, DocumentLoader* loaderToKeep = 0);
void removeAllResources(ResourcesMap* map) { pruneResources(map); }
@@ -380,7 +380,6 @@ private:
ScriptState* m_scriptState;
bool m_windowVisible;
SpecialPanels m_showAfterVisible;
- long long m_nextIdentifier;
RefPtr<Node> m_highlightedNode;
unsigned m_groupLevel;
bool m_searchingForNode;
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 5f880fe..2ec681d 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -466,7 +466,7 @@ ScriptObject InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeTo
break;
}
- value.set("id", static_cast<int>(id));
+ value.set("id", id);
value.set("nodeType", node->nodeType());
value.set("nodeName", nodeName);
value.set("localName", localName);
@@ -533,7 +533,7 @@ ScriptObject InspectorDOMAgent::buildObjectForEventListener(const RegisteredEven
value.set("type", eventType);
value.set("useCapture", registeredEventListener.useCapture);
value.set("isAttribute", eventListener->isAttribute());
- value.set("nodeId", static_cast<long long>(pushNodePathToFrontend(node)));
+ value.set("nodeId", pushNodePathToFrontend(node));
value.set("listener", getEventListenerHandlerBody(node->document(), m_frontend->scriptState(), eventListener.get()));
return value;
}
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index 6e02db1..c4517a3 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -105,7 +105,7 @@ void InspectorFrontend::clearConsoleMessages()
callSimpleFunction("clearConsoleMessages");
}
-bool InspectorFrontend::addResource(long long identifier, const ScriptObject& resourceObj)
+bool InspectorFrontend::addResource(unsigned long identifier, const ScriptObject& resourceObj)
{
OwnPtr<ScriptFunctionCall> function(newFunctionCall("addResource"));
function->appendArgument(identifier);
@@ -115,7 +115,7 @@ bool InspectorFrontend::addResource(long long identifier, const ScriptObject& re
return !hadException;
}
-bool InspectorFrontend::updateResource(long long identifier, const ScriptObject& resourceObj)
+bool InspectorFrontend::updateResource(unsigned long identifier, const ScriptObject& resourceObj)
{
OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateResource"));
function->appendArgument(identifier);
@@ -125,14 +125,14 @@ bool InspectorFrontend::updateResource(long long identifier, const ScriptObject&
return !hadException;
}
-void InspectorFrontend::removeResource(long long identifier)
+void InspectorFrontend::removeResource(unsigned long identifier)
{
OwnPtr<ScriptFunctionCall> function(newFunctionCall("removeResource"));
function->appendArgument(identifier);
function->call();
}
-void InspectorFrontend::updateFocusedNode(long long nodeId)
+void InspectorFrontend::updateFocusedNode(long nodeId)
{
OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateFocusedNode"));
function->appendArgument(nodeId);
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 8d818d1..c318f04 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -67,11 +67,11 @@ namespace WebCore {
void updateConsoleMessageRepeatCount(const int count);
void clearConsoleMessages();
- bool addResource(long long identifier, const ScriptObject& resourceObj);
- bool updateResource(long long identifier, const ScriptObject& resourceObj);
- void removeResource(long long identifier);
+ bool addResource(unsigned long identifier, const ScriptObject& resourceObj);
+ bool updateResource(unsigned long identifier, const ScriptObject& resourceObj);
+ void removeResource(unsigned long identifier);
- void updateFocusedNode(long long nodeId);
+ void updateFocusedNode(long nodeId);
void setAttachedWindow(bool attached);
void showPanel(int panel);
void populateInterface();
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 381dfd5..fac81b3 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -46,7 +46,7 @@
namespace WebCore {
-InspectorResource::InspectorResource(long long identifier, DocumentLoader* loader)
+InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* loader)
: m_identifier(identifier)
, m_loader(loader)
, m_frame(loader->frame())
@@ -70,7 +70,7 @@ InspectorResource::~InspectorResource()
{
}
-PassRefPtr<InspectorResource> InspectorResource::createCached(long long identifier, DocumentLoader* loader, const CachedResource* cachedResource)
+PassRefPtr<InspectorResource> InspectorResource::createCached(unsigned long identifier, DocumentLoader* loader, const CachedResource* cachedResource)
{
PassRefPtr<InspectorResource> resource = create(identifier, loader);
diff --git a/WebCore/inspector/InspectorResource.h b/WebCore/inspector/InspectorResource.h
index 7ee1966..7d9b977 100644
--- a/WebCore/inspector/InspectorResource.h
+++ b/WebCore/inspector/InspectorResource.h
@@ -68,12 +68,12 @@ namespace WebCore {
Other
};
- static PassRefPtr<InspectorResource> create(long long identifier, DocumentLoader* loader)
+ static PassRefPtr<InspectorResource> create(unsigned long identifier, DocumentLoader* loader)
{
return adoptRef(new InspectorResource(identifier, loader));
}
- static PassRefPtr<InspectorResource> createCached(long long identifier, DocumentLoader*, const CachedResource*);
+ static PassRefPtr<InspectorResource> createCached(unsigned long identifier, DocumentLoader*, const CachedResource*);
~InspectorResource();
@@ -91,7 +91,7 @@ namespace WebCore {
bool isSameLoader(DocumentLoader* loader) const { return loader == m_loader; }
void markMainResource() { m_isMainResource = true; }
- long long identifier() const { return m_identifier; }
+ unsigned long identifier() const { return m_identifier; }
String requestURL() const { return m_requestURL.string(); }
Frame* frame() const { return m_frame.get(); }
const String& mimeType() const { return m_mimeType; }
@@ -145,13 +145,13 @@ namespace WebCore {
ChangeType m_change;
};
- InspectorResource(long long identifier, DocumentLoader*);
+ InspectorResource(unsigned long identifier, DocumentLoader*);
Type type() const;
Type cachedResourceType() const;
CachedResource* cachedResource() const;
- long long m_identifier;
+ unsigned long m_identifier;
RefPtr<DocumentLoader> m_loader;
RefPtr<Frame> m_frame;
KURL m_requestURL;
diff --git a/WebCore/inspector/TimelineRecordFactory.cpp b/WebCore/inspector/TimelineRecordFactory.cpp
index e180399..4fdd502 100644
--- a/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/WebCore/inspector/TimelineRecordFactory.cpp
@@ -123,7 +123,7 @@ ScriptObject TimelineRecordFactory::createResourceSendRequestRecord(InspectorFro
{
ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
- data.set("identifier", static_cast<long long>(identifier));
+ data.set("identifier", identifier);
data.set("url", request.url().string());
data.set("requestMethod", request.httpMethod());
data.set("isMainResource", isMainResource);
@@ -136,7 +136,7 @@ ScriptObject TimelineRecordFactory::createResourceReceiveResponseRecord(Inspecto
{
ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
- data.set("identifier", static_cast<long long>(identifier));
+ data.set("identifier", identifier);
data.set("statusCode", response.httpStatusCode());
data.set("mimeType", response.mimeType());
data.set("expectedContentLength", response.expectedContentLength());
@@ -149,7 +149,7 @@ ScriptObject TimelineRecordFactory::createResourceFinishRecord(InspectorFrontend
{
ScriptObject record = createGenericRecord(frontend, startTime);
ScriptObject data = frontend->newScriptObject();
- data.set("identifier", static_cast<long long>(identifier));
+ data.set("identifier", identifier);
data.set("didFail", didFail);
record.set("data", data);
return record;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list