Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)

New snapshot with prospective Mountain Lion build fix

6 files changed, 26 insertions, 26 deletions

diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 12d659a51..0ecf622f3 100755
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -388,7 +388,7 @@ WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent)
 }
 
 DumpRenderTree::DumpRenderTree()
-    : m_dumpPixels(false)
+    : m_dumpPixelsForAllTests(false)
     , m_stdin(0)
     , m_enableTextOutput(false)
     , m_standAloneMode(false)
@@ -606,7 +606,7 @@ void DumpRenderTree::open(const QUrl& url)
 
     if (isDumpAsTextTest(url)) {
         layoutTestController()->dumpAsText();
-        setDumpPixels(false);
+        setDumpPixelsForAllTests(false);
     }
 
     if (isGlobalHistoryTest(url))
@@ -692,14 +692,24 @@ void DumpRenderTree::processLine(const QString &input)
 {
     QString line = input;
 
+    m_dumpPixelsForCurrentTest = false;
     m_expectedHash = QString();
-    if (m_dumpPixels) {
-        // single quote marks the pixel dump hash
-        int i = line.indexOf('\'');
-        if (i > -1) {
-            m_expectedHash = line.mid(i + 1, line.length());
-            line.remove(i, line.length());
+    // single quote marks the pixel dump hash
+    int indexOfFirstSeparator = line.indexOf('\'');
+    int indexOfSecondSeparator = line.indexOf('\'', indexOfFirstSeparator + 1);
+    if (indexOfFirstSeparator > -1) {
+        int indexOfPixelHash = indexOfFirstSeparator + 1;
+
+        // NRWT passes --pixel-test if we should dump pixels for the test.
+        const QString expectedArg(QLatin1String("--pixel-test"));
+        QString argTest = line.mid(indexOfFirstSeparator + 1, expectedArg.length());
+        if (argTest == expectedArg) {
+            m_dumpPixelsForCurrentTest = true;
+            indexOfPixelHash = indexOfSecondSeparator == -1 ? -1 : indexOfSecondSeparator + 1;
         }
+        if (indexOfPixelHash != -1 && indexOfPixelHash < line.size())
+            m_expectedHash = line.mid(indexOfPixelHash);
+        line.remove(indexOfFirstSeparator, line.length());
     }
 
     if (line.startsWith(QLatin1String("http:"))
@@ -731,9 +741,9 @@ void DumpRenderTree::processLine(const QString &input)
     fflush(stdout);
 }
 
-void DumpRenderTree::setDumpPixels(bool dump)
+void DumpRenderTree::setDumpPixelsForAllTests(bool dump)
 {
-    m_dumpPixels = dump;
+    m_dumpPixelsForAllTests = dump;
 }
 
 void DumpRenderTree::closeRemainingWindows()
@@ -951,7 +961,7 @@ void DumpRenderTree::dump()
     fputs("#EOF\n", stdout);
     fputs("#EOF\n", stderr);
 
-    if (m_dumpPixels && !m_controller->shouldDumpAsText()) {
+    if ((m_dumpPixelsForAllTests || m_dumpPixelsForCurrentTest) && !m_controller->shouldDumpAsText()) {
         QImage image;
         if (!m_controller->isPrinting()) {
             image = QImage(m_page->viewportSize(), QImage::Format_ARGB32);
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
index d3928bc99..c4f92983f 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -82,7 +82,7 @@ public:
     void setGraphicsBased(bool flag) { m_graphicsBased = flag; }
     bool isGraphicsBased() { return m_graphicsBased; }
 
-    void setDumpPixels(bool);
+    void setDumpPixelsForAllTests(bool);
 
     void closeRemainingWindows();
     void resetToConsistentStateBeforeTesting(const QUrl&);
@@ -142,7 +142,8 @@ private:
     QString dumpFrameScrollPosition(QWebFrame* frame);
     LayoutTestController *m_controller;
 
-    bool m_dumpPixels;
+    bool m_dumpPixelsForAllTests;
+    bool m_dumpPixelsForCurrentTest;
     QString m_expectedHash;
     QStringList m_standAloneModeTestList;
 
diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index e35f900ad..44d6da6a9 100644
--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -716,17 +716,6 @@ int LayoutTestController::workerThreadCount()
     return DumpRenderTreeSupportQt::workerThreadCount();
 }
 
-int LayoutTestController::pageNumberForElementById(const QString& id, float width, float height)
-{
-    // If no size specified, webpage viewport size is used
-    if (!width && !height) {
-        width = m_drt->webPage()->viewportSize().width();
-        height = m_drt->webPage()->viewportSize().height();
-    }
-
-    return DumpRenderTreeSupportQt::pageNumberForElementById(m_drt->webPage()->mainFrame(), id, width, height);
-}
-
 int LayoutTestController::numberOfPages(float width, float height)
 {
     return DumpRenderTreeSupportQt::numberOfPages(m_drt->webPage()->mainFrame(), width, height);
diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 7e7018e1d..6626f8471 100644
--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -211,7 +211,6 @@ public slots:
     void setUserStyleSheetEnabled(bool enabled);
     void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
     int workerThreadCount();
-    int pageNumberForElementById(const QString& id, float width = 0, float height = 0);
     int numberOfPages(float width = maxViewWidth, float height = maxViewHeight);
     bool callShouldCloseOnWebView();
     // For now, this is a no-op. This may change depending on outcome of
diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
index efe946dd1..07afc4670 100644
--- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
@@ -28,6 +28,7 @@ SOURCES += \
     Tests/NullNPPGetValuePointer.cpp \
     Tests/PassDifferentNPPStruct.cpp \
     Tests/PluginScriptableNPObjectInvokeDefault.cpp \
+    Tests/PluginScriptableObjectOverridesAllProperties.cpp \
     Tests/PrivateBrowsing.cpp
 
 WEBKIT += webcore # For NPAPI headers
diff --git a/Tools/DumpRenderTree/qt/main.cpp b/Tools/DumpRenderTree/qt/main.cpp
index 8188f1816..22fbc75c3 100644
--- a/Tools/DumpRenderTree/qt/main.cpp
+++ b/Tools/DumpRenderTree/qt/main.cpp
@@ -192,7 +192,7 @@ int main(int argc, char* argv[])
 
     int index = args.indexOf(QLatin1String("--pixel-tests"));
     if (index != -1) {
-        dumper.setDumpPixels(true);
+        dumper.setDumpPixelsForAllTests(true);
         args.removeAt(index);
     }