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

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

Issue 2797073002: Move WebTextCheckClient reference from WebViewImpl to WebLocalFrameImpl (Closed)
Patch Set: Tue Apr 4 20:53:35 PDT 2017 Created 3 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/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index ca2f6893f01450038e33fe09f96383a3eb05655e..78e80af6acaa6fba03acfaff0f2dfb07faa006f3 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -6289,10 +6289,11 @@ TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange) {
registerMockedHttpURLLoad("spell.html");
FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
- TextCheckClient textcheck;
- webViewHelper.webView()->setTextCheckClient(&textcheck);
WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
+ TextCheckClient textcheck;
+ frame->setTextCheckClient(&textcheck);
+
Document* document = frame->frame()->document();
Element* element = document->getElementById("data");
@@ -6336,10 +6337,11 @@ TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers) {
registerMockedHttpURLLoad("spell.html");
FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
- TextCheckClient textcheck;
- webViewHelper.webView()->setTextCheckClient(&textcheck);
WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
+ TextCheckClient textcheck;
+ frame->setTextCheckClient(&textcheck);
+
Document* document = frame->frame()->document();
Element* element = document->getElementById("data");
@@ -6378,10 +6380,12 @@ TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords) {
registerMockedHttpURLLoad("spell.html");
FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
+
+ WebLocalFrameImpl* webFrame = webViewHelper.webView()->mainFrameImpl();
TextCheckClient textcheck;
- webViewHelper.webView()->setTextCheckClient(&textcheck);
+ webFrame->setTextCheckClient(&textcheck);
- LocalFrame* frame = webViewHelper.webView()->mainFrameImpl()->frame();
+ LocalFrame* frame = webFrame->frame();
Document* document = frame->document();
Element* element = document->getElementById("data");
@@ -6455,10 +6459,10 @@ TEST_P(ParameterizedWebFrameTest, SlowSpellcheckMarkerPosition) {
FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
+ WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
StubbornTextCheckClient textcheck;
- webViewHelper.webView()->setTextCheckClient(&textcheck);
+ frame->setTextCheckClient(&textcheck);
- WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
Document* document = frame->frame()->document();
Element* element = document->getElementById("data");
@@ -6496,9 +6500,10 @@ TEST_P(ParameterizedWebFrameTest, CancelSpellingRequestCrash) {
registerMockedHttpURLLoad("spell.html");
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
- webViewHelper.webView()->setTextCheckClient(0);
WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
+ frame->setTextCheckClient(0);
+
Document* document = frame->frame()->document();
Element* element = document->getElementById("data");
@@ -6516,10 +6521,10 @@ TEST_P(ParameterizedWebFrameTest, SpellcheckResultErasesMarkers) {
FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
+ WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
StubbornTextCheckClient textcheck;
- webViewHelper.webView()->setTextCheckClient(&textcheck);
+ frame->setTextCheckClient(&textcheck);
- WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
Document* document = frame->frame()->document();
Element* element = document->getElementById("data");
@@ -6556,10 +6561,10 @@ TEST_P(ParameterizedWebFrameTest, SpellcheckResultsSavedInDocument) {
FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
+ WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
StubbornTextCheckClient textcheck;
- webViewHelper.webView()->setTextCheckClient(&textcheck);
+ frame->setTextCheckClient(&textcheck);
- WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
Document* document = frame->frame()->document();
Element* element = document->getElementById("data");

Powered by Google App Engine
This is Rietveld 408576698