Source/core/html/canvas/WebGLRenderingContextBase.h - Issue 656723005: Use C++11 features in core/html

Unified Diff: Source/core/html/canvas/WebGLRenderingContextBase.h

Issue 656723005: Use C++11 features in core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: use nullptr Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« Source/core/html/HTMLDocument.cpp ('K') | « Source/core/html/canvas/WebGLObject.cpp ('k') | Source/core/html/canvas/WebGLRenderingContextBase.cpp » ('j') | Source/core/html/forms/FormController.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/html/canvas/WebGLRenderingContextBase.h

diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.h b/Source/core/html/canvas/WebGLRenderingContextBase.h

index 811bd8dd52d71ae189c265814053f25d420ef5d1..16a8a5e26687b351b5a943569dc500a66dc9da76 100644

--- a/Source/core/html/canvas/WebGLRenderingContextBase.h

+++ b/Source/core/html/canvas/WebGLRenderingContextBase.h

@@ -185,8 +185,8 @@ public:

PassRefPtrWillBeRawPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GLuint index);

PassRefPtrWillBeRawPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GLuint index);

- bool getAttachedShaders(WebGLProgram*, WillBeHeapVector<RefPtrWillBeMember<WebGLShader> >&);

- Nullable<WillBeHeapVector<RefPtrWillBeMember<WebGLShader> > > getAttachedShaders(WebGLProgram*);

+ bool getAttachedShaders(WebGLProgram*, WillBeHeapVector<RefPtrWillBeMember<WebGLShader>>&);

+ Nullable<WillBeHeapVector<RefPtrWillBeMember<WebGLShader>>> getAttachedShaders(WebGLProgram*);

GLint getAttribLocation(WebGLProgram*, const String& name);

WebGLGetInfo getBufferParameter(GLenum target, GLenum pname);

PassRefPtrWillBeRawPtr<WebGLContextAttributes> getContextAttributes();

@@ -201,7 +201,7 @@ public:

String getShaderInfoLog(WebGLShader*);

PassRefPtrWillBeRawPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GLenum shaderType, GLenum precisionType);

String getShaderSource(WebGLShader*);

- Nullable<Vector<String> > getSupportedExtensions();

+ Nullable<Vector<String>> getSupportedExtensions();

WebGLGetInfo getTexParameter(GLenum target, GLenum pname);

WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*);

PassRefPtrWillBeRawPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&);

@@ -457,7 +457,7 @@ protected:

Timer<WebGLRenderingContextBase> m_restoreTimer;

bool m_markedCanvasDirty;

- WillBeHeapHashSet<RawPtrWillBeWeakMember<WebGLContextObject> > m_contextObjects;

+ WillBeHeapHashSet<RawPtrWillBeWeakMember<WebGLContextObject>> m_contextObjects;

OwnPtrWillBeMember<WebGLRenderingContextLostCallback> m_contextLostCallbackAdapter;

OwnPtrWillBeMember<WebGLRenderingContextErrorMessageCallback> m_errorMessageCallbackAdapter;

@@ -616,7 +616,7 @@ protected:

template <typename T>

class TypedExtensionTracker final : public ExtensionTracker {

public:

- static PassOwnPtrWillBeRawPtr<TypedExtensionTracker<T> > create(RefPtrWillBeMember<T>& extensionField, ExtensionFlags flags, const char* const* prefixes)

+ static PassOwnPtrWillBeRawPtr<TypedExtensionTracker<T>> create(RefPtrWillBeMember<T>& extensionField, ExtensionFlags flags, const char* const* prefixes)

{

return adoptPtrWillBeNoop(new TypedExtensionTracker<T>(extensionField, flags, prefixes));

}

@@ -680,7 +680,7 @@ protected:

};

bool m_extensionEnabled[WebGLExtensionNameCount];

- WillBeHeapVector<OwnPtrWillBeMember<ExtensionTracker> > m_extensions;

+ WillBeHeapVector<OwnPtrWillBeMember<ExtensionTracker>> m_extensions;

template <typename T>

void registerExtension(RefPtrWillBeMember<T>& extensionPtr, ExtensionFlags flags = ApprovedExtension, const char* const* prefixes = 0)