| Index: Source/testing/runner/TestRunner.cpp
|
| diff --git a/Source/testing/runner/TestRunner.cpp b/Source/testing/runner/TestRunner.cpp
|
| index 27c95d8e9b51ee9a1844c11a2f503be5016fadf7..1406112e7c663026e0a47bc68e364d59358479ee 100644
|
| --- a/Source/testing/runner/TestRunner.cpp
|
| +++ b/Source/testing/runner/TestRunner.cpp
|
| @@ -69,7 +69,7 @@
|
| #include "public/web/linux/WebFontRendering.h"
|
| #endif
|
|
|
| -using namespace WebKit;
|
| +using namespace blink;
|
| using namespace std;
|
|
|
| namespace WebTestRunner {
|
| @@ -729,7 +729,7 @@ bool TestRunner::isPointerLocked()
|
| return m_pointerLocked;
|
| }
|
|
|
| -void TestRunner::setToolTipText(const WebKit::WebString& text)
|
| +void TestRunner::setToolTipText(const blink::WebString& text)
|
| {
|
| m_tooltipText.set(text.utf8());
|
| }
|
| @@ -739,7 +739,7 @@ bool TestRunner::midiAccessorResult()
|
| return m_midiAccessorResult;
|
| }
|
|
|
| -TestRunner::TestPageOverlay::TestPageOverlay(WebKit::WebView* webView) : m_webView(webView)
|
| +TestRunner::TestPageOverlay::TestPageOverlay(blink::WebView* webView) : m_webView(webView)
|
| {
|
| }
|
|
|
| @@ -747,7 +747,7 @@ TestRunner::TestPageOverlay::~TestPageOverlay()
|
| {
|
| }
|
|
|
| -void TestRunner::TestPageOverlay::paintPageOverlay(WebKit::WebCanvas* canvas)
|
| +void TestRunner::TestPageOverlay::paintPageOverlay(blink::WebCanvas* canvas)
|
| {
|
| SkRect rect = SkRect::MakeWH(m_webView->size().width, m_webView->size().height);
|
| SkPaint paint;
|
| @@ -939,7 +939,7 @@ public:
|
| bool run(WebTestDelegate*, WebView* webView)
|
| {
|
| webView->mainFrame()->loadHTMLString(
|
| - WebKit::WebData(m_html.data(), m_html.length()), m_baseURL, m_unreachableURL);
|
| + blink::WebData(m_html.data(), m_html.length()), m_baseURL, m_unreachableURL);
|
| return true;
|
| }
|
|
|
| @@ -1249,7 +1249,7 @@ void TestRunner::addOriginAccessWhitelistEntry(const CppArgumentList& arguments,
|
| || !arguments[2].isString() || !arguments[3].isBool())
|
| return;
|
|
|
| - WebKit::WebURL url(GURL(arguments[0].toString()));
|
| + blink::WebURL url(GURL(arguments[0].toString()));
|
| if (!url.isValid())
|
| return;
|
|
|
| @@ -1268,7 +1268,7 @@ void TestRunner::removeOriginAccessWhitelistEntry(const CppArgumentList& argumen
|
| || !arguments[2].isString() || !arguments[3].isBool())
|
| return;
|
|
|
| - WebKit::WebURL url(GURL(arguments[0].toString()));
|
| + blink::WebURL url(GURL(arguments[0].toString()));
|
| if (!url.isValid())
|
| return;
|
|
|
| @@ -1420,13 +1420,13 @@ void TestRunner::setTextDirection(const CppArgumentList& arguments, CppVariant*
|
|
|
| // Map a direction name to a WebTextDirection value.
|
| std::string directionName = arguments[0].toString();
|
| - WebKit::WebTextDirection direction;
|
| + blink::WebTextDirection direction;
|
| if (directionName == "auto")
|
| - direction = WebKit::WebTextDirectionDefault;
|
| + direction = blink::WebTextDirectionDefault;
|
| else if (directionName == "rtl")
|
| - direction = WebKit::WebTextDirectionRightToLeft;
|
| + direction = blink::WebTextDirectionRightToLeft;
|
| else if (directionName == "ltr")
|
| - direction = WebKit::WebTextDirectionLeftToRight;
|
| + direction = blink::WebTextDirectionLeftToRight;
|
| else
|
| return;
|
|
|
| @@ -1477,11 +1477,11 @@ void TestRunner::enableAutoResizeMode(const CppArgumentList& arguments, CppVaria
|
| }
|
| int minWidth = cppVariantToInt32(arguments[0]);
|
| int minHeight = cppVariantToInt32(arguments[1]);
|
| - WebKit::WebSize minSize(minWidth, minHeight);
|
| + blink::WebSize minSize(minWidth, minHeight);
|
|
|
| int maxWidth = cppVariantToInt32(arguments[2]);
|
| int maxHeight = cppVariantToInt32(arguments[3]);
|
| - WebKit::WebSize maxSize(maxWidth, maxHeight);
|
| + blink::WebSize maxSize(maxWidth, maxHeight);
|
|
|
| m_delegate->enableAutoResizeMode(minSize, maxSize);
|
| result->set(true);
|
| @@ -1495,7 +1495,7 @@ void TestRunner::disableAutoResizeMode(const CppArgumentList& arguments, CppVari
|
| }
|
| int newWidth = cppVariantToInt32(arguments[0]);
|
| int newHeight = cppVariantToInt32(arguments[1]);
|
| - WebKit::WebSize newSize(newWidth, newHeight);
|
| + blink::WebSize newSize(newWidth, newHeight);
|
|
|
| m_delegate->disableAutoResizeMode(newSize);
|
| result->set(true);
|
|
|