Title: [106003] trunk/Tools
- Revision
- 106003
- Author
- commit-qu...@webkit.org
- Date
- 2012-01-26 07:28:29 -0800 (Thu, 26 Jan 2012)
Log Message
[Qt] The Qt MiniBrowser crashes when given multiple URL's
https://bugs.webkit.org/show_bug.cgi?id=77009
Patch by Alexander Færøy <alexander.fae...@nokia.com> on 2012-01-26
Reviewed by Simon Hausmann.
This patch fixes a crash in BrowserWindow::newWindow() where a
BrowserWindow-object is constructed with a 0 pointer as the
WindowOptions parameter which leads to a crash.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::newWindow):
* MiniBrowser/qt/BrowserWindow.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (106002 => 106003)
--- trunk/Tools/ChangeLog 2012-01-26 15:20:29 UTC (rev 106002)
+++ trunk/Tools/ChangeLog 2012-01-26 15:28:29 UTC (rev 106003)
@@ -1,3 +1,19 @@
+2012-01-26 Alexander Færøy <alexander.fae...@nokia.com>
+
+ [Qt] The Qt MiniBrowser crashes when given multiple URL's
+ https://bugs.webkit.org/show_bug.cgi?id=77009
+
+ Reviewed by Simon Hausmann.
+
+ This patch fixes a crash in BrowserWindow::newWindow() where a
+ BrowserWindow-object is constructed with a 0 pointer as the
+ WindowOptions parameter which leads to a crash.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::newWindow):
+ * MiniBrowser/qt/BrowserWindow.h:
+
2012-01-26 Jesus Sanchez-Palencia <jesus.palen...@openbossa.org>
[Qt] Use ICU if available
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (106002 => 106003)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2012-01-26 15:20:29 UTC (rev 106002)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2012-01-26 15:28:29 UTC (rev 106003)
@@ -37,6 +37,7 @@
#include <QPointF>
BrowserWindow::BrowserWindow(WindowOptions* options)
+ : m_windowOptions(options)
{
setWindowTitle("MiniBrowser");
setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
@@ -88,7 +89,7 @@
BrowserWindow* BrowserWindow::newWindow(const QString& url)
{
- BrowserWindow* window = new BrowserWindow();
+ BrowserWindow* window = new BrowserWindow(m_windowOptions);
window->load(url);
return window;
}
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.h (106002 => 106003)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2012-01-26 15:20:29 UTC (rev 106002)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2012-01-26 15:28:29 UTC (rev 106003)
@@ -39,7 +39,7 @@
Q_OBJECT
public:
- BrowserWindow(WindowOptions* = 0);
+ BrowserWindow(WindowOptions*);
~BrowserWindow();
void load(const QString& url);
void reload();
@@ -56,6 +56,7 @@
private:
void updateUserAgentList();
+ WindowOptions* m_windowOptions;
QStringList m_userAgentList;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
