summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/chrome_qt.gyp44
-rw-r--r--src/core/content_client_qt.cpp9
-rw-r--r--src/core/content_client_qt.h1
-rw-r--r--src/core/core_gyp_generator.pro1
-rw-r--r--src/core/qtwebengine.gypi3
-rw-r--r--src/core/renderer/content_renderer_client_qt.cpp45
-rw-r--r--src/core/renderer/content_renderer_client_qt.h5
-rw-r--r--src/core/resources/grit_action.gypi41
-rw-r--r--src/core/resources/repack_locales.gypi1
-rw-r--r--src/core/resources/repack_resources.gypi2
-rw-r--r--src/core/resources/resources.gyp1
-rw-r--r--src/core/web_engine_library_info.cpp5
-rw-r--r--src/core/web_engine_library_info.h3
-rw-r--r--src/webengine/api/qquickwebengineview.cpp4
14 files changed, 156 insertions, 9 deletions
diff --git a/src/core/chrome_qt.gyp b/src/core/chrome_qt.gyp
index a38b4a9bf..81ab2e881 100644
--- a/src/core/chrome_qt.gyp
+++ b/src/core/chrome_qt.gyp
@@ -1,18 +1,56 @@
{
+ 'variables': {
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+ },
'targets': [
{
'target_name': 'chrome_qt',
'type': 'static_library',
+ 'dependencies': [
+ 'chrome_resources',
+ ],
'include_dirs': [
+ './',
'<(chromium_src_dir)',
'<(chromium_src_dir)/skia/config',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome', # Needed to include grit-generated files in localized_error.cc
],
'sources': [
- '<(chromium_src_dir)/chrome/browser/media/desktop_streams_registry.h',
'<(chromium_src_dir)/chrome/browser/media/desktop_streams_registry.cc',
+ '<(chromium_src_dir)/chrome/browser/media/desktop_streams_registry.h',
'<(chromium_src_dir)/chrome/browser/media/desktop_media_list.h',
+ '<(chromium_src_dir)/chrome/common/localized_error.cc',
+ '<(chromium_src_dir)/chrome/common/localized_error.h',
+ '<(chromium_src_dir)/chrome/common/net/net_error_info.cc',
+ '<(chromium_src_dir)/chrome/common/net/net_error_info.h',
],
- }
+ },
+ {
+ 'target_name': 'chrome_resources',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'generated_resources',
+ 'variables': {
+ 'grit_grd_file': '<(chromium_src_dir)/chrome/app/generated_resources.grd',
+ },
+ 'includes': [ 'resources/grit_action.gypi' ],
+ },
+ {
+ 'action_name': 'chromium_strings.grd',
+ 'variables': {
+ 'grit_grd_file': '<(chromium_src_dir)/chrome/app/chromium_strings.grd',
+ },
+ 'includes': [ 'resources/grit_action.gypi' ],
+ },
+ {
+ 'action_name': 'renderer_resources',
+ 'variables': {
+ 'grit_grd_file': '<(chromium_src_dir)/chrome/renderer/resources/renderer_resources.grd',
+ },
+ 'includes': [ 'resources/grit_action.gypi' ],
+ },
+ ]
+ },
],
}
-
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 6a52cb5d4..972fd43f7 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -46,6 +46,9 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include <QCoreApplication>
+#include <QStringBuilder>
+
base::StringPiece ContentClientQt::GetDataResource(int resource_id, ui::ScaleFactor scale_factor) const {
return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(resource_id, scale_factor);
}
@@ -54,3 +57,9 @@ base::string16 ContentClientQt::GetLocalizedString(int message_id) const
{
return l10n_util::GetStringUTF16(message_id);
}
+
+std::string ContentClientQt::GetProduct() const
+{
+ QString productName(qApp->applicationName() % '/' % qApp->applicationVersion());
+ return productName.toStdString();
+}
diff --git a/src/core/content_client_qt.h b/src/core/content_client_qt.h
index 66f302825..ff4b543ec 100644
--- a/src/core/content_client_qt.h
+++ b/src/core/content_client_qt.h
@@ -51,6 +51,7 @@ class ContentClientQt : public content::ContentClient {
public:
virtual base::StringPiece GetDataResource(int, ui::ScaleFactor) const Q_DECL_OVERRIDE;
virtual base::string16 GetLocalizedString(int message_id) const Q_DECL_OVERRIDE;
+ virtual std::string GetProduct() const Q_DECL_OVERRIDE;
};
#endif // CONTENT_CLIENT_QT_H
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 1c2857030..27ee33e51 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -78,7 +78,6 @@ SOURCES = \
web_event_factory.cpp \
yuv_video_node.cpp
-
HEADERS = \
browser_accessibility_manager_qt.h \
browser_accessibility_qt.h \
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index c01998c59..d1bee5fb6 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -28,11 +28,12 @@
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
'<(chromium_src_dir)/webkit/glue/webkit_glue.gyp:*',
'<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:webkit',
- 'chrome_qt.gyp:*',
+ 'chrome_qt.gyp:chrome_qt',
],
'include_dirs': [
'<(chromium_src_dir)',
'<(SHARED_INTERMEDIATE_DIR)/net', # Needed to include grit/net_resources.h
+ '<(SHARED_INTERMEDIATE_DIR)/chrome', # Needed to include grit/generated_resources.h
],
# Chromium code defines those in common.gypi, do the same for our code that include Chromium headers.
'defines': [
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 0b497a004..ecb469a9d 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -41,10 +41,55 @@
#include "renderer/content_renderer_client_qt.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/common/localized_error.h"
+#include "content/public/renderer/render_thread.h"
+#include "net/base/net_errors.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
+#include "third_party/WebKit/public/platform/WebURLRequest.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/webui/jstemplate_builder.h"
+
#include "renderer/qt_render_view_observer.h"
+#include "grit/renderer_resources.h"
+
+static const char kHttpErrorDomain[] = "http";
+
void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view)
{
// RenderViewObserver destroys itself with its RenderView.
new QtRenderViewObserver(render_view);
}
+
+// To tap into the chromium localized strings. Ripped from the chrome layer (highly simplified).
+void ContentRendererClientQt::GetNavigationErrorStrings(blink::WebFrame *frame, const blink::WebURLRequest &failed_request, const blink::WebURLError &error, const std::string &accept_languages, std::string *error_html, base::string16 *error_description)
+{
+ Q_UNUSED(frame)
+
+ const bool isPost = EqualsASCII(failed_request.httpMethod(), "POST");
+
+ if (error_html) {
+ // Use a local error page.
+ int resource_id;
+ base::DictionaryValue error_strings;
+
+ const std::string locale = content::RenderThread::Get()->GetLocale();
+ // TODO(elproxy): We could potentially get better diagnostics here by first calling NetErrorHelper::GetErrorStringsForDnsProbe
+ LocalizedError::GetStrings(error.reason, error.domain.utf8(),
+ error.unreachableURL, isPost, locale,
+ accept_languages, &error_strings);
+ resource_id = IDR_NET_ERROR_HTML;
+
+
+ const base::StringPiece template_html(ui::ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
+ if (template_html.empty())
+ NOTREACHED() << "unable to load template. ID: " << resource_id;
+ else // "t" is the id of the templates root node.
+ *error_html = webui::GetTemplatesHtml(template_html, &error_strings, "t");
+ }
+
+ if (error_description) {
+ *error_description = LocalizedError::GetErrorDetails(error, isPost);
+ }
+}
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 100bfd703..360e82f2c 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -47,6 +47,7 @@ class ContentRendererClientQt : public content::ContentRendererClient {
public:
virtual void RenderViewCreated(content::RenderView *render_view) Q_DECL_OVERRIDE;
- // Update this when we want to allow overriding error pages.
- virtual bool ShouldSuppressErrorPage(const GURL &) Q_DECL_OVERRIDE { return true; }
+ virtual bool ShouldSuppressErrorPage(const GURL &) Q_DECL_OVERRIDE { return false; }
+ virtual void GetNavigationErrorStrings(blink::WebFrame* frame, const blink::WebURLRequest& failed_request, const blink::WebURLError& error
+ , const std::string& accept_languages, std::string* error_html, base::string16* error_description) Q_DECL_OVERRIDE;
};
diff --git a/src/core/resources/grit_action.gypi b/src/core/resources/grit_action.gypi
new file mode 100644
index 000000000..e8b98b43d
--- /dev/null
+++ b/src/core/resources/grit_action.gypi
@@ -0,0 +1,41 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is meant to be included into an action to invoke grit in a
+# consistent manner. To use this the following variables need to be
+# defined:
+# grit_grd_file: string: grd file path
+# grit_out_dir: string: the output directory path
+
+# It would be really nice to do this with a rule instead of actions, but it
+# would need to determine inputs and outputs via grit_info on a per-file
+# basis. GYP rules don’t currently support that. They could be extended to
+# do this, but then every generator would need to be updated to handle this.
+
+{
+ 'variables': {
+ 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
+ 'grit_resource_ids%': '<(DEPTH)/tools/gritsettings/resource_ids',
+ # This makes it possible to add more defines in specific targets,
+ # instead of build/common.gypi .
+ 'grit_additional_defines%': [],
+ },
+ 'inputs': [
+ '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) '
+ '--inputs <(grit_grd_file) -f "<(grit_resource_ids)")',
+ ],
+ 'outputs': [
+ '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) '
+ '--outputs \'<(grit_out_dir)\' '
+ '<(grit_grd_file) -f "<(grit_resource_ids)")',
+ ],
+ 'action': ['<@(grit_cmd)',
+ '-i', '<(grit_grd_file)', 'build',
+ '-f', '<(grit_resource_ids)',
+ '-o', '<(grit_out_dir)',
+ '<@(grit_defines)',
+ '<@(grit_additional_defines)' ],
+ 'msvs_cygwin_shell': 0,
+ 'message': 'Generating resources from <(grit_grd_file)',
+}
diff --git a/src/core/resources/repack_locales.gypi b/src/core/resources/repack_locales.gypi
index e906d2178..ca3507912 100644
--- a/src/core/resources/repack_locales.gypi
+++ b/src/core/resources/repack_locales.gypi
@@ -3,7 +3,6 @@
# found in the LICENSE file.
{
- 'action_name': 'repack_locales',
'variables': {
'repack_extra_flags%': [],
'repack_output_dir%': '<(SHARED_INTERMEDIATE_DIR)',
diff --git a/src/core/resources/repack_resources.gypi b/src/core/resources/repack_resources.gypi
index 5a955cccc..133813c60 100644
--- a/src/core/resources/repack_resources.gypi
+++ b/src/core/resources/repack_resources.gypi
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
- 'action_name': 'repack_resources',
'variables': {
'repack_path': '<(chromium_src_dir)/tools/grit/grit/format/repack.py',
'pak_inputs': [
@@ -13,6 +12,7 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
],
},
'inputs': [
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp
index 44ffcd703..f07facca6 100644
--- a/src/core/resources/resources.gyp
+++ b/src/core/resources/resources.gyp
@@ -14,6 +14,7 @@
'<(chromium_src_dir)/webkit/webkit_resources.gyp:webkit_strings',
'<(chromium_src_dir)/webkit/webkit_resources.gyp:webkit_resources',
'<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
+ '../chrome_qt.gyp:chrome_resources',
],
'targets': [
{
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 4e7d20cc7..fd1748d00 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -190,3 +190,8 @@ base::FilePath WebEngineLibraryInfo::getPath(int key)
return toFilePath(directory.isEmpty() ? fallbackDir() : directory);
}
+
+base::string16 WebEngineLibraryInfo::getApplicationName()
+{
+ return toString16(qApp->applicationName());
+}
diff --git a/src/core/web_engine_library_info.h b/src/core/web_engine_library_info.h
index 84fee12af..4ce760dc4 100644
--- a/src/core/web_engine_library_info.h
+++ b/src/core/web_engine_library_info.h
@@ -43,6 +43,7 @@
#define WEB_ENGINE_LIBRARY_INFO_H
#include "base/files/file_path.h"
+#include "base/strings/string16.h"
enum {
QT_RESOURCES_PAK = 5000
};
@@ -50,6 +51,8 @@ enum {
class WebEngineLibraryInfo {
public:
static base::FilePath getPath(int key);
+ // Called by localized_error in our custom chrome layer
+ static base::string16 getApplicationName();
};
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index ad57f24ba..a6a11c07d 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -282,6 +282,10 @@ void QQuickWebEngineViewPrivate::loadVisuallyCommitted()
Q_EMIT e->loadVisuallyCommitted();
}
+Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<int>(QQuickWebEngineView::NoErrorDomain));
+Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+
void QQuickWebEngineViewPrivate::loadFinished(bool success, int error_code, const QString &error_description)
{
Q_Q(QQuickWebEngineView);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 20:31:09 +0000