Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

Issue 2888283004: Revert of Introduce WebPluginContainerBase to abstract WebPluginContainerImpl. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5ac1db74ded7bd847af20db59c898bc4e728bfbb..ec344c4a0f5f1ffaa62a5bddc9eded83ab095a76 100644
--- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
@@ -34,7 +34,6 @@
#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"
@@ -65,6 +64,7 @@
#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 @@
->UnregisterAllURLsAndClearMemoryCache();
}
- void CalculateGeometry(WebPluginContainerBase* plugin_container_impl,
+ void CalculateGeometry(WebPluginContainerImpl* plugin_container_impl,
IntRect& window_rect,
IntRect& clip_rect,
IntRect& unobscured_rect) {
@@ -423,7 +423,7 @@
WebInputEvent::kTimeStampForTesting);
web_keyboard_event_c.windows_key_code = 67;
KeyboardEvent* key_event_c = KeyboardEvent::Create(web_keyboard_event_c, 0);
- ToWebPluginContainerBase(plugin_container_one_element.PluginContainer())
+ ToWebPluginContainerImpl(plugin_container_one_element.PluginContainer())
->HandleEvent(key_event_c);
EXPECT_EQ(WebString("x"), Platform::Current()->Clipboard()->ReadPlainText(
WebClipboard::Buffer()));
@@ -439,7 +439,7 @@
web_keyboard_event_insert.windows_key_code = 45;
KeyboardEvent* key_event_insert =
KeyboardEvent::Create(web_keyboard_event_insert, 0);
- ToWebPluginContainerBase(plugin_container_one_element.PluginContainer())
+ ToWebPluginContainerImpl(plugin_container_one_element.PluginContainer())
->HandleEvent(key_event_insert);
EXPECT_EQ(WebString("x"), Platform::Current()->Clipboard()->ReadPlainText(
WebClipboard::Buffer()));
@@ -506,7 +506,7 @@
WebElement plugin_container_one_element =
web_view->MainFrame()->GetDocument().GetElementById(
WebString::FromUTF8("translated-plugin"));
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -555,7 +555,7 @@
WebElement plugin_container_one_element =
web_view->MainFrame()->GetDocument().GetElementById(
WebString::FromUTF8("translated-plugin"));
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -596,7 +596,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -638,7 +638,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -696,7 +696,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -737,7 +737,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -776,7 +776,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -817,7 +817,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -859,7 +859,7 @@
WebString::FromUTF8("scrolled-plugin"));
plugin_container_one_element.PluginContainer()->RequestTouchEventType(
WebPluginContainer::kTouchEventRequestTypeRaw);
- WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
+ WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(
plugin_container_one_element.PluginContainer())
->Plugin();
EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
@@ -897,8 +897,8 @@
web_view->UpdateAllLifecyclePhases();
RunPendingTasks();
- WebPluginContainerBase* plugin_container_impl =
- ToWebPluginContainerBase(GetWebPluginContainer(
+ WebPluginContainerImpl* plugin_container_impl =
+ ToWebPluginContainerImpl(GetWebPluginContainer(
web_view, WebString::FromUTF8("translated-plugin")));
plugin_container_impl->SetFrameRect(IntRect(0, 0, 300, 300));
@@ -939,8 +939,8 @@
WebElement plugin_element =
web_view->MainFrame()->FirstChild()->GetDocument().GetElementById(
"translated-plugin");
- WebPluginContainerBase* plugin_container_impl =
- ToWebPluginContainerBase(plugin_element.PluginContainer());
+ WebPluginContainerImpl* plugin_container_impl =
+ ToWebPluginContainerImpl(plugin_element.PluginContainer());
DCHECK(plugin_container_impl);
@@ -973,8 +973,8 @@
WebElement plugin_element =
web_view->MainFrame()->GetDocument().GetElementById(
"subpixel-positioned-plugin");
- WebPluginContainerBase* plugin_container_impl =
- ToWebPluginContainerBase(plugin_element.PluginContainer());
+ WebPluginContainerImpl* plugin_container_impl =
+ ToWebPluginContainerImpl(plugin_element.PluginContainer());
DCHECK(plugin_container_impl);
@@ -1021,8 +1021,8 @@
web_view->UpdateAllLifecyclePhases();
RunPendingTasks();
- WebPluginContainerBase* plugin_container_impl =
- ToWebPluginContainerBase(GetWebPluginContainer(
+ WebPluginContainerImpl* plugin_container_impl =
+ ToWebPluginContainerImpl(GetWebPluginContainer(
web_view, WebString::FromUTF8("translated-plugin")));
plugin_container_impl->SetFrameRect(IntRect(0, 0, 300, 300));
@@ -1081,7 +1081,7 @@
web_view->UpdateAllLifecyclePhases();
RunPendingTasks();
- WebPluginContainerBase* container = static_cast<WebPluginContainerBase*>(
+ WebPluginContainerImpl* container = static_cast<WebPluginContainerImpl*>(
GetWebPluginContainer(web_view, WebString::FromUTF8("plugin")));
ASSERT_TRUE(container);
Element* element = static_cast<Element*>(container->GetElement());
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698