Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests

10 files changed, 59 insertions, 32 deletions

diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp
index caf95058f..588dcf7aa 100644
--- a/Source/WebKit/qt/Api/qwebsettings.cpp
+++ b/Source/WebKit/qt/Api/qwebsettings.cpp
@@ -82,9 +82,7 @@ public:
     QString localStoragePath;
     QString offlineWebApplicationCachePath;
     qint64 offlineStorageDefaultQuota;
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
     QWebSettings::ThirdPartyCookiePolicy thirdPartyCookiePolicy;
-#endif
     void apply();
     WebCore::Settings* settings;
 };
@@ -164,6 +162,10 @@ void QWebSettingsPrivate::apply()
                                  global->attributes.value(QWebSettings::WebGLEnabled));
 
         settings->setWebGLEnabled(value);
+#if ENABLE(CSS_SHADERS)
+        // For now, enable CSS shaders when WebGL is enabled.
+        settings->setCSSCustomFilterEnabled(value);
+#endif
 #if USE(ACCELERATED_COMPOSITING)
         settings->setAcceleratedCompositingForCanvasEnabled(value);
 #endif
@@ -365,7 +367,6 @@ QWebSettings* QWebSettings::globalSettings()
     \value DefaultFixedFontSize The default font size for fixed-pitch text.
 */
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
 /*!
     \enum QWebSettings::ThirdPartyCookiePolicy
 
@@ -380,7 +381,6 @@ QWebSettings* QWebSettings::globalSettings()
 
     \since QtWebKit 2,3
 */
-#endif
 
 /*!
     \enum QWebSettings::WebGraphic
@@ -530,9 +530,7 @@ QWebSettings::QWebSettings()
     d->attributes.insert(QWebSettings::SiteSpecificQuirksEnabled, true);
     d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
     d->defaultTextEncoding = QLatin1String("iso-8859-1");
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
     d->thirdPartyCookiePolicy = AlwaysAllowThirdPartyCookies;
-#endif
 }
 
 /*!
@@ -869,7 +867,6 @@ void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheM
                                     qMax(0, totalCapacity));
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
 /*!
     Sets the third-party cookie policy, the default is AlwaysAllowThirdPartyCookies.
 */
@@ -885,7 +882,6 @@ QWebSettings::ThirdPartyCookiePolicy QWebSettings::thirdPartyCookiePolicy() cons
 {
     return d->thirdPartyCookiePolicy;
 }
-#endif
 
 /*!
     Sets the actual font family to \a family for the specified generic family,
diff --git a/Source/WebKit/qt/Api/qwebsettings.h b/Source/WebKit/qt/Api/qwebsettings.h
index 2e07356f2..835a72e24 100644
--- a/Source/WebKit/qt/Api/qwebsettings.h
+++ b/Source/WebKit/qt/Api/qwebsettings.h
@@ -97,13 +97,11 @@ public:
         DefaultFontSize,
         DefaultFixedFontSize
     };
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
     enum ThirdPartyCookiePolicy {
         AlwaysAllowThirdPartyCookies,
         AlwaysBlockThirdPartyCookies,
         AllowThirdPartyWithExistingCookies
     };
-#endif
 
     static QWebSettings *globalSettings();
 
@@ -156,10 +154,8 @@ public:
 
     static void enablePersistentStorage(const QString& path = QString());
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
     void setThirdPartyCookiePolicy(ThirdPartyCookiePolicy);
     QWebSettings::ThirdPartyCookiePolicy thirdPartyCookiePolicy() const;
-#endif
 
     inline QWebSettingsPrivate* handle() const { return d; }
 
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index dabbee48e..d75294502 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,54 @@
+2012-07-22  Kent Tamura  <tkent@chromium.org>
+
+        Rename ENABLE_METER_TAG and ENABLE_PROGRESS_TAG to ENABLE_METER_ELEMENT and ENABLE_PROGRESS_ELEMENT respectively
+        https://bugs.webkit.org/show_bug.cgi?id=91941
+
+        Reviewed by Kentaro Hara.
+
+        A flag name for an elmement should be ENABLE_*_ELEMENT.
+
+        * WebCoreSupport/RenderThemeQStyle.cpp:
+        (WebCore):
+        * WebCoreSupport/RenderThemeQStyle.h:
+
+2012-07-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt] Enable CSS shaders in Qt (software mode)
+        https://bugs.webkit.org/show_bug.cgi?id=85140
+
+        Reviewed by Simon Hausmann.
+
+        Enable CSS Shaders in settings when WebGL is enabled.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+
+2012-07-19  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Remove support for Qt versions before 4.8.0
+        https://bugs.webkit.org/show_bug.cgi?id=91730
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove Qt version check #ifdefs for Qt versions before 4.8.0.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate):
+        (QWebSettings::QWebSettings):
+        (QWebSettings::thirdPartyCookiePolicy):
+        * Api/qwebsettings.h:
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::thirdPartyCookiePolicyAllows):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:
+        (tst_QDeclarativeWebView):
+        (tst_QDeclarativeWebView::backgroundColor):
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::render):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage):
+        (tst_QWebPage::thirdPartyCookiePolicy):
+
 2012-07-17  Gabor Ballabas  <gaborb@inf.u-szeged.hu>
 
         [Qt][V8] Remove the V8 related codepaths and configuration
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index d6fa62722..c02e66e66 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -984,13 +984,11 @@ void DumpRenderTreeSupportQt::setMinimumTimerInterval(QWebPage* page, double int
     corePage->settings()->setMinDOMTimerInterval(interval);
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
 bool DumpRenderTreeSupportQt::thirdPartyCookiePolicyAllows(QWebPage *page, const QUrl& url, const QUrl& firstPartyUrl)
 {
     Page* corePage = QWebPagePrivate::core(page);
     return thirdPartyCookiePolicyPermits(corePage->mainFrame()->loader()->networkingContext(), url, firstPartyUrl);
 }
-#endif
 
 QUrl DumpRenderTreeSupportQt::mediaContentUrlByElementId(QWebFrame* frame, const QString& elementId)
 {
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
index e0c868081..0184ee4da 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
@@ -211,9 +211,7 @@ public:
     static void setDefersLoading(QWebPage*, bool flag);
     static void goBack(QWebPage*);
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
     static bool thirdPartyCookiePolicyAllows(QWebPage*, const QUrl&, const QUrl& firstPartyUrl);
-#endif
 
     static QImage paintPagesWithBoundaries(QWebFrame*);
 };
diff --git a/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp b/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp
index 6c734710b..7cfdabfc2 100644
--- a/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp
@@ -47,7 +47,7 @@
 #include "PaintInfo.h"
 #include "QWebPageClient.h"
 #include "RenderBox.h"
-#if ENABLE(PROGRESS_TAG)
+#if ENABLE(PROGRESS_ELEMENT)
 #include "RenderProgress.h"
 #endif
 #include "RenderSlider.h"
@@ -70,7 +70,7 @@
 #include <QStyleFactory>
 #include <QStyleOptionButton>
 #include <QStyleOptionFrameV2>
-#if ENABLE(PROGRESS_TAG)
+#if ENABLE(PROGRESS_ELEMENT)
 #include <QStyleOptionProgressBarV2>
 #endif
 #include <QStyleOptionSlider>
@@ -492,7 +492,7 @@ bool RenderThemeQStyle::paintMenuListButton(RenderObject* o, const PaintInfo& i,
     return false;
 }
 
-#if ENABLE(PROGRESS_TAG)
+#if ENABLE(PROGRESS_ELEMENT)
 double RenderThemeQStyle::animationDurationForProgressBar(RenderProgress* renderProgress) const
 {
     if (renderProgress->position() >= 0)
diff --git a/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.h b/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.h
index fa160366a..7e8c26e91 100644
--- a/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.h
+++ b/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.h
@@ -64,7 +64,7 @@ protected:
     virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
     virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
 
-#if ENABLE(PROGRESS_TAG)
+#if ENABLE(PROGRESS_ELEMENT)
     // Returns the duration of the animation for the progress bar.
     virtual double animationDurationForProgressBar(RenderProgress*) const;
     virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
diff --git a/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp b/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
index b1722a6fb..3623c6a3f 100644
--- a/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -40,9 +40,7 @@ private slots:
     void renderingEnabled();
     void setHtml();
     void settings();
-#if QT_VERSION >= 0x040704
     void backgroundColor();
-#endif
 
 private:
     void checkNoErrors(const QDeclarativeComponent&);
@@ -505,7 +503,6 @@ void tst_QDeclarativeWebView::settings()
     }
 }
 
-#if QT_VERSION >= 0x040704
 void tst_QDeclarativeWebView::backgroundColor()
 {
     // We test here the rendering of the background.
@@ -533,7 +530,6 @@ void tst_QDeclarativeWebView::backgroundColor()
     wv->setProperty("backgroundColor", Qt::green);
     QCOMPARE(spyColorChanged.count(), 1);
 }
-#endif
 
 void tst_QDeclarativeWebView::checkNoErrors(const QDeclarativeComponent& component)
 {
diff --git a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index fb47e4b61..9a208bc47 100644
--- a/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/Source/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -1062,11 +1062,7 @@ void tst_QWebElement::render()
         QPainter painter(&chunk);
         painter.fillRect(chunkRect, Qt::white);
         QRect chunkPaintRect(x, 0, chunkWidth, chunkHeight);
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
         tables[0].render(&painter, chunkPaintRect);
-#else
-        tables[0].render(&painter);
-#endif
         painter.end();
 
         // The first chunk in this test is passing, but the others are failing
diff --git a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index b6f0aeee3..13e7a9f17 100644
--- a/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -90,9 +90,7 @@ public slots:
 private slots:
     void initTestCase();
     void cleanupTestCase();
-#if QT_VERSION >= 0x040800
     void thirdPartyCookiePolicy();
-#endif
     void contextMenuCopy();
     void contextMenuPopulatedOnce();
     void acceptNavigationRequest();
@@ -3042,7 +3040,6 @@ void tst_QWebPage::navigatorCookieEnabled()
     QVERIFY(m_page->mainFrame()->evaluateJavaScript("navigator.cookieEnabled").toBool());
 }
 
-#if QT_VERSION >= 0x040800
 void tst_QWebPage::thirdPartyCookiePolicy()
 {
     QWebSettings::globalSettings()->setThirdPartyCookiePolicy(QWebSettings::AlwaysBlockThirdPartyCookies);
@@ -3081,7 +3078,6 @@ void tst_QWebPage::thirdPartyCookiePolicy()
     QVERIFY(!DumpRenderTreeSupportQt::thirdPartyCookiePolicyAllows(m_page,
             QUrl("http://anotherexample.co.uk"), QUrl("http://example.co.uk")));
 }
-#endif
 
 #ifdef Q_OS_MAC
 void tst_QWebPage::macCopyUnicodeToClipboard()