diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-26 15:26:15 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-26 15:26:45 (GMT) |
commit | 6bcf2ca6645409ffa1aaadd1bd302c6e86b5b028 (patch) | |
tree | b161a65f0d57f0d6584a57b35be7e3d049056ae5 /src/3rdparty/webkit/WebCore | |
parent | 079f38700357a4ff1aaa0d12fcc8f89a499aae7b (diff) | |
download | Qt-6bcf2ca6645409ffa1aaadd1bd302c6e86b5b028.zip Qt-6bcf2ca6645409ffa1aaadd1bd302c6e86b5b028.tar.gz Qt-6bcf2ca6645409ffa1aaadd1bd302c6e86b5b028.tar.bz2 |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 0b6fc217c2b853827926313c09bb3c32f66ffe43 )
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-02-06 Dirk Schulze <krit@webkit.org>
Reviewed by Simon Hausmann.
Fix bug in clearRect(). Use fillRect() instead of eraseRect() to get
the context transparent.
[QT] clearRect fill's a given rect with white
https://bugs.webkit.org/show_bug.cgi?id=23728
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::clearRect):
++ b/WebKit/qt/ChangeLog
2009-03-26 Simon Hausmann <simon.hausmann@nokia.com>
Rubber-stamped by Tor Arne Vestbø.
Fix the documentation of the QLocale usage in userAgentForUrl.
* Api/qwebpage.cpp:
2009-03-20 Erik L. Bunce <elbunce@xendom.com>
Reviewed by Simon Hausmann.
Fix for InsertParagraphSeparator and InsertLineSeparator so that
QWebPage::action() creates QActions for them. Also make sure they get
updated appropriately.
* Api/qwebpage.cpp:
(QWebPagePrivate::updateEditorActions):
(QWebPage::action):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::textEditing):
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
-rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 13 | ||||
-rw-r--r-- | src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 10a3840..3b20751 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2009-02-06 Dirk Schulze <krit@webkit.org> + + Reviewed by Simon Hausmann. + + Fix bug in clearRect(). Use fillRect() instead of eraseRect() to get + the context transparent. + + [QT] clearRect fill's a given rect with white + https://bugs.webkit.org/show_bug.cgi?id=23728 + + * platform/graphics/qt/GraphicsContextQt.cpp: + (WebCore::GraphicsContext::clearRect): + 2009-03-19 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 80a6390..1830566 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -815,7 +815,7 @@ void GraphicsContext::clearRect(const FloatRect& rect) QPainter::CompositionMode currentCompositionMode = p->compositionMode(); if (p->paintEngine()->hasFeature(QPaintEngine::PorterDuff)) p->setCompositionMode(QPainter::CompositionMode_Source); - p->eraseRect(rect); + p->fillRect(rect, Qt::transparent); if (p->paintEngine()->hasFeature(QPaintEngine::PorterDuff)) p->setCompositionMode(currentCompositionMode); } |