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

Side by Side Diff: Source/WebCore/html/canvas/WebGLRenderingContext.cpp

Issue 6591046: Merge 78921 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 m_isDepthStencilSupported = m_context->getExtensions()->supports("GL_OES _packed_depth_stencil"); 430 m_isDepthStencilSupported = m_context->getExtensions()->supports("GL_OES _packed_depth_stencil");
431 } else { 431 } else {
432 m_isGLES2NPOTStrict = !m_context->getExtensions()->supports("GL_ARB_text ure_non_power_of_two"); 432 m_isGLES2NPOTStrict = !m_context->getExtensions()->supports("GL_ARB_text ure_non_power_of_two");
433 m_isDepthStencilSupported = m_context->getExtensions()->supports("GL_EXT _packed_depth_stencil"); 433 m_isDepthStencilSupported = m_context->getExtensions()->supports("GL_EXT _packed_depth_stencil");
434 } 434 }
435 } 435 }
436 436
437 WebGLRenderingContext::~WebGLRenderingContext() 437 WebGLRenderingContext::~WebGLRenderingContext()
438 { 438 {
439 detachAndRemoveAllObjects(); 439 detachAndRemoveAllObjects();
440 if (m_webkitLoseContext)
441 m_webkitLoseContext->contextDestroyed();
440 } 442 }
441 443
442 void WebGLRenderingContext::markContextChanged() 444 void WebGLRenderingContext::markContextChanged()
443 { 445 {
444 #if USE(ACCELERATED_COMPOSITING) 446 #if USE(ACCELERATED_COMPOSITING)
445 RenderBox* renderBox = canvas()->renderBox(); 447 RenderBox* renderBox = canvas()->renderBox();
446 if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAccelerated Compositing()) 448 if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAccelerated Compositing())
447 renderBox->layer()->contentChanged(RenderLayer::CanvasChanged); 449 renderBox->layer()->contentChanged(RenderLayer::CanvasChanged);
448 else { 450 else {
449 #endif 451 #endif
(...skipping 4174 matching lines...) Expand 10 before | Expand all | Expand 10 after
4624 4626
4625 void WebGLRenderingContext::LRUImageBufferCache::bubbleToFront(int idx) 4627 void WebGLRenderingContext::LRUImageBufferCache::bubbleToFront(int idx)
4626 { 4628 {
4627 for (int i = idx; i > 0; --i) 4629 for (int i = idx; i > 0; --i)
4628 m_buffers[i].swap(m_buffers[i-1]); 4630 m_buffers[i].swap(m_buffers[i-1]);
4629 } 4631 }
4630 4632
4631 } // namespace WebCore 4633 } // namespace WebCore
4632 4634
4633 #endif // ENABLE(3D_CANVAS) 4635 #endif // ENABLE(3D_CANVAS)
OLDNEW
« no previous file with comments | « LayoutTests/fast/canvas/webgl/context-destroyed-crash-expected.txt ('k') | Source/WebCore/html/canvas/WebKitLoseContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698