diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-06 18:19:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-20 12:46:45 +0100 |
| commit | acefc4ef38759bea3ede377e21c38dc8e4046e9e (patch) | |
| tree | 891a7200668b41b10f0704676815f5226d37b253 /patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch | |
| parent | cc9c8e14d9a2aec6a746e889b8f597f7d89b303d (diff) | |
Update chromium patches to apply on current stable (1650)
Change-Id: I3bdad02a2ef69d242980e34774a8219ef0c74ea9
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch')
| -rw-r--r-- | patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch | 22 |
1 files changed, 7 insertions, 15 deletions
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 4e71cdfdf..7738e9bf9 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 | 2 +- - .../browser/media/webrtc_identity_store_backend.cc | 37 ----------------- - .../browser/media/webrtc_identity_store_backend.h | 42 ++++++++++++++++++-- - 3 files changed, 40 insertions(+), 41 deletions(-) + 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 7e66da8..4f1afbe 100644 +index eb6a015..2ae33df 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h @@ -12,6 +12,7 @@ @@ -22,15 +22,7 @@ index 7e66da8..4f1afbe 100644 #include "cc/layers/layer_impl.h" +#include "cc/trees/layer_tree_host.h" #include "cc/resources/ui_resource_client.h" - #include "ui/base/latency_info.h" - -@@ -42,7 +43,6 @@ class Proxy; - class ResourceProvider; - class TileManager; - struct RendererCapabilities; --struct UIResourceRequest; - - typedef std::list<UIResourceRequest> UIResourceRequestQueue; + #include "ui/events/latency_info.h" diff --git a/content/browser/media/webrtc_identity_store_backend.cc b/content/browser/media/webrtc_identity_store_backend.cc index 9ec73e9..4188116 100644 @@ -141,5 +133,5 @@ index ab4e1ed..e660c73 100644 ~WebRTCIdentityStoreBackend(); -- -1.7.10.2 (Apple Git-33) +1.8.4.2 |