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

Side by Side Diff: Tools/DumpRenderTree/chromium/WebViewHost.cpp

Issue 14495011: Revert "Create errors (especially cancellation errors) internally to WebCore, rather" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | « Tools/DumpRenderTree/chromium/WebViewHost.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 /* 1 /*
2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 if (another) 426 if (another)
427 another->show(policy); 427 another->show(policy);
428 } 428 }
429 429
430 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( 430 WebNavigationPolicy WebViewHost::decidePolicyForNavigation(
431 WebFrame*, const WebURLRequest&, WebNavigationType, WebNavigationPolicy defa ultPolicy, bool) 431 WebFrame*, const WebURLRequest&, WebNavigationType, WebNavigationPolicy defa ultPolicy, bool)
432 { 432 {
433 return defaultPolicy; 433 return defaultPolicy;
434 } 434 }
435 435
436 bool WebViewHost::canHandleRequest(WebFrame*, const WebURLRequest& request)
437 {
438 return true;
439 }
440
441 WebURLError WebViewHost::cancelledError(WebFrame*, const WebURLRequest& request)
442 {
443 return webkit_support::CreateCancelledError(request);
444 }
445
446 void WebViewHost::unableToImplementPolicyWithError(WebFrame* frame, const WebURL Error& error)
447 {
448 }
449
436 void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds) 450 void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds)
437 { 451 {
438 ds->setExtraData(m_pendingExtraData.leakPtr()); 452 ds->setExtraData(m_pendingExtraData.leakPtr());
439 } 453 }
440 454
441 void WebViewHost::didCommitProvisionalLoad(WebFrame* frame, bool isNewNavigation ) 455 void WebViewHost::didCommitProvisionalLoad(WebFrame* frame, bool isNewNavigation )
442 { 456 {
443 updateForCommittedLoad(frame, isNewNavigation); 457 updateForCommittedLoad(frame, isNewNavigation);
444 } 458 }
445 459
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 } 993 }
980 994
981 #if ENABLE(MEDIA_STREAM) 995 #if ENABLE(MEDIA_STREAM)
982 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() 996 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient()
983 { 997 {
984 if (!m_testMediaStreamClient.get()) 998 if (!m_testMediaStreamClient.get())
985 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl ient()); 999 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl ient());
986 return m_testMediaStreamClient.get(); 1000 return m_testMediaStreamClient.get();
987 } 1001 }
988 #endif 1002 #endif
OLDNEW
« no previous file with comments | « Tools/DumpRenderTree/chromium/WebViewHost.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698