summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/qt')
-rw-r--r--Source/WebKit/qt/Api/qwebelement.cpp17
-rw-r--r--Source/WebKit/qt/Api/qwebpage.cpp8
-rw-r--r--Source/WebKit/qt/ChangeLog88
-rw-r--r--Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp5
-rw-r--r--Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp1
-rw-r--r--Source/WebKit/qt/declarative/experimental/experimental.pri2
-rw-r--r--Source/WebKit/qt/declarative/public.pri2
-rw-r--r--Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp5
8 files changed, 112 insertions, 16 deletions
diff --git a/Source/WebKit/qt/Api/qwebelement.cpp b/Source/WebKit/qt/Api/qwebelement.cpp
index 07716efba..771ad56fb 100644
--- a/Source/WebKit/qt/Api/qwebelement.cpp
+++ b/Source/WebKit/qt/Api/qwebelement.cpp
@@ -503,7 +503,7 @@ QStringList QWebElement::attributeNames(const QString& namespaceUri) const
return QStringList();
QStringList attributeNameList;
- const NamedNodeMap* const attrs = m_element->attributes(/* read only = */ true);
+ const NamedNodeMap* const attrs = m_element->updatedAttributes();
if (attrs) {
const String namespaceUriString(namespaceUri); // convert QString -> String once
const unsigned attrsCount = attrs->length();
@@ -844,13 +844,13 @@ QString QWebElement::styleProperty(const QString &name, StyleResolveStrategy str
if (!propID)
return QString();
- CSSStyleDeclaration* style = static_cast<StyledElement*>(m_element)->style();
+ CSSMutableStyleDeclaration* style = static_cast<StyledElement*>(m_element)->ensureInlineStyleDecl();
if (strategy == InlineStyle)
return style->getPropertyValue(propID);
if (strategy == CascadedStyle) {
- if (style->getPropertyPriority(propID))
+ if (style->propertyIsImportant(propID))
return style->getPropertyValue(propID);
// We are going to resolve the style property by walking through the
@@ -866,11 +866,11 @@ QString QWebElement::styleProperty(const QString &name, StyleResolveStrategy str
for (int i = rules->length(); i > 0; --i) {
CSSStyleRule* rule = static_cast<CSSStyleRule*>(rules->item(i - 1));
- if (rule->style()->getPropertyPriority(propID))
- return rule->style()->getPropertyValue(propID);
+ if (rule->declaration()->propertyIsImportant(propID))
+ return rule->declaration()->getPropertyValue(propID);
if (style->getPropertyValue(propID).isEmpty())
- style = rule->style();
+ style = rule->declaration();
}
}
@@ -909,12 +909,11 @@ void QWebElement::setStyleProperty(const QString &name, const QString &value)
return;
int propID = cssPropertyID(name);
- CSSStyleDeclaration* style = static_cast<StyledElement*>(m_element)->style();
+ CSSMutableStyleDeclaration* style = static_cast<StyledElement*>(m_element)->ensureInlineStyleDecl();
if (!propID || !style)
return;
- ExceptionCode exception = 0;
- style->setProperty(name, value,emptyString(), exception);
+ style->setProperty(propID, value);
}
/*!
diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp
index 91de6f53c..f94d44589 100644
--- a/Source/WebKit/qt/Api/qwebpage.cpp
+++ b/Source/WebKit/qt/Api/qwebpage.cpp
@@ -2092,8 +2092,12 @@ void QWebPage::javaScriptConsoleMessage(const QString& message, int lineNumber,
// Catch plugin logDestroy message for LayoutTests/plugins/open-and-close-window-with-plugin.html
// At this point DRT's WebPage has already been destroyed
if (QWebPagePrivate::drtRun) {
- if (message == QLatin1String("PLUGIN: NPP_Destroy"))
- fprintf (stdout, "CONSOLE MESSAGE: line %d: %s\n", lineNumber, message.toUtf8().constData());
+ if (message == QLatin1String("PLUGIN: NPP_Destroy")) {
+ fprintf(stdout, "CONSOLE MESSAGE: ");
+ if (lineNumber)
+ fprintf(stdout, "line %d: ", lineNumber);
+ fprintf(stdout, "%s\n", message.toUtf8().constData());
+ }
}
}
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 95f374866..0b854f952 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,91 @@
+2012-02-01 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
+
+ Avoid creating NamedNodeMap unnecessarily
+ https://bugs.webkit.org/show_bug.cgi?id=77574
+
+ Reviewed by Ryosuke Niwa.
+
+ * Api/qwebelement.cpp:
+ (QWebElement::attributeNames): use updateAttributes().
+
+2012-02-01 Alexis Menard <alexis.menard@openbossa.org>
+
+ CSSStyleDeclaration.getPropertyPriority() fails for CSS shorthand properties with 'important' priority
+ https://bugs.webkit.org/show_bug.cgi?id=49058
+
+ Reviewed by Andreas Kling.
+
+ Update the code as getPropertyPriority has been renamed to propertyIsImportant.
+
+ * Api/qwebelement.cpp:
+ (QWebElement::styleProperty):
+
+2012-01-31 Antti Koivisto <antti@apple.com>
+
+ Try to fix Qt build.
+
+ Not reviewed.
+
+ * Api/qwebelement.cpp:
+ (QWebElement::styleProperty):
+
+2012-01-30 Antti Koivisto <antti@apple.com>
+
+ Reduce non-CSSOM API of CSSStyleDeclaration
+ https://bugs.webkit.org/show_bug.cgi?id=77299
+
+ Reviewed by Andreas Kling.
+
+ * Api/qwebelement.cpp:
+ (QWebElement::styleProperty):
+ (QWebElement::setStyleProperty):
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo):
+
+2012-01-25 Zeno Albisser <zeno@webkit.org>
+
+ [Qt] public.pri is missing dependency to quick module.
+ https://bugs.webkit.org/show_bug.cgi?id=77016
+
+ Reviewed by Tor Arne Vestbø.
+
+ * declarative/public.pri:
+
+2012-01-17 Viatcheslav Ostapenko <ostapenko.viatcheslav@nokia.com>
+
+ [Qt] Debug build fails with debug qt5
+ https://bugs.webkit.org/show_bug.cgi?id=76463
+
+ Reviewed by Simon Hausmann.
+
+ Add QNetworkCookie include in order to satisfy sizeof in QTypeInfo in debug builds.
+
+ * WebCoreSupport/FrameNetworkingContextQt.cpp:
+
+2012-01-13 Marcelo Lira <marcelo.lira@openbossa.org>
+
+ [Qt] Fix missing signal in qwebframe API test for Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=76195
+
+ Reviewed by Noam Rosenthal.
+
+ In Qt5 QObject has a new signal with this signature: "objectNameChanged(QString)".
+
+ * tests/qwebframe/tst_qwebframe.cpp:
+ (tst_QWebFrame::enumerate_data):
+
+2012-01-11 Vsevolod Vlasov <vsevik@chromium.org>
+
+ Make default console messages line numbers consistent.
+ https://bugs.webkit.org/show_bug.cgi?id=74075
+
+ Reviewed by Pavel Feldman.
+
+ Unset line numbers are not printed to console now.
+
+ * Api/qwebpage.cpp:
+ (QWebPage::javaScriptConsoleMessage):
+
2012-01-11 Simon Hausmann <simon.hausmann@nokia.com>
Unreviewed trivial build fix: Removed unnecessary QHttpRequestHeader
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 92ecdf8da..90254aeca 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -635,10 +635,11 @@ QVariantMap DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(const QWe
if (!webElement)
return res;
- RefPtr<WebCore::CSSComputedStyleDeclaration> style = computedStyle(webElement, true);
+ RefPtr<WebCore::CSSComputedStyleDeclaration> computedStyleDeclaration = computedStyle(webElement, true);
+ CSSStyleDeclaration* style = static_cast<WebCore::CSSStyleDeclaration*>(computedStyleDeclaration.get());
for (unsigned i = 0; i < style->length(); i++) {
QString name = style->item(i);
- QString value = (static_cast<WebCore::CSSStyleDeclaration*>(style.get()))->getPropertyValue(name);
+ QString value = style->getPropertyValue(name);
res[convertToPropertyName(name)] = QVariant(value);
}
return res;
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
index 02b64a443..7e99624b5 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
@@ -25,6 +25,7 @@
#include "qwebframe_p.h"
#include "qwebpage.h"
#include <QNetworkAccessManager>
+#include <QNetworkCookie>
#include <QNetworkCookieJar>
namespace WebCore {
diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri
index 49f463d1b..bbecabb5c 100644
--- a/Source/WebKit/qt/declarative/experimental/experimental.pri
+++ b/Source/WebKit/qt/declarative/experimental/experimental.pri
@@ -26,7 +26,7 @@ wince*:LIBS += $$QMAKE_LIBS_GUI
CONFIG += qtwebkit qtwebkit-private
-QT += declarative widgets network
+QT += declarative widgets network quick
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri
index 3e2fb470a..667d944e2 100644
--- a/Source/WebKit/qt/declarative/public.pri
+++ b/Source/WebKit/qt/declarative/public.pri
@@ -27,7 +27,7 @@ wince*:LIBS += $$QMAKE_LIBS_GUI
CONFIG += qtwebkit qtwebkit-private
QT += declarative
-haveQt(5): QT += widgets
+haveQt(5): QT += widgets quick
contains(QT_CONFIG, qtquick1): {
QT += qtquick1
diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index 43ea86ff5..3eb08c450 100644
--- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2031,8 +2031,11 @@ void tst_QWebFrame::enumerate_data()
<< "p1" << "p2" << "p4" << "p6"
// dynamic properties
<< "dp1" << "dp2" << "dp3"
- // inherited slots
+ // inherited signals and slots
<< "destroyed(QObject*)" << "destroyed()"
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ << "objectNameChanged(QString)"
+#endif
<< "deleteLater()"
// not included because it's private:
// << "_q_reregisterTimers(void*)"
View Lorry Controller Status