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

Unified Diff: Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

Issue 14776006: Add an interface to WebTestDelegate for auto resizing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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: Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
index 9d38dd97c34aee109d39364179ac275f622011ab..451cdb892c7b662980a11aa69db320f5f695779a 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
@@ -359,7 +359,6 @@ void TestRunner::reset()
m_webView->setSelectionColors(0xff1e90ff, 0xff000000, 0xffc8c8c8, 0xff323232);
#endif
m_webView->removeAllUserContent();
- m_webView->disableAutoResizeMode();
}
m_topLoadingFrame = 0;
m_waitUntilDone = false;
@@ -378,6 +377,8 @@ void TestRunner::reset()
m_delegate->setDeviceScaleFactor(1);
m_delegate->setAcceptAllCookies(false);
m_delegate->setLocale("");
+ if (m_webView)
+ m_delegate->disableAutoResizeMode(m_webView->size());
}
m_dumpEditingCallbacks = false;
@@ -1469,7 +1470,7 @@ void TestRunner::enableAutoResizeMode(const CppArgumentList& arguments, CppVaria
int maxHeight = cppVariantToInt32(arguments[3]);
WebKit::WebSize maxSize(maxWidth, maxHeight);
- m_webView->enableAutoResizeMode(minSize, maxSize);
+ m_delegate->enableAutoResizeMode(minSize, maxSize);
result->set(true);
}
@@ -1483,9 +1484,7 @@ void TestRunner::disableAutoResizeMode(const CppArgumentList& arguments, CppVari
int newHeight = cppVariantToInt32(arguments[1]);
WebKit::WebSize newSize(newWidth, newHeight);
- m_delegate->setClientWindowRect(WebRect(0, 0, newSize.width, newSize.height));
- m_webView->disableAutoResizeMode();
- m_webView->resize(newSize);
+ m_delegate->disableAutoResizeMode(newSize);
result->set(true);
}

Powered by Google App Engine
This is Rietveld 408576698