mozilla-bmo1088588.patch
author <josua.mayer97@gmail.com>
Thu, 30 Oct 2014 11:42:24 +0100
branchfirefox33
changeset 786 f721a3dea219
permissions -rw-r--r--
added fix for bmo1088588
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
786
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     1
# HG changeset patch
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     2
# User Dirk Mueller <dmueller@suse.com>
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     3
# Date 1414618964 0
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     4
#      Wed Oct 29 21:42:44 2014 +0000
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     5
# Node ID 8e3825b2d12a9f295b6ff9a972340b9d84fce068
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     6
# Parent  262e4847ad6cca40d7375e40a0d6ebe8b372e3d3
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     7
Bug 1088588 - fix ifdef in X11TextureSourceOGL.cpp, r?nical
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     8
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
     9
diff --git a/gfx/layers/opengl/X11TextureSourceOGL.cpp b/gfx/layers/opengl/X11TextureSourceOGL.cpp
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    10
--- a/gfx/layers/opengl/X11TextureSourceOGL.cpp
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    11
+++ b/gfx/layers/opengl/X11TextureSourceOGL.cpp
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    12
@@ -94,14 +94,14 @@ X11TextureSourceOGL::ContentTypeToSurfac
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    13
   switch (aType) {
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    14
     case gfxContentType::COLOR:
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    15
       return SurfaceFormat::R8G8B8X8;
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    16
     case gfxContentType::COLOR_ALPHA:
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    17
       return SurfaceFormat::R8G8B8A8;
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    18
     default:
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    19
       return SurfaceFormat::UNKNOWN;
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    20
   }
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    21
 }
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    22
 
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    23
+}
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    24
+}
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    25
+
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    26
 #endif
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    27
-
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    28
-}
f721a3dea219 added fix for bmo1088588
<josua.mayer97@gmail.com>
parents:
diff changeset
    29
-}