From: commit-queue@webkit.org Date: Wed, 22 Feb 2012 10:17:16 +0000 (+0000) Subject: [Qt][WK2] Add frame flattening setting to QWebPreferences. X-Git-Tag: 070512121124~12184 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=effcf7593d15db46dfbd7a22caebad7891978a60;p=profile%2Fivi%2Fwebkit-efl.git [Qt][WK2] Add frame flattening setting to QWebPreferences. https://bugs.webkit.org/show_bug.cgi?id=79099 Patch by Zalan Bujtas 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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108471 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 95a7634..6d5b5e1 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,22 @@ +2012-02-22 Zalan Bujtas + + [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 Remove the remaining uses of CSSStyleDeclaration in Editor diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 0924592..39c916d 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -117,6 +117,7 @@ void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pa // 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(); diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp index 71c11af..835c698 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp @@ -54,6 +54,8 @@ bool QWebPreferencesPrivate::testAttribute(QWebPreferencesPrivate::WebAttribute return WKPreferencesGetPrivateBrowsingEnabled(preferencesRef()); case DnsPrefetchEnabled: return WKPreferencesGetDNSPrefetchingEnabled(preferencesRef()); + case FrameFlatteningEnabled: + return WKPreferencesGetFrameFlatteningEnabled(preferencesRef()); default: ASSERT_NOT_REACHED(); return false; @@ -87,6 +89,9 @@ void QWebPreferencesPrivate::setAttribute(QWebPreferencesPrivate::WebAttribute a case DnsPrefetchEnabled: WKPreferencesSetDNSPrefetchingEnabled(preferencesRef(), enable); break; + case FrameFlatteningEnabled: + WKPreferencesSetFrameFlatteningEnabled(preferencesRef(), enable); + break; default: ASSERT_NOT_REACHED(); } @@ -293,6 +298,17 @@ void QWebPreferences::setNavigatorQtObjectEnabled(bool enable) 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); diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h index 29df04c..82b738f 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h @@ -40,6 +40,7 @@ public: 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 @@ public: 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 @@ Q_SIGNALS: void privateBrowsingEnabledChanged(); void dnsPrefetchEnabledChanged(); void navigatorQtObjectEnabledChanged(); + void frameFlatteningEnabledChanged(); void standardFontFamilyChanged(); void fixedFontFamilyChanged();