[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
kenneth at webkit.org
kenneth at webkit.org
Wed Apr 7 23:44:10 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 31f5183bff7b1afffc879a5affca4a67c1c4e1ed
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 16 21:31:02 2009 +0000
r50942 broke output from created windows. Make the
m_enableTextOutput a member of the DRT and not the
WebPage.
Reviewed by Simon Hausmann.
* DumpRenderTree/qt/DumpRenderTree.cpp:
(WebCore::WebPage::WebPage):
(WebCore::WebPage::javaScriptAlert):
(WebCore::WebPage::javaScriptConsoleMessage):
(WebCore::WebPage::javaScriptConfirm):
(WebCore::WebPage::javaScriptPrompt):
(WebCore::WebPage::acceptNavigationRequest):
(WebCore::DumpRenderTree::DumpRenderTree):
(WebCore::DumpRenderTree::open):
(WebCore::DumpRenderTree::createWindow):
* DumpRenderTree/qt/DumpRenderTree.h:
(WebCore::DumpRenderTree::setTextOutputEnabled):
(WebCore::DumpRenderTree::isTextOutputEnabled):
(WebCore::WebPage::shouldInterruptJavaScript):
(WebCore::WebPage::isTextOutputEnabled):
(WebCore::WebPage::setViewGeometry):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9fee134..f1f8782 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,30 @@
2009-11-16 Kenneth Rohde Christiansen <kenneth at webkit.org>
+ Reviewed by Simon Hausmann.
+
+ r50942 broke output from created windows. Make the
+ m_enableTextOutput a member of the DRT and not the
+ WebPage.
+
+ * DumpRenderTree/qt/DumpRenderTree.cpp:
+ (WebCore::WebPage::WebPage):
+ (WebCore::WebPage::javaScriptAlert):
+ (WebCore::WebPage::javaScriptConsoleMessage):
+ (WebCore::WebPage::javaScriptConfirm):
+ (WebCore::WebPage::javaScriptPrompt):
+ (WebCore::WebPage::acceptNavigationRequest):
+ (WebCore::DumpRenderTree::DumpRenderTree):
+ (WebCore::DumpRenderTree::open):
+ (WebCore::DumpRenderTree::createWindow):
+ * DumpRenderTree/qt/DumpRenderTree.h:
+ (WebCore::DumpRenderTree::setTextOutputEnabled):
+ (WebCore::DumpRenderTree::isTextOutputEnabled):
+ (WebCore::WebPage::shouldInterruptJavaScript):
+ (WebCore::WebPage::isTextOutputEnabled):
+ (WebCore::WebPage::setViewGeometry):
+
+2009-11-16 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
Reviewed by Gustavo Noronha Silva.
Moved DumpRenderTree/gtk/TestNetscapePlugin to DumpRenderTree/unix/TestNetscapePlugin
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 883874b..0f11b67 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -80,7 +80,8 @@ const unsigned int maxViewWidth = 800;
const unsigned int maxViewHeight = 600;
WebPage::WebPage(QWidget *parent, DumpRenderTree *drt)
- : QWebPage(parent), m_drt(drt), m_enableTextOutput(false)
+ : QWebPage(parent)
+ , m_drt(drt)
{
QWebSettings* globalSettings = QWebSettings::globalSettings();
@@ -125,7 +126,7 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType)
void WebPage::javaScriptAlert(QWebFrame*, const QString& message)
{
- if (!m_enableTextOutput)
+ if (!isTextOutputEnabled())
return;
fprintf(stdout, "ALERT: %s\n", message.toUtf8().constData());
@@ -141,7 +142,7 @@ static QString urlSuitableForTestResult(const QString& url)
void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString&)
{
- if (!m_enableTextOutput)
+ if (!isTextOutputEnabled())
return;
QString newMessage;
@@ -159,7 +160,7 @@ void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, c
bool WebPage::javaScriptConfirm(QWebFrame*, const QString& msg)
{
- if (!m_enableTextOutput)
+ if (!isTextOutputEnabled())
return true;
fprintf(stdout, "CONFIRM: %s\n", msg.toUtf8().constData());
@@ -168,7 +169,7 @@ bool WebPage::javaScriptConfirm(QWebFrame*, const QString& msg)
bool WebPage::javaScriptPrompt(QWebFrame*, const QString& msg, const QString& defaultValue, QString* result)
{
- if (!m_enableTextOutput)
+ if (!isTextOutputEnabled())
return true;
fprintf(stdout, "PROMPT: %s, default text: %s\n", msg.toUtf8().constData(), defaultValue.toUtf8().constData());
@@ -205,7 +206,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& r
typeDescription = "illegal value";
}
- if (m_enableTextOutput)
+ if (isTextOutputEnabled())
fprintf(stdout, "Policy delegate: attempt to load %s with navigation type '%s'\n",
url.toUtf8().constData(), typeDescription.toUtf8().constData());
@@ -241,6 +242,7 @@ DumpRenderTree::DumpRenderTree()
: m_dumpPixels(false)
, m_stdin(0)
, m_notifier(0)
+ , m_enableTextOutput(false)
{
qt_drt_overwritePluginDirectories();
QWebSettings::enablePersistentStorage();
@@ -365,7 +367,7 @@ void DumpRenderTree::open(const QUrl& aurl)
#endif
qt_dump_frame_loader(url.toString().contains("loading/"));
- m_page->enableTextOutput(true);
+ setTextOutputEnabled(true);
m_page->mainFrame()->load(url);
}
@@ -649,7 +651,7 @@ QWebPage *DumpRenderTree::createWindow()
container->resize(0, 0);
container->move(-1, -1);
container->hide();
- QWebPage *page = new WebPage(container, this);
+ WebPage *page = new WebPage(container, this);
connectFrame(page->mainFrame());
connect(m_page, SIGNAL(frameCreated(QWebFrame *)), this, SLOT(connectFrame(QWebFrame *)));
windows.append(container);
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
index 46a74ab..8812901 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
@@ -51,43 +51,7 @@ class GCController;
namespace WebCore {
-class DumpRenderTree;
-
-class WebPage : public QWebPage {
- Q_OBJECT
-public:
- WebPage(QWidget *parent, DumpRenderTree *drt);
-
- QWebPage *createWindow(QWebPage::WebWindowType);
-
- void javaScriptAlert(QWebFrame *frame, const QString& message);
- void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
- bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
- bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
-
- void resetSettings();
- void enableTextOutput(bool enable) { m_enableTextOutput = enable; }
-
- virtual bool supportsExtension(QWebPage::Extension extension) const;
- virtual bool extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output);
-
-public slots:
- bool shouldInterruptJavaScript() { return false; }
-
-protected:
- bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
-
-private slots:
- void setViewGeometry(const QRect &r)
- {
- QWidget *v = view();
- if (v)
- v->setGeometry(r);
- }
-private:
- DumpRenderTree *m_drt;
- bool m_enableTextOutput;
-};
+class WebPage;
class DumpRenderTree : public QObject {
Q_OBJECT
@@ -102,6 +66,9 @@ public:
// Initialize in single-file mode.
void open(const QUrl& url);
+ void setTextOutputEnabled(bool enable) { m_enableTextOutput = enable; }
+ bool isTextOutputEnabled() { return m_enableTextOutput; }
+
void setDumpPixels(bool);
void closeRemainingWindows();
@@ -151,6 +118,42 @@ private:
QSocketNotifier* m_notifier;
QList<QWidget *> windows;
+ bool m_enableTextOutput;
+};
+
+class WebPage : public QWebPage {
+ Q_OBJECT
+public:
+ WebPage(QWidget *parent, DumpRenderTree *drt);
+
+ QWebPage *createWindow(QWebPage::WebWindowType);
+
+ void javaScriptAlert(QWebFrame *frame, const QString& message);
+ void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
+ bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
+ bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
+
+ void resetSettings();
+
+ virtual bool supportsExtension(QWebPage::Extension extension) const;
+ virtual bool extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output);
+
+public slots:
+ bool shouldInterruptJavaScript() { return false; }
+
+protected:
+ bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
+ bool isTextOutputEnabled() { return m_drt->isTextOutputEnabled(); }
+
+private slots:
+ void setViewGeometry(const QRect &r)
+ {
+ QWidget *v = view();
+ if (v)
+ v->setGeometry(r);
+ }
+private:
+ DumpRenderTree *m_drt;
};
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list