Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_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 2746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2757 void RenderViewImpl::didFailResourceLoad( | 2757 void RenderViewImpl::didFailResourceLoad( |
| 2758 WebFrame* frame, unsigned identifier, const WebURLError& error) { | 2758 WebFrame* frame, unsigned identifier, const WebURLError& error) { |
| 2759 // Ignore | 2759 // Ignore |
| 2760 } | 2760 } |
| 2761 | 2761 |
| 2762 void RenderViewImpl::didLoadResourceFromMemoryCache( | 2762 void RenderViewImpl::didLoadResourceFromMemoryCache( |
| 2763 WebFrame* frame, const WebURLRequest& request, | 2763 WebFrame* frame, const WebURLRequest& request, |
| 2764 const WebURLResponse& response) { | 2764 const WebURLResponse& response) { |
| 2765 // Let the browser know we loaded a resource from the memory cache. This | 2765 // Let the browser know we loaded a resource from the memory cache. This |
| 2766 // message is needed to display the correct SSL indicators. | 2766 // message is needed to display the correct SSL indicators. |
| 2767 GURL url(request.url()); | |
| 2768 if (url.SchemeIs("data")) { | |
| 2769 return; | |
| 2770 } | |
|
abarth-chromium
2011/10/27 20:36:35
I guess this is ok. It's kind of a hack though.
| |
| 2767 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( | 2771 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( |
| 2768 routing_id_, | 2772 routing_id_, |
| 2769 request.url(), | 2773 url, |
| 2770 response.securityInfo(), | 2774 response.securityInfo(), |
| 2771 request.httpMethod().utf8(), | 2775 request.httpMethod().utf8(), |
| 2772 ResourceType::FromTargetType(request.targetType()))); | 2776 ResourceType::FromTargetType(request.targetType()))); |
| 2773 } | 2777 } |
| 2774 | 2778 |
| 2775 void RenderViewImpl::didDisplayInsecureContent(WebFrame* frame) { | 2779 void RenderViewImpl::didDisplayInsecureContent(WebFrame* frame) { |
| 2776 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); | 2780 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); |
| 2777 } | 2781 } |
| 2778 | 2782 |
| 2779 void RenderViewImpl::didRunInsecureContent( | 2783 void RenderViewImpl::didRunInsecureContent( |
| (...skipping 1887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4667 return webview()->settings()->useThreadedCompositor(); | 4671 return webview()->settings()->useThreadedCompositor(); |
| 4668 } | 4672 } |
| 4669 | 4673 |
| 4670 void RenderViewImpl::OnJavaBridgeInit( | 4674 void RenderViewImpl::OnJavaBridgeInit( |
| 4671 const IPC::ChannelHandle& channel_handle) { | 4675 const IPC::ChannelHandle& channel_handle) { |
| 4672 DCHECK(!java_bridge_dispatcher_.get()); | 4676 DCHECK(!java_bridge_dispatcher_.get()); |
| 4673 #if defined(ENABLE_JAVA_BRIDGE) | 4677 #if defined(ENABLE_JAVA_BRIDGE) |
| 4674 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4678 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4675 #endif | 4679 #endif |
| 4676 } | 4680 } |
| OLD | NEW |