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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9315021: In chrome:loadtimes show the NPN protocol negotiated (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 10 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 | « content/public/renderer/document_state.h ('k') | webkit/glue/resource_loader_bridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2864 matching lines...) Expand 10 before | Expand all | Expand 10 after
2875 if (frame->isViewSourceModeEnabled()) 2875 if (frame->isViewSourceModeEnabled())
2876 return; 2876 return;
2877 2877
2878 DocumentState* document_state = 2878 DocumentState* document_state =
2879 DocumentState::FromDataSource(frame->provisionalDataSource()); 2879 DocumentState::FromDataSource(frame->provisionalDataSource());
2880 int http_status_code = response.httpStatusCode(); 2880 int http_status_code = response.httpStatusCode();
2881 2881
2882 // Record page load flags. 2882 // Record page load flags.
2883 document_state->set_was_fetched_via_spdy(response.wasFetchedViaSPDY()); 2883 document_state->set_was_fetched_via_spdy(response.wasFetchedViaSPDY());
2884 document_state->set_was_npn_negotiated(response.wasNpnNegotiated()); 2884 document_state->set_was_npn_negotiated(response.wasNpnNegotiated());
2885 std::string npn_negotiated_protocol(response.npnNegotiatedProtocol().data());
2886 document_state->set_npn_negotiated_protocol(npn_negotiated_protocol);
2885 document_state->set_was_alternate_protocol_available( 2887 document_state->set_was_alternate_protocol_available(
2886 response.wasAlternateProtocolAvailable()); 2888 response.wasAlternateProtocolAvailable());
2887 document_state->set_was_fetched_via_proxy(response.wasFetchedViaProxy()); 2889 document_state->set_was_fetched_via_proxy(response.wasFetchedViaProxy());
2888 document_state->set_http_status_code(http_status_code); 2890 document_state->set_http_status_code(http_status_code);
2889 // Whether or not the http status code actually corresponds to an error is 2891 // Whether or not the http status code actually corresponds to an error is
2890 // only checked when the page is done loading, if |use_error_page| is 2892 // only checked when the page is done loading, if |use_error_page| is
2891 // still true. 2893 // still true.
2892 document_state->set_use_error_page(true); 2894 document_state->set_use_error_page(true);
2893 } 2895 }
2894 2896
(...skipping 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after
4915 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4917 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4916 return !!RenderThreadImpl::current()->compositor_thread(); 4918 return !!RenderThreadImpl::current()->compositor_thread();
4917 } 4919 }
4918 4920
4919 void RenderViewImpl::OnJavaBridgeInit() { 4921 void RenderViewImpl::OnJavaBridgeInit() {
4920 DCHECK(!java_bridge_dispatcher_.get()); 4922 DCHECK(!java_bridge_dispatcher_.get());
4921 #if defined(ENABLE_JAVA_BRIDGE) 4923 #if defined(ENABLE_JAVA_BRIDGE)
4922 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 4924 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
4923 #endif 4925 #endif
4924 } 4926 }
OLDNEW
« no previous file with comments | « content/public/renderer/document_state.h ('k') | webkit/glue/resource_loader_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698