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.

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

mercurial