Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5

1 files changed, 9 insertions, 6 deletions

diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index 4927ea8..5f343ff 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -83,16 +83,19 @@ void InspectorClientQt::inspectorDestroyed()
 
 Page* InspectorClientQt::createPage()
 {
-    QWebView* inspectorView = new QWebView;
-    InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
-    inspectorView->setPage(inspectorPage);
-    m_inspectorView.set(inspectorView);
+    QWebView* inspectorView = m_inspectorView.get();
+    if (!inspectorView) {
+        inspectorView = new QWebView;
+        InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
+        inspectorView->setPage(inspectorPage);
+        m_inspectorView.set(inspectorView);
+    }
 
-    inspectorPage->mainFrame()->load(QString::fromLatin1("qrc:/webkit/inspector/inspector.html"));
+    inspectorView->page()->mainFrame()->load(QString::fromLatin1("qrc:/webkit/inspector/inspector.html"));
     m_inspectedWebPage->d->inspectorFrontend = inspectorView;
     m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(inspectorView);
 
-    return m_inspectorView->page()->d->page;
+    return inspectorView->page()->d->page;
 }
 
 String InspectorClientQt::localizedStringsURL()