Index: third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp |
index ec344c4a0f5f1ffaa62a5bddc9eded83ab095a76..5ac1db74ded7bd847af20db59c898bc4e728bfbb 100644 |
--- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp |
@@ -34,6 +34,7 @@ |
#include <string> |
#include "core/dom/Element.h" |
#include "core/events/KeyboardEvent.h" |
+#include "core/exported/WebPluginContainerBase.h" |
#include "core/exported/WebViewBase.h" |
#include "core/frame/EventHandlerRegistry.h" |
#include "core/layout/LayoutObject.h" |
@@ -64,7 +65,6 @@ |
#include "public/web/WebView.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "web/WebLocalFrameImpl.h" |
-#include "web/WebPluginContainerImpl.h" |
#include "web/tests/FakeWebPlugin.h" |
#include "web/tests/FrameTestHelpers.h" |
@@ -82,7 +82,7 @@ class WebPluginContainerTest : public ::testing::Test { |
->UnregisterAllURLsAndClearMemoryCache(); |
} |
- void CalculateGeometry(WebPluginContainerImpl* plugin_container_impl, |
+ void CalculateGeometry(WebPluginContainerBase* plugin_container_impl, |
IntRect& window_rect, |
IntRect& clip_rect, |
IntRect& unobscured_rect) { |
@@ -423,7 +423,7 @@ TEST_F(WebPluginContainerTest, CopyInsertKeyboardEventsTest) { |
WebInputEvent::kTimeStampForTesting); |
web_keyboard_event_c.windows_key_code = 67; |
KeyboardEvent* key_event_c = KeyboardEvent::Create(web_keyboard_event_c, 0); |
- ToWebPluginContainerImpl(plugin_container_one_element.PluginContainer()) |
+ ToWebPluginContainerBase(plugin_container_one_element.PluginContainer()) |
->HandleEvent(key_event_c); |
EXPECT_EQ(WebString("x"), Platform::Current()->Clipboard()->ReadPlainText( |
WebClipboard::Buffer())); |
@@ -439,7 +439,7 @@ TEST_F(WebPluginContainerTest, CopyInsertKeyboardEventsTest) { |
web_keyboard_event_insert.windows_key_code = 45; |
KeyboardEvent* key_event_insert = |
KeyboardEvent::Create(web_keyboard_event_insert, 0); |
- ToWebPluginContainerImpl(plugin_container_one_element.PluginContainer()) |
+ ToWebPluginContainerBase(plugin_container_one_element.PluginContainer()) |
->HandleEvent(key_event_insert); |
EXPECT_EQ(WebString("x"), Platform::Current()->Clipboard()->ReadPlainText( |
WebClipboard::Buffer())); |
@@ -506,7 +506,7 @@ TEST_F(WebPluginContainerTest, GestureLongPressReachesPlugin) { |
WebElement plugin_container_one_element = |
web_view->MainFrame()->GetDocument().GetElementById( |
WebString::FromUTF8("translated-plugin")); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -555,7 +555,7 @@ TEST_F(WebPluginContainerTest, MouseWheelEventTranslated) { |
WebElement plugin_container_one_element = |
web_view->MainFrame()->GetDocument().GetElementById( |
WebString::FromUTF8("translated-plugin")); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -596,7 +596,7 @@ TEST_F(WebPluginContainerTest, TouchEventScrolled) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -638,7 +638,7 @@ TEST_F(WebPluginContainerTest, TouchEventScrolledWithCoalescedTouches) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -696,7 +696,7 @@ TEST_F(WebPluginContainerTest, MouseWheelEventScrolled) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -737,7 +737,7 @@ TEST_F(WebPluginContainerTest, MouseEventScrolled) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -776,7 +776,7 @@ TEST_F(WebPluginContainerTest, MouseEventZoomed) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -817,7 +817,7 @@ TEST_F(WebPluginContainerTest, MouseWheelEventZoomed) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -859,7 +859,7 @@ TEST_F(WebPluginContainerTest, TouchEventZoomed) { |
WebString::FromUTF8("scrolled-plugin")); |
plugin_container_one_element.PluginContainer()->RequestTouchEventType( |
WebPluginContainer::kTouchEventRequestTypeRaw); |
- WebPlugin* plugin = static_cast<WebPluginContainerImpl*>( |
+ WebPlugin* plugin = static_cast<WebPluginContainerBase*>( |
plugin_container_one_element.PluginContainer()) |
->Plugin(); |
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin); |
@@ -897,8 +897,8 @@ TEST_F(WebPluginContainerTest, IsRectTopmostTest) { |
web_view->UpdateAllLifecyclePhases(); |
RunPendingTasks(); |
- WebPluginContainerImpl* plugin_container_impl = |
- ToWebPluginContainerImpl(GetWebPluginContainer( |
+ WebPluginContainerBase* plugin_container_impl = |
+ ToWebPluginContainerBase(GetWebPluginContainer( |
web_view, WebString::FromUTF8("translated-plugin"))); |
plugin_container_impl->SetFrameRect(IntRect(0, 0, 300, 300)); |
@@ -939,8 +939,8 @@ TEST_F(WebPluginContainerTest, ClippedRectsForIframedElement) { |
WebElement plugin_element = |
web_view->MainFrame()->FirstChild()->GetDocument().GetElementById( |
"translated-plugin"); |
- WebPluginContainerImpl* plugin_container_impl = |
- ToWebPluginContainerImpl(plugin_element.PluginContainer()); |
+ WebPluginContainerBase* plugin_container_impl = |
+ ToWebPluginContainerBase(plugin_element.PluginContainer()); |
DCHECK(plugin_container_impl); |
@@ -973,8 +973,8 @@ TEST_F(WebPluginContainerTest, ClippedRectsForSubpixelPositionedPlugin) { |
WebElement plugin_element = |
web_view->MainFrame()->GetDocument().GetElementById( |
"subpixel-positioned-plugin"); |
- WebPluginContainerImpl* plugin_container_impl = |
- ToWebPluginContainerImpl(plugin_element.PluginContainer()); |
+ WebPluginContainerBase* plugin_container_impl = |
+ ToWebPluginContainerBase(plugin_element.PluginContainer()); |
DCHECK(plugin_container_impl); |
@@ -1021,8 +1021,8 @@ TEST_F(WebPluginContainerTest, TopmostAfterDetachTest) { |
web_view->UpdateAllLifecyclePhases(); |
RunPendingTasks(); |
- WebPluginContainerImpl* plugin_container_impl = |
- ToWebPluginContainerImpl(GetWebPluginContainer( |
+ WebPluginContainerBase* plugin_container_impl = |
+ ToWebPluginContainerBase(GetWebPluginContainer( |
web_view, WebString::FromUTF8("translated-plugin"))); |
plugin_container_impl->SetFrameRect(IntRect(0, 0, 300, 300)); |
@@ -1081,7 +1081,7 @@ TEST_F(WebPluginContainerTest, CompositedPluginSPv2) { |
web_view->UpdateAllLifecyclePhases(); |
RunPendingTasks(); |
- WebPluginContainerImpl* container = static_cast<WebPluginContainerImpl*>( |
+ WebPluginContainerBase* container = static_cast<WebPluginContainerBase*>( |
GetWebPluginContainer(web_view, WebString::FromUTF8("plugin"))); |
ASSERT_TRUE(container); |
Element* element = static_cast<Element*>(container->GetElement()); |