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

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

Issue 1865813002: Remove RawPtr from Source/web/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 8 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
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 f0b37d4fc113bd65e5147129a11bbd76f88ef976..24474b76fef397c6c7d706125fa33d1606667a24 100644
--- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
@@ -339,8 +339,8 @@ TEST_F(WebPluginContainerTest, CopyInsertKeyboardEventsTest)
modifierKey = static_cast<PlatformEvent::Modifiers>(PlatformEvent::MetaKey | PlatformEvent::NumLockOn | PlatformEvent::IsLeft);
#endif
PlatformKeyboardEvent platformKeyboardEventC(PlatformEvent::RawKeyDown, "", "", "67", "", "", 67, 0, false, modifierKey, 0.0);
- RawPtr<KeyboardEvent> keyEventC = KeyboardEvent::create(platformKeyboardEventC, 0);
- toWebPluginContainerImpl(pluginContainerOneElement.pluginContainer())->handleEvent(keyEventC.get());
+ KeyboardEvent* keyEventC = KeyboardEvent::create(platformKeyboardEventC, 0);
+ toWebPluginContainerImpl(pluginContainerOneElement.pluginContainer())->handleEvent(keyEventC);
EXPECT_EQ(WebString("x"), Platform::current()->clipboard()->readPlainText(WebClipboard::Buffer()));
// Clearing |Clipboard::Buffer()|.
@@ -348,8 +348,8 @@ TEST_F(WebPluginContainerTest, CopyInsertKeyboardEventsTest)
EXPECT_EQ(WebString(""), Platform::current()->clipboard()->readPlainText(WebClipboard::Buffer()));
PlatformKeyboardEvent platformKeyboardEventInsert(PlatformEvent::RawKeyDown, "", "", "45", "", "", 45, 0, false, modifierKey, 0.0);
- RawPtr<KeyboardEvent> keyEventInsert = KeyboardEvent::create(platformKeyboardEventInsert, 0);
- toWebPluginContainerImpl(pluginContainerOneElement.pluginContainer())->handleEvent(keyEventInsert.get());
+ KeyboardEvent* keyEventInsert = KeyboardEvent::create(platformKeyboardEventInsert, 0);
+ toWebPluginContainerImpl(pluginContainerOneElement.pluginContainer())->handleEvent(keyEventInsert);
EXPECT_EQ(WebString("x"), Platform::current()->clipboard()->readPlainText(WebClipboard::Buffer()));
}
@@ -429,7 +429,7 @@ TEST_F(WebPluginContainerTest, IsRectTopmostTest)
webView->updateAllLifecyclePhases();
runPendingTasks();
- RawPtr<WebPluginContainerImpl> pluginContainerImpl =
+ WebPluginContainerImpl* pluginContainerImpl =
toWebPluginContainerImpl(getWebPluginContainer(webView, WebString::fromUTF8("translated-plugin")));
pluginContainerImpl->setFrameRect(IntRect(0, 0, 300, 300));
@@ -466,14 +466,14 @@ TEST_F(WebPluginContainerTest, ClippedRectsForIframedElement)
runPendingTasks();
WebElement pluginElement = webView->mainFrame()->firstChild()->document().getElementById("translated-plugin");
- RawPtr<WebPluginContainerImpl> pluginContainerImpl = toWebPluginContainerImpl(pluginElement.pluginContainer());
+ WebPluginContainerImpl* pluginContainerImpl = toWebPluginContainerImpl(pluginElement.pluginContainer());
- DCHECK(pluginContainerImpl.get());
+ DCHECK(pluginContainerImpl);
pluginContainerImpl->setFrameRect(IntRect(0, 0, 300, 300));
IntRect windowRect, clipRect, unobscuredRect;
Vector<IntRect> cutOutRects;
- calculateGeometry(pluginContainerImpl.get(), windowRect, clipRect, unobscuredRect, cutOutRects);
+ calculateGeometry(pluginContainerImpl, windowRect, clipRect, unobscuredRect, cutOutRects);
EXPECT_RECT_EQ(IntRect(10, 210, 300, 300), windowRect);
EXPECT_RECT_EQ(IntRect(0, 0, 240, 90), clipRect);
EXPECT_RECT_EQ(IntRect(0, 0, 240, 160), unobscuredRect);
@@ -496,14 +496,14 @@ TEST_F(WebPluginContainerTest, ClippedRectsForSubpixelPositionedPlugin)
runPendingTasks();
WebElement pluginElement = webView->mainFrame()->document().getElementById("subpixel-positioned-plugin");
- RawPtr<WebPluginContainerImpl> pluginContainerImpl = toWebPluginContainerImpl(pluginElement.pluginContainer());
+ WebPluginContainerImpl* pluginContainerImpl = toWebPluginContainerImpl(pluginElement.pluginContainer());
- DCHECK(pluginContainerImpl.get());
+ DCHECK(pluginContainerImpl);
IntRect windowRect, clipRect, unobscuredRect;
Vector<IntRect> cutOutRects;
- calculateGeometry(pluginContainerImpl.get(), windowRect, clipRect, unobscuredRect, cutOutRects);
+ calculateGeometry(pluginContainerImpl, windowRect, clipRect, unobscuredRect, cutOutRects);
// TODO(chrishtr): these values should not be -1, they should be 0. They are -1 because WebPluginContainerImpl currently uses an IntRect for
// frameRect() to determine the position of the plugin, which results in a loss of precision if it is actually subpixel positioned.
EXPECT_RECT_EQ(IntRect(0, 0, 40, 40), windowRect);
@@ -547,7 +547,7 @@ TEST_F(WebPluginContainerTest, TopmostAfterDetachTest)
webView->updateAllLifecyclePhases();
runPendingTasks();
- RawPtr<WebPluginContainerImpl> pluginContainerImpl =
+ WebPluginContainerImpl* pluginContainerImpl =
toWebPluginContainerImpl(getWebPluginContainer(webView, WebString::fromUTF8("translated-plugin")));
pluginContainerImpl->setFrameRect(IntRect(0, 0, 300, 300));
@@ -619,7 +619,7 @@ TEST_F(WebPluginContainerTest, CompositedPluginSPv2)
WebPluginContainerImpl* container = static_cast<WebPluginContainerImpl*>(getWebPluginContainer(webView, WebString::fromUTF8("plugin")));
ASSERT_TRUE(container);
- RawPtr<Element> element = static_cast<RawPtr<Element>>(container->element());
+ Element* element = static_cast<Element*>(container->element());
const auto* plugin = static_cast<const CompositedPlugin*>(container->plugin());
OwnPtr<PaintController> paintController = PaintController::create();

Powered by Google App Engine
This is Rietveld 408576698