| 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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 int32 routing_id, | 505 int32 routing_id, |
| 506 int32 surface_id, | 506 int32 surface_id, |
| 507 int64 session_storage_namespace_id, | 507 int64 session_storage_namespace_id, |
| 508 const string16& frame_name, | 508 const string16& frame_name, |
| 509 bool is_renderer_created, | 509 bool is_renderer_created, |
| 510 bool swapped_out, | 510 bool swapped_out, |
| 511 int32 next_page_id, | 511 int32 next_page_id, |
| 512 const WebKit::WebScreenInfo& screen_info, | 512 const WebKit::WebScreenInfo& screen_info, |
| 513 content::GuestToEmbedderChannel* guest_to_embedder_channel, | 513 content::GuestToEmbedderChannel* guest_to_embedder_channel, |
| 514 AccessibilityMode accessibility_mode) | 514 AccessibilityMode accessibility_mode) |
| 515 : RenderWidget(WebKit::WebPopupTypeNone, screen_info, swapped_out), | 515 : RenderWidget(WebKit::WebPopupTypeNone, |
| 516 screen_info, |
| 517 swapped_out, |
| 518 renderer_prefs.disable_input_throttle), |
| 516 webkit_preferences_(webkit_prefs), | 519 webkit_preferences_(webkit_prefs), |
| 517 send_content_state_immediately_(false), | 520 send_content_state_immediately_(false), |
| 518 enabled_bindings_(0), | 521 enabled_bindings_(0), |
| 519 send_preferred_size_changes_(false), | 522 send_preferred_size_changes_(false), |
| 520 is_loading_(false), | 523 is_loading_(false), |
| 521 navigation_gesture_(NavigationGestureUnknown), | 524 navigation_gesture_(NavigationGestureUnknown), |
| 522 opened_by_user_gesture_(true), | 525 opened_by_user_gesture_(true), |
| 523 opener_suppressed_(false), | 526 opener_suppressed_(false), |
| 524 page_id_(-1), | 527 page_id_(-1), |
| 525 last_page_id_sent_to_browser_(-1), | 528 last_page_id_sent_to_browser_(-1), |
| (...skipping 5241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5767 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5770 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5768 return !!RenderThreadImpl::current()->compositor_thread(); | 5771 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5769 } | 5772 } |
| 5770 | 5773 |
| 5771 void RenderViewImpl::OnJavaBridgeInit() { | 5774 void RenderViewImpl::OnJavaBridgeInit() { |
| 5772 DCHECK(!java_bridge_dispatcher_); | 5775 DCHECK(!java_bridge_dispatcher_); |
| 5773 #if defined(ENABLE_JAVA_BRIDGE) | 5776 #if defined(ENABLE_JAVA_BRIDGE) |
| 5774 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5777 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5775 #endif | 5778 #endif |
| 5776 } | 5779 } |
| OLD | NEW |