Title: [98718] trunk/Tools
- Revision
- 98718
- Author
- [email protected]
- Date
- 2011-10-28 05:20:13 -0700 (Fri, 28 Oct 2011)
Log Message
[Qt] MiniBrowser needs a -window-size option
https://bugs.webkit.org/show_bug.cgi?id=70999
Reviewed by Simon Hausmann.
Add an -window-size option useful for testing the viewport handling.
Also clean up the option handling.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::handleUserOptions):
* MiniBrowser/qt/MiniBrowserApplication.h:
(WindowOptions::WindowOptions):
(WindowOptions::setRequestedWindowSize):
(WindowOptions::requestedWindowSize):
* MiniBrowser/qt/utils.cpp:
(takeOptionValue):
* MiniBrowser/qt/utils.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98717 => 98718)
--- trunk/Tools/ChangeLog 2011-10-28 12:18:03 UTC (rev 98717)
+++ trunk/Tools/ChangeLog 2011-10-28 12:20:13 UTC (rev 98718)
@@ -1,3 +1,25 @@
+2011-10-28 Kenneth Rohde Christiansen <[email protected]>
+
+ [Qt] MiniBrowser needs a -window-size option
+ https://bugs.webkit.org/show_bug.cgi?id=70999
+
+ Reviewed by Simon Hausmann.
+
+ Add an -window-size option useful for testing the viewport handling.
+ Also clean up the option handling.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::handleUserOptions):
+ * MiniBrowser/qt/MiniBrowserApplication.h:
+ (WindowOptions::WindowOptions):
+ (WindowOptions::setRequestedWindowSize):
+ (WindowOptions::requestedWindowSize):
+ * MiniBrowser/qt/utils.cpp:
+ (takeOptionValue):
+ * MiniBrowser/qt/utils.h:
+
2011-10-28 Jochen Eisinger <[email protected]>
Add allowScriptFromSource callback to FrameLoaderClient
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (98717 => 98718)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-10-28 12:18:03 UTC (rev 98717)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-10-28 12:20:13 UTC (rev 98718)
@@ -53,7 +53,7 @@
if (options->startMaximized())
setWindowState(Qt::WindowMaximized);
else
- resize(800, 600);
+ resize(options->requestedWindowSize());
show();
}
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (98717 => 98718)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-10-28 12:18:03 UTC (rev 98717)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-10-28 12:20:13 UTC (rev 98718)
@@ -175,6 +175,7 @@
qDebug() << "Usage:" << programName.toLatin1().data()
<< "[--touch]"
<< "[--maximize]"
+ << "[--window-size (width)x(height)]"
<< "[-r list]"
<< "[--robot-timeout seconds]"
<< "[--robot-extra-time seconds]"
@@ -196,11 +197,16 @@
}
m_windowOptions.setUseTouchWebView(takeOptionFlag(&args, "--touch"));
+ m_windowOptions.setPrintLoadedUrls(takeOptionFlag(&args, "-v"));
m_windowOptions.setStartMaximized(takeOptionFlag(&args, "--maximize"));
- m_windowOptions.setPrintLoadedUrls(takeOptionFlag(&args, "-v"));
- m_robotTimeoutSeconds = takeOptionValue(&args, "--robot-timeout").toInt();
- m_robotExtraTimeSeconds = takeOptionValue(&args, "--robot-extra-time").toInt();
+ if (args.contains("--window-size")) {
+ QString value = takeOptionValue(&args, "--window-size");
+ QStringList list = value.split(QRegExp("\\D+"), QString::SkipEmptyParts);
+ if (list.length() == 2)
+ m_windowOptions.setRequestedWindowSize(QSize(list.at(0).toInt(), list.at(1).toInt()));
+ }
+
if (args.contains("-r")) {
QString listFile = takeOptionValue(&args, "-r");
if (listFile.isEmpty())
@@ -210,6 +216,10 @@
m_isRobotized = true;
m_urls = QStringList(listFile);
+
+ // toInt() returns 0 if it fails parsing.
+ m_robotTimeoutSeconds = takeOptionValue(&args, "--robot-timeout").toInt();
+ m_robotExtraTimeSeconds = takeOptionValue(&args, "--robot-extra-time").toInt();
} else {
int urlArg = args.indexOf(QRegExp("^[^-].*"));
if (urlArg != -1)
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (98717 => 98718)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-10-28 12:18:03 UTC (rev 98717)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-10-28 12:20:13 UTC (rev 98718)
@@ -50,6 +50,7 @@
, m_printLoadedUrls(false)
, m_useTouchWebView(false)
, m_startMaximized(false)
+ , m_windowSize(QSize(800, 600))
{
}
@@ -59,11 +60,14 @@
bool useTouchWebView() const { return m_useTouchWebView; }
void setStartMaximized(bool enabled) { m_startMaximized = enabled; }
bool startMaximized() const { return m_startMaximized; }
+ void setRequestedWindowSize(const QSize& size) { m_windowSize = size; }
+ QSize requestedWindowSize() const { return m_windowSize; }
private:
bool m_printLoadedUrls;
bool m_useTouchWebView;
bool m_startMaximized;
+ QSize m_windowSize;
};
class MiniBrowserApplication : public QApplication {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
