Title: [108471] trunk/Source/WebKit2
- Revision
- 108471
- Author
- [email protected]
- Date
- 2012-02-22 02:17:16 -0800 (Wed, 22 Feb 2012)
Log Message
[Qt][WK2] Add frame flattening setting to QWebPreferences.
https://bugs.webkit.org/show_bug.cgi?id=79099
Patch by Zalan Bujtas <[email protected]> on 2012-02-22
Reviewed by Simon Hausmann.
Frame flattening is enabled by default for Qt WebKit2.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
* UIProcess/API/qt/qwebpreferences.cpp:
(QWebPreferencesPrivate::testAttribute):
(QWebPreferencesPrivate::setAttribute):
(QWebPreferences::setNavigatorQtObjectEnabled):
(QWebPreferences::frameFlatteningEnabled):
(QWebPreferences::setFrameFlatteningEnabled):
* UIProcess/API/qt/qwebpreferences_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (108470 => 108471)
--- trunk/Source/WebKit2/ChangeLog 2012-02-22 10:12:30 UTC (rev 108470)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-22 10:17:16 UTC (rev 108471)
@@ -1,3 +1,22 @@
+2012-02-22 Zalan Bujtas <[email protected]>
+
+ [Qt][WK2] Add frame flattening setting to QWebPreferences.
+ https://bugs.webkit.org/show_bug.cgi?id=79099
+
+ Reviewed by Simon Hausmann.
+
+ Frame flattening is enabled by default for Qt WebKit2.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewPrivate::initialize):
+ * UIProcess/API/qt/qwebpreferences.cpp:
+ (QWebPreferencesPrivate::testAttribute):
+ (QWebPreferencesPrivate::setAttribute):
+ (QWebPreferences::setNavigatorQtObjectEnabled):
+ (QWebPreferences::frameFlatteningEnabled):
+ (QWebPreferences::setFrameFlatteningEnabled):
+ * UIProcess/API/qt/qwebpreferences_p.h:
+
2012-02-22 Ryosuke Niwa <[email protected]>
Remove the remaining uses of CSSStyleDeclaration in Editor
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (108470 => 108471)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-02-22 10:12:30 UTC (rev 108470)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-02-22 10:17:16 UTC (rev 108471)
@@ -117,6 +117,7 @@
// Any page setting should preferrable be set before creating the page.
webPageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
webPageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
+ webPageProxy->pageGroup()->preferences()->setFrameFlatteningEnabled(true);
pageClient.initialize(q_ptr, pageViewPrivate->eventHandler.data(), &undoController);
webPageProxy->initializeWebPage();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp (108470 => 108471)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp 2012-02-22 10:12:30 UTC (rev 108470)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp 2012-02-22 10:17:16 UTC (rev 108471)
@@ -54,6 +54,8 @@
return WKPreferencesGetPrivateBrowsingEnabled(preferencesRef());
case DnsPrefetchEnabled:
return WKPreferencesGetDNSPrefetchingEnabled(preferencesRef());
+ case FrameFlatteningEnabled:
+ return WKPreferencesGetFrameFlatteningEnabled(preferencesRef());
default:
ASSERT_NOT_REACHED();
return false;
@@ -87,6 +89,9 @@
case DnsPrefetchEnabled:
WKPreferencesSetDNSPrefetchingEnabled(preferencesRef(), enable);
break;
+ case FrameFlatteningEnabled:
+ WKPreferencesSetFrameFlatteningEnabled(preferencesRef(), enable);
+ break;
default:
ASSERT_NOT_REACHED();
}
@@ -293,6 +298,17 @@
emit navigatorQtObjectEnabledChanged();
}
+bool QWebPreferences::frameFlatteningEnabled() const
+{
+ return d->testAttribute(QWebPreferencesPrivate::FrameFlatteningEnabled);
+}
+
+void QWebPreferences::setFrameFlatteningEnabled(bool enable)
+{
+ d->setAttribute(QWebPreferencesPrivate::FrameFlatteningEnabled, enable);
+ emit frameFlatteningEnabledChanged();
+}
+
QString QWebPreferences::standardFontFamily() const
{
return d->fontFamily(QWebPreferencesPrivate::StandardFont);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h (108470 => 108471)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h 2012-02-22 10:12:30 UTC (rev 108470)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h 2012-02-22 10:17:16 UTC (rev 108471)
@@ -40,6 +40,7 @@
Q_PROPERTY(bool privateBrowsingEnabled READ privateBrowsingEnabled WRITE setPrivateBrowsingEnabled NOTIFY privateBrowsingEnabledChanged FINAL)
Q_PROPERTY(bool dnsPrefetchEnabled READ dnsPrefetchEnabled WRITE setDnsPrefetchEnabled NOTIFY dnsPrefetchEnabledChanged FINAL)
Q_PROPERTY(bool navigatorQtObjectEnabled READ navigatorQtObjectEnabled WRITE setNavigatorQtObjectEnabled NOTIFY navigatorQtObjectEnabledChanged FINAL)
+ Q_PROPERTY(bool frameFlatteningEnabled READ frameFlatteningEnabled WRITE setFrameFlatteningEnabled NOTIFY frameFlatteningEnabledChanged FINAL)
Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily NOTIFY standardFontFamilyChanged FINAL)
Q_PROPERTY(QString fixedFontFamily READ fixedFontFamily WRITE setFixedFontFamily NOTIFY fixedFontFamilyChanged FINAL)
@@ -79,6 +80,9 @@
bool navigatorQtObjectEnabled() const;
void setNavigatorQtObjectEnabled(bool);
+ bool frameFlatteningEnabled() const;
+ void setFrameFlatteningEnabled(bool enable);
+
QString standardFontFamily() const;
void setStandardFontFamily(const QString& family);
@@ -116,6 +120,7 @@
void privateBrowsingEnabledChanged();
void dnsPrefetchEnabledChanged();
void navigatorQtObjectEnabledChanged();
+ void frameFlatteningEnabledChanged();
void standardFontFamilyChanged();
void fixedFontFamilyChanged();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
