Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| =================================================================== |
| --- content/renderer/render_view_impl.cc (revision 122395) |
| +++ content/renderer/render_view_impl.cc (working copy) |
| @@ -159,6 +159,7 @@ |
| #include "webkit/glue/webkit_constants.h" |
| #include "webkit/glue/webkit_glue.h" |
| #include "webkit/glue/weburlloader_impl.h" |
| +#include "webkit/glue/weburlresponse_extradata_impl.h" |
| #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
| #include "webkit/media/webmediaplayer_impl.h" |
| #include "webkit/plugins/npapi/plugin_list.h" |
| @@ -268,6 +269,7 @@ |
| using webkit::forms::PasswordFormDomManager; |
| using webkit_glue::AltErrorPageResourceFetcher; |
| using webkit_glue::ResourceFetcher; |
| +using webkit_glue::WebURLResponseExtraDataImpl; |
| //----------------------------------------------------------------------------- |
| @@ -325,6 +327,12 @@ |
| WebKit::WebReferrerPolicyDefault; |
| } |
| +static WebURLResponseExtraDataImpl* getExtraDataFromResponse( |
|
Ryan Sleevi
2012/02/17 22:10:24
While I understand this matches the style of getRe
|
| + const WebURLResponse& response) { |
| + return static_cast<WebURLResponseExtraDataImpl*>( |
| + response.extraData()); |
| +} |
| + |
| NOINLINE static void CrashIntentionally() { |
| // NOTE(shess): Crash directly rather than using NOTREACHED() so |
| // that the signature is easier to triage in crash reports. |
| @@ -3003,6 +3011,9 @@ |
| // Record page load flags. |
| document_state->set_was_fetched_via_spdy(response.wasFetchedViaSPDY()); |
| document_state->set_was_npn_negotiated(response.wasNpnNegotiated()); |
| + WebURLResponseExtraDataImpl* extra_data = getExtraDataFromResponse(response); |
| + document_state->set_npn_negotiated_protocol( |
| + extra_data->npn_negotiated_protocol()); |
| document_state->set_was_alternate_protocol_available( |
| response.wasAlternateProtocolAvailable()); |
| document_state->set_was_fetched_via_proxy(response.wasFetchedViaProxy()); |