Revert errors

patches/0004-Chromium-Add-gl-changes-for-Wayland.patch

@@ -1,20 +1,30 @@
-From 4d3aa300333a97e653deb085b871c3131077cf30 Mon Sep 17 00:00:00 2001
+From 6c56714cc0c2b441da30c0498b31d72fa0068615 Mon Sep 17 00:00:00 2001
 From: Kondapally Kalyan <[email protected]>
-Date: Sat, 31 Aug 2013 03:01:13 +0300
-Subject: [PATCH] Chromium: Add gl changes for Wayland
+Date: Sat, 31 Aug 2013 01:47:46 +0300
+Subject: [PATCH] Most of our changes in glsurfaceegl are obsolete after [1]
+ recent changes to surface factory api. Changes still
+ present are in return type of EGLDisplay and EGLConfig.
 
-This patch should not be upstreamed.
-Ideally, we would need an api to query for supported
-EGLConfig.
+[1] https://chromiumcodereview.appspot.com/23438002
 ---
- ui/gl/gl_surface_egl.cc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ ui/gl/gl_surface_egl.cc |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
-index 5f4edf4..b99a0cf 100644
+index 5f4edf4..4414d17 100644
 --- a/ui/gl/gl_surface_egl.cc
 +++ b/ui/gl/gl_surface_egl.cc
-@@ -140,7 +140,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
+@@ -115,8 +115,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
+     LOG(ERROR) << "OZONE failed to initialize hardware";
+     return false;
+   }
+-  g_native_display = reinterpret_cast<EGLNativeDisplayType>(
+-      surface_factory->GetNativeDisplay());
++  g_native_display = surface_factory->GetNativeDisplay();
+ #else
+   g_native_display = EGL_DEFAULT_DISPLAY;
+ #endif
+@@ -140,7 +139,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
      EGL_GREEN_SIZE, 8,
      EGL_RED_SIZE, 8,
      EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,

patches/1001-Mesa-fix.patch

@@ -0,0 +1,33 @@
+From 3db9bdfd3d8b2a6c185e6b504db67f98e9db3f67 Mon Sep 17 00:00:00 2001
+From: Tiago Vignatti <[email protected]>
+Date: Thu, 11 Jul 2013 18:10:26 -0300
+Subject: [PATCH] Mesa fix
+
+We won't need this as soon the fix the order ui/gl/ is picking the headers, ie
+first khronos and then mesa.
+
+Signed-off-by: Tiago Vignatti <[email protected]>
+---
+ include/EGL/eglplatform.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 28455fb..9c05dca 100644
+--- a/include/EGL/eglplatform.h
++++ b/include/EGL/eglplatform.h
+@@ -104,6 +104,12 @@ typedef struct ANativeWindow        *EGLNativeWindowType;
+ typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
+ typedef void                        *EGLNativeDisplayType;
+
++#elif defined(USE_OZONE)
++
++typedef intptr_t EGLNativeDisplayType;
++typedef intptr_t EGLNativeWindowType;
++typedef intptr_t EGLNativePixmapType;
++
+ #elif defined(__unix__)
+
+ #ifdef MESA_EGL_NO_X11_HEADERS
+-- 
+1.7.9.5
+

patches/patch-chromium.sh

@@ -16,3 +16,8 @@ fi
 
 git checkout -b $HACKING_BRANCH origin/master
 git am $PATCH_DIR/00*
+
+# jump now to mesa dir and apply the needed patches there
+cd third_party/mesa/src
+git reset --hard origin/master
+git am $PATCH_DIR/100*