summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 10:32:02 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 10:32:02 +0000
commitbcdcb3e04f0e7667a28415c2a0320a9315a3a3a5 (patch)
tree23da911b8e89ec187ec5ebdca36f66adfde0391d /webkit
parente3f38ad3766e4dc05c80501afded493acc1f26bf (diff)
downloadchromium_src-bcdcb3e04f0e7667a28415c2a0320a9315a3a3a5.zip
chromium_src-bcdcb3e04f0e7667a28415c2a0320a9315a3a3a5.tar.gz
chromium_src-bcdcb3e04f0e7667a28415c2a0320a9315a3a3a5.tar.bz2
Glue part for the provisional WebKit merge (https://bugs.webkit.org/show_bug.cgi?id=25347).TBR=yurys
Review URL: http://codereview.chromium.org/99274 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc6
-rw-r--r--webkit/glue/webframeloaderclient_impl.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index fdcff3ee..0521da6 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -460,6 +460,12 @@ bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(
return result;
}
+void WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest(
+ unsigned long identifier,
+ const ScriptString&) {
+ //TODO(pfeldman): Wire to net_agent.
+}
+
void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() {
// During the onload event of a subframe, the subframe can be removed. In
// that case, it has no page. This is covered by
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index c15bfb1..ec51ea8 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -71,6 +71,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier);
virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&);
virtual bool dispatchDidLoadResourceFromMemoryCache(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, int length);
+ virtual void dispatchDidLoadResourceByXMLHttpRequest(unsigned long identifier, const WebCore::ScriptString&);
virtual void dispatchDidHandleOnloadEvents();
virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();