Source/web/tests/WebFrameTest.cpp - Issue 545123002: Cleanup namespace usage in Source/web/.

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

Issue 545123002: Cleanup namespace usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 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

Index: Source/web/tests/WebFrameTest.cpp

diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp

index 629eec70fd68d5de57cecfe4a7073e72187ea154..ef9878f96847b19b8e21fe5f44d5e06a2957f73a 100644

--- a/Source/web/tests/WebFrameTest.cpp

+++ b/Source/web/tests/WebFrameTest.cpp

@@ -107,17 +107,11 @@

#include <map>

#include <v8.h>

-using namespace blink;

-using blink::Document;

-using blink::DocumentMarker;

-using blink::Element;

-using blink::FloatRect;

-using blink::HitTestRequest;

-using blink::Range;

+namespace {

using blink::URLTestHelpers::toKURL;

using blink::FrameTestHelpers::runPendingTasks;

-namespace {

+using namespace blink;

const int touchPointPadding = 32;

@@ -157,13 +151,13 @@ protected:

void applyViewportStyleOverride(FrameTestHelpers::WebViewHelper* webViewHelper)

{

- RefPtrWillBeRawPtr<blink::StyleSheetContents> styleSheet = blink::StyleSheetContents::create(blink::CSSParserContext(blink::UASheetMode, 0));

+ RefPtrWillBeRawPtr<StyleSheetContents> styleSheet = StyleSheetContents::create(CSSParserContext(UASheetMode, 0));

styleSheet->parseString(String(blink::viewportAndroidCss, sizeof(blink::viewportAndroidCss)));

- OwnPtrWillBeRawPtr<blink::RuleSet> ruleSet = blink::RuleSet::create();

- ruleSet->addRulesFromSheet(styleSheet.get(), blink::MediaQueryEvaluator("screen"));

+ OwnPtrWillBeRawPtr<RuleSet> ruleSet = RuleSet::create();

+ ruleSet->addRulesFromSheet(styleSheet.get(), MediaQueryEvaluator("screen"));

Document* document = toLocalFrame(webViewHelper->webViewImpl()->page()->mainFrame())->document();

- document->ensureStyleResolver().viewportStyleResolver()->collectViewportRules(ruleSet.get(), blink::ViewportStyleResolver::UserAgentOrigin);

+ document->ensureStyleResolver().viewportStyleResolver()->collectViewportRules(ruleSet.get(), ViewportStyleResolver::UserAgentOrigin);

document->ensureStyleResolver().viewportStyleResolver()->resolve();

}

@@ -185,14 +179,14 @@ protected:

webViewHelper->webView()->resize(WebSize(640, 480));

}

- PassOwnPtr<blink::DragImage> nodeImageTestSetup(FrameTestHelpers::WebViewHelper* webViewHelper, const std::string& testcase)

+ PassOwnPtr<DragImage> nodeImageTestSetup(FrameTestHelpers::WebViewHelper* webViewHelper, const std::string& testcase)

{

registerMockedHttpURLLoad("nodeimage.html");

webViewHelper->initializeAndLoad(m_baseURL + "nodeimage.html");

webViewHelper->webView()->resize(WebSize(640, 480));

webViewHelper->webView()->layout();

- RefPtr<blink::LocalFrame> frame = toLocalFrame(webViewHelper->webViewImpl()->page()->mainFrame());

- blink::Element* element = frame->document()->getElementById(testcase.c_str());

+ RefPtr<LocalFrame> frame = toLocalFrame(webViewHelper->webViewImpl()->page()->mainFrame());

+ Element* element = frame->document()->getElementById(testcase.c_str());

return frame->nodeImage(*element);

}

@@ -204,15 +198,15 @@ class UseMockScrollbarSettings {

public:

UseMockScrollbarSettings()

{

- blink::Settings::setMockScrollbarsEnabled(true);

- blink::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);

- EXPECT_TRUE(blink::ScrollbarTheme::theme()->usesOverlayScrollbars());

+ Settings::setMockScrollbarsEnabled(true);

+ RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);

+ EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars());

}

~UseMockScrollbarSettings()

{

- blink::Settings::setMockScrollbarsEnabled(false);

- blink::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);

+ Settings::setMockScrollbarsEnabled(false);

+ RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);

}

};

@@ -647,9 +641,9 @@ TEST_F(WebFrameTest, PostMessageThenDetach)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad("about:blank");

- RefPtr<blink::LocalFrame> frame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());

- blink::NonThrowableExceptionState exceptionState;

- frame->domWindow()->postMessage(blink::SerializedScriptValue::create("message"), 0, "*", frame->domWindow(), exceptionState);

+ RefPtr<LocalFrame> frame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());

+ NonThrowableExceptionState exceptionState;

+ frame->domWindow()->postMessage(SerializedScriptValue::create("message"), 0, "*", frame->domWindow(), exceptionState);

webViewHelper.reset();

EXPECT_FALSE(exceptionState.hadException());

@@ -689,11 +683,11 @@ TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)

webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));

webViewHelper.webView()->layout();

- webViewHelper.webViewImpl()->setFixedLayoutSize(blink::IntSize(100, 100));

+ webViewHelper.webViewImpl()->setFixedLayoutSize(IntSize(100, 100));

EXPECT_TRUE(webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->needsLayout());

int prevLayoutCount = webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutCount();

- webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->setFrameRect(blink::IntRect(0, 0, 641, 481));

+ webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->setFrameRect(IntRect(0, 0, 641, 481));

EXPECT_EQ(prevLayoutCount, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutCount());

webViewHelper.webViewImpl()->layout();

@@ -703,7 +697,7 @@ TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)

static bool checkOrSetTextAutosizingMultiplier(Document* document, float multiplier, bool setMultiplier)

{

bool multiplierCheckedOrSetAtLeastOnce = false;

- for (blink::RenderObject* renderer = document->renderView(); renderer; renderer = renderer->nextInPreOrder()) {

+ for (RenderObject* renderer = document->renderView(); renderer; renderer = renderer->nextInPreOrder()) {

if (renderer->style()) {

if (setMultiplier)

renderer->style()->setTextAutosizingMultiplier(multiplier);

@@ -737,7 +731,7 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutResetsTextAutosizingMultipliers)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);

- blink::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

+ Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

document->settings()->setTextAutosizingEnabled(true);

EXPECT_TRUE(document->settings()->textAutosizingEnabled());

webViewHelper.webViewImpl()->resize(WebSize(viewportWidth, viewportHeight));

@@ -745,10 +739,10 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutResetsTextAutosizingMultipliers)

EXPECT_TRUE(setTextAutosizingMultiplier(document, 2));

- blink::ViewportDescription description = document->viewportDescription();

+ ViewportDescription description = document->viewportDescription();

// Choose a width that's not going match the viewport width of the loaded document.

- description.minWidth = blink::Length(100, blink::Fixed);

- description.maxWidth = blink::Length(100, blink::Fixed);

+ description.minWidth = Length(100, blink::Fixed);

+ description.maxWidth = Length(100, blink::Fixed);

webViewHelper.webViewImpl()->updatePageDefinedViewportConstraints(description);

EXPECT_TRUE(checkTextAutosizingMultiplier(document, 1));

@@ -767,29 +761,29 @@ TEST_F(WebFrameTest, SetFrameRectInvalidatesTextAutosizingMultipliers)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "iframe_reload.html", true, 0, &client, enableViewportSettings);

- blink::LocalFrame* mainFrame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());

- blink::Document* document = mainFrame->document();

- blink::FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ LocalFrame* mainFrame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());

+ Document* document = mainFrame->document();

+ FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

document->settings()->setTextAutosizingEnabled(true);

EXPECT_TRUE(document->settings()->textAutosizingEnabled());

webViewHelper.webViewImpl()->resize(WebSize(viewportWidth, viewportHeight));

webViewHelper.webViewImpl()->layout();

- for (blink::Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {

+ for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {

if (!frame->isLocalFrame())

continue;

EXPECT_TRUE(setTextAutosizingMultiplier(toLocalFrame(frame)->document(), 2));

- for (blink::RenderObject* renderer = toLocalFrame(frame)->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {

+ for (RenderObject* renderer = toLocalFrame(frame)->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {

if (renderer->isText())

EXPECT_FALSE(renderer->needsLayout());

}

- frameView->setFrameRect(blink::IntRect(0, 0, 200, 200));

- for (blink::Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {

+ frameView->setFrameRect(IntRect(0, 0, 200, 200));

+ for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {

if (!frame->isLocalFrame())

continue;

- for (blink::RenderObject* renderer = toLocalFrame(frame)->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {

+ for (RenderObject* renderer = toLocalFrame(frame)->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {

if (renderer->isText())

EXPECT_TRUE(renderer->needsLayout());

}

@@ -1056,8 +1050,8 @@ TEST_F(WebFrameTest, DelayedViewportInitialScale)

EXPECT_EQ(0.25f, webViewHelper.webView()->pageScaleFactor());

- blink::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

- blink::ViewportDescription description = document->viewportDescription();

+ Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

+ ViewportDescription description = document->viewportDescription();

description.zoom = 2;

document->setViewportDescription(description);

webViewHelper.webView()->layout();

@@ -1539,27 +1533,27 @@ TEST_F(WebFrameTest, LayoutSize320Quirk)

// The magic number to snap to device-width is 320, so test that 321 is

// respected.

- blink::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

- blink::ViewportDescription description = document->viewportDescription();

- description.minWidth = blink::Length(321, blink::Fixed);

- description.maxWidth = blink::Length(321, blink::Fixed);

+ Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

+ ViewportDescription description = document->viewportDescription();

+ description.minWidth = Length(321, blink::Fixed);

+ description.maxWidth = Length(321, blink::Fixed);

document->setViewportDescription(description);

webViewHelper.webView()->layout();

EXPECT_EQ(321, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());

- description.minWidth = blink::Length(320, blink::Fixed);

- description.maxWidth = blink::Length(320, blink::Fixed);

+ description.minWidth = Length(320, blink::Fixed);

+ description.maxWidth = Length(320, blink::Fixed);

document->setViewportDescription(description);

webViewHelper.webView()->layout();

EXPECT_EQ(600, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());

description = document->viewportDescription();

- description.maxHeight = blink::Length(1000, blink::Fixed);

+ description.maxHeight = Length(1000, blink::Fixed);

document->setViewportDescription(description);

webViewHelper.webView()->layout();

EXPECT_EQ(1000, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height());

- description.maxHeight = blink::Length(320, blink::Fixed);

+ description.maxHeight = Length(320, blink::Fixed);

document->setViewportDescription(description);

webViewHelper.webView()->layout();

EXPECT_EQ(800, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height());

@@ -1606,8 +1600,8 @@ TEST_F(WebFrameTest, OverflowHiddenDisablesScrolling)

FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden.html");

webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));

- blink::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

- EXPECT_FALSE(view->userInputScrollable(blink::VerticalScrollbar));

+ FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ EXPECT_FALSE(view->userInputScrollable(VerticalScrollbar));

}

TEST_F(WebFrameTest, IgnoreOverflowHiddenQuirk)

@@ -1625,8 +1619,8 @@ TEST_F(WebFrameTest, IgnoreOverflowHiddenQuirk)

FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden.html");

webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));

- blink::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

- EXPECT_TRUE(view->userInputScrollable(blink::VerticalScrollbar));

+ FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ EXPECT_TRUE(view->userInputScrollable(VerticalScrollbar));

}

TEST_F(WebFrameTest, NonZeroValuesNoQuirk)

@@ -1756,21 +1750,21 @@ TEST_F(WebFrameTest, pageScaleFactorShrinksViewport)

webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));

webViewHelper.webView()->layout();

- blink::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

int viewportWidthMinusScrollbar = viewportWidth - (view->verticalScrollbar()->isOverlayScrollbar() ? 0 : 15);

int viewportHeightMinusScrollbar = viewportHeight - (view->horizontalScrollbar()->isOverlayScrollbar() ? 0 : 15);

webViewHelper.webView()->setPageScaleFactor(2);

- blink::IntSize unscaledSize = view->unscaledVisibleContentSize(blink::IncludeScrollbars);

+ IntSize unscaledSize = view->unscaledVisibleContentSize(IncludeScrollbars);

EXPECT_EQ(viewportWidth, unscaledSize.width());

EXPECT_EQ(viewportHeight, unscaledSize.height());

- blink::IntSize unscaledSizeMinusScrollbar = view->unscaledVisibleContentSize(blink::ExcludeScrollbars);

+ IntSize unscaledSizeMinusScrollbar = view->unscaledVisibleContentSize(ExcludeScrollbars);

EXPECT_EQ(viewportWidthMinusScrollbar, unscaledSizeMinusScrollbar.width());

EXPECT_EQ(viewportHeightMinusScrollbar, unscaledSizeMinusScrollbar.height());

- blink::IntSize scaledSize = view->visibleContentRect().size();

+ IntSize scaledSize = view->visibleContentRect().size();

EXPECT_EQ(ceil(viewportWidthMinusScrollbar / 2.0), scaledSize.width());

EXPECT_EQ(ceil(viewportHeightMinusScrollbar / 2.0), scaledSize.height());

}

@@ -2039,9 +2033,9 @@ TEST_F(WebFrameTest, DesktopPageCanBeZoomedInWhenWideViewportIsTurnedOff)

class WebFrameResizeTest : public WebFrameTest {

protected:

- static blink::FloatSize computeRelativeOffset(const blink::IntPoint& absoluteOffset, const blink::LayoutRect& rect)

+ static FloatSize computeRelativeOffset(const IntPoint& absoluteOffset, const LayoutRect& rect)

{

- blink::FloatSize relativeOffset = blink::FloatPoint(absoluteOffset) - rect.location();

+ FloatSize relativeOffset = FloatPoint(absoluteOffset) - rect.location();

relativeOffset.scale(1.f / rect.width(), 1.f / rect.height());

return relativeOffset;

}

@@ -2096,16 +2090,16 @@ protected:

EXPECT_NEAR(expectedPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor(), 0.05f);

webViewHelper.webViewImpl()->mainFrame()->setScrollOffset(scrollOffset);

- blink::IntPoint anchorPoint = blink::IntPoint(scrollOffset) + blink::IntPoint(viewportSize.width / 2, 0);

- RefPtrWillBeRawPtr<blink::Node> anchorNode = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().hitTestResultAtPoint(anchorPoint, HitTestRequest::ReadOnly | HitTestRequest::Active).innerNode();

+ IntPoint anchorPoint = IntPoint(scrollOffset) + IntPoint(viewportSize.width / 2, 0);

+ RefPtrWillBeRawPtr<Node> anchorNode = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().hitTestResultAtPoint(anchorPoint, HitTestRequest::ReadOnly | HitTestRequest::Active).innerNode();

ASSERT(anchorNode);

pageScaleFactor = webViewHelper.webViewImpl()->pageScaleFactor();

- const blink::FloatSize preResizeRelativeOffset

+ const FloatSize preResizeRelativeOffset

= computeRelativeOffset(anchorPoint, anchorNode->boundingBox());

webViewHelper.webViewImpl()->resize(WebSize(viewportSize.height, viewportSize.width));

- blink::IntPoint newAnchorPoint = blink::IntPoint(webViewHelper.webViewImpl()->mainFrame()->scrollOffset()) + blink::IntPoint(viewportSize.height / 2, 0);

- const blink::FloatSize postResizeRelativeOffset

+ IntPoint newAnchorPoint = IntPoint(webViewHelper.webViewImpl()->mainFrame()->scrollOffset()) + IntPoint(viewportSize.height / 2, 0);

+ const FloatSize postResizeRelativeOffset

= computeRelativeOffset(newAnchorPoint, anchorNode->boundingBox());

EXPECT_NEAR(preResizeRelativeOffset.width(), postResizeRelativeOffset.width(), 0.15f);

expectedPageScaleFactor = pageScaleFactor * (shouldScaleRelativeToViewportWidth ? 1 / aspectRatio : 1);

@@ -2198,13 +2192,13 @@ TEST_F(WebFrameTest, pageScaleFactorScalesPaintClip)

bitmap.eraseColor(0);

SkCanvas canvas(bitmap);

- blink::GraphicsContext context(&canvas);

+ GraphicsContext context(&canvas);

context.setRegionTrackingMode(GraphicsContext::RegionTrackingOpaque);

- EXPECT_EQ_RECT(blink::IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());

+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());

- blink::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

- blink::IntRect paintRect(0, 0, 200, 200);

+ FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ IntRect paintRect(0, 0, 200, 200);

view->paint(&context, paintRect);

// FIXME: This test broke in release builds when changing the FixedLayoutTestWebViewClient

@@ -2214,7 +2208,7 @@ TEST_F(WebFrameTest, pageScaleFactorScalesPaintClip)

#ifndef NDEBUG

int viewportWidthMinusScrollbar = 50 - (view->verticalScrollbar()->isOverlayScrollbar() ? 0 : 15);

int viewportHeightMinusScrollbar = 50 - (view->horizontalScrollbar()->isOverlayScrollbar() ? 0 : 15);

- blink::IntRect clippedRect(0, 0, viewportWidthMinusScrollbar * 2, viewportHeightMinusScrollbar * 2);

+ IntRect clippedRect(0, 0, viewportWidthMinusScrollbar * 2, viewportHeightMinusScrollbar * 2);

EXPECT_EQ_RECT(clippedRect, context.opaqueRegion().asRect());

#endif

}

@@ -2234,14 +2228,14 @@ TEST_F(WebFrameTest, pageScaleFactorUpdatesScrollbars)

webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));

webViewHelper.webView()->layout();

- blink::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

- EXPECT_EQ(view->scrollSize(blink::HorizontalScrollbar), view->contentsSize().width() - view->visibleContentRect().width());

- EXPECT_EQ(view->scrollSize(blink::VerticalScrollbar), view->contentsSize().height() - view->visibleContentRect().height());

+ FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ EXPECT_EQ(view->scrollSize(HorizontalScrollbar), view->contentsSize().width() - view->visibleContentRect().width());

+ EXPECT_EQ(view->scrollSize(VerticalScrollbar), view->contentsSize().height() - view->visibleContentRect().height());

webViewHelper.webView()->setPageScaleFactor(10);

- EXPECT_EQ(view->scrollSize(blink::HorizontalScrollbar), view->contentsSize().width() - view->visibleContentRect().width());

- EXPECT_EQ(view->scrollSize(blink::VerticalScrollbar), view->contentsSize().height() - view->visibleContentRect().height());

+ EXPECT_EQ(view->scrollSize(HorizontalScrollbar), view->contentsSize().width() - view->visibleContentRect().width());

+ EXPECT_EQ(view->scrollSize(VerticalScrollbar), view->contentsSize().height() - view->visibleContentRect().height());

}

TEST_F(WebFrameTest, CanOverrideScaleLimits)

@@ -2292,7 +2286,7 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers)

webViewHelper.webView()->resize(WebSize(viewWidth, viewHeight));

FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "large-div.html");

- blink::FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

EXPECT_TRUE(view->renderView()->compositor()->layerForHorizontalScrollbar());

EXPECT_TRUE(view->renderView()->compositor()->layerForVerticalScrollbar());

@@ -2302,7 +2296,7 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers)

EXPECT_FALSE(view->renderView()->compositor()->layerForVerticalScrollbar());

}

-void setScaleAndScrollAndLayout(blink::WebView* webView, WebPoint scroll, float scale)

+void setScaleAndScrollAndLayout(WebView* webView, WebPoint scroll, float scale)

{

webView->setPageScaleFactor(scale);

webView->setMainFrameScrollOffset(WebPoint(scroll.x, scroll.y));

@@ -2370,7 +2364,7 @@ TEST_F(WebFrameTest, DivAutoZoomParamsTest)

void simulatePageScale(WebViewImpl* webViewImpl, float& scale)

{

- blink::IntSize scrollDelta = webViewImpl->fakePageScaleAnimationTargetPositionForTesting() - webViewImpl->mainFrameImpl()->frameView()->scrollPosition();

+ IntSize scrollDelta = webViewImpl->fakePageScaleAnimationTargetPositionForTesting() - webViewImpl->mainFrameImpl()->frameView()->scrollPosition();

float scaleDelta = webViewImpl->fakePageScaleAnimationPageScaleForTesting() / webViewImpl->pageScaleFactor();

webViewImpl->applyScrollAndScale(scrollDelta, scaleDelta);

scale = webViewImpl->pageScaleFactor();

@@ -2704,7 +2698,7 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)

webViewHelper.webViewImpl()->selectionBounds(caret, rect);

float scale;

- blink::IntPoint scroll;

+ IntPoint scroll;

bool needAnimation;

webViewHelper.webViewImpl()->computeScaleAndScrollForFocusedNode(webViewHelper.webViewImpl()->focusedElement(), scale, scroll, needAnimation);

EXPECT_TRUE(needAnimation);

@@ -2776,7 +2770,7 @@ TEST_F(WebFrameTest, ReloadDoesntSetRedirect)

class ReloadWithOverrideURLTask : public WebThread::Task {

public:

- ReloadWithOverrideURLTask(WebFrame* frame, const blink::KURL& url, bool ignoreCache)

+ ReloadWithOverrideURLTask(WebFrame* frame, const KURL& url, bool ignoreCache)

: m_frame(frame), m_url(url), m_ignoreCache(ignoreCache)

{

}

@@ -2788,7 +2782,7 @@ public:

private:

WebFrame* const m_frame;

- const blink::KURL m_url;

+ const KURL m_url;

const bool m_ignoreCache;

};

@@ -3154,7 +3148,7 @@ TEST_F(WebFrameTest, GetContentAsPlainText)

// Generate a simple test case.

const char simpleSource[] = "<div>Foo bar</div><div></div>baz";

- blink::KURL testURL = toKURL("about:blank");

+ KURL testURL = toKURL("about:blank");

FrameTestHelpers::loadHTMLString(frame, simpleSource, testURL);

// Make sure it comes out OK.

@@ -3193,7 +3187,7 @@ TEST_F(WebFrameTest, GetFullHtmlOfPage)

// Generate a simple test case.

const char simpleSource[] = "<p>Hello</p><p>World</p>";

- blink::KURL testURL = toKURL("about:blank");

+ KURL testURL = toKURL("about:blank");

FrameTestHelpers::loadHTMLString(frame, simpleSource, testURL);

WebString text = frame->contentAsText(std::numeric_limits<size_t>::max());

@@ -3435,7 +3429,7 @@ TEST_F(WebFrameTest, FindOnDetachedFrame)

WebString searchText = WebString::fromUTF8(kFindString);

WebLocalFrameImpl* mainFrame = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame());

RefPtr<WebLocalFrameImpl> secondFrame = toWebLocalFrameImpl(mainFrame->traverseNext(false));

- RefPtr<blink::LocalFrame> holdSecondFrame = secondFrame->frame();

+ RefPtr<LocalFrame> holdSecondFrame = secondFrame->frame();

// Detach the frame before finding.

EXPECT_TRUE(mainFrame->document().getElementById("frame").remove());

@@ -3476,7 +3470,7 @@ TEST_F(WebFrameTest, FindDetachFrameBeforeScopeStrings)

WebString searchText = WebString::fromUTF8(kFindString);

WebLocalFrameImpl* mainFrame = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame());

WebLocalFrameImpl* secondFrame = toWebLocalFrameImpl(mainFrame->traverseNext(false));

- RefPtr<blink::LocalFrame> holdSecondFrame = secondFrame->frame();

+ RefPtr<LocalFrame> holdSecondFrame = secondFrame->frame();

for (WebFrame* frame = mainFrame; frame; frame = frame->traverseNext(false))

EXPECT_TRUE(frame->find(kFindIdentifier, searchText, options, false, 0));

@@ -3517,7 +3511,7 @@ TEST_F(WebFrameTest, FindDetachFrameWhileScopingStrings)

WebString searchText = WebString::fromUTF8(kFindString);

WebLocalFrameImpl* mainFrame = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame());

WebLocalFrameImpl* secondFrame = toWebLocalFrameImpl(mainFrame->traverseNext(false));

- RefPtr<blink::LocalFrame> holdSecondFrame = secondFrame->frame();

+ RefPtr<LocalFrame> holdSecondFrame = secondFrame->frame();

for (WebFrame* frame = mainFrame; frame; frame = frame->traverseNext(false))

EXPECT_TRUE(frame->find(kFindIdentifier, searchText, options, false, 0));

@@ -3596,30 +3590,30 @@ TEST_F(WebFrameTest, SetTickmarks)

EXPECT_TRUE(client.findResultsAreReady());

// Get the tickmarks for the original find request.

- blink::FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

- RefPtr<blink::Scrollbar> scrollbar = frameView->createScrollbar(blink::HorizontalScrollbar);

- Vector<blink::IntRect> originalTickmarks;

+ FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ RefPtr<Scrollbar> scrollbar = frameView->createScrollbar(HorizontalScrollbar);

+ Vector<IntRect> originalTickmarks;

scrollbar->getTickmarks(originalTickmarks);

EXPECT_EQ(4u, originalTickmarks.size());

// Override the tickmarks.

- Vector<blink::IntRect> overridingTickmarksExpected;

- overridingTickmarksExpected.append(blink::IntRect(0, 0, 100, 100));

- overridingTickmarksExpected.append(blink::IntRect(0, 20, 100, 100));

- overridingTickmarksExpected.append(blink::IntRect(0, 30, 100, 100));

+ Vector<IntRect> overridingTickmarksExpected;

+ overridingTickmarksExpected.append(IntRect(0, 0, 100, 100));

+ overridingTickmarksExpected.append(IntRect(0, 20, 100, 100));

+ overridingTickmarksExpected.append(IntRect(0, 30, 100, 100));

mainFrame->setTickmarks(overridingTickmarksExpected);

// Check the tickmarks are overriden correctly.

- Vector<blink::IntRect> overridingTickmarksActual;

+ Vector<IntRect> overridingTickmarksActual;

scrollbar->getTickmarks(overridingTickmarksActual);

EXPECT_EQ(overridingTickmarksExpected, overridingTickmarksActual);

// Reset the tickmark behavior.

- Vector<blink::IntRect> resetTickmarks;

+ Vector<IntRect> resetTickmarks;

mainFrame->setTickmarks(resetTickmarks);

// Check that the original tickmarks are returned

- Vector<blink::IntRect> originalTickmarksAfterReset;

+ Vector<IntRect> originalTickmarksAfterReset;

scrollbar->getTickmarks(originalTickmarksAfterReset);

EXPECT_EQ(originalTickmarks, originalTickmarksAfterReset);

}

@@ -3863,9 +3857,9 @@ TEST_F(WebFrameTest, SelectRangeCanMoveSelectionEnd)

// EXPECT_EQ("Editable 1. Editable 2. ]", selectionAsString(frame));

}

-static int computeOffset(blink::RenderObject* renderer, int x, int y)

+static int computeOffset(RenderObject* renderer, int x, int y)

{

- return blink::VisiblePosition(renderer->positionForPoint(blink::LayoutPoint(x, y))).deepEquivalent().computeOffsetInContainerNode();

+ return VisiblePosition(renderer->positionForPoint(LayoutPoint(x, y))).deepEquivalent().computeOffsetInContainerNode();

}

// positionForPoint returns the wrong values for contenteditable spans. See

@@ -3876,7 +3870,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest)

FrameTestHelpers::WebViewHelper webViewHelper;

initializeTextSelectionWebView(m_baseURL + "select_range_span_editable.html", &webViewHelper);

WebLocalFrameImpl* mainFrame = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame());

- blink::RenderObject* renderer = mainFrame->frame()->selection().rootEditableElement()->renderer();

+ RenderObject* renderer = mainFrame->frame()->selection().rootEditableElement()->renderer();

EXPECT_EQ(0, computeOffset(renderer, -1, -1));

EXPECT_EQ(64, computeOffset(renderer, 1000, 1000));

@@ -4026,7 +4020,7 @@ private:

TEST_F(WebFrameTest, CompositedSelectionBoundsCleared)

{

- blink::RuntimeEnabledFeatures::setCompositedSelectionUpdatesEnabled(true);

+ RuntimeEnabledFeatures::setCompositedSelectionUpdatesEnabled(true);

registerMockedHttpURLLoad("select_range_basic.html");

registerMockedHttpURLLoad("select_range_scroll.html");

@@ -4450,7 +4444,7 @@ class SpellCheckClient : public WebSpellCheckClient {

public:

explicit SpellCheckClient(uint32_t hash = 0) : m_numberOfTimesChecked(0), m_hash(hash) { }

virtual ~SpellCheckClient() { }

- virtual void requestCheckingOfText(const blink::WebString&, const blink::WebVector<uint32_t>&, const blink::WebVector<unsigned>&, blink::WebTextCheckingCompletion* completion) OVERRIDE

+ virtual void requestCheckingOfText(const WebString&, const WebVector<uint32_t>&, const WebVector<unsigned>&, WebTextCheckingCompletion* completion) OVERRIDE

{

++m_numberOfTimesChecked;

Vector<WebTextCheckingResult> results;

@@ -4589,10 +4583,10 @@ public:

virtual ~StubbornSpellCheckClient() { }

virtual void requestCheckingOfText(

- const blink::WebString&,

- const blink::WebVector<uint32_t>&,

- const blink::WebVector<unsigned>&,

- blink::WebTextCheckingCompletion* completion) OVERRIDE

+ const WebString&,

+ const WebVector<uint32_t>&,

+ const WebVector<unsigned>&,

+ WebTextCheckingCompletion* completion) OVERRIDE

{

m_completion = completion;

}

@@ -4629,7 +4623,7 @@ private:

m_completion = 0;

}

- blink::WebTextCheckingCompletion* m_completion;

+ WebTextCheckingCompletion* m_completion;

};

TEST_F(WebFrameTest, SlowSpellcheckMarkerPosition)

@@ -4938,7 +4932,7 @@ public:

if (frame->parent())

return;

EXPECT_FALSE(m_didScrollMainFrame);

- blink::FrameView* view = toWebLocalFrameImpl(frame)->frameView();

+ FrameView* view = toWebLocalFrameImpl(frame)->frameView();

// FrameView can be scrolled in FrameView::setFixedVisibleContentRect

// which is called from LocalFrame::createView (before the frame is associated

// with the the view).

@@ -5069,13 +5063,13 @@ TEST_F(WebFrameTest, SimulateFragmentAnchorMiddleClick)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true, &client);

- blink::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

- blink::KURL destination = document->url();

+ Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

+ KURL destination = document->url();

destination.setFragmentIdentifier("test");

- RefPtrWillBeRawPtr<blink::Event> event = blink::MouseEvent::create(blink::EventTypeNames::click, false, false,

+ RefPtrWillBeRawPtr<Event> event = MouseEvent::create(EventTypeNames::click, false, false,

document->domWindow(), 0, 0, 0, 0, 0, 0, 0, false, false, false, false, 1, nullptr, nullptr);

- blink::FrameLoadRequest frameRequest(document, blink::ResourceRequest(destination));

+ FrameLoadRequest frameRequest(document, ResourceRequest(destination));

frameRequest.setTriggeringEvent(event);

toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);

}

@@ -5118,15 +5112,15 @@ TEST_F(WebFrameTest, ModifiedClickNewWindow)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "ctrl_click.html", true, &webFrameClient, &webViewClient);

- blink::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

- blink::KURL destination = toKURL(m_baseURL + "hello_world.html");

+ Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();

+ KURL destination = toKURL(m_baseURL + "hello_world.html");

// ctrl+click event

- RefPtrWillBeRawPtr<blink::Event> event = blink::MouseEvent::create(blink::EventTypeNames::click, false, false,

+ RefPtrWillBeRawPtr<Event> event = MouseEvent::create(EventTypeNames::click, false, false,

document->domWindow(), 0, 0, 0, 0, 0, 0, 0, true, false, false, false, 0, nullptr, nullptr);

- blink::FrameLoadRequest frameRequest(document, blink::ResourceRequest(destination));

+ FrameLoadRequest frameRequest(document, ResourceRequest(destination));

frameRequest.setTriggeringEvent(event);

- blink::UserGestureIndicator gesture(blink::DefinitelyProcessingUserGesture);

+ UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);

FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webView()->mainFrame());

@@ -5140,8 +5134,8 @@ TEST_F(WebFrameTest, BackToReload)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true);

WebFrame* frame = webViewHelper.webView()->mainFrame();

- const blink::FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

- RefPtr<blink::HistoryItem> firstItem = mainFrameLoader.currentItem();

+ const FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

+ RefPtr<HistoryItem> firstItem = mainFrameLoader.currentItem();

EXPECT_TRUE(firstItem);

registerMockedHttpURLLoad("white-1x1.png");

@@ -5161,7 +5155,7 @@ TEST_F(WebFrameTest, BackDuringChildFrameReload)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "page_with_blank_iframe.html", true);

WebFrame* mainFrame = webViewHelper.webView()->mainFrame();

- const blink::FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

+ const FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

WebFrame* childFrame = mainFrame->firstChild();

ASSERT_TRUE(childFrame);

@@ -5205,8 +5199,8 @@ TEST_F(WebFrameTest, LoadHistoryItemReload)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true);

WebFrame* frame = webViewHelper.webView()->mainFrame();

- const blink::FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

- RefPtr<blink::HistoryItem> firstItem = mainFrameLoader.currentItem();

+ const FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

+ RefPtr<HistoryItem> firstItem = mainFrameLoader.currentItem();

EXPECT_TRUE(firstItem);

registerMockedHttpURLLoad("white-1x1.png");

@@ -5316,7 +5310,7 @@ public:

virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&)

{

- if (toWebLocalFrameImpl(frame)->frame()->loader().loadType() == blink::FrameLoadTypeSame)

+ if (toWebLocalFrameImpl(frame)->frame()->loader().loadType() == FrameLoadTypeSame)

m_frameLoadTypeSameSeen = true;

}

@@ -5334,7 +5328,7 @@ TEST_F(WebFrameTest, NavigateToSame)

webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html", true, &client);

EXPECT_FALSE(client.frameLoadTypeSameSeen());

- blink::FrameLoadRequest frameRequest(0, blink::ResourceRequest(toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document()->url()));

+ FrameLoadRequest frameRequest(0, ResourceRequest(toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document()->url()));

toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);

FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webView()->mainFrame());

@@ -5385,7 +5379,7 @@ TEST_F(WebFrameTest, WebNodeImageContents)

static const char bluePNG[] = "<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGElEQVQYV2NkYPj/n4EIwDiqEF8oUT94AFIQE/cCn90IAAAAAElFTkSuQmCC\">";

// Load up the image and test that we can extract the contents.

- blink::KURL testURL = toKURL("about:blank");

+ KURL testURL = toKURL("about:blank");

FrameTestHelpers::loadHTMLString(frame, bluePNG, testURL);

WebNode node = frame->document().body().firstChild();

@@ -5471,10 +5465,10 @@ TEST_F(WebFrameTest, SameDocumentHistoryNavigationCommitType)

TestDidNavigateCommitTypeWebFrameClient client;

FrameTestHelpers::WebViewHelper webViewHelper;

WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, &client);

- RefPtr<blink::HistoryItem> item = toLocalFrame(webViewImpl->page()->mainFrame())->loader().currentItem();

+ RefPtr<HistoryItem> item = toLocalFrame(webViewImpl->page()->mainFrame())->loader().currentItem();

runPendingTasks();

- toLocalFrame(webViewImpl->page()->mainFrame())->loader().loadHistoryItem(item.get(), blink::HistorySameDocumentLoad);

+ toLocalFrame(webViewImpl->page()->mainFrame())->loader().loadHistoryItem(item.get(), HistorySameDocumentLoad);

EXPECT_EQ(WebBackForwardCommit, client.lastCommitType());

}

@@ -5560,11 +5554,11 @@ TEST_F(WebFrameTest, overflowHiddenRewrite)

webViewHelper.webView()->resize(WebSize(100, 100));

FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "non-scrollable.html");

- blink::RenderLayerCompositor* compositor = webViewHelper.webViewImpl()->compositor();

+ RenderLayerCompositor* compositor = webViewHelper.webViewImpl()->compositor();

ASSERT_TRUE(compositor->scrollLayer());

// Verify that the WebLayer is not scrollable initially.

- blink::GraphicsLayer* scrollLayer = compositor->scrollLayer();

+ GraphicsLayer* scrollLayer = compositor->scrollLayer();

WebLayer* webScrollLayer = scrollLayer->platformLayer();

ASSERT_FALSE(webScrollLayer->userScrollableHorizontal());

ASSERT_FALSE(webScrollLayer->userScrollableVertical());

@@ -5586,7 +5580,7 @@ TEST_F(WebFrameTest, CurrentHistoryItem)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initialize();

WebFrame* frame = webViewHelper.webView()->mainFrame();

- const blink::FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

+ const FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();

WebURLRequest request;

request.initialize();

request.setURL(toKURL(url));

@@ -5598,7 +5592,7 @@ TEST_F(WebFrameTest, CurrentHistoryItem)

FrameTestHelpers::pumpPendingRequestsDoNotUse(frame);

// After commit, there is.

- blink::HistoryItem* item = mainFrameLoader.currentItem();

+ HistoryItem* item = mainFrameLoader.currentItem();

ASSERT_TRUE(item);

EXPECT_EQ(WTF::String(url.data()), item->urlString());

}

@@ -5673,11 +5667,11 @@ TEST_F(WebFrameTest, FrameViewSetFrameRect)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad("about:blank");

- blink::FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

- frameView->setFrameRect(blink::IntRect(0, 0, 200, 200));

- EXPECT_EQ_RECT(blink::IntRect(0, 0, 200, 200), frameView->frameRect());

- frameView->setFrameRect(blink::IntRect(100, 100, 200, 200));

- EXPECT_EQ_RECT(blink::IntRect(100, 100, 200, 200), frameView->frameRect());

+ FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();

+ frameView->setFrameRect(IntRect(0, 0, 200, 200));

+ EXPECT_EQ_RECT(IntRect(0, 0, 200, 200), frameView->frameRect());

+ frameView->setFrameRect(IntRect(100, 100, 200, 200));

+ EXPECT_EQ_RECT(IntRect(100, 100, 200, 200), frameView->frameRect());

}

TEST_F(WebFrameTest, FullscreenLayerNonScrollable)

@@ -5692,21 +5686,21 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)

webViewImpl->layout();

Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();

- blink::UserGestureIndicator gesture(blink::DefinitelyProcessingUserGesture);

+ UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Element* divFullscreen = document->getElementById("div1");

Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);

webViewImpl->didEnterFullScreen();

webViewImpl->layout();

// Verify that the main frame is not scrollable.

- ASSERT_TRUE(blink::Fullscreen::isFullScreen(*document));

+ ASSERT_TRUE(Fullscreen::isFullScreen(*document));

WebLayer* webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();

ASSERT_FALSE(webScrollLayer->scrollable());

// Verify that the main frame is scrollable upon exiting fullscreen.

webViewImpl->didExitFullScreen();

webViewImpl->layout();

- ASSERT_FALSE(blink::Fullscreen::isFullScreen(*document));

+ ASSERT_FALSE(Fullscreen::isFullScreen(*document));

webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();

ASSERT_TRUE(webScrollLayer->scrollable());

}

@@ -5723,13 +5717,13 @@ TEST_F(WebFrameTest, FullscreenMainFrameScrollable)

webViewImpl->layout();

Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();

- blink::UserGestureIndicator gesture(blink::DefinitelyProcessingUserGesture);

+ UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest);

webViewImpl->didEnterFullScreen();

webViewImpl->layout();

// Verify that the main frame is still scrollable.

- ASSERT_TRUE(blink::Fullscreen::isFullScreen(*document));

+ ASSERT_TRUE(Fullscreen::isFullScreen(*document));

WebLayer* webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();

ASSERT_TRUE(webScrollLayer->scrollable());

}

@@ -5745,12 +5739,12 @@ TEST_F(WebFrameTest, RenderBlockPercentHeightDescendants)

webView->layout();

Document* document = toWebLocalFrameImpl(webView->mainFrame())->frame()->document();

- blink::RenderBlock* container = blink::toRenderBlock(document->getElementById("container")->renderer());

- blink::RenderBox* percentHeightInAnonymous = blink::toRenderBox(document->getElementById("percent-height-in-anonymous")->renderer());

- blink::RenderBox* percentHeightDirectChild = blink::toRenderBox(document->getElementById("percent-height-direct-child")->renderer());

+ RenderBlock* container = toRenderBlock(document->getElementById("container")->renderer());

+ RenderBox* percentHeightInAnonymous = toRenderBox(document->getElementById("percent-height-in-anonymous")->renderer());

+ RenderBox* percentHeightDirectChild = toRenderBox(document->getElementById("percent-height-direct-child")->renderer());

- EXPECT_TRUE(blink::RenderBlock::hasPercentHeightDescendant(percentHeightInAnonymous));

- EXPECT_TRUE(blink::RenderBlock::hasPercentHeightDescendant(percentHeightDirectChild));

+ EXPECT_TRUE(RenderBlock::hasPercentHeightDescendant(percentHeightInAnonymous));

+ EXPECT_TRUE(RenderBlock::hasPercentHeightDescendant(percentHeightDirectChild));

ASSERT_TRUE(container->percentHeightDescendants());

ASSERT_TRUE(container->hasPercentHeightDescendants());

@@ -5758,7 +5752,7 @@ TEST_F(WebFrameTest, RenderBlockPercentHeightDescendants)

EXPECT_TRUE(container->percentHeightDescendants()->contains(percentHeightInAnonymous));

EXPECT_TRUE(container->percentHeightDescendants()->contains(percentHeightDirectChild));

- blink::RenderBlock* anonymousBlock = percentHeightInAnonymous->containingBlock();

+ RenderBlock* anonymousBlock = percentHeightInAnonymous->containingBlock();

EXPECT_TRUE(anonymousBlock->isAnonymous());

EXPECT_FALSE(anonymousBlock->hasPercentHeightDescendants());

}

@@ -5820,7 +5814,7 @@ TEST_F(WebFrameTest, ReloadBypassingCache)

EXPECT_EQ(WebURLRequest::ReloadBypassingCache, frame->dataSource()->request().cachePolicy());

}

-static void nodeImageTestValidation(const blink::IntSize& referenceBitmapSize, blink::DragImage* dragImage)

+static void nodeImageTestValidation(const IntSize& referenceBitmapSize, DragImage* dragImage)

{

// Prepare the reference bitmap.

SkBitmap bitmap;

@@ -5838,37 +5832,37 @@ static void nodeImageTestValidation(const blink::IntSize& referenceBitmapSize, b

TEST_F(WebFrameTest, NodeImageTestCSSTransform)

{

FrameTestHelpers::WebViewHelper webViewHelper;

- OwnPtr<blink::DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-transform"));

+ OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-transform"));

EXPECT_TRUE(dragImage);

- nodeImageTestValidation(blink::IntSize(40, 40), dragImage.get());

+ nodeImageTestValidation(IntSize(40, 40), dragImage.get());

}

TEST_F(WebFrameTest, NodeImageTestCSS3DTransform)

{

FrameTestHelpers::WebViewHelper webViewHelper;

- OwnPtr<blink::DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-3dtransform"));

+ OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-3dtransform"));

EXPECT_TRUE(dragImage);

- nodeImageTestValidation(blink::IntSize(20, 40), dragImage.get());

+ nodeImageTestValidation(IntSize(20, 40), dragImage.get());

}

TEST_F(WebFrameTest, NodeImageTestInlineBlock)

{

FrameTestHelpers::WebViewHelper webViewHelper;

- OwnPtr<blink::DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-inlineblock"));

+ OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-inlineblock"));

EXPECT_TRUE(dragImage);

- nodeImageTestValidation(blink::IntSize(40, 40), dragImage.get());

+ nodeImageTestValidation(IntSize(40, 40), dragImage.get());

}

TEST_F(WebFrameTest, NodeImageTestFloatLeft)

{

FrameTestHelpers::WebViewHelper webViewHelper;

- OwnPtr<blink::DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-float-left-overflow-hidden"));

+ OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-float-left-overflow-hidden"));

EXPECT_TRUE(dragImage);

- nodeImageTestValidation(blink::IntSize(40, 40), dragImage.get());

+ nodeImageTestValidation(IntSize(40, 40), dragImage.get());

}

// Crashes on Android: http://crbug.com/403804

@@ -6075,10 +6069,10 @@ TEST_F(WebFrameSwapTest, SwapLastChild)

remoteFrame->close();

}

-class MockDocumentThreadableLoaderClient : public blink::DocumentThreadableLoaderClient {

+class MockDocumentThreadableLoaderClient : public DocumentThreadableLoaderClient {

public:

MockDocumentThreadableLoaderClient() : m_failed(false) { }

- virtual void didFail(const blink::ResourceError&) OVERRIDE { m_failed = true;}

+ virtual void didFail(const ResourceError&) OVERRIDE { m_failed = true;}

void reset() { m_failed = false; }

bool failed() { return m_failed; }

@@ -6094,29 +6088,29 @@ TEST_F(WebFrameTest, LoaderOriginAccess)

FrameTestHelpers::WebViewHelper webViewHelper;

webViewHelper.initializeAndLoad("about:blank");

- blink::SchemeRegistry::registerURLSchemeAsDisplayIsolated("chrome");

+ SchemeRegistry::registerURLSchemeAsDisplayIsolated("chrome");

// Cross-origin request.

- blink::KURL resourceUrl(blink::ParsedURLString, "chrome://test.pdf");

+ KURL resourceUrl(ParsedURLString, "chrome://test.pdf");

registerMockedChromeURLLoad("test.pdf");

- RefPtr<blink::LocalFrame> frame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());

+ RefPtr<LocalFrame> frame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());

MockDocumentThreadableLoaderClient client;

- blink::ThreadableLoaderOptions options;

+ ThreadableLoaderOptions options;

// First try to load the request with regular access. Should fail.

- options.crossOriginRequestPolicy = blink::UseAccessControl;

- blink::ResourceLoaderOptions resourceLoaderOptions;

- blink::DocumentThreadableLoader::loadResourceSynchronously(

- *frame->document(), blink::ResourceRequest(resourceUrl), client, options, resourceLoaderOptions);

+ options.crossOriginRequestPolicy = UseAccessControl;

+ ResourceLoaderOptions resourceLoaderOptions;

+ DocumentThreadableLoader::loadResourceSynchronously(

+ *frame->document(), ResourceRequest(resourceUrl), client, options, resourceLoaderOptions);

EXPECT_TRUE(client.failed());

client.reset();

// Try to load the request with cross origin access. Should succeed.

- options.crossOriginRequestPolicy = blink::AllowCrossOriginRequests;

- blink::DocumentThreadableLoader::loadResourceSynchronously(

- *frame->document(), blink::ResourceRequest(resourceUrl), client, options, resourceLoaderOptions);

+ options.crossOriginRequestPolicy = AllowCrossOriginRequests;

+ DocumentThreadableLoader::loadResourceSynchronously(

+ *frame->document(), ResourceRequest(resourceUrl), client, options, resourceLoaderOptions);

EXPECT_FALSE(client.failed());

}

@@ -6150,7 +6144,7 @@ private:

TEST_F(WebFrameTest, NavigationTransitionCallbacks)

{

- blink::RuntimeEnabledFeatures::setNavigationTransitionsEnabled(true);

+ RuntimeEnabledFeatures::setNavigationTransitionsEnabled(true);

FrameTestHelpers::WebViewHelper viewHelper;

NavigationTransitionCallbackWebFrameClient frameClient;

WebLocalFrame* localFrame = viewHelper.initialize(true, &frameClient)->mainFrame()->toWebLocalFrame();

« no previous file with comments | « Source/web/tests/WebDocumentTest.cpp ('k') | Source/web/tests/WebHelperPluginTest.cpp » ('j') | no next file with comments »