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 --- .../0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch') diff --git a/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch b/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch index 926f799f2..55cf5a5d5 100644 --- a/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch +++ b/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch @@ -40,7 +40,7 @@ index 8b466bd..fe3f7b3 100644 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index cc664c6..f817cb2 100644 +index 1f5e836..2168769 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -48,6 +48,7 @@ class CryptoModuleBlockingPasswordDelegate; @@ -51,7 +51,7 @@ index cc664c6..f817cb2 100644 class ImageSkia; } -@@ -570,6 +571,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -563,6 +564,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Return NULL to use the default one for the platform to be created. virtual LocationProvider* OverrideSystemLocationProvider(); -- cgit v1.2.3