Changeset 67554 in webkit

Timestamp:

Sep 15, 2010 6:32:02 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] QtTestBrowser crashes when enabling QGraphicsView mode after first loading page without it enabled
​https://bugs.webkit.org/show_bug.cgi?id=35247

Reviewed by Tor Arne Vestbø.

The main issue when changing the views is that the plugins and any other components that
depend on view specific attributes such as the native window id are not teared down.
Even if we had a tear-down procedure, we'd have to re-initialize the plugin after
switching to the new view (QGraphicsWebView). This is a rather uncommon situation, so
we decided to work around this in QtTestBrowser by making toggling between QWebView
and QGraphicsWebView also re-create the page.

• QtTestBrowser/launcherwindow.cpp:

(LauncherWindow::initializeView):

• QtTestBrowser/mainwindow.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (2 diffs)
• QtTestBrowser/mainwindow.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-15  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] QtTestBrowser crashes when enabling QGraphicsView mode after first loading page without it enabled
+        https://bugs.webkit.org/show_bug.cgi?id=35247
+
+        The main issue when changing the views is that the plugins and any other components that
+        depend on view specific attributes such as the native window id are not teared down.
+        Even if we had a tear-down procedure, we'd have to re-initialize the plugin after
+        switching to the new view (QGraphicsWebView). This is a rather uncommon situation, so
+        we decided to work around this in QtTestBrowser by making toggling between QWebView
+        and QGraphicsWebView also re-create the page.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::initializeView):
+        * QtTestBrowser/mainwindow.h:
+
 2010-09-14  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebKitTools/QtTestBrowser/launcherwindow.cpp

@@ -104 +104 @@
 void LauncherWindow::initializeView()
 {
+    QUrl url = m_page->mainFrame()->url();
+    delete m_page;
     delete m_view;
+    m_page = new WebPage(this);
 
     QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
@@ -128 +131 @@
         m_view = view;
     }
+
+    if (url.isValid())
+        m_page->mainFrame()->load(url);
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)

trunk/WebKitTools/QtTestBrowser/mainwindow.h

@@ -66 +66 @@
     LocationEdit* urlEdit;
 
+protected:
     WebPage* m_page;
 };