Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1179)

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.h

Issue 2023603003: Fix content scripts that use WebGL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@yukishiino-v8privateproperty-fix
Patch Set: Rebased. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef WebGLFramebuffer_h 26 #ifndef WebGLFramebuffer_h
27 #define WebGLFramebuffer_h 27 #define WebGLFramebuffer_h
28 28
29 #include "bindings/core/v8/ScopedPersistent.h"
30 #include "modules/webgl/WebGLContextObject.h" 29 #include "modules/webgl/WebGLContextObject.h"
31 #include "modules/webgl/WebGLSharedObject.h" 30 #include "modules/webgl/WebGLSharedObject.h"
32 31
33 namespace gpu { 32 namespace gpu {
34 namespace gles2 { 33 namespace gles2 {
35 class GLES2Interface; 34 class GLES2Interface;
36 } 35 }
37 } 36 }
38 37
39 namespace blink { 38 namespace blink {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 87
89 // Wrapper for drawBuffersEXT/drawBuffersARB to work around a driver bug. 88 // Wrapper for drawBuffersEXT/drawBuffersARB to work around a driver bug.
90 void drawBuffers(const Vector<GLenum>& bufs); 89 void drawBuffers(const Vector<GLenum>& bufs);
91 90
92 GLenum getDrawBuffer(GLenum); 91 GLenum getDrawBuffer(GLenum);
93 92
94 void readBuffer(const GLenum colorBuffer) { m_readBuffer = colorBuffer; } 93 void readBuffer(const GLenum colorBuffer) { m_readBuffer = colorBuffer; }
95 94
96 GLenum getReadBuffer() const { return m_readBuffer; } 95 GLenum getReadBuffer() const { return m_readBuffer; }
97 96
98 ScopedPersistent<v8::Array>* getPersistentCache();
99
100 DECLARE_VIRTUAL_TRACE(); 97 DECLARE_VIRTUAL_TRACE();
101 98
102 protected: 99 protected:
103 explicit WebGLFramebuffer(WebGLRenderingContextBase*); 100 explicit WebGLFramebuffer(WebGLRenderingContextBase*);
104 101
105 bool hasObject() const override { return m_object != 0; } 102 bool hasObject() const override { return m_object != 0; }
106 void deleteObjectImpl(gpu::gles2::GLES2Interface*) override; 103 void deleteObjectImpl(gpu::gles2::GLES2Interface*) override;
107 104
108 private: 105 private:
109 WebGLAttachment* getAttachment(GLenum attachment) const; 106 WebGLAttachment* getAttachment(GLenum attachment) const;
(...skipping 13 matching lines...) Expand all
123 120
124 AttachmentMap m_attachments; 121 AttachmentMap m_attachments;
125 bool m_destructionInProgress; 122 bool m_destructionInProgress;
126 123
127 bool m_hasEverBeenBound; 124 bool m_hasEverBeenBound;
128 125
129 Vector<GLenum> m_drawBuffers; 126 Vector<GLenum> m_drawBuffers;
130 Vector<GLenum> m_filteredDrawBuffers; 127 Vector<GLenum> m_filteredDrawBuffers;
131 128
132 GLenum m_readBuffer; 129 GLenum m_readBuffer;
133
134 ScopedPersistent<v8::Array> m_attachmentWrappers;
135 }; 130 };
136 131
137 } // namespace blink 132 } // namespace blink
138 133
139 #endif // WebGLFramebuffer_h 134 #endif // WebGLFramebuffer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698