Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Side by Side Diff: webkit/glue/webframeloaderclient_impl.cc

Issue 99274: Glue part for the provisional WebKit merge (https://bugs.webkit.org/show_bug.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webframeloaderclient_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 10
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 if (net_agent) { 453 if (net_agent) {
454 net_agent->DidLoadResourceFromMemoryCache( 454 net_agent->DidLoadResourceFromMemoryCache(
455 loader, 455 loader,
456 request, 456 request,
457 response, 457 response,
458 length); 458 length);
459 } 459 }
460 return result; 460 return result;
461 } 461 }
462 462
463 void WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest(
464 unsigned long identifier,
465 const ScriptString&) {
466 //TODO(pfeldman): Wire to net_agent.
467 }
468
463 void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() { 469 void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() {
464 // During the onload event of a subframe, the subframe can be removed. In 470 // During the onload event of a subframe, the subframe can be removed. In
465 // that case, it has no page. This is covered by 471 // that case, it has no page. This is covered by
466 // LayoutTests/fast/dom/replaceChild.html 472 // LayoutTests/fast/dom/replaceChild.html
467 if (!webframe_->frame()->page()) 473 if (!webframe_->frame()->page())
468 return; 474 return;
469 WebViewImpl* webview = webframe_->webview_impl(); 475 WebViewImpl* webview = webframe_->webview_impl();
470 WebViewDelegate* d = webview->delegate(); 476 WebViewDelegate* d = webview->delegate();
471 if (d) 477 if (d)
472 d->DidHandleOnloadEventsForFrame(webview, webframe_); 478 d->DidHandleOnloadEventsForFrame(webview, webframe_);
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 if (!web_view) { 1629 if (!web_view) {
1624 return NULL; 1630 return NULL;
1625 } 1631 }
1626 WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl(); 1632 WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl();
1627 if (tools_agent) { 1633 if (tools_agent) {
1628 return tools_agent->net_agent_impl(); 1634 return tools_agent->net_agent_impl();
1629 } else { 1635 } else {
1630 return NULL; 1636 return NULL;
1631 } 1637 }
1632 } 1638 }
OLDNEW
« no previous file with comments | « webkit/glue/webframeloaderclient_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698