Title: [113022] trunk/Source/WebKit2
- Revision
- 113022
- Author
- [email protected]
- Date
- 2012-04-03 06:22:41 -0700 (Tue, 03 Apr 2012)
Log Message
[Qt] Add developerExtrasEnabled to QWebPreferences.
https://bugs.webkit.org/show_bug.cgi?id=83018
Reviewed by Kenneth Rohde Christiansen.
This is required to allow inspecting pages.
* UIProcess/API/qt/qwebpreferences.cpp:
(QWebPreferencesPrivate::testAttribute):
(QWebPreferencesPrivate::setAttribute):
(QWebPreferences::developerExtrasEnabled):
(QWebPreferences::setDeveloperExtrasEnabled):
* UIProcess/API/qt/qwebpreferences_p.h:
* UIProcess/API/qt/qwebpreferences_p_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (113021 => 113022)
--- trunk/Source/WebKit2/ChangeLog 2012-04-03 13:13:14 UTC (rev 113021)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-03 13:22:41 UTC (rev 113022)
@@ -1,3 +1,20 @@
+2012-04-03 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Add developerExtrasEnabled to QWebPreferences.
+ https://bugs.webkit.org/show_bug.cgi?id=83018
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ This is required to allow inspecting pages.
+
+ * UIProcess/API/qt/qwebpreferences.cpp:
+ (QWebPreferencesPrivate::testAttribute):
+ (QWebPreferencesPrivate::setAttribute):
+ (QWebPreferences::developerExtrasEnabled):
+ (QWebPreferences::setDeveloperExtrasEnabled):
+ * UIProcess/API/qt/qwebpreferences_p.h:
+ * UIProcess/API/qt/qwebpreferences_p_p.h:
+
2012-04-03 Allan Sandfeld Jensen <[email protected]>
[Qt] Tap highlight attempted hidden several times
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp (113021 => 113022)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp 2012-04-03 13:13:14 UTC (rev 113021)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp 2012-04-03 13:22:41 UTC (rev 113022)
@@ -57,6 +57,8 @@
return WKPreferencesGetDNSPrefetchingEnabled(preferencesRef());
case FrameFlatteningEnabled:
return WKPreferencesGetFrameFlatteningEnabled(preferencesRef());
+ case DeveloperExtrasEnabled:
+ return WKPreferencesGetDeveloperExtrasEnabled(preferencesRef());
default:
ASSERT_NOT_REACHED();
return false;
@@ -92,6 +94,8 @@
break;
case FrameFlatteningEnabled:
WKPreferencesSetFrameFlatteningEnabled(preferencesRef(), enable);
+ case DeveloperExtrasEnabled:
+ WKPreferencesSetDeveloperExtrasEnabled(preferencesRef(), enable);
break;
default:
ASSERT_NOT_REACHED();
@@ -310,6 +314,17 @@
emit dnsPrefetchEnabledChanged();
}
+bool QWebPreferences::developerExtrasEnabled() const
+{
+ return d->testAttribute(QWebPreferencesPrivate::DeveloperExtrasEnabled);
+}
+
+void QWebPreferences::setDeveloperExtrasEnabled(bool enable)
+{
+ d->setAttribute(QWebPreferencesPrivate::DeveloperExtrasEnabled, enable);
+ emit developerExtrasEnabledChanged();
+}
+
bool QWebPreferences::navigatorQtObjectEnabled() const
{
return d->webViewPrivate->navigatorQtObjectEnabled();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h (113021 => 113022)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h 2012-04-03 13:13:14 UTC (rev 113021)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h 2012-04-03 13:22:41 UTC (rev 113022)
@@ -41,6 +41,7 @@
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(bool developerExtrasEnabled READ developerExtrasEnabled WRITE setDeveloperExtrasEnabled NOTIFY developerExtrasEnabledChanged FINAL)
Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily NOTIFY standardFontFamilyChanged FINAL)
Q_PROPERTY(QString fixedFontFamily READ fixedFontFamily WRITE setFixedFontFamily NOTIFY fixedFontFamilyChanged FINAL)
@@ -83,6 +84,9 @@
bool frameFlatteningEnabled() const;
void setFrameFlatteningEnabled(bool enable);
+ bool developerExtrasEnabled() const;
+ void setDeveloperExtrasEnabled(bool enable);
+
QString standardFontFamily() const;
void setStandardFontFamily(const QString& family);
@@ -121,6 +125,7 @@
void dnsPrefetchEnabledChanged();
void navigatorQtObjectEnabledChanged();
void frameFlatteningEnabledChanged();
+ void developerExtrasEnabledChanged();
void standardFontFamilyChanged();
void fixedFontFamilyChanged();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h (113021 => 113022)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h 2012-04-03 13:13:14 UTC (rev 113021)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h 2012-04-03 13:22:41 UTC (rev 113022)
@@ -36,7 +36,8 @@
XSSAuditingEnabled,
FrameFlatteningEnabled,
PrivateBrowsingEnabled,
- DnsPrefetchEnabled
+ DnsPrefetchEnabled,
+ DeveloperExtrasEnabled
};
enum FontFamily {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
