diff options
| author | Iain Merrick <husky@google.com> | 2010-11-02 12:48:08 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 15:54:43 +0000 |
| commit | 2d2498eb555b4096a63a64dc6afcf2c95ec19f4d (patch) | |
| tree | f4f67e4b3b93a2b1f78729b18e6f0fd289fb591f /net/spdy | |
| parent | a63d6587a9fe4317d9cd57ab8b7ef9e5951d05fc (diff) | |
| download | external_chromium-2d2498eb555b4096a63a64dc6afcf2c95ec19f4d.zip external_chromium-2d2498eb555b4096a63a64dc6afcf2c95ec19f4d.tar.gz external_chromium-2d2498eb555b4096a63a64dc6afcf2c95ec19f4d.tar.bz2 | |
Merge Chromium at r63472 : Workaround for compiler bug.
IN PROGRESS. The compiler generates bad assembly for this file and
I don't know why. There's something it doesn't like about this one
function; splitting it out into a separate file fixes the problem.
Change-Id: I3cad52d7a14d341d16b826c031fd3b2599197b74
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_session.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index f94dfd3..b89665e 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -988,6 +988,10 @@ bool SpdySession::Respond(const spdy::SpdyHeaderBlock& headers, return true; } +#if !defined(ANDROID) +// This function generates bad ARM assembly in the Android build. +// As a workaround, it has been moved to android/net/spdy/spdy_session_android.cc + void SpdySession::OnSyn(const spdy::SpdySynStreamControlFrame& frame, const linked_ptr<spdy::SpdyHeaderBlock>& headers) { spdy::SpdyStreamId stream_id = frame.stream_id(); @@ -1069,6 +1073,8 @@ void SpdySession::OnSyn(const spdy::SpdySynStreamControlFrame& frame, push_requests.Increment(); } +#endif // ANDROID + void SpdySession::OnSynReply(const spdy::SpdySynReplyControlFrame& frame, const linked_ptr<spdy::SpdyHeaderBlock>& headers) { spdy::SpdyStreamId stream_id = frame.stream_id(); |