summaryrefslogtreecommitdiffstats
path: root/WebKit/qt
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/qt')
-rw-r--r--WebKit/qt/Api/qwebframe.cpp5
-rw-r--r--WebKit/qt/ChangeLog92
-rw-r--r--WebKit/qt/WebCoreSupport/ChromeClientQt.cpp7
-rw-r--r--WebKit/qt/WebCoreSupport/ChromeClientQt.h2
-rw-r--r--WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp26
-rw-r--r--WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h1
-rw-r--r--WebKit/qt/WebCoreSupport/EditorClientQt.cpp2
-rw-r--r--WebKit/qt/WebCoreSupport/EditorClientQt.h2
8 files changed, 5 insertions, 132 deletions
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 3cdbef2..eb7a85f 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -837,11 +837,6 @@ void QWebFrame::load(const QNetworkRequest &req,
case QNetworkAccessManager::DeleteOperation:
request.setHTTPMethod("DELETE");
break;
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
- case QNetworkAccessManager::CustomOperation:
- request.setHTTPMethod(req.attribute(QNetworkRequest::CustomVerbAttribute).toByteArray().constData());
- break;
-#endif
case QNetworkAccessManager::UnknownOperation:
// eh?
break;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d361624..5c54db2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,95 +1,3 @@
-2010-12-01 Jia Pu <jpu@apple.com>
-
- Reviewed by Darin Adler.
-
- Support multiple correction candidates panel for misspelled word on Mac OS X.
- https://bugs.webkit.org/show_bug.cgi?id=50137
- <rdar://problem/8568059>
-
- Adopted new function signature defined in base class.
-
- * WebCoreSupport/EditorClientQt.cpp:
- (WebCore::EditorClientQt::getGuessesForWord):
- * WebCoreSupport/EditorClientQt.h:
-
-2010-11-30 Benjamin Poulain <benjamin.poulain@nokia.com>
-
- Reviewed by Kenneth Rohde Christiansen.
-
- [Qt] Implement layoutTestController.findString
- https://bugs.webkit.org/show_bug.cgi?id=50236
-
- Add support for the new advanced findString().
-
- * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
- (DumpRenderTreeSupportQt::findString):
- * WebCoreSupport/DumpRenderTreeSupportQt.h:
-
-2010-11-30 Ojan Vafai <ojan@chromium.org>
-
- Revert r72876. It caused a ~30% perf regression in chromium's bloat-http test
- https://bugs.webkit.org/show_bug.cgi?id=50288
-
- 2010-11-29 Adam Barth <abarth@webkit.org (:abarth) (r)>
- Reviewed by Darin Adler.
- Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs
- https://bugs.webkit.org/show_bug.cgi?id=50182
- A display-isolated URL can only be displayed (e.g., put in an iframe,
- hyperlinked to) by documents from that scheme. In a sense, this is a
- generalization of some of the protections we give file URLs, but
- instead of lumping them all together into one "local" bucket, this
- patch creates a separate bucket for each scheme.
- For a while, I tried using a separate bucket for each origin. That
- would have played nicely with what Blob URLs are trying to do, but some
- "chrome" URL pages rely on being able to display other chrome URL
- pages, even in different origins. For example, the New Tab Page shows
- thumbnails from the "thumbnail" host.
- This patch also removes a bunch of unused code. I've also propagated
- the "deprecated" status of deprecatedCanDisplay to
- deprecatedShouldTreatURLAsLocal because that method has no other
- callers and is really asking for uppercase/lowercase bugs. I dream of
- someday removing these functions.
- 2010-11-29 Adam Barth <abarth@webkit.org (:abarth) (r)>
- Reviewed by Darin Adler.
- Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs
- https://bugs.webkit.org/show_bug.cgi?id=50182
- This patch adds a Chromium API for registering schemes as
- display-isolated. In a subsequent patch, I'll change the "chrome"
- scheme in Chrome to be display isolated instead of local. That will
- prevent file URLs from linking to chrome URLs.
-
- * Api/qwebsecurityorigin.cpp:
- (QWebSecurityOrigin::localSchemes):
-
-2010-11-29 Vangelis Kokkevis <vangelis@chromium.org>
-
- Reviewed by Simon Fraser.
-
- Provide more fine grained control to ports over when to turn on accelerated
- compositing.
- https://bugs.webkit.org/show_bug.cgi?id=49998
-
- As part of this change, the old hasAcceleratedCompositing method on the ChromeClient
- has now been replaced by allowedCompositingTriggers which returns a bitfield of
- all the features which can trigger the compositor.
-
-
- * WebCoreSupport/ChromeClientQt.cpp:
- (WebCore::ChromeClientQt::allowedCompositingTriggers):
- * WebCoreSupport/ChromeClientQt.h:
-
-2010-11-30 Thiago Macieira <thiago.macieira@nokia.com>
-
- Reviewed by Andreas Kling.
-
- [Qt] QWebFrame::load(QNetworkRequest) should respect the CustomVerbAttribute
-
- For CustomOperation requests, pass the CustomVerbAttribute on to
- the WebCore::ResourceRequest.
-
- * Api/qwebframe.cpp:
- (QWebFrame::load):
-
2010-11-25 Norbert Leser <norbert.leser@nokia.com>
Reviewed by Laszlo Gombos.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index e72ef3e..d4875a8 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -617,12 +617,9 @@ void ChromeClientQt::scheduleCompositingLayerSync()
platformPageClient()->markForSync(true);
}
-ChromeClient::CompositingTriggerFlags ChromeClientQt::allowedCompositingTriggers() const
+bool ChromeClientQt::allowsAcceleratedCompositing() const
{
- if (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing())
- return AllTriggers;
-
- return 0;
+ return (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing());
}
#endif
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index bcf8975..b8bc72d 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -152,7 +152,7 @@ namespace WebCore {
virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*);
virtual void setNeedsOneShotDrawingSynchronization();
virtual void scheduleCompositingLayerSync();
- virtual CompositingTriggerFlags allowedCompositingTriggers() const;
+ virtual bool allowsAcceleratedCompositing() const;
#endif
#if ENABLE(TILED_BACKING_STORE)
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index a2863b1..a5a7270 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -437,32 +437,6 @@ bool DumpRenderTreeSupportQt::isCommandEnabled(QWebPage* page, const QString& na
return page->handle()->page->focusController()->focusedOrMainFrame()->editor()->command(name).isEnabled();
}
-bool DumpRenderTreeSupportQt::findString(QWebPage* page, const QString& string, const QStringList& optionArray)
-{
- // 1. Parse the options from the array
- WebCore::FindOptions options = 0;
- const int optionCount = optionArray.size();
- for (int i = 0; i < optionCount; ++i) {
- const QString& option = optionArray.at(i);
- if (option == QLatin1String("CaseInsensitive"))
- options |= WebCore::CaseInsensitive;
- else if (option == QLatin1String("AtWordStarts"))
- options |= WebCore::AtWordStarts;
- else if (option == QLatin1String("TreatMedialCapitalAsWordStart"))
- options |= WebCore::TreatMedialCapitalAsWordStart;
- else if (option == QLatin1String("Backwards"))
- options |= WebCore::Backwards;
- else if (option == QLatin1String("WrapAround"))
- options |= WebCore::WrapAround;
- else if (option == QLatin1String("StartInSelection"))
- options |= WebCore::StartInSelection;
- }
-
- // 2. find the string
- WebCore::Frame* frame = page->handle()->page->focusController()->focusedOrMainFrame();
- return frame && frame->editor()->findString(string, options);
-}
-
QString DumpRenderTreeSupportQt::markerTextForListItem(const QWebElement& listItem)
{
return WebCore::markerTextForListItem(listItem.m_element);
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
index 98f2b94..82d9319 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
@@ -44,7 +44,6 @@ public:
static void executeCoreCommandByName(QWebPage* page, const QString& name, const QString& value);
static bool isCommandEnabled(QWebPage* page, const QString& name);
- static bool findString(QWebPage* page, const QString& string, const QStringList& optionArray);
static void setSmartInsertDeleteEnabled(QWebPage* page, bool enabled);
static void setSelectTrailingWhitespaceEnabled(QWebPage* page, bool enabled);
static QVariantList selectedRange(QWebPage* page);
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index 46eeeb0..91a0cc6 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -558,7 +558,7 @@ bool EditorClientQt::spellingUIIsShowing()
return false;
}
-void EditorClientQt::getGuessesForWord(const String& word, const String& context, Vector<String>& guesses)
+void EditorClientQt::getGuessesForWord(const String&, Vector<String>&)
{
notImplemented();
}
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.h b/WebKit/qt/WebCoreSupport/EditorClientQt.h
index defa8bb..7d99d22 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.h
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.h
@@ -104,7 +104,7 @@ public:
virtual void updateSpellingUIWithMisspelledWord(const String&);
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
- virtual void getGuessesForWord(const String& word, const String& context, Vector<String>& guesses);
+ virtual void getGuessesForWord(const String&, Vector<String>& guesses);
virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
generated by cgit v1.1 at 2025-08-15 20:06:10 +0000