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 | #include "precompiled.h" |
michael@0 | 2 | // |
michael@0 | 3 | // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved. |
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 | |
michael@0 | 8 | // Buffer.cpp: Implements the gl::Buffer class, representing storage of vertex and/or |
michael@0 | 9 | // index data. Implements GL buffer objects and related functionality. |
michael@0 | 10 | // [OpenGL ES 2.0.24] section 2.9 page 21. |
michael@0 | 11 | |
michael@0 | 12 | #include "libGLESv2/Buffer.h" |
michael@0 | 13 | |
michael@0 | 14 | #include "libGLESv2/renderer/VertexBuffer.h" |
michael@0 | 15 | #include "libGLESv2/renderer/IndexBuffer.h" |
michael@0 | 16 | #include "libGLESv2/renderer/BufferStorage.h" |
michael@0 | 17 | #include "libGLESv2/renderer/Renderer.h" |
michael@0 | 18 | |
michael@0 | 19 | namespace gl |
michael@0 | 20 | { |
michael@0 | 21 | |
michael@0 | 22 | Buffer::Buffer(rx::Renderer *renderer, GLuint id) : RefCountObject(id) |
michael@0 | 23 | { |
michael@0 | 24 | mRenderer = renderer; |
michael@0 | 25 | mUsage = GL_DYNAMIC_DRAW; |
michael@0 | 26 | |
michael@0 | 27 | mBufferStorage = renderer->createBufferStorage(); |
michael@0 | 28 | mStaticVertexBuffer = NULL; |
michael@0 | 29 | mStaticIndexBuffer = NULL; |
michael@0 | 30 | mUnmodifiedDataUse = 0; |
michael@0 | 31 | } |
michael@0 | 32 | |
michael@0 | 33 | Buffer::~Buffer() |
michael@0 | 34 | { |
michael@0 | 35 | delete mBufferStorage; |
michael@0 | 36 | delete mStaticVertexBuffer; |
michael@0 | 37 | delete mStaticIndexBuffer; |
michael@0 | 38 | } |
michael@0 | 39 | |
michael@0 | 40 | void Buffer::bufferData(const void *data, GLsizeiptr size, GLenum usage) |
michael@0 | 41 | { |
michael@0 | 42 | mBufferStorage->clear(); |
michael@0 | 43 | mIndexRangeCache.clear(); |
michael@0 | 44 | mBufferStorage->setData(data, size, 0); |
michael@0 | 45 | |
michael@0 | 46 | mUsage = usage; |
michael@0 | 47 | |
michael@0 | 48 | invalidateStaticData(); |
michael@0 | 49 | |
michael@0 | 50 | if (usage == GL_STATIC_DRAW) |
michael@0 | 51 | { |
michael@0 | 52 | mStaticVertexBuffer = new rx::StaticVertexBufferInterface(mRenderer); |
michael@0 | 53 | mStaticIndexBuffer = new rx::StaticIndexBufferInterface(mRenderer); |
michael@0 | 54 | } |
michael@0 | 55 | } |
michael@0 | 56 | |
michael@0 | 57 | void Buffer::bufferSubData(const void *data, GLsizeiptr size, GLintptr offset) |
michael@0 | 58 | { |
michael@0 | 59 | mBufferStorage->setData(data, size, offset); |
michael@0 | 60 | mIndexRangeCache.invalidateRange(offset, size); |
michael@0 | 61 | |
michael@0 | 62 | if ((mStaticVertexBuffer && mStaticVertexBuffer->getBufferSize() != 0) || (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0)) |
michael@0 | 63 | { |
michael@0 | 64 | invalidateStaticData(); |
michael@0 | 65 | } |
michael@0 | 66 | |
michael@0 | 67 | mUnmodifiedDataUse = 0; |
michael@0 | 68 | } |
michael@0 | 69 | |
michael@0 | 70 | rx::BufferStorage *Buffer::getStorage() const |
michael@0 | 71 | { |
michael@0 | 72 | return mBufferStorage; |
michael@0 | 73 | } |
michael@0 | 74 | |
michael@0 | 75 | unsigned int Buffer::size() |
michael@0 | 76 | { |
michael@0 | 77 | return mBufferStorage->getSize(); |
michael@0 | 78 | } |
michael@0 | 79 | |
michael@0 | 80 | GLenum Buffer::usage() const |
michael@0 | 81 | { |
michael@0 | 82 | return mUsage; |
michael@0 | 83 | } |
michael@0 | 84 | |
michael@0 | 85 | rx::StaticVertexBufferInterface *Buffer::getStaticVertexBuffer() |
michael@0 | 86 | { |
michael@0 | 87 | return mStaticVertexBuffer; |
michael@0 | 88 | } |
michael@0 | 89 | |
michael@0 | 90 | rx::StaticIndexBufferInterface *Buffer::getStaticIndexBuffer() |
michael@0 | 91 | { |
michael@0 | 92 | return mStaticIndexBuffer; |
michael@0 | 93 | } |
michael@0 | 94 | |
michael@0 | 95 | void Buffer::invalidateStaticData() |
michael@0 | 96 | { |
michael@0 | 97 | delete mStaticVertexBuffer; |
michael@0 | 98 | mStaticVertexBuffer = NULL; |
michael@0 | 99 | |
michael@0 | 100 | delete mStaticIndexBuffer; |
michael@0 | 101 | mStaticIndexBuffer = NULL; |
michael@0 | 102 | |
michael@0 | 103 | mUnmodifiedDataUse = 0; |
michael@0 | 104 | } |
michael@0 | 105 | |
michael@0 | 106 | // Creates static buffers if sufficient used data has been left unmodified |
michael@0 | 107 | void Buffer::promoteStaticUsage(int dataSize) |
michael@0 | 108 | { |
michael@0 | 109 | if (!mStaticVertexBuffer && !mStaticIndexBuffer) |
michael@0 | 110 | { |
michael@0 | 111 | mUnmodifiedDataUse += dataSize; |
michael@0 | 112 | |
michael@0 | 113 | if (mUnmodifiedDataUse > 3 * mBufferStorage->getSize()) |
michael@0 | 114 | { |
michael@0 | 115 | mStaticVertexBuffer = new rx::StaticVertexBufferInterface(mRenderer); |
michael@0 | 116 | mStaticIndexBuffer = new rx::StaticIndexBufferInterface(mRenderer); |
michael@0 | 117 | } |
michael@0 | 118 | } |
michael@0 | 119 | } |
michael@0 | 120 | |
michael@0 | 121 | rx::IndexRangeCache *Buffer::getIndexRangeCache() |
michael@0 | 122 | { |
michael@0 | 123 | return &mIndexRangeCache; |
michael@0 | 124 | } |
michael@0 | 125 | |
michael@0 | 126 | } |