diff options
37 files changed, 163 insertions, 164 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 5c10a2b..d7ac476 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -35,7 +35,6 @@ include_rules = [ # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW! "+content/browser/geolocation/wifi_data_provider_common.h", "+content/browser/renderer_host/resource_request_info_impl.h", - "+content/browser/tab_contents/test_tab_contents.h", # TODO(asanka): see http://codereview.chromium.org/9141031 "+content/browser/download/download_state_info.h", # TODO(ben): http://crbug.com/118410 will fix the following: diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 7c28a78..a18540d 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -31,11 +31,13 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/test/mock_render_process_host.h" +#include "content/test/test_renderer_host.h" #include "content/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" using content::RenderViewHost; +using content::RenderViewHostTester; using content::WebContents; static const char* kDataURIPrefix = "data:text/html;charset=utf-8,"; @@ -691,7 +693,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillAfterTranslate) { ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(), url)); // Get translation bar. - render_view_host()->OnMessageReceivedForTesting( + RenderViewHostTester::TestOnMessageReceived( + render_view_host(), ChromeViewHostMsg_TranslateLanguageDetermined(0, "ja", true)); TranslateInfoBarDelegate* infobar = browser()->GetSelectedTabContentsWrapper()->infobar_tab_helper()-> diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index e8d0b99..12eb760 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -100,7 +100,7 @@ class BrowserFeatureExtractorTest : public ChromeRenderViewHostTestHarness { static int page_id = 0; content::RenderViewHost* rvh = - WebContentsTester::For(contents())->pending_rvh(); + WebContentsTester::For(contents())->GetPendingRenderViewHost(); if (!rvh) { rvh = contents()->GetRenderViewHost(); } diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 581358d..3d55889 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -126,7 +126,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness { // The pending RVH should commit for cross-site navigations. content::RenderViewHost* rvh = is_cross_site ? - WebContentsTester::For(contents())->pending_rvh() : + WebContentsTester::For(contents())->GetPendingRenderViewHost() : contents()->GetRenderViewHost(); WebContentsTester::For(contents())->TestDidNavigate( rvh, diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 8e3ce44..7e78056 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -74,7 +74,8 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness, void SimulateOnTranslateLanguageDetermined(const std::string& lang, bool page_translatable) { - rvh_tester()->TestOnMessageReceived( + RenderViewHostTester::TestOnMessageReceived( + rvh(), ChromeViewHostMsg_TranslateLanguageDetermined( 0, lang, page_translatable)); } @@ -366,8 +367,10 @@ TEST_F(TranslateManagerTest, NormalTranslate) { EXPECT_EQ("en", target_lang); // Simulate the render notifying the translation has been done. - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The after translate infobar should be showing. infobar = GetTranslateInfoBar(); @@ -382,8 +385,10 @@ TEST_F(TranslateManagerTest, NormalTranslate) { EXPECT_EQ(new_original_lang, original_lang); EXPECT_EQ("en", target_lang); // Simulate the render notifying the translation has been done. - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, new_original_lang, "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, new_original_lang, "en", TranslateErrors::NONE)); // infobar is now invalid. TranslateInfoBarDelegate* new_infobar = GetTranslateInfoBar(); ASSERT_TRUE(new_infobar != NULL); @@ -397,7 +402,8 @@ TEST_F(TranslateManagerTest, NormalTranslate) { EXPECT_EQ(new_original_lang, original_lang); EXPECT_EQ(new_target_lang, target_lang); // Simulate the render notifying the translation has been done. - rvh_tester()->TestOnMessageReceived( + RenderViewHostTester::TestOnMessageReceived( + rvh(), ChromeViewHostMsg_PageTranslated( 0, 0, new_original_lang, new_target_lang, TranslateErrors::NONE)); // infobar is now invalid. @@ -457,8 +463,10 @@ TEST_F(TranslateManagerTest, TranslateUnknownLanguage) { // Simulate the render notifying the translation has been done, the server // having detected the page was in a known and supported language. - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The after translate infobar should be showing. infobar = GetTranslateInfoBar(); @@ -473,8 +481,10 @@ TEST_F(TranslateManagerTest, TranslateUnknownLanguage) { menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 1, 0, "en", "en", TranslateErrors::IDENTICAL_LANGUAGES)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 1, 0, "en", "en", TranslateErrors::IDENTICAL_LANGUAGES)); infobar = GetTranslateInfoBar(); ASSERT_TRUE(infobar != NULL); EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR, infobar->type()); @@ -486,8 +496,10 @@ TEST_F(TranslateManagerTest, TranslateUnknownLanguage) { menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 2, 0, "", "en", TranslateErrors::UNKNOWN_LANGUAGE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 2, 0, "", "en", TranslateErrors::UNKNOWN_LANGUAGE)); infobar = GetTranslateInfoBar(); ASSERT_TRUE(infobar != NULL); EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR, infobar->type()); @@ -686,8 +698,10 @@ TEST_F(TranslateManagerTest, AutoTranslateOnNavigate) { // Simulate the translate script being retrieved. SimulateTranslateScriptURLFetch(true); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // Now navigate to a new page in the same language. process()->sink().ClearMessages(); @@ -860,8 +874,10 @@ TEST_F(TranslateManagerTest, TranslateCloseInfoBarInPageNavigation) { infobar->Translate(); // Simulate the translate script being retrieved. SimulateTranslateScriptURLFetch(true); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // Close the infobar. EXPECT_TRUE(CloseTranslateInfoBar()); @@ -890,8 +906,10 @@ TEST_F(TranslateManagerTest, TranslateInPageNavigation) { infobar->Translate(); // Simulate the translate script being retrieved. SimulateTranslateScriptURLFetch(true); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The after translate infobar is showing. infobar = GetTranslateInfoBar(); ASSERT_TRUE(infobar != NULL); @@ -929,8 +947,10 @@ TEST_F(TranslateManagerTest, ServerReportsUnsupportedLanguage) { SimulateTranslateScriptURLFetch(true); // Simulate the render notifying the translation has been done, but it // reports a language we don't support. - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "qbz", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "qbz", "en", TranslateErrors::NONE)); // An error infobar should be showing to report that we don't support this // language. @@ -1247,8 +1267,10 @@ TEST_F(TranslateManagerTest, ContextMenu) { EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(url.host())); // Let's simulate the page being translated. - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // The translate menu should now be disabled. menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); @@ -1283,8 +1305,10 @@ TEST_F(TranslateManagerTest, ContextMenu) { menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); EXPECT_TRUE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE)); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "de", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "de", "en", TranslateErrors::NONE)); menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE); // No message expected since the translation should have been ignored. EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang)); @@ -1410,8 +1434,10 @@ TEST_F(TranslateManagerTest, ScriptExpires) { process()->sink().ClearMessages(); infobar->Translate(); SimulateTranslateScriptURLFetch(true); - rvh_tester()->TestOnMessageReceived(ChromeViewHostMsg_PageTranslated( - 0, 0, "fr", "en", TranslateErrors::NONE)); + RenderViewHostTester::TestOnMessageReceived( + rvh(), + ChromeViewHostMsg_PageTranslated( + 0, 0, "fr", "en", TranslateErrors::NONE)); // A task should have been posted to clear the script, run it. MessageLoop::current()->RunAllPending(); diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 0c4f39e..689003d 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -16,6 +16,7 @@ #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; +using content::RenderViewHostTester; class WebApplicationTest : public TabContentsWrapperTestHarness { public: @@ -35,7 +36,8 @@ TEST_F(WebApplicationTest, GetShortcutInfoForTab) { web_app_info.description = description; web_app_info.app_url = url; - rvh_tester()->TestOnMessageReceived( + RenderViewHostTester::TestOnMessageReceived( + rvh(), ExtensionHostMsg_DidGetApplicationInfo(0, 0, web_app_info)); ShellIntegration::ShortcutInfo info; web_app::GetShortcutInfoForTab(contents_wrapper(), &info); diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc index 1380ca9..43e2807 100644 --- a/chrome/test/base/chrome_render_view_host_test_harness.cc +++ b/chrome/test/base/chrome_render_view_host_test_harness.cc @@ -13,6 +13,7 @@ #endif using content::RenderViewHostTester; +using content::RenderViewHostTestHarness; ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() : RenderViewHostTestHarness() { diff --git a/chrome/test/base/chrome_render_view_host_test_harness.h b/chrome/test/base/chrome_render_view_host_test_harness.h index f8d15f5..e39f85f 100644 --- a/chrome/test/base/chrome_render_view_host_test_harness.h +++ b/chrome/test/base/chrome_render_view_host_test_harness.h @@ -17,7 +17,8 @@ class WebContents; // Wrapper around RenderViewHostTestHarness that uses a TestingProfile as // browser context instead of a TestBrowserContext. -class ChromeRenderViewHostTestHarness : public RenderViewHostTestHarness { +class ChromeRenderViewHostTestHarness + : public content::RenderViewHostTestHarness { public: ChromeRenderViewHostTestHarness(); virtual ~ChromeRenderViewHostTestHarness(); diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index 89e96a4..786962d 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -17,9 +17,9 @@ #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/accessibility/dump_accessibility_tree_helper.h" #include "content/browser/renderer_host/render_view_host_impl.h" +#include "content/port/browser/render_widget_host_view_port.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" -#include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,6 +28,7 @@ using content::OpenURLParams; using content::RenderViewHostImpl; using content::RenderWidgetHostImpl; using content::RenderWidgetHost; +using content::RenderWidgetHostViewPort; using content::Referrer; namespace { @@ -76,10 +77,9 @@ class DumpAccessibilityTreeTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, PlatformTreeDifferenceTest) { - content::RenderWidgetHostView* host_view = - browser()->GetSelectedWebContents()->GetRenderWidgetHostView(); + RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>( + browser()->GetSelectedWebContents()->GetRenderWidgetHostView()); RenderWidgetHost* host = host_view->GetRenderWidgetHost(); - // TODO(joi): Remove this dependency RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(host)); view_host->set_save_accessibility_tree_for_testing(true); diff --git a/content/browser/intents/internal_web_intents_dispatcher_unittest.cc b/content/browser/intents/internal_web_intents_dispatcher_unittest.cc index b9eb246..f28f07f 100644 --- a/content/browser/intents/internal_web_intents_dispatcher_unittest.cc +++ b/content/browser/intents/internal_web_intents_dispatcher_unittest.cc @@ -11,7 +11,8 @@ #include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_reply_data.h" -class InternalWebIntentsDispatcherTest : public RenderViewHostTestHarness { +class InternalWebIntentsDispatcherTest + : public content::RenderViewHostTestHarness { public: InternalWebIntentsDispatcherTest() { replied_ = 0; diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 2ea7e24..8dabcfe 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -112,8 +112,6 @@ class ExecuteNotificationObserver : public NotificationObserver { // will not be able to traverse pages back and forward. We need to determine // if we want to bring that and other functionality down into this object so // it can be shared by others. -// -// TODO(joi): Move to content namespace. class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost, public RenderWidgetHostImpl { diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 4cc338e..9aeddda 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -181,7 +181,7 @@ TEST_F(RenderViewHostTest, BadMessageHandlerRenderViewHost) { // two payload items but the one we construct has none. IPC::Message message(0, ViewHostMsg_UpdateTargetURL::ID, IPC::Message::PRIORITY_NORMAL); - test_rvh()->TestOnMessageReceived(message); + test_rvh()->OnMessageReceived(message); EXPECT_EQ(1, process()->bad_msg_count()); } @@ -193,7 +193,7 @@ TEST_F(RenderViewHostTest, BadMessageHandlerRenderWidgetHost) { // one payload item but the one we construct has none. IPC::Message message(0, ViewHostMsg_UpdateRect::ID, IPC::Message::PRIORITY_NORMAL); - test_rvh()->TestOnMessageReceived(message); + test_rvh()->OnMessageReceived(message); EXPECT_EQ(1, process()->bad_msg_count()); } @@ -206,7 +206,7 @@ TEST_F(RenderViewHostTest, BadMessageHandlerInputEventAck) { // OnMsgInputEventAck() processing. IPC::Message message(0, ViewHostMsg_HandleInputEvent_ACK::ID, IPC::Message::PRIORITY_NORMAL); - test_rvh()->TestOnMessageReceived(message); + test_rvh()->OnMessageReceived(message); EXPECT_EQ(1, process()->bad_msg_count()); } diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 17d18ae..4720ac6 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -206,11 +206,6 @@ RenderWidgetHostImpl* RenderWidgetHostImpl::AsRenderWidgetHostImpl() { return this; } -bool RenderWidgetHostImpl::OnMessageReceivedForTesting( - const IPC::Message& msg) { - return OnMessageReceived(msg); -} - gfx::NativeViewId RenderWidgetHostImpl::GetNativeViewId() const { if (view_) return view_->GetNativeViewId(); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index d26a67f..f28bbf6 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -110,7 +110,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, virtual void SetIgnoreInputEvents(bool ignore_input_events) OVERRIDE; virtual void Stop() OVERRIDE; virtual void WasResized() OVERRIDE; - virtual bool OnMessageReceivedForTesting(const IPC::Message& msg) OVERRIDE; virtual void AddKeyboardListener(KeyboardListener* listener) OVERRIDE; virtual void RemoveKeyboardListener(KeyboardListener* listener) OVERRIDE; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 7f462cf..c6ca1db 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -569,11 +569,6 @@ gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() { return window_->GetScreenBounds(); } -void RenderWidgetHostViewAura::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { - // Not needed. Mac-only. -} - void RenderWidgetHostViewAura::ProcessTouchAck( WebKit::WebInputEvent::Type type, bool processed) { // The ACKs for the touch-events arrive in the same sequence as they were diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 7b8f99a..285bc8e 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -65,8 +65,6 @@ class RenderWidgetHostViewAura virtual void Hide() OVERRIDE; virtual bool IsShowing() OVERRIDE; virtual gfx::Rect GetViewBounds() const OVERRIDE; - virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; virtual void SetBackground(const SkBitmap& background) OVERRIDE; virtual bool CopyFromCompositingSurface( const gfx::Size& size, diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc index 0de5cea..d7760e9 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc @@ -50,11 +50,6 @@ const SkBitmap& RenderWidgetHostViewBase::GetBackground() { return background_; } -BrowserAccessibilityManager* - RenderWidgetHostViewBase::GetBrowserAccessibilityManager() const { - return browser_accessibility_manager_.get(); -} - void RenderWidgetHostViewBase::SelectionChanged(const string16& text, size_t offset, const ui::Range& range) { @@ -77,6 +72,11 @@ bool RenderWidgetHostViewBase::IsMouseLocked() { return mouse_locked_; } +void RenderWidgetHostViewBase::UnhandledWheelEvent( + const WebKit::WebMouseWheelEvent& event) { + // Most implementations don't need to do anything here. +} + void RenderWidgetHostViewBase::SetPopupType(WebKit::WebPopupType popup_type) { popup_type_ = popup_type; } @@ -85,6 +85,11 @@ WebKit::WebPopupType RenderWidgetHostViewBase::GetPopupType() { return popup_type_; } +BrowserAccessibilityManager* + RenderWidgetHostViewBase::GetBrowserAccessibilityManager() const { + return browser_accessibility_manager_.get(); +} + void RenderWidgetHostViewBase::SetBrowserAccessibilityManager( BrowserAccessibilityManager* manager) { browser_accessibility_manager_.reset(manager); diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h index 31aa2229..0136ab7 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h @@ -49,11 +49,13 @@ class CONTENT_EXPORT RenderWidgetHostViewBase virtual const SkBitmap& GetBackground() OVERRIDE; virtual bool IsShowingContextMenu() const OVERRIDE; virtual void SetShowingContextMenu(bool showing_menu) OVERRIDE; - virtual BrowserAccessibilityManager* - GetBrowserAccessibilityManager() const OVERRIDE; virtual bool IsMouseLocked() OVERRIDE; + virtual void UnhandledWheelEvent( + const WebKit::WebMouseWheelEvent& event) OVERRIDE; virtual void SetPopupType(WebKit::WebPopupType popup_type) OVERRIDE; virtual WebKit::WebPopupType GetPopupType() OVERRIDE; + virtual BrowserAccessibilityManager* + GetBrowserAccessibilityManager() const OVERRIDE; void SetBrowserAccessibilityManager(BrowserAccessibilityManager* manager); diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc index 36100b5..6580fc1 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc @@ -1142,10 +1142,6 @@ void RenderWidgetHostViewGtk::DestroyPluginContainer( plugin_container_manager_.DestroyPluginContainer(id); } -void RenderWidgetHostViewGtk::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { -} - void RenderWidgetHostViewGtk::ProcessTouchAck( WebKit::WebInputEvent::Type type, bool processed) { } diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.h b/content/browser/renderer_host/render_widget_host_view_gtk.h index eeaf25d..b943a8d 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.h +++ b/content/browser/renderer_host/render_widget_host_view_gtk.h @@ -61,8 +61,6 @@ class RenderWidgetHostViewGtk : public content::RenderWidgetHostViewBase { virtual gfx::Rect GetViewBounds() const OVERRIDE; virtual GdkEventButton* GetLastMouseDown() OVERRIDE; virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE; - virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; virtual void SetBackground(const SkBitmap& background) OVERRIDE; virtual bool CopyFromCompositingSurface( const gfx::Size& size, diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h index db85bfc..98a5f31 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.h +++ b/content/browser/renderer_host/render_widget_host_view_mac.h @@ -190,8 +190,6 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase { virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE; virtual void SetWindowVisibility(bool visible) OVERRIDE; virtual void WindowFrameChanged() OVERRIDE; - virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; virtual void SetBackground(const SkBitmap& background) OVERRIDE; virtual bool CopyFromCompositingSurface( const gfx::Size& size, @@ -292,9 +290,10 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase { bool has_horizontal_scrollbar) OVERRIDE; virtual void SetScrollOffsetPinning( bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; - virtual bool LockMouse() OVERRIDE; virtual void UnlockMouse() OVERRIDE; + virtual void UnhandledWheelEvent( + const WebKit::WebMouseWheelEvent& event) OVERRIDE; void KillSelf(); diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 9ace1d3..7e67011 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -1034,11 +1034,6 @@ void RenderWidgetHostViewMac::ForceTextureReload() { plugin_container_manager_.ForceTextureReload(); } -void RenderWidgetHostViewMac::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { - [cocoa_view_ gotUnhandledWheelEvent]; -} - void RenderWidgetHostViewMac::ProcessTouchAck( WebKit::WebInputEvent::Type type, bool processed) { } @@ -1083,6 +1078,11 @@ void RenderWidgetHostViewMac::UnlockMouse() { render_widget_host_->LostMouseLock(); } +void RenderWidgetHostViewMac::UnhandledWheelEvent( + const WebKit::WebMouseWheelEvent& event) { + [cocoa_view_ gotUnhandledWheelEvent]; +} + void RenderWidgetHostViewMac::ShutdownHost() { weak_factory_.InvalidateWeakPtrs(); render_widget_host_->Shutdown(); diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 25bf9c9..aee7cca 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -924,10 +924,6 @@ bool RenderWidgetHostViewWin::CopyFromCompositingSurface( size, output->getTopDevice()->accessBitmap(true).getPixels()); } -void RenderWidgetHostViewWin::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { -} - void RenderWidgetHostViewWin::ProcessTouchAck( WebKit::WebInputEvent::Type type, bool processed) { if (type == WebKit::WebInputEvent::TouchStart) diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h index 2269430..08829ad 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.h +++ b/content/browser/renderer_host/render_widget_host_view_win.h @@ -168,8 +168,6 @@ class RenderWidgetHostViewWin virtual void Hide() OVERRIDE; virtual bool IsShowing() OVERRIDE; virtual gfx::Rect GetViewBounds() const OVERRIDE; - virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; virtual void SetBackground(const SkBitmap& background) OVERRIDE; virtual bool CopyFromCompositingSurface( const gfx::Size& size, diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index 13fe45c..b85ef89 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -287,10 +287,6 @@ void TestRenderViewHost::SimulateWasRestored() { WasRestored(); } -bool TestRenderViewHost::TestOnMessageReceived(const IPC::Message& msg) { - return OnMessageReceived(msg); -} - void TestRenderViewHost::TestOnMsgStartDragging( const WebDropData& drop_data) { WebKit::WebDragOperationsMask drag_operation = WebKit::WebDragOperationEvery; diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index 2803e53..aedd9495 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -73,8 +73,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE; #endif // !defined(TOOLKIT_VIEWS) #endif // defined(TOOLKIT_USES_GTK) - virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE {} virtual bool CopyFromCompositingSurface( const gfx::Size& size, skia::PlatformCanvas* output) OVERRIDE; @@ -232,7 +230,6 @@ class TestRenderViewHost virtual void SimulateSwapOutACK() OVERRIDE; virtual void SimulateWasHidden() OVERRIDE; virtual void SimulateWasRestored() OVERRIDE; - virtual bool TestOnMessageReceived(const IPC::Message& msg) OVERRIDE; void TestOnMsgStartDragging(const WebDropData& drop_data); @@ -301,7 +298,8 @@ class TestRenderViewHost #endif // Adds methods to get straight at the impl classes. -class RenderViewHostImplTestHarness : public RenderViewHostTestHarness { +class RenderViewHostImplTestHarness + : public content::RenderViewHostTestHarness { public: RenderViewHostImplTestHarness(); virtual ~RenderViewHostImplTestHarness(); diff --git a/content/browser/tab_contents/navigation_controller_impl_unittest.cc b/content/browser/tab_contents/navigation_controller_impl_unittest.cc index 1546571..73ba9b3 100644 --- a/content/browser/tab_contents/navigation_controller_impl_unittest.cc +++ b/content/browser/tab_contents/navigation_controller_impl_unittest.cc @@ -165,7 +165,7 @@ TEST_F(NavigationControllerTest, LoadURL) { // commit. test_rvh()->SendShouldCloseACK(true); static_cast<TestRenderViewHost*>( - contents()->pending_rvh())->SendNavigate(1, url2); + contents()->GetPendingRenderViewHost())->SendNavigate(1, url2); EXPECT_TRUE(notifications.Check1AndReset( content::NOTIFICATION_NAV_ENTRY_COMMITTED)); @@ -301,7 +301,7 @@ TEST_F(NavigationControllerTest, LoadURL_NewPending) { test_rvh()->SendShouldCloseACK(true); const GURL kNewURL("http://see"); static_cast<TestRenderViewHost*>( - contents()->pending_rvh())->SendNavigate(3, kNewURL); + contents()->GetPendingRenderViewHost())->SendNavigate(3, kNewURL); // There should no longer be any pending entry, and the third navigation we // just made should be committed. @@ -475,7 +475,7 @@ TEST_F(NavigationControllerTest, LoadURL_AbortCancelsPending) { params.error_description = string16(); params.url = kNewURL; params.showing_repost_interstitial = false; - test_rvh()->TestOnMessageReceived( + test_rvh()->OnMessageReceived( ViewHostMsg_DidFailProvisionalLoadWithError(0, // routing_id params)); @@ -517,7 +517,7 @@ TEST_F(NavigationControllerTest, LoadURL_RedirectAbortCancelsPending) { // Now the navigation redirects. const GURL kRedirectURL("http://bee"); - test_rvh()->TestOnMessageReceived( + test_rvh()->OnMessageReceived( ViewHostMsg_DidRedirectProvisionalLoad(0, // routing_id -1, // pending page_id GURL(), // opener @@ -537,7 +537,7 @@ TEST_F(NavigationControllerTest, LoadURL_RedirectAbortCancelsPending) { params.error_description = string16(); params.url = kRedirectURL; params.showing_repost_interstitial = false; - test_rvh()->TestOnMessageReceived( + test_rvh()->OnMessageReceived( ViewHostMsg_DidFailProvisionalLoadWithError(0, // routing_id params)); @@ -1646,9 +1646,9 @@ TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) { fail_load_params.error_description = string16(); fail_load_params.url = url; fail_load_params.showing_repost_interstitial = false; - rvh->TestOnMessageReceived( - ViewHostMsg_DidFailProvisionalLoadWithError(0, // routing_id - fail_load_params)); + rvh->OnMessageReceived( + ViewHostMsg_DidFailProvisionalLoadWithError(0, // routing_id + fail_load_params)); // Now the pending restored entry commits. ViewHostMsg_FrameNavigate_Params params; diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc index 2762842..820f93e 100644 --- a/content/browser/tab_contents/render_view_host_manager_unittest.cc +++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc @@ -269,7 +269,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { // Send an update title message and make sure it works. const string16 ntp_title = ASCIIToUTF16("NTP Title"); WebKit::WebTextDirection direction = WebKit::WebTextDirectionLeftToRight; - EXPECT_TRUE(ntp_rvh->TestOnMessageReceived( + EXPECT_TRUE(ntp_rvh->OnMessageReceived( ViewHostMsg_UpdateTitle(rvh()->GetRoutingID(), 0, ntp_title, direction))); EXPECT_EQ(ntp_title, contents()->GetTitle()); @@ -291,7 +291,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { // The new RVH should be able to update its title. const string16 dest_title = ASCIIToUTF16("Google"); - EXPECT_TRUE(dest_rvh->TestOnMessageReceived( + EXPECT_TRUE(dest_rvh->OnMessageReceived( ViewHostMsg_UpdateTitle(rvh()->GetRoutingID(), 101, dest_title, direction))); EXPECT_EQ(dest_title, contents()->GetTitle()); @@ -299,7 +299,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { // The old renderer, being slow, now updates the title. It should be filtered // out and not take effect. EXPECT_TRUE(ntp_rvh->is_swapped_out()); - EXPECT_TRUE(ntp_rvh->TestOnMessageReceived( + EXPECT_TRUE(ntp_rvh->OnMessageReceived( ViewHostMsg_UpdateTitle(rvh()->GetRoutingID(), 0, ntp_title, direction))); EXPECT_EQ(dest_title, contents()->GetTitle()); @@ -317,7 +317,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { rvh()->GetRoutingID(), kNtpUrl, msg, false, &result, &unused); // Enable pumping for check in BrowserMessageFilter::CheckCanDispatchOnUI. before_unload_msg.EnableMessagePumping(); - EXPECT_TRUE(ntp_rvh->TestOnMessageReceived(before_unload_msg)); + EXPECT_TRUE(ntp_rvh->OnMessageReceived(before_unload_msg)); EXPECT_TRUE(ntp_process_host->sink().GetUniqueMessageMatching(IPC_REPLY_ID)); // Also test RunJavaScriptMessage. @@ -326,7 +326,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { rvh()->GetRoutingID(), msg, msg, kNtpUrl, ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM, &result, &unused); js_msg.EnableMessagePumping(); - EXPECT_TRUE(ntp_rvh->TestOnMessageReceived(js_msg)); + EXPECT_TRUE(ntp_rvh->OnMessageReceived(js_msg)); EXPECT_TRUE(ntp_process_host->sink().GetUniqueMessageMatching(IPC_REPLY_ID)); } @@ -351,7 +351,7 @@ TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) { controller().LoadURL( kUrl, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); // Simulate response from RenderView for FirePageBeforeUnload. - test_rvh()->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + test_rvh()->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( rvh()->GetRoutingID(), true, base::TimeTicks(), base::TimeTicks())); ASSERT_TRUE(pending_rvh()); // New pending RenderViewHost will be created. RenderViewHost* last_rvh = pending_rvh(); diff --git a/content/browser/tab_contents/tab_contents_unittest.cc b/content/browser/tab_contents/tab_contents_unittest.cc index 217bf41..b0aa456 100644 --- a/content/browser/tab_contents/tab_contents_unittest.cc +++ b/content/browser/tab_contents/tab_contents_unittest.cc @@ -369,7 +369,7 @@ TEST_F(TabContentsTest, UpdateMaxPageID) { TEST_F(TabContentsTest, SimpleNavigation) { TestRenderViewHost* orig_rvh = test_rvh(); SiteInstance* instance1 = contents()->GetSiteInstance(); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); // Navigate to URL const GURL url("http://www.google.com"); @@ -432,7 +432,7 @@ TEST_F(TabContentsTest, CrossSiteBoundaries) { url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); TestRenderViewHost* pending_rvh = - static_cast<TestRenderViewHost*>(contents()->pending_rvh()); + static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost()); int pending_rvh_delete_count = 0; pending_rvh->set_delete_counter(&pending_rvh_delete_count); @@ -449,7 +449,7 @@ TEST_F(TabContentsTest, CrossSiteBoundaries) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(pending_rvh, contents()->GetRenderViewHost()); EXPECT_NE(instance1, instance2); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); // We keep the original RVH around, swapped out. EXPECT_TRUE(contents()->GetRenderManagerForTesting()->IsSwappedOut(orig_rvh)); EXPECT_EQ(orig_rvh_delete_count, 0); @@ -459,7 +459,7 @@ TEST_F(TabContentsTest, CrossSiteBoundaries) { // We should use the same RVH as before, swapping it back in. controller().GoBack(); TestRenderViewHost* goback_rvh = - static_cast<TestRenderViewHost*>(contents()->pending_rvh()); + static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost()); EXPECT_EQ(orig_rvh, goback_rvh); EXPECT_TRUE(contents()->cross_navigation_pending()); @@ -512,7 +512,7 @@ TEST_F(TabContentsTest, CrossSiteBoundariesAfterCrash) { url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); RenderViewHost* new_rvh = rvh(); EXPECT_FALSE(contents()->cross_navigation_pending()); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); EXPECT_NE(orig_rvh, new_rvh); EXPECT_EQ(orig_rvh_delete_count, 1); @@ -523,7 +523,7 @@ TEST_F(TabContentsTest, CrossSiteBoundariesAfterCrash) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(new_rvh, rvh()); EXPECT_NE(instance1, instance2); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); // Close tab and ensure RVHs are deleted. DeleteContents(); @@ -561,7 +561,7 @@ TEST_F(TabContentsTest, NavigateTwoTabsCrossSite) { std::string()); orig_rvh->SendShouldCloseACK(true); TestRenderViewHost* pending_rvh_a = - static_cast<TestRenderViewHost*>(contents()->pending_rvh()); + static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost()); contents()->TestDidNavigate( pending_rvh_a, 1, url2a, content::PAGE_TRANSITION_TYPED); SiteInstance* instance2a = contents()->GetSiteInstance(); @@ -576,7 +576,7 @@ TEST_F(TabContentsTest, NavigateTwoTabsCrossSite) { static_cast<TestRenderViewHost*>(contents2.GetRenderViewHost()); rvh2->SendShouldCloseACK(true); TestRenderViewHost* pending_rvh_b = - static_cast<TestRenderViewHost*>(contents2.pending_rvh()); + static_cast<TestRenderViewHost*>(contents2.GetPendingRenderViewHost()); EXPECT_TRUE(pending_rvh_b != NULL); EXPECT_TRUE(contents2.cross_navigation_pending()); @@ -663,7 +663,7 @@ TEST_F(TabContentsTest, CrossSiteUnloadHandlers) { controller().LoadURL( url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack()); - orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, false, base::TimeTicks(), base::TimeTicks())); EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack()); EXPECT_FALSE(contents()->cross_navigation_pending()); @@ -673,12 +673,12 @@ TEST_F(TabContentsTest, CrossSiteUnloadHandlers) { controller().LoadURL( url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack()); - orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack()); EXPECT_TRUE(contents()->cross_navigation_pending()); TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>( - contents()->pending_rvh()); + contents()->GetPendingRenderViewHost()); // We won't hear DidNavigate until the onunload handler has finished running. // (No way to simulate that here, but it involves a call from RDH to @@ -691,7 +691,7 @@ TEST_F(TabContentsTest, CrossSiteUnloadHandlers) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(pending_rvh, rvh()); EXPECT_NE(instance1, instance2); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); } // Test that during a slow cross-site navigation, the original renderer can @@ -715,7 +715,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationPreempted) { controller().LoadURL( url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack()); - orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); EXPECT_TRUE(contents()->cross_navigation_pending()); @@ -728,7 +728,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationPreempted) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(orig_rvh, rvh()); EXPECT_EQ(instance1, instance2); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); } TEST_F(TabContentsTest, CrossSiteNavigationBackPreempted) { @@ -756,11 +756,11 @@ TEST_F(TabContentsTest, CrossSiteNavigationBackPreempted) { url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(contents()->cross_navigation_pending()); TestRenderViewHost* google_rvh = - static_cast<TestRenderViewHost*>(contents()->pending_rvh()); + static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost()); // Simulate beforeunload approval. EXPECT_TRUE(ntp_rvh->is_waiting_for_beforeunload_ack()); - ntp_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + ntp_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); // DidNavigate from the pending page. @@ -772,7 +772,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationBackPreempted) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(google_rvh, contents()->GetRenderViewHost()); EXPECT_NE(instance1, instance2); - EXPECT_FALSE(contents()->pending_rvh()); + EXPECT_FALSE(contents()->GetPendingRenderViewHost()); EXPECT_EQ(url2, entry2->GetURL()); EXPECT_EQ(instance2, NavigationEntryImpl::FromNavigationEntry(entry2)->site_instance()); @@ -792,7 +792,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationBackPreempted) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(google_rvh, contents()->GetRenderViewHost()); EXPECT_EQ(instance2, instance3); - EXPECT_FALSE(contents()->pending_rvh()); + EXPECT_FALSE(contents()->GetPendingRenderViewHost()); EXPECT_EQ(url3, entry3->GetURL()); EXPECT_EQ(instance3, NavigationEntryImpl::FromNavigationEntry(entry3)->site_instance()); @@ -805,12 +805,12 @@ TEST_F(TabContentsTest, CrossSiteNavigationBackPreempted) { // Before that commits, go back again. controller().GoBack(); EXPECT_TRUE(contents()->cross_navigation_pending()); - EXPECT_TRUE(contents()->pending_rvh()); + EXPECT_TRUE(contents()->GetPendingRenderViewHost()); EXPECT_EQ(entry1, controller().GetPendingEntry()); // Simulate beforeunload approval. EXPECT_TRUE(google_rvh->is_waiting_for_beforeunload_ack()); - google_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + google_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); // DidNavigate from the first back. This aborts the second back's pending RVH. @@ -860,7 +860,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationNotPreemptedByFrame) { // Now simulate the onbeforeunload approval and verify the navigation is // not canceled. - orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack()); EXPECT_TRUE(contents()->cross_navigation_pending()); @@ -885,7 +885,7 @@ TEST_F(TabContentsTest, CrossSiteNotPreemptedDuringBeforeUnload) { controller().LoadURL( url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); TestRenderViewHost* pending_rvh = - static_cast<TestRenderViewHost*>(contents()->pending_rvh()); + static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost()); EXPECT_TRUE(contents()->cross_navigation_pending()); EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack()); @@ -925,11 +925,11 @@ TEST_F(TabContentsTest, CrossSiteCantPreemptAfterUnload) { const GURL url2("http://www.yahoo.com"); controller().LoadURL( url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); - orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); EXPECT_TRUE(contents()->cross_navigation_pending()); TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>( - contents()->pending_rvh()); + contents()->GetPendingRenderViewHost()); // Simulate the pending renderer's response, which leads to an unload request // being sent to orig_rvh. @@ -946,7 +946,7 @@ TEST_F(TabContentsTest, CrossSiteCantPreemptAfterUnload) { // Verify that the pending navigation is still in progress. EXPECT_TRUE(contents()->cross_navigation_pending()); - EXPECT_TRUE(contents()->pending_rvh() != NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() != NULL); // DidNavigate from the pending page should commit it. contents()->TestDidNavigate( @@ -955,7 +955,7 @@ TEST_F(TabContentsTest, CrossSiteCantPreemptAfterUnload) { EXPECT_FALSE(contents()->cross_navigation_pending()); EXPECT_EQ(pending_rvh, rvh()); EXPECT_NE(instance1, instance2); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); } // Test that a cross-site navigation that doesn't commit after the unload @@ -978,7 +978,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationCanceled) { controller().LoadURL( url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack()); - orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK( + orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK( 0, true, base::TimeTicks(), base::TimeTicks())); EXPECT_TRUE(contents()->cross_navigation_pending()); @@ -998,7 +998,7 @@ TEST_F(TabContentsTest, CrossSiteNavigationCanceled) { EXPECT_EQ(orig_rvh, rvh()); EXPECT_FALSE(orig_rvh->is_swapped_out()); EXPECT_EQ(instance1, instance2); - EXPECT_TRUE(contents()->pending_rvh() == NULL); + EXPECT_TRUE(contents()->GetPendingRenderViewHost() == NULL); } // Test that NavigationEntries have the correct content state after going @@ -1450,7 +1450,7 @@ TEST_F(TabContentsTest, ShowInterstitialCrashRendererThenGoBack) { interstitial->TestDidNavigate(2, interstitial_url); // Crash the renderer - test_rvh()->TestOnMessageReceived( + test_rvh()->OnMessageReceived( ViewHostMsg_RenderViewGone( 0, base::TERMINATION_STATUS_PROCESS_CRASHED, -1)); @@ -1487,7 +1487,7 @@ TEST_F(TabContentsTest, ShowInterstitialCrashRendererThenNavigate) { interstitial->Show(); // Crash the renderer - test_rvh()->TestOnMessageReceived( + test_rvh()->OnMessageReceived( ViewHostMsg_RenderViewGone( 0, base::TERMINATION_STATUS_PROCESS_CRASHED, -1)); diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc index c2feabf..31f15eb 100644 --- a/content/browser/tab_contents/test_tab_contents.cc +++ b/content/browser/tab_contents/test_tab_contents.cc @@ -38,12 +38,12 @@ TestTabContents::TestTabContents(content::BrowserContext* browser_context, TestTabContents::~TestTabContents() { } -RenderViewHost* TestTabContents::pending_rvh() const { +RenderViewHost* TestTabContents::GetPendingRenderViewHost() const { return render_manager_.pending_render_view_host_; } TestRenderViewHost* TestTabContents::pending_test_rvh() const { - return static_cast<TestRenderViewHost*>(pending_rvh()); + return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost()); } void TestTabContents::TestDidNavigate(RenderViewHost* render_view_host, @@ -122,7 +122,8 @@ void TestTabContents::CommitPendingNavigation() { // navigate. ProceedWithCrossSiteNavigation(); RenderViewHost* old_rvh = render_manager_.current_host(); - TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(pending_rvh()); + TestRenderViewHost* rvh = + static_cast<TestRenderViewHost*>(GetPendingRenderViewHost()); if (!rvh) rvh = static_cast<TestRenderViewHost*>(old_rvh); @@ -147,7 +148,7 @@ int TestTabContents::GetNumberOfFocusCalls() { } void TestTabContents::ProceedWithCrossSiteNavigation() { - if (!pending_rvh()) + if (!GetPendingRenderViewHost()) return; TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>( render_manager_.current_host()); diff --git a/content/browser/tab_contents/test_tab_contents.h b/content/browser/tab_contents/test_tab_contents.h index eac4e94..a3e590f 100644 --- a/content/browser/tab_contents/test_tab_contents.h +++ b/content/browser/tab_contents/test_tab_contents.h @@ -33,7 +33,7 @@ class TestTabContents : public TabContents, public content::WebContentsTester { // WebContentsTester implementation. virtual void CommitPendingNavigation() OVERRIDE; virtual int GetNumberOfFocusCalls() OVERRIDE; - virtual content::RenderViewHost* pending_rvh() const OVERRIDE; + virtual content::RenderViewHost* GetPendingRenderViewHost() const OVERRIDE; virtual void NavigateAndCommit(const GURL& url) OVERRIDE; virtual void ProceedWithCrossSiteNavigation() OVERRIDE; virtual void TestDidNavigate(content::RenderViewHost* render_view_host, diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h index 7d84000..9f10d05 100644 --- a/content/port/browser/render_widget_host_view_port.h +++ b/content/port/browser/render_widget_host_view_port.h @@ -244,9 +244,14 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView { virtual void UnlockMouse() = 0; virtual bool IsMouseLocked() = 0; + // Called when a mousewheel event was not processed by the renderer. + virtual void UnhandledWheelEvent(const WebKit::WebMouseWheelEvent& event) = 0; + virtual void SetPopupType(WebKit::WebPopupType popup_type) = 0; virtual WebKit::WebPopupType GetPopupType() = 0; + virtual BrowserAccessibilityManager* + GetBrowserAccessibilityManager() const = 0; virtual void OnAccessibilityNotifications( const std::vector<AccessibilityHostMsg_NotificationParams>& params) { } diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index 7d341ad..2a5bf15 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -265,13 +265,6 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Sender { // IPC::Channel::Listener::OnMessageReceived. Intended only for // test code. - // TODO(joi): Remove this and convert the single test using it to - // get the TabContentsWrapper from - // browser()->GetSelectedWebContents() and then call its - // translate_tab_helper() to get at the object that dispatches its - // method. - virtual bool OnMessageReceivedForTesting(const IPC::Message& msg) = 0; - // Add a keyboard listener that can handle key presses without requiring // focus. virtual void AddKeyboardListener(KeyboardListener* listener) = 0; diff --git a/content/public/browser/render_widget_host_view.h b/content/public/browser/render_widget_host_view.h index db457db..367eca5 100644 --- a/content/public/browser/render_widget_host_view.h +++ b/content/public/browser/render_widget_host_view.h @@ -125,20 +125,11 @@ class CONTENT_EXPORT RenderWidgetHostView { #endif // !defined(TOOLKIT_VIEWS) #endif // defined(TOOLKIT_USES_GTK) - // TODO(joi): May be able to move into impl if RWHVMacDelegate stops - // being exposed to Chrome. - virtual void UnhandledWheelEvent(const WebKit::WebMouseWheelEvent& event) = 0; - // Subclasses should override this method to do what is appropriate to set // the custom background for their platform. virtual void SetBackground(const SkBitmap& background) = 0; virtual const SkBitmap& GetBackground() = 0; - // TODO(joi): Remove this when we remove the dependency by chrome/ - // on browser_accessibility* files in content. - virtual BrowserAccessibilityManager* - GetBrowserAccessibilityManager() const = 0; - #if defined(OS_WIN) && !defined(USE_AURA) // The region specified will be transparent to mouse clicks. virtual void SetClickthroughRegion(SkRegion* region) {} diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc index cb03104..7c99439 100644 --- a/content/test/test_renderer_host.cc +++ b/content/test/test_renderer_host.cc @@ -107,6 +107,12 @@ bool RenderViewHostTester::IsRenderViewHostSwappedOut(RenderViewHost* rvh) { return static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out(); } +// static +bool RenderViewHostTester::TestOnMessageReceived(RenderViewHost* rvh, + const IPC::Message& msg) { + return static_cast<RenderViewHostImpl*>(rvh)->OnMessageReceived(msg); +} + RenderViewHostTestEnabler::RenderViewHostTestEnabler() : rph_factory_(new MockRenderProcessHostFactory()), rvh_factory_(new TestRenderViewHostFactory(rph_factory_.get())) { diff --git a/content/test/test_renderer_host.h b/content/test/test_renderer_host.h index 65bcd3b..bab7ef6 100644 --- a/content/test/test_renderer_host.h +++ b/content/test/test_renderer_host.h @@ -57,6 +57,11 @@ class RenderViewHostTester { // constructed while a RenderViewHostTestEnabler is in play. static bool IsRenderViewHostSwappedOut(RenderViewHost* rvh); + // Calls the RenderViewHosts' private OnMessageReceived function with the + // given message. + static bool TestOnMessageReceived(RenderViewHost* rvh, + const IPC::Message& msg); + virtual ~RenderViewHostTester() {} // Gives tests access to RenderViewHostImpl::CreateRenderView. @@ -90,10 +95,6 @@ class RenderViewHostTester { // tell it it has been hidden or restored from having been hidden. virtual void SimulateWasHidden() = 0; virtual void SimulateWasRestored() = 0; - - // Calls the RenderViewHosts' private OnMessageReceived function with the - // given message. - virtual bool TestOnMessageReceived(const IPC::Message& msg) = 0; }; // You can instantiate only one class like this at a time. During its @@ -180,7 +181,4 @@ class RenderViewHostTestHarness : public testing::Test { } // namespace content -// TODO(joi): Remove this after converting all clients. -using content::RenderViewHostTestHarness; - #endif // CONTENT_TEST_TEST_RENDERER_HOST_H_ diff --git a/content/test/web_contents_tester.h b/content/test/web_contents_tester.h index 1729404..9ede723 100644 --- a/content/test/web_contents_tester.h +++ b/content/test/web_contents_tester.h @@ -84,8 +84,7 @@ class WebContentsTester { // in question have been made. virtual int GetNumberOfFocusCalls() = 0; - // TODO(joi): Rename this and other hacker_style virtual methods. - virtual content::RenderViewHost* pending_rvh() const = 0; + virtual content::RenderViewHost* GetPendingRenderViewHost() const = 0; // Creates a pending navigation to the given URL with the default parameters // and then commits the load with a page ID one larger than any seen. This |