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

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Issue 2776203002: Migrate WTF::Vector::remove() to ::erase() (Closed)
Patch Set: rebase, repatch VectorTest Created 3 years, 8 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 2828 matching lines...) Expand 10 before | Expand all | Expand 10 after
2839 if (creationAttributes().depth() && !drawingBuffer()->hasDepthBuffer()) 2839 if (creationAttributes().depth() && !drawingBuffer()->hasDepthBuffer())
2840 result.get().setDepth(false); 2840 result.get().setDepth(false);
2841 if (creationAttributes().stencil() && !drawingBuffer()->hasStencilBuffer()) 2841 if (creationAttributes().stencil() && !drawingBuffer()->hasStencilBuffer())
2842 result.get().setStencil(false); 2842 result.get().setStencil(false);
2843 result.get().setAntialias(drawingBuffer()->multisample()); 2843 result.get().setAntialias(drawingBuffer()->multisample());
2844 } 2844 }
2845 2845
2846 GLenum WebGLRenderingContextBase::getError() { 2846 GLenum WebGLRenderingContextBase::getError() {
2847 if (!m_lostContextErrors.isEmpty()) { 2847 if (!m_lostContextErrors.isEmpty()) {
2848 GLenum error = m_lostContextErrors.front(); 2848 GLenum error = m_lostContextErrors.front();
2849 m_lostContextErrors.remove(0); 2849 m_lostContextErrors.erase(0);
2850 return error; 2850 return error;
2851 } 2851 }
2852 2852
2853 if (isContextLost()) 2853 if (isContextLost())
2854 return GL_NO_ERROR; 2854 return GL_NO_ERROR;
2855 2855
2856 if (!m_syntheticErrors.isEmpty()) { 2856 if (!m_syntheticErrors.isEmpty()) {
2857 GLenum error = m_syntheticErrors.front(); 2857 GLenum error = m_syntheticErrors.front();
2858 m_syntheticErrors.remove(0); 2858 m_syntheticErrors.erase(0);
2859 return error; 2859 return error;
2860 } 2860 }
2861 2861
2862 return contextGL()->GetError(); 2862 return contextGL()->GetError();
2863 } 2863 }
2864 2864
2865 const char* const* WebGLRenderingContextBase::ExtensionTracker::prefixes() 2865 const char* const* WebGLRenderingContextBase::ExtensionTracker::prefixes()
2866 const { 2866 const {
2867 static const char* const unprefixed[] = { 2867 static const char* const unprefixed[] = {
2868 "", 0, 2868 "", 0,
(...skipping 4976 matching lines...) Expand 10 before | Expand all | Expand 10 after
7845 7845
7846 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( 7846 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(
7847 HTMLCanvasElementOrOffscreenCanvas& result) const { 7847 HTMLCanvasElementOrOffscreenCanvas& result) const {
7848 if (canvas()) 7848 if (canvas())
7849 result.setHTMLCanvasElement(canvas()); 7849 result.setHTMLCanvasElement(canvas());
7850 else 7850 else
7851 result.setOffscreenCanvas(offscreenCanvas()); 7851 result.setOffscreenCanvas(offscreenCanvas());
7852 } 7852 }
7853 7853
7854 } // namespace blink 7854 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698