OLD | NEW |
---|---|
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 3191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3202 navigation_state->set_request_committed(true); | 3202 navigation_state->set_request_committed(true); |
3203 | 3203 |
3204 UpdateURL(frame); | 3204 UpdateURL(frame); |
3205 | 3205 |
3206 // If this committed load was initiated by a client redirect, we're | 3206 // If this committed load was initiated by a client redirect, we're |
3207 // at the last stop now, so clear it. | 3207 // at the last stop now, so clear it. |
3208 completed_client_redirect_src_ = Referrer(); | 3208 completed_client_redirect_src_ = Referrer(); |
3209 | 3209 |
3210 // Check whether we have new encoding name. | 3210 // Check whether we have new encoding name. |
3211 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); | 3211 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); |
3212 | |
3213 if (!frame->parent()) { // Only for top frames. | |
3214 RenderThreadImpl::current()->RenderViewNavigatedToHost(GURL( | |
3215 frame->document().url()).host(), g_view_map.Get().size()); | |
Charlie Reis
2012/08/22 23:09:59
We should probably use GetLoadingURL, or move this
marja
2012/08/23 14:15:00
Done.
| |
3216 } | |
3212 } | 3217 } |
3213 | 3218 |
3214 void RenderViewImpl::didClearWindowObject(WebFrame* frame) { | 3219 void RenderViewImpl::didClearWindowObject(WebFrame* frame) { |
3215 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3220 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
3216 DidClearWindowObject(frame)); | 3221 DidClearWindowObject(frame)); |
3217 | 3222 |
3218 GURL frame_url = frame->document().url(); | 3223 GURL frame_url = frame->document().url(); |
3219 if ((enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI) && | 3224 if ((enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI) && |
3220 (frame_url.SchemeIs(chrome::kChromeUIScheme) || | 3225 (frame_url.SchemeIs(chrome::kChromeUIScheme) || |
3221 frame_url.SchemeIs(chrome::kDataScheme))) { | 3226 frame_url.SchemeIs(chrome::kDataScheme))) { |
(...skipping 2662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5884 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5889 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5885 return !!RenderThreadImpl::current()->compositor_thread(); | 5890 return !!RenderThreadImpl::current()->compositor_thread(); |
5886 } | 5891 } |
5887 | 5892 |
5888 void RenderViewImpl::OnJavaBridgeInit() { | 5893 void RenderViewImpl::OnJavaBridgeInit() { |
5889 DCHECK(!java_bridge_dispatcher_); | 5894 DCHECK(!java_bridge_dispatcher_); |
5890 #if defined(ENABLE_JAVA_BRIDGE) | 5895 #if defined(ENABLE_JAVA_BRIDGE) |
5891 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5896 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5892 #endif | 5897 #endif |
5893 } | 5898 } |
OLD | NEW |