gfx/skia/trunk/include/utils/SkJSONCPP.h

Sat, 03 Jan 2015 20:18:00 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 03 Jan 2015 20:18:00 +0100
branch
TOR_BUG_3246
changeset 7
129ffea94266
permissions
-rw-r--r--

Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.

     1 /*
     2  * Copyright 2013 Google Inc.
     3  *
     4  * Use of this source code is governed by a BSD-style license that can be
     5  * found in the LICENSE file.
     6  *
     7  * A common place to put the jsoncpp library includes, as opposed to littering
     8  * the pragmas repeatedly through our code.
     9  */
    10 #ifndef SkJSONCPP_DEFINED
    11 #define SkJSONCPP_DEFINED
    13 #ifdef SK_BUILD_FOR_WIN
    14     // json includes xlocale which generates warning 4530 because we're
    15     // compiling without exceptions;
    16     // see https://code.google.com/p/skia/issues/detail?id=1067
    17     #pragma warning(push)
    18     #pragma warning(disable : 4530)
    19 #endif
    20 #include "json/reader.h"
    21 #include "json/value.h"
    22 #ifdef SK_BUILD_FOR_WIN
    23     #pragma warning(pop)
    24 #endif
    26 #endif

mercurial