← Back to branch summary

~osomon/oxide/context-menu

« back to all changes in this revision

Viewing changes to patches/port/gl_implementation.patch

  • Committer: Olivier Tilloy
  • Date: 2015-04-24 11:34:28 UTC
  • mfrom: (1031.1.24 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20150424113428-r221y8t5hv083t0n
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/port/gl_implementation.patch
28
28
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
29
29
--- a/ui/gfx/gfx.gyp
30
30
+++ b/ui/gfx/gfx.gyp
31
 
@@ -306,16 +306,18 @@
 
31
@@ -305,16 +305,18 @@
32
32
         'win/dpi.h',
33
33
         'win/hwnd_util.cc',
34
34
         'win/hwnd_util.h',
47
47
         ['OS=="ios"', {
48
48
           # Linkable dependents need to set the linker flag '-ObjC' in order to
49
49
           # use the categories in this target (e.g. NSString+CrStringDrawing.h).
50
 
@@ -395,17 +397,17 @@
 
50
@@ -390,17 +392,17 @@
51
51
             'harfbuzz_font_skia.h',
52
52
             'render_text.cc',
53
53
             'render_text.h',
215
215
 #endif
216
216
 
217
217
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
218
 
@@ -51,17 +51,17 @@ std::string DriverEGL::GetPlatformExtens
219
 
   DCHECK(g_driver_egl.fn.eglInitializeFn);
220
 
   g_driver_egl.fn.eglInitializeFn(display, NULL, NULL);
221
 
   DCHECK(g_driver_egl.fn.eglQueryStringFn);
222
 
   const char* str = g_driver_egl.fn.eglQueryStringFn(display, EGL_EXTENSIONS);
 
218
@@ -58,17 +58,17 @@ std::string DriverEGL::GetPlatformExtens
 
219
 // static
 
220
 std::string DriverEGL::GetClientExtensions() {
 
221
   const char* str =
 
222
       g_driver_egl.fn.eglQueryStringFn(EGL_NO_DISPLAY, EGL_EXTENSIONS);
223
223
   return str ? std::string(str) : "";
224
224
 }
225
225
 #endif
256
256
 #undef Bool
257
257
 #undef None
258
258
 #undef Status
259
 
@@ -314,16 +314,19 @@ typedef uint64 EGLuint64CHROMIUM;
 
259
@@ -317,16 +317,19 @@ typedef uint64 EGLuint64CHROMIUM;
260
260
 #if defined(OS_WIN)
261
261
 #include "gl_bindings_autogen_egl.h"
262
262
 #include "gl_bindings_autogen_wgl.h"
276
276
 
277
277
 struct GL_EXPORT DriverGL {
278
278
   void InitializeStaticBindings();
279
 
@@ -383,17 +386,17 @@ struct GL_EXPORT DriverEGL {
280
 
   ProcsEGL debug_fn;
 
279
@@ -387,17 +390,17 @@ struct GL_EXPORT DriverEGL {
281
280
   ExtensionsEGL ext;
282
281
 
283
282
  private:
284
283
   static std::string GetPlatformExtensions();
 
284
   static std::string GetClientExtensions();
285
285
 };
286
286
 #endif
287
287
 
295
295
   ProcsGLX fn;
296
296
   ProcsGLX debug_fn;
297
297
   ExtensionsGLX ext;
298
 
@@ -425,16 +428,23 @@ GL_EXPORT extern GLXApi* g_current_glx_c
 
298
@@ -429,16 +432,23 @@ GL_EXPORT extern GLXApi* g_current_glx_c
299
299
 GL_EXPORT extern DriverEGL g_driver_egl;
300
300
 GL_EXPORT extern DriverGLX g_driver_glx;
301
301
 
401
401
 
402
402
 gfx::AcceleratedWidget NativeViewGLSurfaceGLX::GetDrawableHandle() const {
403
403
   return window_;
404
 
@@ -584,16 +587,17 @@ bool NativeViewGLSurfaceGLX::PostSubBuff
 
404
@@ -585,16 +588,17 @@ bool NativeViewGLSurfaceGLX::PostSubBuff
405
405
 
406
406
 VSyncProvider* NativeViewGLSurfaceGLX::GetVSyncProvider() {
407
407
   return vsync_provider_.get();