Sat, 03 Jan 2015 20:18:00 +0100
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 | # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- |
michael@0 | 2 | # vim: set filetype=python: |
michael@0 | 3 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 6 | |
michael@0 | 7 | gl_provider = 'Null' |
michael@0 | 8 | |
michael@0 | 9 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': |
michael@0 | 10 | gl_provider = 'WGL' |
michael@0 | 11 | elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
michael@0 | 12 | gl_provider = 'CGL' |
michael@0 | 13 | elif CONFIG['MOZ_WIDGET_GTK']: |
michael@0 | 14 | if CONFIG['MOZ_EGL_XRENDER_COMPOSITE']: |
michael@0 | 15 | gl_provider = 'EGL' |
michael@0 | 16 | else: |
michael@0 | 17 | gl_provider = 'GLX' |
michael@0 | 18 | elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': |
michael@0 | 19 | gl_provider = 'GLX' |
michael@0 | 20 | elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': |
michael@0 | 21 | gl_provider = 'EGL' |
michael@0 | 22 | elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': |
michael@0 | 23 | gl_provider = 'EGL' |
michael@0 | 24 | |
michael@0 | 25 | if CONFIG['MOZ_GL_PROVIDER']: |
michael@0 | 26 | gl_provider = CONFIG['MOZ_GL_PROVIDER'] |
michael@0 | 27 | |
michael@0 | 28 | EXPORTS += [ |
michael@0 | 29 | 'DecomposeIntoNoRepeatTriangles.h', |
michael@0 | 30 | 'ForceDiscreteGPUHelperCGL.h', |
michael@0 | 31 | 'GfxTexturesReporter.h', |
michael@0 | 32 | 'GLBlitTextureImageHelper.h', |
michael@0 | 33 | 'GLConsts.h', |
michael@0 | 34 | 'GLContext.h', |
michael@0 | 35 | 'GLContextEGL.h', |
michael@0 | 36 | 'GLContextProvider.h', |
michael@0 | 37 | 'GLContextProviderImpl.h', |
michael@0 | 38 | 'GLContextSymbols.h', |
michael@0 | 39 | 'GLContextTypes.h', |
michael@0 | 40 | 'GLDefs.h', |
michael@0 | 41 | 'GLLibraryEGL.h', |
michael@0 | 42 | 'GLLibraryLoader.h', |
michael@0 | 43 | 'GLReadTexImageHelper.h', |
michael@0 | 44 | 'GLScreenBuffer.h', |
michael@0 | 45 | 'GLSharedHandleHelpers.h', |
michael@0 | 46 | 'GLTextureImage.h', |
michael@0 | 47 | 'GLTypes.h', |
michael@0 | 48 | 'GLUploadHelpers.h', |
michael@0 | 49 | 'ScopedGLHelpers.h', |
michael@0 | 50 | 'SharedSurface.h', |
michael@0 | 51 | 'SharedSurfaceEGL.h', |
michael@0 | 52 | 'SharedSurfaceGL.h', |
michael@0 | 53 | 'SurfaceFactory.h', |
michael@0 | 54 | 'SurfaceStream.h', |
michael@0 | 55 | 'SurfaceTypes.h', |
michael@0 | 56 | 'TextureGarbageBin.h', |
michael@0 | 57 | 'VBOArena.h', |
michael@0 | 58 | ] |
michael@0 | 59 | |
michael@0 | 60 | if CONFIG['MOZ_X11']: |
michael@0 | 61 | EXPORTS += [ |
michael@0 | 62 | 'GLContextGLX.h', |
michael@0 | 63 | 'GLXLibrary.h', |
michael@0 | 64 | ] |
michael@0 | 65 | |
michael@0 | 66 | # Win32 is a special snowflake, for ANGLE |
michael@0 | 67 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': |
michael@0 | 68 | EXPORTS += [ |
michael@0 | 69 | 'GLContextWGL.h', |
michael@0 | 70 | 'SharedSurfaceANGLE.h', |
michael@0 | 71 | 'WGLLibrary.h', |
michael@0 | 72 | ] |
michael@0 | 73 | UNIFIED_SOURCES += [ |
michael@0 | 74 | 'GLContextProviderEGL.cpp', |
michael@0 | 75 | 'SharedSurfaceANGLE.cpp', |
michael@0 | 76 | ] |
michael@0 | 77 | if CONFIG['MOZ_ENABLE_SKIA_GPU']: |
michael@0 | 78 | EXPORTS += ['SkiaGLGlue.h'] |
michael@0 | 79 | UNIFIED_SOURCES += [ |
michael@0 | 80 | 'SkiaGLGlue.cpp', |
michael@0 | 81 | ] |
michael@0 | 82 | |
michael@0 | 83 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': |
michael@0 | 84 | UNIFIED_SOURCES += ['SharedSurfaceGralloc.cpp'] |
michael@0 | 85 | EXPORTS += ['SharedSurfaceGralloc.h'] |
michael@0 | 86 | LOCAL_INCLUDES += ['/widget/gonk'] |
michael@0 | 87 | CXXFLAGS += ['-I%s/%s' % (CONFIG['ANDROID_SOURCE'], 'hardware/libhardware/include')] |
michael@0 | 88 | |
michael@0 | 89 | if gl_provider == 'CGL': |
michael@0 | 90 | # These files include Mac headers that are unfriendly to unified builds |
michael@0 | 91 | SOURCES += [ |
michael@0 | 92 | "GLContextProviderCGL.mm", |
michael@0 | 93 | "TextureImageCGL.mm" |
michael@0 | 94 | ] |
michael@0 | 95 | EXPORTS += [ |
michael@0 | 96 | 'GLContextCGL.h', |
michael@0 | 97 | 'SharedSurfaceIO.h', |
michael@0 | 98 | ] |
michael@0 | 99 | # SharedSurfaceIO.cpp includes MacIOSurface.h which include Mac headers |
michael@0 | 100 | # which define Size and Point types in root namespace with often conflict with |
michael@0 | 101 | # our own types. While I haven't actually hit this issue in the present case, |
michael@0 | 102 | # it's been an issue in gfx/layers so let's not risk it. |
michael@0 | 103 | SOURCES += [ |
michael@0 | 104 | 'SharedSurfaceIO.cpp', |
michael@0 | 105 | ] |
michael@0 | 106 | elif gl_provider == 'GLX': |
michael@0 | 107 | # GLContextProviderGLX.cpp needs to be kept out of UNIFIED_SOURCES |
michael@0 | 108 | # as it includes X11 headers which cause conflicts. |
michael@0 | 109 | SOURCES += [ |
michael@0 | 110 | 'GLContextProviderGLX.cpp', |
michael@0 | 111 | ] |
michael@0 | 112 | else: |
michael@0 | 113 | UNIFIED_SOURCES += [ |
michael@0 | 114 | 'GLContextProvider%s.cpp' % gl_provider, |
michael@0 | 115 | ] |
michael@0 | 116 | |
michael@0 | 117 | UNIFIED_SOURCES += [ |
michael@0 | 118 | 'DecomposeIntoNoRepeatTriangles.cpp', |
michael@0 | 119 | 'GfxTexturesReporter.cpp', |
michael@0 | 120 | 'GLBlitHelper.cpp', |
michael@0 | 121 | 'GLBlitTextureImageHelper.cpp', |
michael@0 | 122 | 'GLContext.cpp', |
michael@0 | 123 | 'GLContextFeatures.cpp', |
michael@0 | 124 | 'GLContextTypes.cpp', |
michael@0 | 125 | 'GLDebugUtils.cpp', |
michael@0 | 126 | 'GLLibraryEGL.cpp', |
michael@0 | 127 | 'GLLibraryLoader.cpp', |
michael@0 | 128 | 'GLReadTexImageHelper.cpp', |
michael@0 | 129 | 'GLScreenBuffer.cpp', |
michael@0 | 130 | 'GLSharedHandleHelpers.cpp', |
michael@0 | 131 | 'GLTextureImage.cpp', |
michael@0 | 132 | 'GLUploadHelpers.cpp', |
michael@0 | 133 | 'ScopedGLHelpers.cpp', |
michael@0 | 134 | 'SharedSurface.cpp', |
michael@0 | 135 | 'SharedSurfaceEGL.cpp', |
michael@0 | 136 | 'SharedSurfaceGL.cpp', |
michael@0 | 137 | 'SurfaceFactory.cpp', |
michael@0 | 138 | 'SurfaceStream.cpp', |
michael@0 | 139 | 'SurfaceTypes.cpp', |
michael@0 | 140 | 'TextureGarbageBin.cpp', |
michael@0 | 141 | 'TextureImageEGL.cpp', |
michael@0 | 142 | 'VBOArena.cpp', |
michael@0 | 143 | ] |
michael@0 | 144 | |
michael@0 | 145 | FAIL_ON_WARNINGS = True |
michael@0 | 146 | |
michael@0 | 147 | MSVC_ENABLE_PGO = True |
michael@0 | 148 | |
michael@0 | 149 | include('/ipc/chromium/chromium-config.mozbuild') |
michael@0 | 150 | |
michael@0 | 151 | FINAL_LIBRARY = 'xul' |
michael@0 | 152 | |
michael@0 | 153 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows' and CONFIG['MOZ_WEBGL']: |
michael@0 | 154 | DEFINES['MOZ_D3DCOMPILER_DLL'] = CONFIG['MOZ_D3DCOMPILER_DLL'] |
michael@0 | 155 | |
michael@0 | 156 | if CONFIG['MOZ_ANDROID_OMTC']: |
michael@0 | 157 | DEFINES['MOZ_ANDROID_OMTC'] = True |