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

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

Issue 15301006: Merged GraphicsContext3DPrivate into GraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed ExtractWebGraphicsContext3D Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/platform/chromium/support/GraphicsContext3DPrivate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 canvas()->clearPresentationCopy(); 832 canvas()->clearPresentationCopy();
833 return; 833 return;
834 } 834 }
835 835
836 if (canvas()->document()->printing()) 836 if (canvas()->document()->printing())
837 canvas()->clearPresentationCopy(); 837 canvas()->clearPresentationCopy();
838 838
839 // Until the canvas is written to by the application, the clear that 839 // Until the canvas is written to by the application, the clear that
840 // happened after it was composited should be ignored by the compositor. 840 // happened after it was composited should be ignored by the compositor.
841 if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer) { 841 if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer) {
842 m_context->paintCompositedResultsToCanvas(canvas()->buffer());
843
844 m_drawingBuffer->paintCompositedResultsToCanvas(canvas()->buffer()); 842 m_drawingBuffer->paintCompositedResultsToCanvas(canvas()->buffer());
845 843
846 canvas()->makePresentationCopy(); 844 canvas()->makePresentationCopy();
847 } else 845 } else
848 canvas()->clearPresentationCopy(); 846 canvas()->clearPresentationCopy();
849 clearIfComposited(); 847 clearIfComposited();
850 848
851 if (!m_markedCanvasDirty && !m_layerCleared) 849 if (!m_markedCanvasDirty && !m_layerCleared)
852 return; 850 return;
853 851
(...skipping 4626 matching lines...) Expand 10 before | Expand all | Expand 10 after
5480 5478
5481 void WebGLRenderingContext::multisamplingChanged(bool enabled) 5479 void WebGLRenderingContext::multisamplingChanged(bool enabled)
5482 { 5480 {
5483 if (m_multisamplingAllowed != enabled) { 5481 if (m_multisamplingAllowed != enabled) {
5484 m_multisamplingAllowed = enabled; 5482 m_multisamplingAllowed = enabled;
5485 forceLostContext(WebGLRenderingContext::AutoRecoverSyntheticLostContext) ; 5483 forceLostContext(WebGLRenderingContext::AutoRecoverSyntheticLostContext) ;
5486 } 5484 }
5487 } 5485 }
5488 5486
5489 } // namespace WebCore 5487 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/platform/chromium/support/GraphicsContext3DPrivate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698