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: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
michael@0 | 2 | * This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | #include "MacIOSurfaceTextureClientOGL.h" |
michael@0 | 7 | #include "mozilla/gfx/MacIOSurface.h" |
michael@0 | 8 | |
michael@0 | 9 | namespace mozilla { |
michael@0 | 10 | namespace layers { |
michael@0 | 11 | |
michael@0 | 12 | MacIOSurfaceTextureClientOGL::MacIOSurfaceTextureClientOGL(TextureFlags aFlags) |
michael@0 | 13 | : TextureClient(aFlags) |
michael@0 | 14 | , mIsLocked(false) |
michael@0 | 15 | {} |
michael@0 | 16 | |
michael@0 | 17 | MacIOSurfaceTextureClientOGL::~MacIOSurfaceTextureClientOGL() |
michael@0 | 18 | {} |
michael@0 | 19 | |
michael@0 | 20 | void |
michael@0 | 21 | MacIOSurfaceTextureClientOGL::InitWith(MacIOSurface* aSurface) |
michael@0 | 22 | { |
michael@0 | 23 | MOZ_ASSERT(IsValid()); |
michael@0 | 24 | MOZ_ASSERT(!IsAllocated()); |
michael@0 | 25 | mSurface = aSurface; |
michael@0 | 26 | } |
michael@0 | 27 | |
michael@0 | 28 | bool |
michael@0 | 29 | MacIOSurfaceTextureClientOGL::Lock(OpenMode aMode) |
michael@0 | 30 | { |
michael@0 | 31 | MOZ_ASSERT(!mIsLocked); |
michael@0 | 32 | mIsLocked = true; |
michael@0 | 33 | return IsValid() && IsAllocated(); |
michael@0 | 34 | } |
michael@0 | 35 | |
michael@0 | 36 | void |
michael@0 | 37 | MacIOSurfaceTextureClientOGL::Unlock() |
michael@0 | 38 | { |
michael@0 | 39 | MOZ_ASSERT(mIsLocked); |
michael@0 | 40 | mIsLocked = false; |
michael@0 | 41 | } |
michael@0 | 42 | |
michael@0 | 43 | bool |
michael@0 | 44 | MacIOSurfaceTextureClientOGL::IsLocked() const |
michael@0 | 45 | { |
michael@0 | 46 | return mIsLocked; |
michael@0 | 47 | } |
michael@0 | 48 | |
michael@0 | 49 | bool |
michael@0 | 50 | MacIOSurfaceTextureClientOGL::ToSurfaceDescriptor(SurfaceDescriptor& aOutDescriptor) |
michael@0 | 51 | { |
michael@0 | 52 | MOZ_ASSERT(IsValid()); |
michael@0 | 53 | if (!IsAllocated()) { |
michael@0 | 54 | return false; |
michael@0 | 55 | } |
michael@0 | 56 | aOutDescriptor = SurfaceDescriptorMacIOSurface(mSurface->GetIOSurfaceID(), |
michael@0 | 57 | mSurface->GetContentsScaleFactor(), |
michael@0 | 58 | mSurface->HasAlpha()); |
michael@0 | 59 | return true; |
michael@0 | 60 | } |
michael@0 | 61 | |
michael@0 | 62 | gfx::IntSize |
michael@0 | 63 | MacIOSurfaceTextureClientOGL::GetSize() const |
michael@0 | 64 | { |
michael@0 | 65 | return gfx::IntSize(mSurface->GetDevicePixelWidth(), mSurface->GetDevicePixelHeight()); |
michael@0 | 66 | } |
michael@0 | 67 | |
michael@0 | 68 | class MacIOSurfaceTextureClientData : public TextureClientData |
michael@0 | 69 | { |
michael@0 | 70 | public: |
michael@0 | 71 | MacIOSurfaceTextureClientData(MacIOSurface* aSurface) |
michael@0 | 72 | : mSurface(aSurface) |
michael@0 | 73 | {} |
michael@0 | 74 | |
michael@0 | 75 | virtual void DeallocateSharedData(ISurfaceAllocator*) MOZ_OVERRIDE |
michael@0 | 76 | { |
michael@0 | 77 | mSurface = nullptr; |
michael@0 | 78 | } |
michael@0 | 79 | |
michael@0 | 80 | private: |
michael@0 | 81 | RefPtr<MacIOSurface> mSurface; |
michael@0 | 82 | }; |
michael@0 | 83 | |
michael@0 | 84 | TextureClientData* |
michael@0 | 85 | MacIOSurfaceTextureClientOGL::DropTextureData() |
michael@0 | 86 | { |
michael@0 | 87 | TextureClientData* data = new MacIOSurfaceTextureClientData(mSurface); |
michael@0 | 88 | mSurface = nullptr; |
michael@0 | 89 | MarkInvalid(); |
michael@0 | 90 | return data; |
michael@0 | 91 | } |
michael@0 | 92 | |
michael@0 | 93 | } |
michael@0 | 94 | } |