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 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1102 // This zoom level was merely recorded transiently for this load. We can | 1102 // This zoom level was merely recorded transiently for this load. We can |
1103 // erase it now. If at some point we reload this page, the browser will | 1103 // erase it now. If at some point we reload this page, the browser will |
1104 // send us a new, up-to-date zoom level. | 1104 // send us a new, up-to-date zoom level. |
1105 host_zoom_levels_.erase(host_zoom); | 1105 host_zoom_levels_.erase(host_zoom); |
1106 } | 1106 } |
1107 | 1107 |
1108 // Reset the zoom limits in case a plugin had changed them previously. This | 1108 // Reset the zoom limits in case a plugin had changed them previously. This |
1109 // will also call us back which will cause us to send a message to | 1109 // will also call us back which will cause us to send a message to |
1110 // update TabContents. | 1110 // update TabContents. |
1111 webview()->zoomLimitsChanged( | 1111 webview()->zoomLimitsChanged( |
1112 WebView::zoomFactorToZoomLevel(WebView::minTextSizeMultiplier), | 1112 WebView::zoomFactorToZoomLevel(content::kMinimumZoomFactor), |
1113 WebView::zoomFactorToZoomLevel(WebView::maxTextSizeMultiplier)); | 1113 WebView::zoomFactorToZoomLevel(content::kMaximumZoomFactor)); |
1114 | 1114 |
1115 // Update contents MIME type for main frame. | 1115 // Update contents MIME type for main frame. |
1116 params.contents_mime_type = ds->response().mimeType().utf8(); | 1116 params.contents_mime_type = ds->response().mimeType().utf8(); |
1117 | 1117 |
1118 params.transition = navigation_state->transition_type(); | 1118 params.transition = navigation_state->transition_type(); |
1119 if (!content::PageTransitionIsMainFrame(params.transition)) { | 1119 if (!content::PageTransitionIsMainFrame(params.transition)) { |
1120 // If the main frame does a load, it should not be reported as a subframe | 1120 // If the main frame does a load, it should not be reported as a subframe |
1121 // navigation. This can occur in the following case: | 1121 // navigation. This can occur in the following case: |
1122 // 1. You're on a site with frames. | 1122 // 1. You're on a site with frames. |
1123 // 2. You do a subframe navigation. This is stored with transition type | 1123 // 2. You do a subframe navigation. This is stored with transition type |
(...skipping 3609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4733 return webview()->settings()->useThreadedCompositor(); | 4733 return webview()->settings()->useThreadedCompositor(); |
4734 } | 4734 } |
4735 | 4735 |
4736 void RenderViewImpl::OnJavaBridgeInit( | 4736 void RenderViewImpl::OnJavaBridgeInit( |
4737 const IPC::ChannelHandle& channel_handle) { | 4737 const IPC::ChannelHandle& channel_handle) { |
4738 DCHECK(!java_bridge_dispatcher_.get()); | 4738 DCHECK(!java_bridge_dispatcher_.get()); |
4739 #if defined(ENABLE_JAVA_BRIDGE) | 4739 #if defined(ENABLE_JAVA_BRIDGE) |
4740 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4740 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
4741 #endif | 4741 #endif |
4742 } | 4742 } |
OLD | NEW |