| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 // 1. WebGL draws something. | 245 // 1. WebGL draws something. |
| 246 // 2. The compositor begins the frame. | 246 // 2. The compositor begins the frame. |
| 247 // 3. Javascript makes a context lost using WEBGL_lose_context extension
. | 247 // 3. Javascript makes a context lost using WEBGL_lose_context extension
. |
| 248 // 4. Here. | 248 // 4. Here. |
| 249 return false; | 249 return false; |
| 250 } | 250 } |
| 251 ASSERT(!m_isHidden); | 251 ASSERT(!m_isHidden); |
| 252 if (!m_contentsChanged) | 252 if (!m_contentsChanged) |
| 253 return false; | 253 return false; |
| 254 | 254 |
| 255 TRACE_EVENT0("blink", "DrawingBuffer::prepareMailbox"); |
| 256 |
| 255 if (m_newMailboxCallback) | 257 if (m_newMailboxCallback) |
| 256 (*m_newMailboxCallback)(); | 258 (*m_newMailboxCallback)(); |
| 257 | 259 |
| 258 // Resolve the multisampled buffer into m_colorBuffer texture. | 260 // Resolve the multisampled buffer into m_colorBuffer texture. |
| 259 if (m_antiAliasingMode != None) | 261 if (m_antiAliasingMode != None) |
| 260 commit(); | 262 commit(); |
| 261 | 263 |
| 262 if (bitmap) { | 264 if (bitmap) { |
| 263 bitmap->setSize(size()); | 265 bitmap->setSize(size()); |
| 264 | 266 |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1109 | 1111 |
| 1110 void DrawingBuffer::restoreTextureBindings() | 1112 void DrawingBuffer::restoreTextureBindings() |
| 1111 { | 1113 { |
| 1112 // This class potentially modifies the bindings for GL_TEXTURE_2D and | 1114 // This class potentially modifies the bindings for GL_TEXTURE_2D and |
| 1113 // GL_TEXTURE_RECTANGLE. Only GL_TEXTURE_2D needs to be restored since | 1115 // GL_TEXTURE_RECTANGLE. Only GL_TEXTURE_2D needs to be restored since |
| 1114 // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE. | 1116 // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE. |
| 1115 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); | 1117 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); |
| 1116 } | 1118 } |
| 1117 | 1119 |
| 1118 } // namespace blink | 1120 } // namespace blink |
| OLD | NEW |