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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/TouchActionTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/TouchActionTest.cpp b/third_party/WebKit/Source/web/tests/TouchActionTest.cpp
index 3784842e091b4444a20b006c228ede915c1b8c5e..26d8ccdecb208801a72f3dc4dce82350c20e7d47 100644
--- a/third_party/WebKit/Source/web/tests/TouchActionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/TouchActionTest.cpp
@@ -143,7 +143,7 @@ void TouchActionTest::runTouchActionTest(std::string file)
// scenario.
WebView* webView = setupTest(file, client);
- RefPtrWillBePersistent<Document> document = static_cast<PassRefPtrWillBeRawPtr<Document>>(webView->mainFrame()->document());
+ Persistent<Document> document = static_cast<RawPtr<Document>>(webView->mainFrame()->document());
runTestOnTree(document.get(), webView, client);
m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client.
@@ -158,8 +158,8 @@ void TouchActionTest::runShadowDOMTest(std::string file)
TrackExceptionState es;
// Oilpan: see runTouchActionTest() comment why these are persistent references.
- RefPtrWillBePersistent<Document> document = static_cast<PassRefPtrWillBeRawPtr<Document>>(webView->mainFrame()->document());
- RefPtrWillBePersistent<StaticElementList> hostNodes = document->querySelectorAll("[shadow-host]", es);
+ Persistent<Document> document = static_cast<RawPtr<Document>>(webView->mainFrame()->document());
+ Persistent<StaticElementList> hostNodes = document->querySelectorAll("[shadow-host]", es);
ASSERT_FALSE(es.hadException());
ASSERT_GE(hostNodes->length(), 1u);
@@ -184,7 +184,7 @@ void TouchActionTest::runIFrameTest(std::string file)
for (; curFrame; curFrame = curFrame->nextSibling()) {
// Oilpan: see runTouchActionTest() comment why these are persistent references.
- RefPtrWillBePersistent<Document> contentDoc = static_cast<PassRefPtrWillBeRawPtr<Document>>(curFrame->document());
+ Persistent<Document> contentDoc = static_cast<RawPtr<Document>>(curFrame->document());
runTestOnTree(contentDoc.get(), webView, client);
}
@@ -202,7 +202,7 @@ WebView* TouchActionTest::setupTest(std::string file, TouchActionTrackingWebView
// Scroll to verify the code properly transforms windows to client co-ords.
const int kScrollOffset = 100;
- RefPtrWillBeRawPtr<Document> document = static_cast<PassRefPtrWillBeRawPtr<Document>>(webView->mainFrame()->document());
+ RawPtr<Document> document = static_cast<RawPtr<Document>>(webView->mainFrame()->document());
document->frame()->view()->setScrollPosition(IntPoint(0, kScrollOffset), ProgrammaticScroll);
return webView;
@@ -214,7 +214,7 @@ void TouchActionTest::runTestOnTree(ContainerNode* root, WebView* webView, Touch
TrackExceptionState es;
// Oilpan: see runTouchActionTest() comment why these are persistent references.
- RefPtrWillBePersistent<StaticElementList> elements = root->querySelectorAll("[expected-action]", es);
+ Persistent<StaticElementList> elements = root->querySelectorAll("[expected-action]", es);
ASSERT_FALSE(es.hadException());
for (unsigned index = 0; index < elements->length(); index++) {
« no previous file with comments | « third_party/WebKit/Source/web/tests/TopControlsTest.cpp ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698