Commit bcdcb3e0 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

Glue part for the provisional WebKit merge...

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
parent e3f38ad3
...@@ -19,7 +19,7 @@ deps = { ...@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@243", "http://googletest.googlecode.com/svn/trunk@243",
"src/third_party/WebKit": "src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@15030", "/trunk/deps/third_party/WebKit@15040",
"src/third_party/icu38": "src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472", "/trunk/deps/third_party/icu38@13472",
......
...@@ -460,6 +460,12 @@ bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache( ...@@ -460,6 +460,12 @@ bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(
return result; return result;
} }
void WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest(
unsigned long identifier,
const ScriptString&) {
//TODO(pfeldman): Wire to net_agent.
}
void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() { void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() {
// During the onload event of a subframe, the subframe can be removed. In // During the onload event of a subframe, the subframe can be removed. In
// that case, it has no page. This is covered by // that case, it has no page. This is covered by
......
...@@ -71,6 +71,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { ...@@ -71,6 +71,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier); virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier);
virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&); 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 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 dispatchDidHandleOnloadEvents();
virtual void dispatchDidReceiveServerRedirectForProvisionalLoad(); virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment