[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
robert at webkit.org
robert at webkit.org
Thu Apr 8 02:18:56 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 85ded53e59a450d67148e70b8c5e30ab21cc1a2b
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 10 21:55:34 2010 +0000
2010-03-10 Robert Hogan <robert at webkit.org>
Reviewed by Simon Hausmann.
[Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
Unskip test fast/events/multiline-link-arrow-navigation.html
https://bugs.webkit.org/show_bug.cgi?id=35593
* platform/qt/Skipped:
2010-03-10 Robert Hogan <robert at webkit.org>
Reviewed by Simon Hausmann.
[Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
Unskip test fast/events/multiline-link-arrow-navigation.html
https://bugs.webkit.org/show_bug.cgi?id=35593
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::WebPage::resetSettings):
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::overridePreference):
(LayoutTestController::setCaretBrowsingEnabled):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
2010-03-10 Robert Hogan <robert at webkit.org>
Reviewed by Simon Hausmann.
[Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
Unskip test fast/events/multiline-link-arrow-navigation.html
Fix typo (superfluous space) in QWebSettings docs.
https://bugs.webkit.org/show_bug.cgi?id=35593
* Api/qwebpage.cpp:
(qt_drt_enableCaretBrowsing):
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply): fix typo in docs
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55803 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 13bef03..33abedf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-10 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
+
+ Unskip test fast/events/multiline-link-arrow-navigation.html
+
+ https://bugs.webkit.org/show_bug.cgi?id=35593
+
+ * platform/qt/Skipped:
+
2010-03-10 Brady Eidson <beidson at apple.com>
Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 8399bcf..f503c2b 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -178,7 +178,6 @@ fast/text/international/thai-cursor-position.html
fast/events/ime-composition-events-001.html
# Missing layoutTestController.overridePreference()
-fast/events/multiline-link-arrow-navigation.html
fast/events/pageshow-pagehide-on-back-cached.html
fast/events/pageshow-pagehide-on-back-cached-with-frames.html
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 2a8aced..ad81227 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -195,6 +195,11 @@ void QWEBKIT_EXPORT qt_drt_setTimelineProfilingEnabled(QWebPage* page, bool enab
}
#endif
+void QWEBKIT_EXPORT qt_drt_enableCaretBrowsing(QWebPage* page, bool value)
+{
+ page->handle()->page->settings()->setCaretBrowsingEnabled(value);
+}
+
class QWebPageWidgetClient : public QWebPageClient {
public:
QWebPageWidgetClient(QWidget* view)
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index 2c63d06..59a7d83 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -389,7 +389,7 @@ QWebSettings* QWebSettings::globalSettings()
\value LocalStorageDatabaseEnabled \e{This enum value is deprecated.} Use
QWebSettings::LocalStorageEnabled instead.
\value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
- \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls.
+ \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls.
\value XSSAuditorEnabled Specifies whether load requests should be monitored for cross-site scripting attempts.
*/
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b4ccf49..4c2f4e1 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-10 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
+
+ Unskip test fast/events/multiline-link-arrow-navigation.html
+ Fix typo (superfluous space) in QWebSettings docs.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35593
+
+ * Api/qwebpage.cpp:
+ (qt_drt_enableCaretBrowsing):
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply): fix typo in docs
+
2010-03-02 Adam Treat <atreat at rim.com>
Reviewed by Dave Hyatt.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0ba7204..b2d5932 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,22 @@
2010-03-10 Robert Hogan <robert at webkit.org>
+ Reviewed by Simon Hausmann.
+
+ [Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
+
+ Unskip test fast/events/multiline-link-arrow-navigation.html
+
+ https://bugs.webkit.org/show_bug.cgi?id=35593
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::WebPage::resetSettings):
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::overridePreference):
+ (LayoutTestController::setCaretBrowsingEnabled):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
+2010-03-10 Robert Hogan <robert at webkit.org>
+
Reviewed by Holger Freyther.
QtLauncher: Fix typo in conditional statement in
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 7407b28..5c51997 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -167,6 +167,7 @@ void WebPage::resetSettings()
settings()->resetAttribute(QWebSettings::LinksIncludedInFocusChain);
settings()->resetAttribute(QWebSettings::OfflineWebApplicationCacheEnabled);
settings()->resetAttribute(QWebSettings::LocalContentCanAccessRemoteUrls);
+ m_drt->layoutTestController()->setCaretBrowsingEnabled(false);
// globalSettings must be reset explicitly.
m_drt->layoutTestController()->setXSSAuditorEnabled(false);
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 72cd873..c8a2929 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -56,6 +56,7 @@ extern int qt_drt_numberOfPages(QWebFrame* qFrame, float width, float height);
extern void qt_drt_webinspector_executeScript(QWebPage* page, long callId, const QString& script);
extern void qt_drt_webinspector_show(QWebPage *page);
extern void qt_drt_webinspector_close(QWebPage *page);
+extern void qt_drt_enableCaretBrowsing(QWebPage* page, bool value);
LayoutTestController::LayoutTestController(WebCore::DumpRenderTree* drt)
: QObject()
@@ -462,6 +463,8 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian
settings->setFontSize(QWebSettings::DefaultFontSize, value.toInt());
else if (name == "WebKitUsesPageCachePreferenceKey")
QWebSettings::setMaximumPagesInCache(value.toInt());
+ else if (name == "WebKitEnableCaretBrowsing")
+ setCaretBrowsingEnabled(value.toBool());
else
printf("ERROR: LayoutTestController::overridePreference() does not support the '%s' preference\n",
name.toLatin1().data());
@@ -472,6 +475,11 @@ void LayoutTestController::setUserStyleSheetLocation(const QString& url)
m_userStyleSheetLocation = QUrl(url);
}
+void LayoutTestController::setCaretBrowsingEnabled(bool value)
+{
+ qt_drt_enableCaretBrowsing(m_drt->webPage(), value);
+}
+
void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
{
if (enabled)
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 3d04be5..8a9f26f 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -135,6 +135,7 @@ public slots:
void setWindowIsKey(bool isKey);
void setMainFrameIsFirstResponder(bool isFirst);
void setXSSAuditorEnabled(bool enable);
+ void setCaretBrowsingEnabled(bool enable);
bool pauseAnimationAtTimeOnElementWithId(const QString& animationName, double time, const QString& elementId);
bool pauseTransitionAtTimeOnElementWithId(const QString& propertyName, double time, const QString& elementId);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list