Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)

New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.

1 files changed, 35 insertions, 28 deletions

diff --git a/Source/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp b/Source/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp
index 181fdac45..37e62f67b 100644
--- a/Source/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp
+++ b/Source/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp
@@ -28,39 +28,46 @@ class tst_QWebInspector : public QObject {
     Q_OBJECT
 
 private Q_SLOTS:
-    void attachAndDestroy();
+    void attachAndDestroyPageFirst();
+    void attachAndDestroyInspectorFirst();
+    void attachAndDestroyInternalInspector();
 };
 
-void tst_QWebInspector::attachAndDestroy()
+void tst_QWebInspector::attachAndDestroyPageFirst()
 {
-    {   // External inspector + manual destruction of page first
-        QWebPage* page = new QWebPage();
-        page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-        QWebInspector* inspector = new QWebInspector();
-        inspector->setPage(page);
-        page->updatePositionDependentActions(QPoint(0, 0));
-        page->triggerAction(QWebPage::InspectElement);
+    // External inspector + manual destruction of page first
+    QWebPage* page = new QWebPage();
+    page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    QWebInspector* inspector = new QWebInspector();
+    inspector->setPage(page);
+    page->updatePositionDependentActions(QPoint(0, 0));
+    page->triggerAction(QWebPage::InspectElement);
 
-        delete page;
-        delete inspector;
-    }
-    {   // External inspector + manual destruction of inspector first
-        QWebPage* page = new QWebPage();
-        page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-        QWebInspector* inspector = new QWebInspector();
-        inspector->setPage(page);
-        page->updatePositionDependentActions(QPoint(0, 0));
-        page->triggerAction(QWebPage::InspectElement);
+    delete page;
+    delete inspector;
+}
+
+void tst_QWebInspector::attachAndDestroyInspectorFirst()
+{
+    // External inspector + manual destruction of inspector first
+    QWebPage* page = new QWebPage();
+    page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    QWebInspector* inspector = new QWebInspector();
+    inspector->setPage(page);
+    page->updatePositionDependentActions(QPoint(0, 0));
+    page->triggerAction(QWebPage::InspectElement);
 
-        delete inspector;
-        delete page;
-    }
-    {   // Internal inspector
-        QWebPage page;
-        page.settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-        page.updatePositionDependentActions(QPoint(0, 0));
-        page.triggerAction(QWebPage::InspectElement);
-    }
+    delete inspector;
+    delete page;
+}
+
+void tst_QWebInspector::attachAndDestroyInternalInspector()
+{
+    // Internal inspector
+    QWebPage page;
+    page.settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    page.updatePositionDependentActions(QPoint(0, 0));
+    page.triggerAction(QWebPage::InspectElement);
 }
 
 QTEST_MAIN(tst_QWebInspector)