Title: [111179] trunk/Tools
- Revision
- 111179
- Author
- [email protected]
- Date
- 2012-03-19 07:42:42 -0700 (Mon, 19 Mar 2012)
Log Message
[Qt] Add command line option to set the user agent in the MiniBrowser https://bugs.webkit.org/show_bug.cgi?id=81508
Reviewed by Simon Hausmann.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::webViewExperimental):
* MiniBrowser/qt/BrowserWindow.h:
(BrowserWindow):
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(printHelp):
(MiniBrowserApplication::handleUserOptions):
* MiniBrowser/qt/MiniBrowserApplication.h:
(WindowOptions::WindowOptions):
(WindowOptions::setUserAgent):
(WindowOptions::userAgent):
(WindowOptions):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111178 => 111179)
--- trunk/Tools/ChangeLog 2012-03-19 14:42:17 UTC (rev 111178)
+++ trunk/Tools/ChangeLog 2012-03-19 14:42:42 UTC (rev 111179)
@@ -1,5 +1,26 @@
2012-03-19 Alexander Færøy <[email protected]>
+ [Qt] Add command line option to set the user agent in the MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=81508
+
+ Reviewed by Simon Hausmann.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::webViewExperimental):
+ * MiniBrowser/qt/BrowserWindow.h:
+ (BrowserWindow):
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (printHelp):
+ (MiniBrowserApplication::handleUserOptions):
+ * MiniBrowser/qt/MiniBrowserApplication.h:
+ (WindowOptions::WindowOptions):
+ (WindowOptions::setUserAgent):
+ (WindowOptions::userAgent):
+ (WindowOptions):
+
+2012-03-19 Alexander Færøy <[email protected]>
+
[Qt] Remove dead user agent code from the MiniBrowser.
Reviewed by Simon Hausmann.
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (111178 => 111179)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2012-03-19 14:42:17 UTC (rev 111178)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2012-03-19 14:42:42 UTC (rev 111179)
@@ -63,6 +63,9 @@
resize(options->requestedWindowSize());
show();
}
+
+ if (!options->userAgent().isNull())
+ webViewExperimental()->setUserAgent(options->userAgent());
}
QQuickWebView* BrowserWindow::webView() const
@@ -70,6 +73,11 @@
return rootObject()->property("webview").value<QQuickWebView*>();
}
+QQuickWebViewExperimental* BrowserWindow::webViewExperimental() const
+{
+ return webView()->property("experimental").value<QQuickWebViewExperimental*>();
+}
+
void BrowserWindow::load(const QString& url)
{
QUrl completedUrl = Utils::urlFromUserInput(url);
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.h (111178 => 111179)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2012-03-19 14:42:17 UTC (rev 111178)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2012-03-19 14:42:42 UTC (rev 111179)
@@ -34,6 +34,7 @@
#include <QtQuick/QQuickView>
class QQuickWebView;
+class QQuickWebViewExperimental;
class BrowserWindow : public QQuickView {
Q_OBJECT
@@ -45,6 +46,7 @@
void reload();
void focusAddressBar();
QQuickWebView* webView() const;
+ QQuickWebViewExperimental* webViewExperimental() const;
void updateVisualMockTouchPoints(const QList<QTouchEvent::TouchPoint>& touchPoints);
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (111178 => 111179)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-03-19 14:42:17 UTC (rev 111178)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-03-19 14:42:42 UTC (rev 111179)
@@ -261,6 +261,7 @@
<< "[--window-size (width)x(height)]"
<< "[--maximize]"
<< "[-f] Full screen mode."
+ << "[--user-agent string]"
<< "[-v]"
<< "URL";
}
@@ -289,6 +290,9 @@
m_windowOptions.setStartMaximized(takeOptionFlag(&args, "--maximize"));
m_windowOptions.setStartFullScreen(takeOptionFlag(&args, "-f"));
+ if (args.contains("--user-agent"))
+ m_windowOptions.setUserAgent(takeOptionValue(&args, "--user-agent"));
+
if (args.contains("--window-size")) {
QString value = takeOptionValue(&args, "--window-size");
QStringList list = value.split(QRegExp("\\D+"), QString::SkipEmptyParts);
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (111178 => 111179)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-03-19 14:42:17 UTC (rev 111178)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-03-19 14:42:42 UTC (rev 111179)
@@ -64,6 +64,8 @@
bool startFullScreen() const { return m_startFullScreen; }
void setRequestedWindowSize(const QSize& size) { m_windowSize = size; }
QSize requestedWindowSize() const { return m_windowSize; }
+ void setUserAgent(const QString& userAgent) { m_userAgent = userAgent; }
+ QString userAgent() const { return m_userAgent; }
bool touchMockingEnabled() const { return m_touchMockingEnabled; }
void setTouchMockingEnabled(bool enabled)
{
@@ -82,6 +84,7 @@
bool m_startFullScreen;
bool m_touchMockingEnabled;
QSize m_windowSize;
+ QString m_userAgent;
};
class MiniBrowserApplication : public QGuiApplication {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
