[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:15 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit edbee9daab198cd67d5a5357e3c906f8174bef54
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 26 21:22:37 2009 +0000
2009-11-26 Yury Semikhatsky <yurys at chromium.org>
Not reviewed. Build fix: revert r51421.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::willSendRequest):
(WebCore::InspectorController::didReceiveResponse):
(WebCore::InspectorController::didReceiveContentLength):
(WebCore::InspectorController::didFinishLoading):
(WebCore::InspectorController::didFailLoading):
* inspector/InspectorController.h:
* inspector/InspectorResource.cpp:
(WebCore::InspectorResource::addLength):
* loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::didFailToLoad):
(WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
(WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
(WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
(WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
2009-11-26 Yury Semikhatsky <yurys at chromium.org>
Not reviewed. Build fix: revert r51421.
* public/WebDevToolsAgent.h:
* public/WebView.h:
* src/WebViewImpl.cpp:
* src/WebViewImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51422 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 727085c..983170b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,25 @@
2009-11-26 Yury Semikhatsky <yurys at chromium.org>
+ Not reviewed. Build fix: revert r51421.
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::willSendRequest):
+ (WebCore::InspectorController::didReceiveResponse):
+ (WebCore::InspectorController::didReceiveContentLength):
+ (WebCore::InspectorController::didFinishLoading):
+ (WebCore::InspectorController::didFailLoading):
+ * inspector/InspectorController.h:
+ * inspector/InspectorResource.cpp:
+ (WebCore::InspectorResource::addLength):
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::didFailToLoad):
+ (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
+ (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
+ (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
+ (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
+
+2009-11-26 Yury Semikhatsky <yurys at chromium.org>
+
Reviewed by Pavel Feldman.
This is a WebCore part of the fix that allows to view plugin
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 1c1653c..ddb13d2 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -939,11 +939,10 @@ bool InspectorController::isMainResourceLoader(DocumentLoader* loader, const KUR
return loader->frame() == m_inspectedPage->mainFrame() && requestUrl == loader->requestURL();
}
-void InspectorController::willSendRequest(unsigned long identifier, const ResourceRequest& request, const ResourceResponse& redirectResponse)
+void InspectorController::willSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
{
- bool isMainResource = (m_mainResource && m_mainResource->identifier() == identifier);
if (m_timelineAgent)
- m_timelineAgent->willSendResourceRequest(identifier, isMainResource, request);
+ m_timelineAgent->willSendResourceRequest(identifier, isMainResourceLoader(loader, request.url()), request);
RefPtr<InspectorResource> resource = getTrackedResource(identifier);
if (!resource)
@@ -960,7 +959,7 @@ void InspectorController::willSendRequest(unsigned long identifier, const Resour
resource->createScriptObject(m_frontend.get());
}
-void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
+void InspectorController::didReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse& response)
{
if (m_timelineAgent)
m_timelineAgent->didReceiveResourceResponse(identifier, response);
@@ -976,7 +975,7 @@ void InspectorController::didReceiveResponse(unsigned long identifier, const Res
resource->updateScriptObject(m_frontend.get());
}
-void InspectorController::didReceiveContentLength(unsigned long identifier, int lengthReceived)
+void InspectorController::didReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived)
{
RefPtr<InspectorResource> resource = getTrackedResource(identifier);
if (!resource)
@@ -988,7 +987,7 @@ void InspectorController::didReceiveContentLength(unsigned long identifier, int
resource->updateScriptObject(m_frontend.get());
}
-void InspectorController::didFinishLoading(unsigned long identifier)
+void InspectorController::didFinishLoading(DocumentLoader*, unsigned long identifier)
{
if (m_timelineAgent)
m_timelineAgent->didFinishLoadingResource(identifier, false);
@@ -1007,7 +1006,7 @@ void InspectorController::didFinishLoading(unsigned long identifier)
resource->updateScriptObject(m_frontend.get());
}
-void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& /*error*/)
+void InspectorController::didFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError& /*error*/)
{
if (m_timelineAgent)
m_timelineAgent->didFinishLoadingResource(identifier, true);
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index c44ec22..22bd076 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -216,11 +216,11 @@ public:
void didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*);
void identifierForInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
- void willSendRequest(unsigned long identifier, const ResourceRequest&, const ResourceResponse& redirectResponse);
- void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
- void didReceiveContentLength(unsigned long identifier, int lengthReceived);
- void didFinishLoading(unsigned long identifier);
- void didFailLoading(unsigned long identifier, const ResourceError&);
+ void willSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
+ void didReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&);
+ void didReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived);
+ void didFinishLoading(DocumentLoader*, unsigned long identifier);
+ void didFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&);
void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString);
void scriptImported(unsigned long identifier, const String& sourceString);
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 5818627..381dfd5 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -381,12 +381,6 @@ void InspectorResource::addLength(int lengthReceived)
{
m_length += lengthReceived;
m_changes.set(LengthChange);
-
- // Update load time, otherwise the resource will
- // have start time == end time and 0 load duration
- // until its loading is completed.
- m_endTime = currentTime();
- m_changes.set(TimingChange);
}
} // namespace WebCore
diff --git a/WebCore/loader/ResourceLoadNotifier.cpp b/WebCore/loader/ResourceLoadNotifier.cpp
index 9280434..4cddd01 100644
--- a/WebCore/loader/ResourceLoadNotifier.cpp
+++ b/WebCore/loader/ResourceLoadNotifier.cpp
@@ -96,11 +96,6 @@ void ResourceLoadNotifier::didFailToLoad(ResourceLoader* loader, const ResourceE
if (!error.isNull())
m_frame->loader()->client()->dispatchDidFailLoading(loader->documentLoader(), loader->identifier(), error);
-
-#if ENABLE(INSPECTOR)
- if (Page* page = m_frame->page())
- page->inspectorController()->didFailLoading(loader->identifier(), error);
-#endif
}
void ResourceLoadNotifier::didLoadResourceByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString)
@@ -131,7 +126,7 @@ void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsig
#if ENABLE(INSPECTOR)
if (Page* page = m_frame->page())
- page->inspectorController()->willSendRequest(identifier, request, redirectResponse);
+ page->inspectorController()->willSendRequest(loader, identifier, request, redirectResponse);
#endif
}
@@ -141,7 +136,7 @@ void ResourceLoadNotifier::dispatchDidReceiveResponse(DocumentLoader* loader, un
#if ENABLE(INSPECTOR)
if (Page* page = m_frame->page())
- page->inspectorController()->didReceiveResponse(identifier, r);
+ page->inspectorController()->didReceiveResponse(loader, identifier, r);
#endif
}
@@ -151,7 +146,7 @@ void ResourceLoadNotifier::dispatchDidReceiveContentLength(DocumentLoader* loade
#if ENABLE(INSPECTOR)
if (Page* page = m_frame->page())
- page->inspectorController()->didReceiveContentLength(identifier, length);
+ page->inspectorController()->didReceiveContentLength(loader, identifier, length);
#endif
}
@@ -161,7 +156,7 @@ void ResourceLoadNotifier::dispatchDidFinishLoading(DocumentLoader* loader, unsi
#if ENABLE(INSPECTOR)
if (Page* page = m_frame->page())
- page->inspectorController()->didFinishLoading(identifier);
+ page->inspectorController()->didFinishLoading(loader, identifier);
#endif
}
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 87a2f05..0e7a2bc 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,20 +1,10 @@
2009-11-26 Yury Semikhatsky <yurys at chromium.org>
- Reviewed by Pavel Feldman.
-
- WebCore part of the fix that allows to view plugin
- resources loaded by plugins. Methods that for resource
- loading notifications are exposed through WebDevToolsAgent
- interface to the glue code to allow Chromium's plugin
- implementation to notify InspectorController about resource
- loading in plugins.
-
- https://bugs.webkit.org/show_bug.cgi?id=31832
+ Not reviewed. Build fix: revert r51421.
* public/WebDevToolsAgent.h:
* public/WebView.h:
* src/WebViewImpl.cpp:
- (WebKit::WebViewImpl::createUniqueIdentifierForRequest):
* src/WebViewImpl.h:
2009-11-25 Dimitri Glazkov <dglazkov at chromium.org>
diff --git a/WebKit/chromium/public/WebDevToolsAgent.h b/WebKit/chromium/public/WebDevToolsAgent.h
index 4a44cb0..cf4d7ea 100644
--- a/WebKit/chromium/public/WebDevToolsAgent.h
+++ b/WebKit/chromium/public/WebDevToolsAgent.h
@@ -35,13 +35,9 @@
namespace WebKit {
class WebDevToolsAgentClient;
-class WebFrame;
class WebString;
-class WebURLRequest;
-class WebURLResponse;
class WebView;
struct WebPoint;
-struct WebURLError;
class WebDevToolsAgent {
public:
@@ -74,13 +70,6 @@ public:
// Installs dispatch handle that is going to be called periodically
// while on a breakpoint.
WEBKIT_API static void setMessageLoopDispatchHandler(MessageLoopDispatchHandler);
-
- virtual void identifierForInitialRequest(unsigned long resourceId, WebFrame*, const WebURLRequest&) = 0;
- virtual void willSendRequest(unsigned long resourceId, const WebURLRequest&) = 0;
- virtual void didReceiveData(unsigned long resourceId, int length) = 0;
- virtual void didReceiveResponse(unsigned long resourceId, const WebURLResponse&) = 0;
- virtual void didFinishLoading(unsigned long resourceId) = 0;
- virtual void didFailLoading(unsigned long resourceId, const WebURLError&) = 0;
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 29a3f9e..8261afc 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -191,13 +191,6 @@ public:
virtual bool setDropEffect(bool accept) = 0;
- // Support for resource loading initiated by plugins -------------------
-
- // Returns next unused request identifier which is unique within the
- // parent Page.
- virtual unsigned long createUniqueIdentifierForRequest() = 0;
-
-
// Developer tools -----------------------------------------------------
// Inspect a particular point in the WebView. (x = -1 || y = -1) is a
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 7914a9e..aaf7174 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -70,7 +70,6 @@
#include "PluginInfoStore.h"
#include "PopupMenuChromium.h"
#include "PopupMenuClient.h"
-#include "ProgressTracker.h"
#include "RenderView.h"
#include "ResourceHandle.h"
#include "SecurityOrigin.h"
@@ -1476,12 +1475,6 @@ int WebViewImpl::dragIdentity()
return 0;
}
-unsigned long WebViewImpl::createUniqueIdentifierForRequest() {
- if (m_page)
- return m_page->progress()->createUniqueIdentifier();
- return 0;
-}
-
void WebViewImpl::inspectElementAt(const WebPoint& point)
{
if (!m_page.get())
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index 96227e3..2b83a8e 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -143,7 +143,6 @@ public:
const WebPoint& screenPoint);
virtual int dragIdentity();
virtual bool setDropEffect(bool accept);
- virtual unsigned long createUniqueIdentifierForRequest();
virtual void inspectElementAt(const WebPoint& point);
virtual WebString inspectorSettings() const;
virtual void setInspectorSettings(const WebString& settings);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list