diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 00:04:28 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 00:04:28 +0000 |
| commit | 0d9d4513509b7185d16861d039c6502c06258409 (patch) | |
| tree | 6ea65fb75dd42437318b9c302ace957943422adf /chrome_frame/npapi_url_request.h | |
| parent | ea38baf5b3a5a8dd0287d61b26502a2c9ffb4661 (diff) | |
| download | chromium_src-0d9d4513509b7185d16861d039c6502c06258409.zip chromium_src-0d9d4513509b7185d16861d039c6502c06258409.tar.gz chromium_src-0d9d4513509b7185d16861d039c6502c06258409.tar.bz2 | |
Fix ChromeFrame Firefox unit test failures. The host network stack implementation for Firefox needs
to ignore streams created as a result of the src attribute for the ChromeFrame plugin. Fixed the
signatures of the stream handling functions to return NPError instead of bool as the semantics differ
if we return true which equates to NPERR_USER_BREAK.
Review URL: http://codereview.chromium.org/561005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/npapi_url_request.h')
| -rw-r--r-- | chrome_frame/npapi_url_request.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/npapi_url_request.h b/chrome_frame/npapi_url_request.h index 87e40a9..0fec438 100644 --- a/chrome_frame/npapi_url_request.h +++ b/chrome_frame/npapi_url_request.h @@ -24,8 +24,8 @@ class NPAPIUrlRequestManager : public PluginUrlRequestManager, // Notifications from the browser. We find the appropriate NPAPIUrlRequest // and forward the call. - bool NewStream(NPMIMEType type, NPStream* stream, - NPBool seekable, uint16* stream_type); + NPError NewStream(NPMIMEType type, NPStream* stream, + NPBool seekable, uint16* stream_type); int32 WriteReady(NPStream* stream); int32 Write(NPStream* stream, int32 offset, int32 len, void* buffer); NPError DestroyStream(NPStream* stream, NPReason reason); @@ -44,6 +44,8 @@ class NPAPIUrlRequestManager : public PluginUrlRequestManager, typedef std::map<int, scoped_refptr<NPAPIUrlRequest> > RequestMap; RequestMap request_map_; + scoped_refptr<NPAPIUrlRequest> LookupRequest(int request_id); + // PluginUrlRequestDelegate implementation. Forwards back to delegate. virtual void OnResponseStarted(int request_id, const char* mime_type, const char* headers, int size, |