| Index: Source/web/tests/WebViewTest.cpp
|
| diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
|
| index 43957ea548f6aae5dfcb2526652f7b814810dc8d..ca578916fc6994982e1b41c7d7a49ba3538ee53e 100644
|
| --- a/Source/web/tests/WebViewTest.cpp
|
| +++ b/Source/web/tests/WebViewTest.cpp
|
| @@ -262,14 +262,14 @@ TEST_F(WebViewTest, SetBaseBackgroundColor)
|
| // Expected: transparent on top of kTransparent will still be transparent.
|
| EXPECT_EQ(kTransparent, webView->backgroundColor());
|
|
|
| - WebCore::LocalFrame* frame = webView->mainFrameImpl()->frame();
|
| + blink::LocalFrame* frame = webView->mainFrameImpl()->frame();
|
|
|
| // Creating a new frame view with the background color having 0 alpha.
|
| - frame->createView(WebCore::IntSize(1024, 768), WebCore::Color::transparent, true);
|
| + frame->createView(blink::IntSize(1024, 768), blink::Color::transparent, true);
|
| EXPECT_EQ(kTransparent, frame->view()->baseBackgroundColor());
|
|
|
| - WebCore::Color kTransparentRed(100, 0, 0, 0);
|
| - frame->createView(WebCore::IntSize(1024, 768), kTransparentRed, true);
|
| + blink::Color kTransparentRed(100, 0, 0, 0);
|
| + frame->createView(blink::IntSize(1024, 768), kTransparentRed, true);
|
| EXPECT_EQ(kTransparentRed, frame->view()->baseBackgroundColor());
|
| }
|
|
|
| @@ -306,19 +306,19 @@ TEST_F(WebViewTest, SetBaseBackgroundColorAndBlendWithExistingContent)
|
| SkCanvas canvas(bitmap);
|
| canvas.clear(kAlphaRed);
|
|
|
| - WebCore::GraphicsContext context(&canvas);
|
| + blink::GraphicsContext context(&canvas);
|
|
|
| // Paint the root of the main frame in the way that CompositedLayerMapping would.
|
| - WebCore::FrameView* view = m_webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
|
| - WebCore::RenderLayer* rootLayer = view->renderView()->layer();
|
| - WebCore::IntRect paintRect(0, 0, kWidth, kHeight);
|
| - WebCore::LayerPaintingInfo paintingInfo(rootLayer, paintRect, WebCore::PaintBehaviorNormal, WebCore::LayoutSize());
|
| - rootLayer->paintLayerContents(&context, paintingInfo, WebCore::PaintLayerPaintingCompositingAllPhases);
|
| + blink::FrameView* view = m_webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
|
| + blink::RenderLayer* rootLayer = view->renderView()->layer();
|
| + blink::IntRect paintRect(0, 0, kWidth, kHeight);
|
| + blink::LayerPaintingInfo paintingInfo(rootLayer, paintRect, blink::PaintBehaviorNormal, blink::LayoutSize());
|
| + rootLayer->paintLayerContents(&context, paintingInfo, blink::PaintLayerPaintingCompositingAllPhases);
|
|
|
| // The result should be a blend of red and green.
|
| SkColor color = bitmap.getColor(kWidth / 2, kHeight / 2);
|
| - EXPECT_TRUE(WebCore::redChannel(color));
|
| - EXPECT_TRUE(WebCore::greenChannel(color));
|
| + EXPECT_TRUE(blink::redChannel(color));
|
| + EXPECT_TRUE(blink::greenChannel(color));
|
| }
|
|
|
| TEST_F(WebViewTest, FocusIsInactive)
|
| @@ -331,7 +331,7 @@ TEST_F(WebViewTest, FocusIsInactive)
|
| WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
|
| EXPECT_TRUE(frame->frame()->document()->isHTMLDocument());
|
|
|
| - WebCore::HTMLDocument* document = WebCore::toHTMLDocument(frame->frame()->document());
|
| + blink::HTMLDocument* document = blink::toHTMLDocument(frame->frame()->document());
|
| EXPECT_TRUE(document->hasFocus());
|
| webView->setFocus(false);
|
| webView->setIsActive(false);
|
| @@ -398,7 +398,7 @@ void WebViewTest::testAutoResize(const WebSize& minAutoResize, const WebSize& ma
|
| client.testData().setWebView(webView);
|
|
|
| WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
|
| - WebCore::FrameView* frameView = frame->frame()->view();
|
| + blink::FrameView* frameView = frame->frame()->view();
|
| frameView->layout();
|
| EXPECT_FALSE(frameView->layoutPending());
|
| EXPECT_FALSE(frameView->needsLayout());
|
| @@ -822,7 +822,7 @@ TEST_F(WebViewTest, HistoryResetScrollAndScaleState)
|
| EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
|
| EXPECT_EQ(116, webViewImpl->mainFrame()->scrollOffset().width);
|
| EXPECT_EQ(84, webViewImpl->mainFrame()->scrollOffset().height);
|
| - WebCore::LocalFrame* mainFrameLocal = toLocalFrame(webViewImpl->page()->mainFrame());
|
| + blink::LocalFrame* mainFrameLocal = toLocalFrame(webViewImpl->page()->mainFrame());
|
| mainFrameLocal->loader().saveScrollState();
|
| EXPECT_EQ(2.0f, mainFrameLocal->loader().currentItem()->pageScaleFactor());
|
| EXPECT_EQ(116, mainFrameLocal->loader().currentItem()->scrollPoint().x());
|
| @@ -849,25 +849,25 @@ TEST_F(WebViewTest, BackForwardRestoreScroll)
|
|
|
| // Emulate a user scroll
|
| webViewImpl->setMainFrameScrollOffset(WebPoint(0, 900));
|
| - WebCore::LocalFrame* mainFrameLocal = toLocalFrame(webViewImpl->page()->mainFrame());
|
| - RefPtr<WebCore::HistoryItem> item1 = mainFrameLocal->loader().currentItem();
|
| + blink::LocalFrame* mainFrameLocal = toLocalFrame(webViewImpl->page()->mainFrame());
|
| + RefPtr<blink::HistoryItem> item1 = mainFrameLocal->loader().currentItem();
|
|
|
| // Click an anchor
|
| - mainFrameLocal->loader().load(WebCore::FrameLoadRequest(mainFrameLocal->document(), WebCore::ResourceRequest(mainFrameLocal->document()->completeURL("#a"))));
|
| - RefPtr<WebCore::HistoryItem> item2 = mainFrameLocal->loader().currentItem();
|
| + mainFrameLocal->loader().load(blink::FrameLoadRequest(mainFrameLocal->document(), blink::ResourceRequest(mainFrameLocal->document()->completeURL("#a"))));
|
| + RefPtr<blink::HistoryItem> item2 = mainFrameLocal->loader().currentItem();
|
|
|
| // Go back, then forward, then back again.
|
| - mainFrameLocal->loader().loadHistoryItem(item1.get(), WebCore::HistorySameDocumentLoad);
|
| - mainFrameLocal->loader().loadHistoryItem(item2.get(), WebCore::HistorySameDocumentLoad);
|
| - mainFrameLocal->loader().loadHistoryItem(item1.get(), WebCore::HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item1.get(), blink::HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item2.get(), blink::HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item1.get(), blink::HistorySameDocumentLoad);
|
|
|
| // Click a different anchor
|
| - mainFrameLocal->loader().load(WebCore::FrameLoadRequest(mainFrameLocal->document(), WebCore::ResourceRequest(mainFrameLocal->document()->completeURL("#b"))));
|
| - RefPtr<WebCore::HistoryItem> item3 = mainFrameLocal->loader().currentItem();
|
| + mainFrameLocal->loader().load(blink::FrameLoadRequest(mainFrameLocal->document(), blink::ResourceRequest(mainFrameLocal->document()->completeURL("#b"))));
|
| + RefPtr<blink::HistoryItem> item3 = mainFrameLocal->loader().currentItem();
|
|
|
| // Go back, then forward. The scroll position should be properly set on the forward navigation.
|
| - mainFrameLocal->loader().loadHistoryItem(item1.get(), WebCore::HistorySameDocumentLoad);
|
| - mainFrameLocal->loader().loadHistoryItem(item3.get(), WebCore::HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item1.get(), blink::HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item3.get(), blink::HistorySameDocumentLoad);
|
| EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
|
| EXPECT_GT(webViewImpl->mainFrame()->scrollOffset().height, 2000);
|
| }
|
| @@ -897,7 +897,7 @@ TEST_F(WebViewTest, EnterFullscreenResetScrollAndScaleState)
|
| EXPECT_EQ(116, webViewImpl->mainFrame()->scrollOffset().width);
|
| EXPECT_EQ(84, webViewImpl->mainFrame()->scrollOffset().height);
|
|
|
| - RefPtrWillBeRawPtr<WebCore::Element> element = static_cast<PassRefPtrWillBeRawPtr<WebCore::Element> >(webViewImpl->mainFrame()->document().body());
|
| + RefPtrWillBeRawPtr<blink::Element> element = static_cast<PassRefPtrWillBeRawPtr<blink::Element> >(webViewImpl->mainFrame()->document().body());
|
| webViewImpl->enterFullScreenForElement(element.get());
|
| webViewImpl->willEnterFullScreen();
|
| webViewImpl->didEnterFullScreen();
|
| @@ -907,7 +907,7 @@ TEST_F(WebViewTest, EnterFullscreenResetScrollAndScaleState)
|
| EXPECT_EQ(1.0f, webViewImpl->pageScaleFactor());
|
|
|
| // Make sure fullscreen nesting doesn't disrupt scroll/scale saving.
|
| - RefPtrWillBeRawPtr<WebCore::Element> otherElement = static_cast<PassRefPtrWillBeRawPtr<WebCore::Element> >(webViewImpl->mainFrame()->document().head());
|
| + RefPtrWillBeRawPtr<blink::Element> otherElement = static_cast<PassRefPtrWillBeRawPtr<blink::Element> >(webViewImpl->mainFrame()->document().head());
|
| webViewImpl->enterFullScreenForElement(otherElement.get());
|
|
|
| // Confirm that exiting fullscreen restores the parameters.
|
| @@ -946,7 +946,7 @@ TEST_F(WebViewTest, PrintWithXHRInFlight)
|
| URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("print_with_xhr_inflight.html"));
|
| WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(m_baseURL + "print_with_xhr_inflight.html", true, 0, &client);
|
|
|
| - ASSERT_EQ(WebCore::FrameStateComplete, toLocalFrame(webViewImpl->page()->mainFrame())->loader().state());
|
| + ASSERT_EQ(blink::FrameStateComplete, toLocalFrame(webViewImpl->page()->mainFrame())->loader().state());
|
| EXPECT_TRUE(client.printCalled());
|
| m_webViewHelper.reset();
|
| }
|
| @@ -1056,12 +1056,12 @@ private:
|
| static bool tapElementById(WebView* webView, WebInputEvent::Type type, const WebString& id)
|
| {
|
| ASSERT(webView);
|
| - RefPtrWillBeRawPtr<WebCore::Element> element = static_cast<PassRefPtrWillBeRawPtr<WebCore::Element> >(webView->mainFrame()->document().getElementById(id));
|
| + RefPtrWillBeRawPtr<blink::Element> element = static_cast<PassRefPtrWillBeRawPtr<blink::Element> >(webView->mainFrame()->document().getElementById(id));
|
| if (!element)
|
| return false;
|
|
|
| element->scrollIntoViewIfNeeded();
|
| - WebCore::IntPoint center = element->screenRect().center();
|
| + blink::IntPoint center = element->screenRect().center();
|
|
|
| WebGestureEvent event;
|
| event.type = type;
|
| @@ -1422,7 +1422,7 @@ TEST_F(WebViewTest, FocusExistingFrameOnNavigate)
|
| // Make a request that will open a new window
|
| WebURLRequest webURLRequest;
|
| webURLRequest.initialize();
|
| - WebCore::FrameLoadRequest request(0, webURLRequest.toResourceRequest(), "_blank");
|
| + blink::FrameLoadRequest request(0, webURLRequest.toResourceRequest(), "_blank");
|
| toLocalFrame(webViewImpl->page()->mainFrame())->loader().load(request);
|
| ASSERT_TRUE(client.createdWebView());
|
| EXPECT_FALSE(client.didFocusCalled());
|
| @@ -1430,7 +1430,7 @@ TEST_F(WebViewTest, FocusExistingFrameOnNavigate)
|
| // Make a request from the new window that will navigate the original window. The original window should be focused.
|
| WebURLRequest webURLRequestWithTargetStart;
|
| webURLRequestWithTargetStart.initialize();
|
| - WebCore::FrameLoadRequest requestWithTargetStart(0, webURLRequestWithTargetStart.toResourceRequest(), "_start");
|
| + blink::FrameLoadRequest requestWithTargetStart(0, webURLRequestWithTargetStart.toResourceRequest(), "_start");
|
| toLocalFrame(toWebViewImpl(client.createdWebView())->page()->mainFrame())->loader().load(requestWithTargetStart);
|
| EXPECT_TRUE(client.didFocusCalled());
|
|
|
| @@ -1464,12 +1464,12 @@ TEST_F(WebViewTest, DispatchesDomFocusOutDomFocusInOnViewToggleFocus)
|
| }
|
|
|
| #if !ENABLE(INPUT_MULTIPLE_FIELDS_UI)
|
| -static void openDateTimeChooser(WebView* webView, WebCore::HTMLInputElement* inputElement)
|
| +static void openDateTimeChooser(WebView* webView, blink::HTMLInputElement* inputElement)
|
| {
|
| inputElement->focus();
|
|
|
| WebKeyboardEvent keyEvent;
|
| - keyEvent.windowsKeyCode = WebCore::VKEY_SPACE;
|
| + keyEvent.windowsKeyCode = blink::VKEY_SPACE;
|
| keyEvent.type = WebInputEvent::RawKeyDown;
|
| keyEvent.setKeyIdentifierFromWindowsKeyCode();
|
| webView->handleInputEvent(keyEvent);
|
| @@ -1485,9 +1485,9 @@ TEST_F(WebViewTest, ChooseValueFromDateTimeChooser)
|
| URLTestHelpers::registerMockedURLLoad(toKURL(url), "date_time_chooser.html");
|
| WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true, 0, &client);
|
|
|
| - WebCore::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
|
| + blink::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
|
|
|
| - WebCore::HTMLInputElement* inputElement;
|
| + blink::HTMLInputElement* inputElement;
|
|
|
| inputElement = toHTMLInputElement(document->getElementById("date"));
|
| openDateTimeChooser(webViewImpl, inputElement);
|
| @@ -1697,7 +1697,7 @@ TEST_F(WebViewTest, HasTouchEventHandlers)
|
| EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
|
|
|
| // Adding the first document handler results in a has-handlers call.
|
| - WebCore::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
|
| + blink::Document* document = webViewImpl->mainFrameImpl()->frame()->document();
|
| document->didAddTouchEventHandler(document);
|
| EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
|
| EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
|
| @@ -1718,7 +1718,7 @@ TEST_F(WebViewTest, HasTouchEventHandlers)
|
| EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
|
|
|
| // Adding a handler on a div results in a has-handlers call.
|
| - WebCore::Element* parentDiv = document->getElementById("parentdiv");
|
| + blink::Element* parentDiv = document->getElementById("parentdiv");
|
| ASSERT(parentDiv);
|
| document->didAddTouchEventHandler(parentDiv);
|
| EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
|
| @@ -1751,10 +1751,10 @@ TEST_F(WebViewTest, HasTouchEventHandlers)
|
| EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
|
|
|
| // Adding a handler inside of a child iframe results in a has-handlers call.
|
| - WebCore::Element* childFrame = document->getElementById("childframe");
|
| + blink::Element* childFrame = document->getElementById("childframe");
|
| ASSERT(childFrame);
|
| - WebCore::Document* childDocument = toHTMLIFrameElement(childFrame)->contentDocument();
|
| - WebCore::Element* childDiv = childDocument->getElementById("childdiv");
|
| + blink::Document* childDocument = toHTMLIFrameElement(childFrame)->contentDocument();
|
| + blink::Element* childDiv = childDocument->getElementById("childdiv");
|
| ASSERT(childDiv);
|
| childDocument->didAddTouchEventHandler(childDiv);
|
| EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
|
| @@ -1809,14 +1809,14 @@ TEST_F(WebViewTest, DeleteElementWithRegisteredHandler)
|
| URLTestHelpers::registerMockedURLLoad(toKURL(url), "simple_div.html");
|
| WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true);
|
|
|
| - RefPtrWillBePersistent<WebCore::Document> document = webViewImpl->mainFrameImpl()->frame()->document();
|
| - WebCore::Element* div = document->getElementById("div");
|
| - WebCore::EventHandlerRegistry& registry = document->frameHost()->eventHandlerRegistry();
|
| + RefPtrWillBePersistent<blink::Document> document = webViewImpl->mainFrameImpl()->frame()->document();
|
| + blink::Element* div = document->getElementById("div");
|
| + blink::EventHandlerRegistry& registry = document->frameHost()->eventHandlerRegistry();
|
|
|
| - registry.didAddEventHandler(*div, WebCore::EventHandlerRegistry::ScrollEvent);
|
| - EXPECT_TRUE(registry.hasEventHandlers(WebCore::EventHandlerRegistry::ScrollEvent));
|
| + registry.didAddEventHandler(*div, blink::EventHandlerRegistry::ScrollEvent);
|
| + EXPECT_TRUE(registry.hasEventHandlers(blink::EventHandlerRegistry::ScrollEvent));
|
|
|
| - WebCore::TrackExceptionState exceptionState;
|
| + blink::TrackExceptionState exceptionState;
|
| div->remove(exceptionState);
|
| #if ENABLE(OILPAN)
|
| // For oilpan we have to force a GC to ensure the event handlers have been removed when
|
| @@ -1825,20 +1825,20 @@ TEST_F(WebViewTest, DeleteElementWithRegisteredHandler)
|
| // since we want that to stay around.
|
| Heap::collectAllGarbage();
|
| #endif
|
| - EXPECT_FALSE(registry.hasEventHandlers(WebCore::EventHandlerRegistry::ScrollEvent));
|
| + EXPECT_FALSE(registry.hasEventHandlers(blink::EventHandlerRegistry::ScrollEvent));
|
| }
|
|
|
| -static WebRect ExpectedRootBounds(WebCore::Document* document, float scaleFactor)
|
| +static WebRect ExpectedRootBounds(blink::Document* document, float scaleFactor)
|
| {
|
| - WebCore::Element* element = document->getElementById("root");
|
| + blink::Element* element = document->getElementById("root");
|
| if (!element)
|
| element = document->getElementById("target");
|
| - if (element->hasTagName(WebCore::HTMLNames::iframeTag))
|
| + if (element->hasTagName(blink::HTMLNames::iframeTag))
|
| return ExpectedRootBounds(toHTMLIFrameElement(element)->contentDocument(), scaleFactor);
|
|
|
| - WebCore::IntRect boundingBox;
|
| - if (element->hasTagName(WebCore::HTMLNames::htmlTag))
|
| - boundingBox = WebCore::IntRect(WebCore::IntPoint(0, 0), document->frame()->view()->contentsSize());
|
| + blink::IntRect boundingBox;
|
| + if (element->hasTagName(blink::HTMLNames::htmlTag))
|
| + boundingBox = blink::IntRect(blink::IntPoint(0, 0), document->frame()->view()->contentsSize());
|
| else
|
| boundingBox = element->pixelSnappedBoundingBox();
|
| boundingBox = document->frame()->view()->contentsToWindow(boundingBox);
|
| @@ -1858,7 +1858,7 @@ void WebViewTest::testSelectionRootBounds(const char* htmlFile, float pageScaleF
|
|
|
| WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
|
| EXPECT_TRUE(frame->frame()->document()->isHTMLDocument());
|
| - WebCore::HTMLDocument* document = WebCore::toHTMLDocument(frame->frame()->document());
|
| + blink::HTMLDocument* document = blink::toHTMLDocument(frame->frame()->document());
|
|
|
| WebRect expectedRootBounds = ExpectedRootBounds(document, webView->pageScaleFactor());
|
| WebRect actualRootBounds;
|
| @@ -1867,7 +1867,7 @@ void WebViewTest::testSelectionRootBounds(const char* htmlFile, float pageScaleF
|
|
|
| WebRect anchor, focus;
|
| webView->selectionBounds(anchor, focus);
|
| - WebCore::IntRect expectedIntRect = expectedRootBounds;
|
| + blink::IntRect expectedIntRect = expectedRootBounds;
|
| ASSERT_TRUE(expectedIntRect.contains(anchor));
|
| // The "overflow" tests have the focus boundary outside of the element box.
|
| ASSERT_EQ(url.find("overflow") == std::string::npos, expectedIntRect.contains(focus));
|
| @@ -1976,17 +1976,17 @@ TEST_F(WebViewTest, NonUserInputTextUpdate)
|
| webViewImpl->setInitialFocus(false);
|
|
|
| WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewImpl->mainFrame());
|
| - WebCore::HTMLDocument* document = WebCore::toHTMLDocument(frame->frame()->document());
|
| + blink::HTMLDocument* document = blink::toHTMLDocument(frame->frame()->document());
|
|
|
| // (A) <input>
|
| // (A.1) Focused and value is changed by script.
|
| client.reset();
|
| EXPECT_FALSE(client.textIsUpdated());
|
|
|
| - WebCore::HTMLInputElement* inputElement = toHTMLInputElement(document->getElementById("input"));
|
| + blink::HTMLInputElement* inputElement = toHTMLInputElement(document->getElementById("input"));
|
| document->setFocusedElement(inputElement);
|
| webViewImpl->setFocus(true);
|
| - EXPECT_EQ(document->focusedElement(), static_cast<WebCore::Element*>(inputElement));
|
| + EXPECT_EQ(document->focusedElement(), static_cast<blink::Element*>(inputElement));
|
|
|
| // Emulate value change from script.
|
| inputElement->setValue("testA");
|
| @@ -2010,7 +2010,7 @@ TEST_F(WebViewTest, NonUserInputTextUpdate)
|
| EXPECT_FALSE(client.textIsUpdated());
|
| document->setFocusedElement(nullptr);
|
| webViewImpl->setFocus(false);
|
| - EXPECT_NE(document->focusedElement(), static_cast<WebCore::Element*>(inputElement));
|
| + EXPECT_NE(document->focusedElement(), static_cast<blink::Element*>(inputElement));
|
| inputElement->setValue("testA3");
|
| EXPECT_FALSE(client.textIsUpdated());
|
|
|
| @@ -2018,10 +2018,10 @@ TEST_F(WebViewTest, NonUserInputTextUpdate)
|
| // (B.1) Focused and value is changed by script.
|
| client.reset();
|
| EXPECT_FALSE(client.textIsUpdated());
|
| - WebCore::HTMLTextAreaElement* textAreaElement = toHTMLTextAreaElement(document->getElementById("textarea"));
|
| + blink::HTMLTextAreaElement* textAreaElement = toHTMLTextAreaElement(document->getElementById("textarea"));
|
| document->setFocusedElement(textAreaElement);
|
| webViewImpl->setFocus(true);
|
| - EXPECT_EQ(document->focusedElement(), static_cast<WebCore::Element*>(textAreaElement));
|
| + EXPECT_EQ(document->focusedElement(), static_cast<blink::Element*>(textAreaElement));
|
| textAreaElement->setValue("testB");
|
| EXPECT_TRUE(client.textIsUpdated());
|
| info = webViewImpl->textInputInfo();
|
| @@ -2040,7 +2040,7 @@ TEST_F(WebViewTest, NonUserInputTextUpdate)
|
| EXPECT_FALSE(client.textIsUpdated());
|
| document->setFocusedElement(nullptr);
|
| webViewImpl->setFocus(false);
|
| - EXPECT_NE(document->focusedElement(), static_cast<WebCore::Element*>(textAreaElement));
|
| + EXPECT_NE(document->focusedElement(), static_cast<blink::Element*>(textAreaElement));
|
| inputElement->setValue("testB3");
|
| EXPECT_FALSE(client.textIsUpdated());
|
|
|
| @@ -2061,7 +2061,7 @@ TEST_F(WebViewTest, FirstUserGestureObservedKeyEvent)
|
| EXPECT_EQ(0, client.getUserGestureNotificationsCount());
|
|
|
| WebKeyboardEvent keyEvent;
|
| - keyEvent.windowsKeyCode = WebCore::VKEY_SPACE;
|
| + keyEvent.windowsKeyCode = blink::VKEY_SPACE;
|
| keyEvent.type = WebInputEvent::RawKeyDown;
|
| keyEvent.setKeyIdentifierFromWindowsKeyCode();
|
| webView->handleInputEvent(keyEvent);
|
|
|