summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/3rdparty/webkit/.tag2
-rw-r--r--src/3rdparty/webkit/ChangeLog23
-rw-r--r--src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog23
-rw-r--r--src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h4
-rw-r--r--src/3rdparty/webkit/Source/WebKit.pri3
-rw-r--r--src/3rdparty/webkit/Source/WebKit/qt/ChangeLog33
-rw-r--r--src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp57
-rw-r--r--src/3rdparty/webkit/VERSION2
8 files changed, 69 insertions, 78 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 0b8bae5..a560e52 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-85d4df147ac7b239497b05979a51fd6fde7580fd
+dda59e50379214c098f365a39c4d64b39ced427e
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index bc11b4d..5f97e57 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,26 @@
+2011-08-26 Ademar de Souza Reis Jr. <ademar.reis@openbossa.org>
+
+ [Qt] libwebcore.a source is compiled without -fvisibility=hidden
+ -fvisibility-inlines-hidden
+ https://bugs.webkit.org/show_bug.cgi?id=65470
+
+ Patch by Holger Freyther <zecke@selfish.org>
+ Rubberstamped by Andreas Kling.
+
+ (qtwebkit-2.2 only by now)
+
+ WTF_USE_EXPORT_MACROS is still not enabled on trunk because there are
+ pending issues with WebKit2, but it appears to be safe to enable this
+ on QtWebKit, so this change is being added to the qtwebkit-2.2 branch.
+
+ The patch also adds CONFIG += hide_symbols and on Unix, +=
+ bsymbolic_functions, which should help reduce the library binary size.
+
+ Testing this is quite easy, so if there's any problem we'll soon
+ know. :-)
+
+ * Source/WebKit.pri:
+
2011-08-06 Aron Rosenberg <arosenberg@logitech.com>
Reviewed by Benjamin Poulain.
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
index ce9eee0..010e66a 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,26 @@
+2011-08-26 Ademar de Souza Reis Jr. <ademar.reis@openbossa.org>
+
+ [Qt] libwebcore.a source is compiled without -fvisibility=hidden
+ -fvisibility-inlines-hidden
+ https://bugs.webkit.org/show_bug.cgi?id=65470
+
+ Patch by Holger Freyther <zecke@selfish.org>
+ Rubberstamped by Andreas Kling.
+
+ (qtwebkit-2.2 only by now)
+
+ WTF_USE_EXPORT_MACROS is still not enabled on trunk because there are
+ pending issues with WebKit2, but it appears to be safe to enable this
+ on QtWebKit, so this change is being added to the qtwebkit-2.2 branch.
+
+ The patch also adds CONFIG += hide_symbols and on Unix, +=
+ bsymbolic_functions, which should help reduce the library binary size.
+
+ Testing this is quite easy, so if there's any problem we'll soon
+ know. :-)
+
+ * wtf/Platform.h:
+
2011-07-08 Chang Shu <cshu@webkit.org>
Rename "makeSecure" to "fill" and remove the support for displaying last character
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
index 55f0b58..8309acc 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
@@ -1221,7 +1221,11 @@
since most ports try to support sub-project independence, adding new headers
to WTF causes many ports to break, and so this way we can address the build
breakages one port at a time. */
+#if PLATFORM(QT)
+#define WTF_USE_EXPORT_MACROS 1
+#else
#define WTF_USE_EXPORT_MACROS 0
+#endif
#if PLATFORM(QT) || PLATFORM(GTK)
#define WTF_USE_UNIX_DOMAIN_SOCKETS 1
diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri
index 5bd9577..be1c7b7 100644
--- a/src/3rdparty/webkit/Source/WebKit.pri
+++ b/src/3rdparty/webkit/Source/WebKit.pri
@@ -2,6 +2,9 @@
contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
+
# Detect that we are building as a standalone package by the presence of
# either the generated files directory or as part of the Qt package through
# QTDIR_build
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
index 33ee4c2..0bca4b2 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
@@ -254,22 +254,6 @@
(WebCore::ChromeClientQt::allowsAcceleratedCompositing):
* WebCoreSupport/ChromeClientQt.h:
-2011-07-05 Rafael Brandao <rafael.lobo@openbossa.org>
-
- [Qt] Fix tst_QWebFrame::setHtmlWithResource() API test
- https://bugs.webkit.org/show_bug.cgi?id=63235
-
- Modified baseUrl to be a local file in order to get a security origin
- that is allowed to request local resources. Removed QSignalSpy from it
- as loadFinished always happens, and the original test was split into two.
-
- Reviewed by Benjamin Poulain.
-
- * tests/qwebframe/tst_qwebframe.cpp:
- (tst_QWebFrame::setHtmlWithImageResource):
- (tst_QWebFrame::setHtmlWithStylesheetResource):
- (tst_QWebFrame::setHtmlWithBaseURL):
-
2011-07-01 Jade Han <jade.han@nokia.com>
[Qt][Symbian] Update .def file for Symbian to build Tools
@@ -336,23 +320,6 @@
Rubber-stamped by Andreas Kling.
- [Qt] Fix tst_QWebFrame::setHtmlWithResource() API test
- https://bugs.webkit.org/show_bug.cgi?id=63235
-
- [Qt] Fix tst_QWebFrame::renderGeometry() API test
- https://bugs.webkit.org/show_bug.cgi?id=63236
-
- [Qt] Fix tst_QWebFrame::setUrlWithPendingLoads() API test
- https://bugs.webkit.org/show_bug.cgi?id=63237
-
- * tests/qwebframe/tst_qwebframe.cpp: Mark failing test cases as expected fails until real fix.
- (tst_QWebFrame::setHtmlWithResource):
- (tst_QWebFrame::renderGeometry):
-
-2011-06-23 Csaba Osztrogonác <ossy@webkit.org>
-
- Rubber-stamped by Andreas Kling.
-
[Qt] Fix tst_QWebPage::showModalDialog() API test
https://bugs.webkit.org/show_bug.cgi?id=63244
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index b423317..c9e862a 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -619,8 +619,7 @@ private slots:
void javaScriptWindowObjectCleared();
void javaScriptWindowObjectClearedOnEvaluate();
void setHtml();
- void setHtmlWithImageResource();
- void setHtmlWithStylesheetResource();
+ void setHtmlWithResource();
void setHtmlWithBaseURL();
void setHtmlWithJSAlert();
void ipv6HostEncoding();
@@ -650,7 +649,7 @@ private slots:
void setContent_data();
void setContent();
void setCacheLoadControlAttribute();
- //void setUrlWithPendingLoads();
+ void setUrlWithPendingLoads();
void setUrlWithFragment_data();
void setUrlWithFragment();
void setUrlToEmpty();
@@ -2500,37 +2499,24 @@ void tst_QWebFrame::setHtml()
QCOMPARE(spy.count(), 1);
}
-void tst_QWebFrame::setHtmlWithImageResource()
+void tst_QWebFrame::setHtmlWithResource()
{
- // By default, only security origins of local files can load local resources.
- // So we should specify baseUrl to be a local file in order to get a proper origin and load the local image.
+ QString html("<html><body><p>hello world</p><img src='qrc:/image.png'/></body></html>");
- QLatin1String html("<html><body><p>hello world</p><img src='qrc:/image.png'/></body></html>");
QWebPage page;
QWebFrame* frame = page.mainFrame();
- frame->setHtml(html, QUrl(QLatin1String("file:///path/to/file")));
+ // in few seconds, the image should be completey loaded
+ QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
+ frame->setHtml(html);
waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
+ QCOMPARE(spy.count(), 1);
QCOMPARE(frame->evaluateJavaScript("document.images.length").toInt(), 1);
QCOMPARE(frame->evaluateJavaScript("document.images[0].width").toInt(), 128);
QCOMPARE(frame->evaluateJavaScript("document.images[0].height").toInt(), 128);
- // Now we test the opposite: without a baseUrl as a local file, we cannot request local resources.
-
- frame->setHtml(html);
- waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
- QCOMPARE(frame->evaluateJavaScript("document.images.length").toInt(), 1);
- QCOMPARE(frame->evaluateJavaScript("document.images[0].width").toInt(), 0);
- QCOMPARE(frame->evaluateJavaScript("document.images[0].height").toInt(), 0);
-}
-
-void tst_QWebFrame::setHtmlWithStylesheetResource()
-{
- // By default, only security origins of local files can load local resources.
- // So we should specify baseUrl to be a local file in order to be able to download the local stylesheet.
-
- const char* htmlData =
+ QString html2 =
"<html>"
"<head>"
"<link rel='stylesheet' href='qrc:/style.css' type='text/css' />"
@@ -2539,29 +2525,18 @@ void tst_QWebFrame::setHtmlWithStylesheetResource()
"<p id='idP'>some text</p>"
"</body>"
"</html>";
- QLatin1String html(htmlData);
- QWebPage page;
- QWebFrame* frame = page.mainFrame();
- QWebElement webElement;
- frame->setHtml(html, QUrl(QLatin1String("qrc:///file")));
+ // in few seconds, the CSS should be completey loaded
+ frame->setHtml(html2);
waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
- webElement = frame->documentElement().findFirst("p");
- QCOMPARE(webElement.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("red"));
+ QCOMPARE(spy.size(), 2);
- // Now we test the opposite: without a baseUrl as a local file, we cannot request local resources.
-
- frame->setHtml(html, QUrl(QLatin1String("http://www.example.com/")));
- waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
- webElement = frame->documentElement().findFirst("p");
- QCOMPARE(webElement.styleProperty("color", QWebElement::CascadedStyle), QString());
+ QWebElement p = frame->documentElement().findAll("p").at(0);
+ QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("red"));
}
void tst_QWebFrame::setHtmlWithBaseURL()
{
- // This tests if baseUrl is indeed affecting the relative paths from resources.
- // As we are using a local file as baseUrl, its security origin should be able to load local resources.
-
if (!QDir(TESTS_SOURCE_DIR).exists())
QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -3391,16 +3366,12 @@ void tst_QWebFrame::webElementSlotOnly()
QCOMPARE(evalJS("myWebElementSlotObject.tagName"), QString("BODY"));
}
-// [Qt] Fix tst_QWebFrame::setUrlWithPendingLoads() API test
-// https://bugs.webkit.org/show_bug.cgi?id=63237
-/*
void tst_QWebFrame::setUrlWithPendingLoads()
{
QWebPage page;
page.mainFrame()->setHtml("<img src='dummy:'/>");
page.mainFrame()->setUrl(QUrl("about:blank"));
}
-*/
void tst_QWebFrame::setUrlWithFragment_data()
{
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index a6f6ced..413f504 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
and has the sha1 checksum
- 85d4df147ac7b239497b05979a51fd6fde7580fd
+ dda59e50379214c098f365a39c4d64b39ced427e
generated by cgit v0.12 at 2024-11-18 02:27:22 (GMT)