From df8eff9b1e457fe0783cc6022bf7c21f5381afbb Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 16 Dec 2013 10:40:46 +0100 Subject: Revert "Update chromium patches to apply on current stable (1650)" Let's make sure that the submodule integration succeeds first. This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e. Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4 Reviewed-by: Andras Becsi --- ...ard-declare-UIResourceRequest-Identity-an.patch | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch') diff --git a/patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch b/patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch index 7738e9bf9..4e71cdfdf 100644 --- a/patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch +++ b/patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch @@ -7,13 +7,13 @@ Subject: [PATCH] Do not forward declare UIResourceRequest, Identity and 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(-) + cc/trees/layer_tree_impl.h | 2 +- + .../browser/media/webrtc_identity_store_backend.cc | 37 ----------------- + .../browser/media/webrtc_identity_store_backend.h | 42 ++++++++++++++++++-- + 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h -index eb6a015..2ae33df 100644 +index 7e66da8..4f1afbe 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h @@ -12,6 +12,7 @@ @@ -22,7 +22,15 @@ index eb6a015..2ae33df 100644 #include "cc/layers/layer_impl.h" +#include "cc/trees/layer_tree_host.h" #include "cc/resources/ui_resource_client.h" - #include "ui/events/latency_info.h" + #include "ui/base/latency_info.h" + +@@ -42,7 +43,6 @@ class Proxy; + class ResourceProvider; + class TileManager; + struct RendererCapabilities; +-struct UIResourceRequest; + + typedef std::list UIResourceRequestQueue; diff --git a/content/browser/media/webrtc_identity_store_backend.cc b/content/browser/media/webrtc_identity_store_backend.cc index 9ec73e9..4188116 100644 @@ -133,5 +141,5 @@ index ab4e1ed..e660c73 100644 ~WebRTCIdentityStoreBackend(); -- -1.8.4.2 +1.7.10.2 (Apple Git-33) -- cgit v1.2.3