summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoroysteine@chromium.org <oysteine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-16 22:10:06 +0000
committeroysteine@chromium.org <oysteine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-16 22:10:06 +0000
commit079fe6c556e539e97ef85e7d3773c2512adf16b3 (patch)
tree8d4a35a19eceb8750e9afa93ce59a7c6d412f3c1 /webkit
parent286b0de304da1832029c3c07e6b27927d1e378ac (diff)
downloadchromium_src-079fe6c556e539e97ef85e7d3773c2512adf16b3.zip
chromium_src-079fe6c556e539e97ef85e7d3773c2512adf16b3.tar.gz
chromium_src-079fe6c556e539e97ef85e7d3773c2512adf16b3.tar.bz2
Revert 276494 "Revert 275655 "Redirect HTML resource bytes direc..."
Relanding with two fixes: Check that Blink hasn't shut down the background (parser) thread before posting tasks to it, and only attach the ThreadedDataProvider if we have a shared memory handle available (fixes a crash when loading FTP listings) > Revert 275655 "Redirect HTML resource bytes directly to parser t..." > > > Redirect HTML resource bytes directly to parser thread (Chrome side) > > > > Blink side: https://codereview.chromium.org/100563004/ > > > > Note: This can't land until the Blink-side has landed. > > > > R=jamesr@chromium.org,jam@chromium.org > > BUG=277886 > > > > Review URL: https://codereview.chromium.org/109283006 > > TBR=oysteine@chromium.org > > Review URL: https://codereview.chromium.org/326403005 TBR=darin@chromium.org Review URL: https://codereview.chromium.org/334813004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/child/resource_loader_bridge.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/child/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h
index 9b97aa3..1907758 100644
--- a/webkit/child/resource_loader_bridge.h
+++ b/webkit/child/resource_loader_bridge.h
@@ -21,6 +21,10 @@
#include "net/base/request_priority.h"
#include "webkit/child/webkit_child_export.h"
+namespace blink {
+class WebThreadedDataReceiver;
+}
+
// TODO(pilgrim) remove this once resource loader is moved to content
// http://crbug.com/338338
namespace content {
@@ -61,6 +65,11 @@ class ResourceLoaderBridge {
virtual void DidChangePriority(net::RequestPriority new_priority,
int intra_priority_value) = 0;
+ // Call this method to attach a data receiver which will receive resource data
+ // on its own thread.
+ virtual bool AttachThreadedDataReceiver(
+ blink::WebThreadedDataReceiver* threaded_data_receiver) = 0;
+
// Call this method to load the resource synchronously (i.e., in one shot).
// This is an alternative to the Start method. Be warned that this method
// will block the calling thread until the resource is fully downloaded or an