summaryrefslogtreecommitdiffstats
path: root/patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch')
-rw-r--r--patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch133
1 files changed, 0 insertions, 133 deletions
diff --git a/patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch b/patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
deleted file mode 100644
index a5ae49a28..000000000
--- a/patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zeno Albisser <zeno.albisser@digia.com>
-Date: Tue, 29 Oct 2013 11:30:28 +0100
-Subject: Do not forward declare UIResourceRequest, Identity and IdentityKey.
-
-Clang / libc++ does not support incomplete types in templates.
-See: http://clang.llvm.org/compatibility.html#undep_incomplete
----
- cc/trees/layer_tree_impl.h | 1 +
- .../browser/media/webrtc_identity_store_backend.cc | 37 -------------------
- .../browser/media/webrtc_identity_store_backend.h | 42 ++++++++++++++++++++--
- 3 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
-index 2f27460..85a71f5c 100644
---- a/cc/trees/layer_tree_impl.h
-+++ b/cc/trees/layer_tree_impl.h
-@@ -14,6 +14,7 @@
- #include "cc/base/scoped_ptr_vector.h"
- #include "cc/base/swap_promise.h"
- #include "cc/layers/layer_impl.h"
-+#include "cc/trees/layer_tree_host.h"
- #include "cc/resources/ui_resource_client.h"
-
- #if defined(COMPILER_GCC)
-diff --git a/content/browser/media/webrtc_identity_store_backend.cc b/content/browser/media/webrtc_identity_store_backend.cc
-index d599dcd..697de93 100644
---- a/content/browser/media/webrtc_identity_store_backend.cc
-+++ b/content/browser/media/webrtc_identity_store_backend.cc
-@@ -46,43 +46,6 @@ static bool InitDB(sql::Connection* db) {
- "creation_time INTEGER)");
- }
-
--struct WebRTCIdentityStoreBackend::IdentityKey {
-- IdentityKey(const GURL& origin, const std::string& identity_name)
-- : origin(origin), identity_name(identity_name) {}
--
-- bool operator<(const IdentityKey& other) const {
-- return origin < other.origin ||
-- (origin == other.origin && identity_name < other.identity_name);
-- }
--
-- GURL origin;
-- std::string identity_name;
--};
--
--struct WebRTCIdentityStoreBackend::Identity {
-- Identity(const std::string& common_name,
-- const std::string& certificate,
-- const std::string& private_key)
-- : common_name(common_name),
-- certificate(certificate),
-- private_key(private_key),
-- creation_time(base::Time::Now().ToInternalValue()) {}
--
-- Identity(const std::string& common_name,
-- const std::string& certificate,
-- const std::string& private_key,
-- int64 creation_time)
-- : common_name(common_name),
-- certificate(certificate),
-- private_key(private_key),
-- creation_time(creation_time) {}
--
-- std::string common_name;
-- std::string certificate;
-- std::string private_key;
-- int64 creation_time;
--};
--
- struct WebRTCIdentityStoreBackend::PendingFindRequest {
- PendingFindRequest(const GURL& origin,
- const std::string& identity_name,
-diff --git a/content/browser/media/webrtc_identity_store_backend.h b/content/browser/media/webrtc_identity_store_backend.h
-index 92b68b6..9be3fc2 100644
---- a/content/browser/media/webrtc_identity_store_backend.h
-+++ b/content/browser/media/webrtc_identity_store_backend.h
-@@ -11,8 +11,7 @@
- #include "base/time/time.h"
- #include "sql/connection.h"
- #include "sql/meta_table.h"
--
--class GURL;
-+#include "url/gurl.h"
-
- namespace base {
- class FilePath;
-@@ -94,7 +93,44 @@ class WebRTCIdentityStoreBackend
- };
- struct PendingFindRequest;
- struct IdentityKey;
-- struct Identity;
-+
-+ struct IdentityKey {
-+ IdentityKey(const GURL& origin, const std::string& identity_name)
-+ : origin(origin), identity_name(identity_name) {}
-+
-+ bool operator<(const IdentityKey& other) const {
-+ return origin < other.origin ||
-+ (origin == other.origin && identity_name < other.identity_name);
-+ }
-+
-+ GURL origin;
-+ std::string identity_name;
-+ };
-+
-+ struct Identity {
-+ Identity(const std::string& common_name,
-+ const std::string& certificate,
-+ const std::string& private_key)
-+ : common_name(common_name),
-+ certificate(certificate),
-+ private_key(private_key),
-+ creation_time(base::Time::Now().ToInternalValue()) {}
-+
-+ Identity(const std::string& common_name,
-+ const std::string& certificate,
-+ const std::string& private_key,
-+ int64 creation_time)
-+ : common_name(common_name),
-+ certificate(certificate),
-+ private_key(private_key),
-+ creation_time(creation_time) {}
-+
-+ std::string common_name;
-+ std::string certificate;
-+ std::string private_key;
-+ int64 creation_time;
-+ };
-+
- typedef std::map<IdentityKey, Identity> IdentityMap;
-
- ~WebRTCIdentityStoreBackend();