From 73f0716ddf56443db3d45a9eb60cee6177df2fc4 Mon Sep 17 00:00:00 2001
From: Adam Kallai <kadam@inf.u-szeged.hu>
Date: Thu, 19 Dec 2013 08:26:35 -0800
Subject: [PATCH] Implement WebEngineError class for handling ErrorDomain
Change-Id: I6092483d46b8d0db6193b92f2744bd836beb4912
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
---
src/core/core_gyp_generator.pro | 2 +
src/core/web_engine_error.cpp | 87 +++++++++++++++++++++++++++++++++
src/core/web_engine_error.h | 65 ++++++++++++++++++++++++
3 files changed, 154 insertions(+)
create mode 100644 src/core/web_engine_error.cpp
create mode 100644 src/core/web_engine_error.h
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 60157377e..4064324d0 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -51,6 +51,7 @@ SOURCES = \
web_contents_delegate_qt.cpp \
web_contents_view_qt.cpp \
web_engine_context.cpp \
+ web_engine_error.cpp \
web_engine_library_info.cpp \
web_event_factory.cpp \
yuv_video_node.cpp \
@@ -79,6 +80,7 @@ HEADERS = \
web_contents_delegate_qt.h \
web_contents_view_qt.h \
web_engine_context.h \
+ web_engine_error.h \
web_engine_library_info.h \
web_event_factory.h \
yuv_video_node.h \
diff --git a/src/core/web_engine_error.cpp b/src/core/web_engine_error.cpp
new file mode 100644
index 000000000..f53346995
--- /dev/null
+++ b/src/core/web_engine_error.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "web_engine_error.h"
+
+namespace {
+const int noError = 0;
+const int systemRelatedErrors = -1;
+const int connectionRelatedErrors = -100;
+const int certificateErrors = -200;
+const int httpErrors = -300;
+const int cacheErrors = -400;
+const int internalErrors = -500;
+const int ftpErrors = -600;
+const int certificateManagerErrors = -700;
+const int dnsResolverErrors = -800;
+const int endErrors = -900;
+}
+
+WebEngineError::ErrorDomain WebEngineError::toQtErrorDomain(int error_code)
+{
+ // Chromium's ranges from net/base/net_error_list.h:
+ // 0 No error
+ // 1- 99 System related errors
+ // 100-199 Connection related errors
+ // 200-299 Certificate errors
+ // 300-399 HTTP errors
+ // 400-499 Cache errors
+ // 500-599 Internal errors
+ // 600-699 FTP errors
+ // 700-799 Certificate manager errors
+ // 800-899 DNS resolver errors
+
+ if (error_code == noError)
+ return WebEngineError::NoErrorDomain;
+ else if (certificateErrors < error_code && error_code <= connectionRelatedErrors)
+ return WebEngineError::ConnectionErrorDomain;
+ else if ((httpErrors < error_code && error_code <= certificateErrors)
+ || (dnsResolverErrors < error_code && error_code <= certificateManagerErrors))
+ return WebEngineError::CertificateErrorDomain;
+ else if (cacheErrors < error_code && error_code <= httpErrors)
+ return WebEngineError::HttpErrorDomain;
+ else if (certificateManagerErrors < error_code && error_code <= ftpErrors)
+ return WebEngineError::FtpErrorDomain;
+ else if (endErrors < error_code && error_code <= dnsResolverErrors)
+ return WebEngineError::DnsErrorDomain;
+ else
+ return WebEngineError::InternalErrorDomain;
+}
diff --git a/src/core/web_engine_error.h b/src/core/web_engine_error.h
new file mode 100644
index 000000000..9fd7eb265
--- /dev/null
+++ b/src/core/web_engine_error.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WEB_ENGINE_ERROR_H
+#define WEB_ENGINE_ERROR_H
+
+#include "qtwebenginecoreglobal.h"
+
+class QWEBENGINE_EXPORT WebEngineError
+{
+
+public:
+ enum ErrorDomain {
+ NoErrorDomain,
+ InternalErrorDomain,
+ ConnectionErrorDomain,
+ CertificateErrorDomain,
+ HttpErrorDomain,
+ FtpErrorDomain,
+ DnsErrorDomain
+ };
+
+ static ErrorDomain toQtErrorDomain(int error_code);
+
+};
+
+#endif // WEB_ENGINE_ERROR_H
--
GitLab