diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-29 13:58:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-29 13:58:03 +0200 |
| commit | 107b7d767d99104aac9d236b3dc872663a236cd4 (patch) | |
| tree | d7a0d11234e71ab013e40c83bed84b994f69936c /src/3rdparty/webkit/WebKit/qt/WebCoreSupport | |
| parent | 1df2292eaa543f7f25e37b7f14d63f6e70394c56 (diff) | |
| download | qt4-tools-107b7d767d99104aac9d236b3dc872663a236cd4.tar.gz | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-29062009 ( 22aadba1b4356ad7d8e9446b95baccb6b2c037b0 )
Changes in WebKit/qt since the last update:
2009-06-29 Simon Hausmann <simon.hausmann@nokia.com>
Fix the Qt build, add missing isSpeaking() implementation to
ContextMenuClient.
* WebCoreSupport/ContextMenuClientQt.cpp:
(WebCore::ContextMenuClientQt::isSpeaking):
* WebCoreSupport/ContextMenuClientQt.h:
2009-06-28 Sriram Yadavalli <sriram.yadavalli@nokia.com>
Reviewed by Eric Seidel.
[Qt] Fix build break for Qt
https://bugs.webkit.org/show_bug.cgi?id=26779
* Api/qwebpage.cpp:
(QWebPage::swallowContextMenuEvent):
2009-06-27 Simon Hausmann <simon.hausmann@nokia.com>
Build fix for Qt under Windows.
* Api/qwebhistory.h: Use consistent export linkage for the datastream operators.
2009-06-26 Brian Weinstein <bweinstein@apple.com>
Reviewed by Simon Fraser.
Changed call of scrollbarUnderMouse to scrollbarUnderPoint to match new API.
* Api/qwebpage.cpp:
(QWebPage::swallowContextMenuEvent):
2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed by Simon Hausmann.
Add support for saving and loading of QWebHistory to and from a QByteArray.
This includes streaming operators for QWebHistory. for convenience.
New autotests that test QWebHistory and QWebHistoryItem serialization.
* Api/qwebhistory.cpp:
(QWebHistory::restoreState):
(QWebHistory::saveState):
(operator<<):
(operator>>):
* Api/qwebhistory.h:
* Api/qwebhistory_p.h:
* tests/qwebhistory/tst_qwebhistory.cpp:
(tst_QWebHistory::):
(tst_QWebHistory::init):
(tst_QWebHistory::title):
(tst_QWebHistory::count):
(tst_QWebHistory::back):
(tst_QWebHistory::forward):
(tst_QWebHistory::itemAt):
(tst_QWebHistory::goToItem):
(tst_QWebHistory::items):
(tst_QWebHistory::serialize_1):
(tst_QWebHistory::serialize_2):
(tst_QWebHistory::serialize_3):
(tst_QWebHistory::saveAndRestore_1):
(tst_QWebHistory::saveAndRestore_2):
(tst_QWebHistory::saveAndRestore_3):
2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed by Simon Hausmann.
Fix the behaviour of QWebHistory::itemAt to interpret the specified index as absolute index.
Returns an invalid QWebHistoryItem if the index is out of range.
* Api/qwebhistory.cpp:
(QWebHistory::itemAt):
* tests/qwebhistory/tst_qwebhistory.cpp:
(tst_QWebHistory::itemAt):
2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed by Simon Hausmann.
Added a few autotest to QWebHistory.
* tests/qwebhistory/data/page1.html: Added.
* tests/qwebhistory/data/page2.html: Added.
* tests/qwebhistory/data/page3.html: Added.
* tests/qwebhistory/data/page4.html: Added.
* tests/qwebhistory/data/page5.html: Added.
* tests/qwebhistory/data/page6.html: Added.
* tests/qwebhistory/qwebhistory.pro: Added.
* tests/qwebhistory/tst_qwebhistory.cpp: Added.
(tst_QWebHistory::):
(tst_QWebHistory::tst_QWebHistory):
(tst_QWebHistory::~tst_QWebHistory):
(tst_QWebHistory::init):
(tst_QWebHistory::cleanup):
(tst_QWebHistory::title):
(tst_QWebHistory::count):
(tst_QWebHistory::back):
(tst_QWebHistory::forward):
(tst_QWebHistory::goToItem):
(tst_QWebHistory::items):
* tests/qwebhistory/tst_qwebhistory.qrc: Added.
* tests/tests.pro:
2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed by Simon Hausmann.
Fix support for documenting functions prefixed with QWEBKIT_EXPORT
Add QWEBKIT_EXPORT to the list of macros to ignore by qdoc.
* docs/qtwebkit.qdocconf:
2009-06-26 Yongjun Zhang <yongjun.zhang@nokia.com>
Reviewed by Eric Seidel.
Bug 20303: [Qt] Key events are not working in frames.
Send scrolling events to current focused frame, bubble the event
up to parent frame if it is not handled. Use EventHandler's new
shared scrolling code.
* Api/qwebpage.cpp:
(QWebPagePrivate::keyPressEvent):
(QWebPagePrivate::handleScrolling):
* Api/qwebpage_p.h:
2009-06-25 Jakub Wieczorek <faw217@gmail.com>
Reviewed by Adam Treat.
Add highlight functionality to the QWebPage::findText() method. Introduced is
new HighlightAllOccurrences flag which passed to the function will make it mark
all existing occurrences of specified string in the page.
* Api/qwebpage.cpp:
(QWebPage::findText):
* Api/qwebpage.h:
* Api/qwebview.cpp:
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/WebCoreSupport')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp | 6 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp index ae9d718ff8..ed79946230 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp @@ -67,6 +67,12 @@ void ContextMenuClientQt::speak(const String&) notImplemented(); } +bool ContextMenuClientQt::isSpeaking() +{ + notImplemented(); + return false; +} + void ContextMenuClientQt::stopSpeaking() { notImplemented(); diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h index ad6bfae359..8440ff5ab4 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h @@ -44,6 +44,7 @@ namespace WebCore { virtual void downloadURL(const KURL& url); virtual void lookUpInDictionary(Frame*); virtual void speak(const String&); + virtual bool isSpeaking(); virtual void stopSpeaking(); virtual void searchWithGoogle(const Frame*); }; |