Use FocusParams in FocusController::setFocusedElement and Document::setFocusedElement arguments.

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2420 matching lines @@
     WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
     webViewImpl->setInitialFocus(false);
 
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewImpl->mainFrame());
     HTMLDocument* document = toHTMLDocument(frame->frame()->document());
 
     // (A) <input>
     // (A.1) Verifies autocorrect/autocomplete/spellcheck flags are Off and
     // autocapitalize is set to none.
     HTMLInputElement* inputElement = toHTMLInputElement(document->getElementById("input"));
-    document->setFocusedElement(inputElement);
+    document->setFocusedElement(inputElement, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
     webViewImpl->setFocus(true);
     WebTextInputInfo info = webViewImpl->textInputInfo();
     EXPECT_EQ(
         WebTextInputFlagAutocompleteOff | WebTextInputFlagAutocorrectOff | WebTextInputFlagSpellcheckOff | WebTextInputFlagAutocapitalizeNone,
         info.flags);
 
     // (A.2) Verifies autocorrect/autocomplete/spellcheck flags are On and
     // autocapitalize is set to sentences.
     inputElement = toHTMLInputElement(document->getElementById("input2"));
-    document->setFocusedElement(inputElement);
+    document->setFocusedElement(inputElement, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
     webViewImpl->setFocus(true);
     info = webViewImpl->textInputInfo();
     EXPECT_EQ(
         WebTextInputFlagAutocompleteOn | WebTextInputFlagAutocorrectOn | WebTextInputFlagSpellcheckOn | WebTextInputFlagAutocapitalizeSentences,
         info.flags);
 
     // (B) <textarea> Verifies the default text input flags are
     // WebTextInputFlagAutocapitalizeSentences.
     HTMLTextAreaElement* textAreaElement = toHTMLTextAreaElement(document->getElementById("textarea"));
-    document->setFocusedElement(textAreaElement);
+    document->setFocusedElement(textAreaElement, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
     webViewImpl->setFocus(true);
     info = webViewImpl->textInputInfo();
     EXPECT_EQ(WebTextInputFlagAutocapitalizeSentences, info.flags);
 
     // Free the webView before freeing the NonUserInputTextUpdateWebViewClient.
     m_webViewHelper.reset();
 }
 
 // This test verifies that WebWidgetClient::didUpdateTextOfFocusedElementByNonUserInput is
 // called iff value of a focused element is modified via script.
 TEST_F(WebViewTest, NonUserInputTextUpdate)
 {
     NonUserInputTextUpdateWebViewClient client;
     std::string url = m_baseURL + "non_user_input_text_update.html";
     URLTestHelpers::registerMockedURLLoad(toKURL(url), "non_user_input_text_update.html");
     WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
     webViewImpl->setInitialFocus(false);
 
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewImpl->mainFrame());
     HTMLDocument* document = toHTMLDocument(frame->frame()->document());
 
     // (A) <input>
     // (A.1) Focused and value is changed by script.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
 
     HTMLInputElement* inputElement = toHTMLInputElement(document->getElementById("input"));
-    document->setFocusedElement(inputElement);
+    document->setFocusedElement(inputElement, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
     webViewImpl->setFocus(true);
     EXPECT_EQ(document->focusedElement(), static_cast<Element*>(inputElement));
 
     // Emulate value change from script.
     inputElement->setValue("testA");
     EXPECT_TRUE(client.textIsUpdated());
     WebTextInputInfo info = webViewImpl->textInputInfo();
     EXPECT_EQ("testA", std::string(info.value.utf8().data()));
 
     // (A.2) Focused and user input modifies value.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
 
     WebVector<WebCompositionUnderline> emptyUnderlines;
     webViewImpl->setComposition(WebString::fromUTF8("2"), emptyUnderlines, 1, 1);
     webViewImpl->confirmComposition(WebWidget::KeepSelection);
     EXPECT_FALSE(client.textIsUpdated());
     info = webViewImpl->textInputInfo();
     EXPECT_EQ("testA2", std::string(info.value.utf8().data()));
 
     // (A.3) Unfocused and value is changed by script.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
-    document->setFocusedElement(nullptr);
+    document->clearFocusedElement();
     webViewImpl->setFocus(false);
     EXPECT_NE(document->focusedElement(), static_cast<Element*>(inputElement));
     inputElement->setValue("testA3");
     EXPECT_FALSE(client.textIsUpdated());
 
     // (B) <textarea>
     // (B.1) Focused and value is changed by script.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
     HTMLTextAreaElement* textAreaElement = toHTMLTextAreaElement(document->getElementById("textarea"));
-    document->setFocusedElement(textAreaElement);
+    document->setFocusedElement(textAreaElement, FocusParams(SelectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
     webViewImpl->setFocus(true);
     EXPECT_EQ(document->focusedElement(), static_cast<Element*>(textAreaElement));
     textAreaElement->setValue("testB");
     EXPECT_TRUE(client.textIsUpdated());
     info = webViewImpl->textInputInfo();
     EXPECT_EQ("testB", std::string(info.value.utf8().data()));
 
     // (B.2) Focused and user input modifies value.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
     webViewImpl->setComposition(WebString::fromUTF8("2"), emptyUnderlines, 1, 1);
     webViewImpl->confirmComposition(WebWidget::KeepSelection);
     info = webViewImpl->textInputInfo();
     EXPECT_EQ("testB2", std::string(info.value.utf8().data()));
 
     // (B.3) Unfocused and value is changed by script.
     client.reset();
     EXPECT_FALSE(client.textIsUpdated());
-    document->setFocusedElement(nullptr);
+    document->clearFocusedElement();
     webViewImpl->setFocus(false);
     EXPECT_NE(document->focusedElement(), static_cast<Element*>(textAreaElement));
     inputElement->setValue("testB3");
     EXPECT_FALSE(client.textIsUpdated());
 
     // Free the webView before freeing the NonUserInputTextUpdateWebViewClient.
     m_webViewHelper.reset();
 }
 
 // Check that the WebAutofillClient is correctly notified about first user
@@ skipping 587 matching lines @@
     WebFrame* frame = mainWebView.webView()->mainFrame();
     v8::HandleScope scope(v8::Isolate::GetCurrent());
     v8::Local<v8::Value> v8Value = frame->executeScriptAndReturnValue(WebScriptSource("var win = window.open('javascript:false'); win.document"));
     ASSERT_TRUE(v8Value->IsObject());
     Document* document = V8Document::toImplWithTypeCheck(v8::Isolate::GetCurrent(), v8Value);
     ASSERT_TRUE(document);
     EXPECT_FALSE(document->frame()->isLoading());
 }
 
 } // namespace blink