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

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

Issue 7461106: Inform disk cache of WebKit memory cache hits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove rank from test Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "content/renderer/render_view.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 2724 matching lines...) Expand 10 before | Expand all | Expand 10 after
2735 } 2735 }
2736 2736
2737 void RenderView::didLoadResourceFromMemoryCache( 2737 void RenderView::didLoadResourceFromMemoryCache(
2738 WebFrame* frame, const WebURLRequest& request, 2738 WebFrame* frame, const WebURLRequest& request,
2739 const WebURLResponse& response) { 2739 const WebURLResponse& response) {
2740 // Let the browser know we loaded a resource from the memory cache. This 2740 // Let the browser know we loaded a resource from the memory cache. This
2741 // message is needed to display the correct SSL indicators. 2741 // message is needed to display the correct SSL indicators.
2742 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( 2742 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(
2743 routing_id_, 2743 routing_id_,
2744 request.url(), 2744 request.url(),
2745 response.securityInfo())); 2745 response.securityInfo(),
2746 request.httpMethod().utf8(),
2747 ResourceType::FromTargetType(request.targetType())));
2746 } 2748 }
2747 2749
2748 void RenderView::didDisplayInsecureContent(WebFrame* frame) { 2750 void RenderView::didDisplayInsecureContent(WebFrame* frame) {
2749 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); 2751 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_));
2750 } 2752 }
2751 2753
2752 void RenderView::didRunInsecureContent( 2754 void RenderView::didRunInsecureContent(
2753 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { 2755 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) {
2754 Send(new ViewHostMsg_DidRunInsecureContent( 2756 Send(new ViewHostMsg_DidRunInsecureContent(
2755 routing_id_, 2757 routing_id_,
(...skipping 1653 matching lines...) Expand 10 before | Expand all | Expand 10 after
4409 } 4411 }
4410 #endif 4412 #endif
4411 4413
4412 void RenderView::OnContextMenuClosed( 4414 void RenderView::OnContextMenuClosed(
4413 const webkit_glue::CustomContextMenuContext& custom_context) { 4415 const webkit_glue::CustomContextMenuContext& custom_context) {
4414 if (custom_context.is_pepper_menu) 4416 if (custom_context.is_pepper_menu)
4415 pepper_delegate_.OnContextMenuClosed(custom_context); 4417 pepper_delegate_.OnContextMenuClosed(custom_context);
4416 else 4418 else
4417 context_menu_node_.reset(); 4419 context_menu_node_.reset();
4418 } 4420 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698