Changeset 96455 in webkit

Timestamp:

Oct 1, 2011 12:22:29 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r96421.
​http://trac.webkit.org/changeset/96421
​https://bugs.webkit.org/show_bug.cgi?id=69206

It broke Qt-WK2 build (Requested by ossy on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-10-01

Source/JavaScriptCore:

• JavaScriptCore.pri:
• wtf/qt/UtilsQt.h: Removed.
• wtf/wtf.pri:

Source/WebCore:

• WebCore.pro:

Source/WebKit/qt:

• Api/qwebpage.cpp:

(QWebPage::javaScriptAlert):
(QWebPage::javaScriptConfirm):
(QWebPage::javaScriptPrompt):

• WebCoreSupport/ChromeClientQt.cpp:

(WebCore::ChromeClientQt::setToolTip):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.pri (modified) (1 diff)
• JavaScriptCore/wtf/qt/UtilsQt.h (deleted)
• JavaScriptCore/wtf/wtf.pri (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (5 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-10-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96421.
+        http://trac.webkit.org/changeset/96421
+        https://bugs.webkit.org/show_bug.cgi?id=69206
+
+        It broke Qt-WK2 build (Requested by ossy on #webkit).
+
+        * JavaScriptCore.pri:
+        * wtf/qt/UtilsQt.h: Removed.
+        * wtf/wtf.pri:
+
 2011-09-30  Daniel Bates  <dbates@webkit.org>
 

trunk/Source/JavaScriptCore/JavaScriptCore.pri

@@ -34 +34 @@
     $$PWD/wtf \
     $$PWD/wtf/gobject \
-    $$PWD/wtf/qt \
     $$PWD/wtf/symbian \
     $$PWD/wtf/unicode \

trunk/Source/JavaScriptCore/wtf/wtf.pri

@@ -85 +85 @@
     wtf/Platform.h \
     wtf/PossiblyNull.h \
-    wtf/qt/UtilsQt.h \
     wtf/RandomNumber.h \
     wtf/RandomNumberSeed.h \

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96421.
+        http://trac.webkit.org/changeset/96421
+        https://bugs.webkit.org/show_bug.cgi?id=69206
+
+        It broke Qt-WK2 build (Requested by ossy on #webkit).
+
+        * WebCore.pro:
+
 2011-09-30  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/WebCore.pro

@@ -58 +58 @@
     include($$PWD/../JavaScriptCore/yarr/yarr.pri)
     include($$PWD/../JavaScriptCore/wtf/wtf.pri)
-
-    INCLUDEPATH = $$PWD/../JavaScriptCore/wtf/qt $$INCLUDEPATH
 
     SOURCES += \

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -109 +109 @@
 #endif // Q_OS_WIN32
 #include "TextIterator.h"
-#include "UtilsQt.h"
 #include "WebPlatformStrategies.h"
 #if USE(QTKIT)
@@ -141 +140 @@
 #include <QSysInfo>
 #include <QTextCharFormat>
+#include <QTextDocument>
 #include <QTouchEvent>
 #include <QNetworkAccessManager>
@@ -2111 +2111 @@
 #ifndef QT_NO_MESSAGEBOX
     QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
-    QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QMessageBox::Ok);
+    QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Ok);
 #endif
 }
@@ -2128 +2128 @@
 #else
     QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
-    return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QMessageBox::Yes, QMessageBox::No);
+    return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Yes, QMessageBox::No);
 #endif
 }
@@ -2148 +2148 @@
 #ifndef QT_NO_INPUTDIALOG
     QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
-    QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QLineEdit::Normal, defaultValue, &ok);
+    QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QLineEdit::Normal, defaultValue, &ok);
     if (ok && result)
         *result = x;

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-10-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96421.
+        http://trac.webkit.org/changeset/96421
+        https://bugs.webkit.org/show_bug.cgi?id=69206
+
+        It broke Qt-WK2 build (Requested by ossy on #webkit).
+
+        * Api/qwebpage.cpp:
+        (QWebPage::javaScriptAlert):
+        (QWebPage::javaScriptConfirm):
+        (QWebPage::javaScriptPrompt):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::setToolTip):
+
 2011-09-30  Pierre Rossi  <pierre.rossi@gmail.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -75 +75 @@
 #include <qdebug.h>
 #include <qeventloop.h>
+#include <qtextdocument.h>
 #include <qtooltip.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/qt/UtilsQt.h>
 
 #if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
@@ -517 +517 @@
         QToolTip::hideText();
     } else {
-        QString dtip = QLatin1String("<p>") + escapeHtml(tip) + QLatin1String("</p>");
+        QString dtip = QLatin1String("<p>") + Qt::escape(tip) + QLatin1String("</p>");
         view->setToolTip(dtip);
     }