diff options
Diffstat (limited to 'Source/WebKit/qt/WidgetApi')
-rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebframe.h | 4 | ||||
-rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h index a3374ff13..9502618ff 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.h +++ b/Source/WebKit/qt/WidgetApi/qwebframe.h @@ -59,6 +59,9 @@ namespace WebCore { class ChromeClientQt; class TextureMapperLayerClientQt; } +namespace WebKit { + class InspectorClientWebPage; +} class QWebFrameData; class QWebHitTestResultPrivate; class QWebFrame; @@ -242,6 +245,7 @@ private: friend class WebCore::FrameLoaderClientQt; friend class WebCore::ChromeClientQt; friend class WebCore::TextureMapperLayerClientQt; + friend class WebKit::InspectorClientWebPage; QWebFramePrivate *d; Q_PRIVATE_SLOT(d, void _q_orientationChanged()) }; diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index f8d8c0abc..261e032fd 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -663,16 +663,6 @@ void QWebPagePrivate::createWebInspector(QObject** inspectorView, QWebPageAdapte QWebPage* page = new WebKit::InspectorClientWebPage; *inspectorView = page->view(); *inspectorPage = page->d; - - // FIXME: Find out what's going on with Settings - page->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, false); - - // We treat "qrc:" scheme as local, but by default local content is not allowed to use - // LocalStorage which is required for Inspector to work. - // See https://bugs.webkit.org/show_bug.cgi?id=155265 - // Alternatively we can make "qrc:" scheme non-local like GTK port does: - // https://bugs.webkit.org/show_bug.cgi?id=155497 - page->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true); } #ifndef QT_NO_MENU @@ -3219,7 +3209,7 @@ bool QWebPage::supportsExtension(Extension extension) const if (extension == ChooseMultipleFilesExtension) return true; #endif - return extension == ErrorPageExtension; + return extension == ErrorPageExtension && d->settings->testAttribute(QWebSettings::ErrorPageEnabled); } /*! |