Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

4 files changed, 12 insertions, 2 deletions

diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index f9caca6..f119dd0 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -156,7 +156,7 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
     connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
             this, SLOT(setViewGeometry(const QRect & )));
 
-    setNetworkAccessManager(new NetworkAccessManager(this));
+    setNetworkAccessManager(m_drt->networkAccessManager());
     setPluginFactory(new TestPlugin(this));
 }
 
@@ -346,6 +346,7 @@ DumpRenderTree::DumpRenderTree()
 
     QWebSettings::enablePersistentStorage(m_persistentStoragePath);
 
+    m_networkAccessManager = new NetworkAccessManager(this);
     // create our primary testing page/view.
     m_mainView = new QWebView(0);
     m_mainView->resize(QSize(LayoutTestController::maxViewWidth, LayoutTestController::maxViewHeight));
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
index e6449b7..ad41e3a 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -61,6 +61,7 @@ class GCController;
 namespace WebCore {
 
 class WebPage;
+class NetworkAccessManager;
 
 class DumpRenderTree : public QObject {
 Q_OBJECT
@@ -87,6 +88,7 @@ public:
     EventSender *eventSender() const { return m_eventSender; }
     TextInputController *textInputController() const { return m_textInputController; }
     QString persistentStoragePath() const { return m_persistentStoragePath; }
+    NetworkAccessManager *networkAccessManager() const { return m_networkAccessManager; }
 
     QWebPage *createWindow();
     int windowCount() const;
@@ -95,7 +97,6 @@ public:
 
     WebPage *webPage() const { return m_page; }
 
-
 #if defined(Q_WS_X11)
     static void initializeFonts();
 #endif
@@ -136,6 +137,7 @@ private:
     EventSender *m_eventSender;
     TextInputController *m_textInputController;
     GCController* m_gcController;
+    NetworkAccessManager* m_networkAccessManager;
 
     QFile *m_stdin;
 
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 1fadd61..9616835 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -638,5 +638,10 @@ void LayoutTestController::setIconDatabaseEnabled(bool enable)
         QWebSettings::setIconDatabasePath(QString());
 }
 
+void LayoutTestController::setEditingBehavior(const QString& editingBehavior)
+{
+    // FIXME: Implement.
+}
+
 const unsigned LayoutTestController::maxViewWidth = 800;
 const unsigned LayoutTestController::maxViewHeight = 600;
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 1359a6f..5fb40b6 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -193,6 +193,8 @@ public slots:
     // Simulate a request an embedding application could make, populating per-session credential storage.
     void authenticateSession(const QString& url, const QString& username, const QString& password);
 
+    void setEditingBehavior(const QString& editingBehavior);
+
 private slots:
     void processWork();