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/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 3816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3827 bool WebContentsImpl::AddMessageToConsole(int32 level, | 3827 bool WebContentsImpl::AddMessageToConsole(int32 level, |
3828 const base::string16& message, | 3828 const base::string16& message, |
3829 int32 line_no, | 3829 int32 line_no, |
3830 const base::string16& source_id) { | 3830 const base::string16& source_id) { |
3831 if (!delegate_) | 3831 if (!delegate_) |
3832 return false; | 3832 return false; |
3833 return delegate_->AddMessageToConsole(this, level, message, line_no, | 3833 return delegate_->AddMessageToConsole(this, level, message, line_no, |
3834 source_id); | 3834 source_id); |
3835 } | 3835 } |
3836 | 3836 |
3837 WebPreferences WebContentsImpl::ComputeWebkitPrefs() { | 3837 WebPreferences WebContentsImpl::GetWebkitPrefs() { |
3838 // We want to base the page config off of the actual URL, rather than the | 3838 // We want to base the page config off of the actual URL, rather than the |
3839 // virtual URL. | 3839 // virtual URL. |
3840 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, | 3840 // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, |
3841 // as it is deprecated and can be out of sync with GetRenderViewHost(). | 3841 // as it is deprecated and can be out of sync with GetRenderViewHost(). |
3842 GURL url = controller_.GetActiveEntry() | 3842 GURL url = controller_.GetActiveEntry() |
3843 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); | 3843 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); |
3844 | 3844 |
3845 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); | 3845 return GetRenderManager()->current_host()->GetWebkitPrefs(url); |
3846 } | 3846 } |
3847 | 3847 |
3848 int WebContentsImpl::CreateSwappedOutRenderView( | 3848 int WebContentsImpl::CreateSwappedOutRenderView( |
3849 SiteInstance* instance) { | 3849 SiteInstance* instance) { |
3850 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, | 3850 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, |
3851 true, true); | 3851 true, true); |
3852 } | 3852 } |
3853 | 3853 |
3854 void WebContentsImpl::OnUserGesture() { | 3854 void WebContentsImpl::OnUserGesture() { |
3855 // Notify observers. | 3855 // Notify observers. |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4233 if (new_size != old_size) | 4233 if (new_size != old_size) |
4234 delegate_->UpdatePreferredSize(this, new_size); | 4234 delegate_->UpdatePreferredSize(this, new_size); |
4235 } | 4235 } |
4236 | 4236 |
4237 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4237 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
4238 FrameTreeNode* node = frame_tree_.root(); | 4238 FrameTreeNode* node = frame_tree_.root(); |
4239 node->render_manager()->ResumeResponseDeferredAtStart(); | 4239 node->render_manager()->ResumeResponseDeferredAtStart(); |
4240 } | 4240 } |
4241 | 4241 |
4242 } // namespace content | 4242 } // namespace content |
OLD | NEW |