diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-02 04:14:09 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-02 14:26:04 +0300 |
| commit | 6fb62e5afd575a380322955a0a0144e4a6f8f86d (patch) | |
| tree | 7903573103880a868ab4584e3c2030dd377e338c /Source/WebKit | |
| parent | 33a5322d0126b0fcf90026b6bf26092fd78b072e (diff) | |
Import QtWebKit commit 1c054b639030b02ff98964cc915beaa45b18e6ce
Change-Id: Ieac288ef14217f25da44d69e1d191c47290182c3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 10 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index b27ac1357..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 diff --git a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp index 8e5427b23..9b2ba7dfd 100644 --- a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp +++ b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp @@ -41,7 +41,21 @@ InspectorClientWebPage::InspectorClientWebPage() QWebView* view = new QWebView; view->setPage(this); setParent(view); + settings()->setAttribute(QWebSettings::JavascriptEnabled, true); +#if !ENABLE(DEVELOPER_MODE) + settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false); +#endif connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), SLOT(javaScriptWindowObjectCleared())); + + // FIXME: Find out what's going on with Settings + 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 + settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true); } QWebPage* InspectorClientWebPage::createWindow(QWebPage::WebWindowType) |