The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/skia/patches/0031-Bug-945588-Add-include-guard.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,39 @@
     1.4 +# HG changeset patch
     1.5 +# User Ehsan Akhgari <ehsan@mozilla.com>
     1.6 +
     1.7 +Bug 945588 - Add include guards to SkConfig8888.h
     1.8 +
     1.9 +diff --git a/gfx/skia/src/core/SkConfig8888.h b/gfx/skia/src/core/SkConfig8888.h
    1.10 +index 96eaef2..36bc9b4 100644
    1.11 +--- a/gfx/skia/src/core/SkConfig8888.h
    1.12 ++++ b/gfx/skia/src/core/SkConfig8888.h
    1.13 +@@ -1,16 +1,18 @@
    1.14 + 
    1.15 + /*
    1.16 +  * Copyright 2011 Google Inc.
    1.17 +  *
    1.18 +  * Use of this source code is governed by a BSD-style license that can be
    1.19 +  * found in the LICENSE file.
    1.20 +  */
    1.21 + 
    1.22 ++#ifndef SkConfig8888_DEFINED
    1.23 ++#define SkConfig8888_DEFINED
    1.24 + 
    1.25 + #include "SkCanvas.h"
    1.26 + #include "SkColorPriv.h"
    1.27 + 
    1.28 + /**
    1.29 +  * Converts pixels from one Config8888 to another Config8888
    1.30 +  */
    1.31 + void SkConvertConfig8888Pixels(uint32_t* dstPixels,
    1.32 +@@ -69,8 +71,10 @@ static inline void SkCopyConfig8888ToBitmap(const SkBitmap& dstBmp,
    1.33 +     int h = dstBmp.height();
    1.34 +     size_t dstRowBytes = dstBmp.rowBytes();
    1.35 +     uint32_t* dstPixels = reinterpret_cast<uint32_t*>(dstBmp.getPixels());
    1.36 + 
    1.37 +     SkConvertConfig8888Pixels(dstPixels, dstRowBytes, SkCanvas::kNative_Premul_Config8888, srcPixels, srcRowBytes, srcConfig8888, w, h);
    1.38 + }
    1.39 + 
    1.40 + }
    1.41 ++
    1.42 ++#endif