| 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 2911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2922 frame, context, world_id); | 2922 frame, context, world_id); |
| 2923 } | 2923 } |
| 2924 | 2924 |
| 2925 void RenderViewImpl::willReleaseScriptContext(WebFrame* frame, | 2925 void RenderViewImpl::willReleaseScriptContext(WebFrame* frame, |
| 2926 v8::Handle<v8::Context> context, | 2926 v8::Handle<v8::Context> context, |
| 2927 int world_id) { | 2927 int world_id) { |
| 2928 content::GetContentClient()->renderer()->WillReleaseScriptContext( | 2928 content::GetContentClient()->renderer()->WillReleaseScriptContext( |
| 2929 frame, context, world_id); | 2929 frame, context, world_id); |
| 2930 } | 2930 } |
| 2931 | 2931 |
| 2932 void RenderViewImpl::didUpdateLayout(WebFrame* frame) { | |
| 2933 didUpdateLayout(); | |
| 2934 } | |
| 2935 | |
| 2936 void RenderViewImpl::CheckPreferredSize() { | 2932 void RenderViewImpl::CheckPreferredSize() { |
| 2937 // We don't always want to send the change messages over IPC, only if we've | 2933 // We don't always want to send the change messages over IPC, only if we've |
| 2938 // been put in that mode by getting a |ViewMsg_EnablePreferredSizeChangedMode| | 2934 // been put in that mode by getting a |ViewMsg_EnablePreferredSizeChangedMode| |
| 2939 // message. | 2935 // message. |
| 2940 if (!send_preferred_size_changes_ || !webview()) | 2936 if (!send_preferred_size_changes_ || !webview()) |
| 2941 return; | 2937 return; |
| 2942 | 2938 |
| 2943 gfx::Size size(webview()->mainFrame()->contentsPreferredWidth(), | 2939 gfx::Size size(webview()->mainFrame()->contentsPreferredWidth(), |
| 2944 webview()->mainFrame()->documentElementScrollHeight()); | 2940 webview()->mainFrame()->documentElementScrollHeight()); |
| 2945 | 2941 |
| (...skipping 1909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4855 return !!RenderThreadImpl::current()->compositor_thread(); | 4851 return !!RenderThreadImpl::current()->compositor_thread(); |
| 4856 } | 4852 } |
| 4857 | 4853 |
| 4858 void RenderViewImpl::OnJavaBridgeInit( | 4854 void RenderViewImpl::OnJavaBridgeInit( |
| 4859 const IPC::ChannelHandle& channel_handle) { | 4855 const IPC::ChannelHandle& channel_handle) { |
| 4860 DCHECK(!java_bridge_dispatcher_.get()); | 4856 DCHECK(!java_bridge_dispatcher_.get()); |
| 4861 #if defined(ENABLE_JAVA_BRIDGE) | 4857 #if defined(ENABLE_JAVA_BRIDGE) |
| 4862 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4858 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4863 #endif | 4859 #endif |
| 4864 } | 4860 } |
| OLD | NEW |