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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
index d5e7e4564c6d80ded84553fcb7317d1744f22790..1a18fb1c203f792eb9f5d95b68e5871fb2b1fd61 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
@@ -26,9 +26,9 @@
#include "modules/webgl/WebGLVertexArrayObject.h"
#include "platform/CheckedInt.h"
#include "public/platform/WebGraphicsContext3DProvider.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
+#include "wtf/PtrUtil.h"
#include "wtf/text/WTFString.h"
+#include <memory>
using WTF::String;
@@ -114,7 +114,7 @@ const GLenum kCompressedTextureFormatsETC2EAC[] = {
GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
};
-WebGL2RenderingContextBase::WebGL2RenderingContextBase(HTMLCanvasElement* passedCanvas, PassOwnPtr<WebGraphicsContext3DProvider> contextProvider, const WebGLContextAttributes& requestedAttributes)
+WebGL2RenderingContextBase::WebGL2RenderingContextBase(HTMLCanvasElement* passedCanvas, std::unique_ptr<WebGraphicsContext3DProvider> contextProvider, const WebGLContextAttributes& requestedAttributes)
: WebGLRenderingContextBase(passedCanvas, std::move(contextProvider), requestedAttributes)
{
m_supportedInternalFormatsStorage.insert(kSupportedInternalFormatsStorage, kSupportedInternalFormatsStorage + WTF_ARRAY_LENGTH(kSupportedInternalFormatsStorage));
@@ -405,20 +405,20 @@ ScriptValue WebGL2RenderingContextBase::getInternalformatParameter(ScriptState*
switch (pname) {
case GL_SAMPLES:
{
- OwnPtr<GLint[]> values;
+ std::unique_ptr<GLint[]> values;
GLint length = -1;
if (!floatType) {
contextGL()->GetInternalformativ(target, internalformat, GL_NUM_SAMPLE_COUNTS, 1, &length);
if (length <= 0)
return WebGLAny(scriptState, DOMInt32Array::create(0));
- values = adoptArrayPtr(new GLint[length]);
+ values = wrapArrayUnique(new GLint[length]);
for (GLint ii = 0; ii < length; ++ii)
values[ii] = 0;
contextGL()->GetInternalformativ(target, internalformat, GL_SAMPLES, length, values.get());
} else {
length = 1;
- values = adoptArrayPtr(new GLint[1]);
+ values = wrapArrayUnique(new GLint[1]);
values[0] = 1;
}
return WebGLAny(scriptState, DOMInt32Array::create(values.get(), length));
@@ -2116,7 +2116,7 @@ WebGLActiveInfo* WebGL2RenderingContextBase::getTransformFeedbackVarying(WebGLPr
if (maxNameLength <= 0) {
return nullptr;
}
- OwnPtr<GLchar[]> name = adoptArrayPtr(new GLchar[maxNameLength]);
+ std::unique_ptr<GLchar[]> name = wrapArrayUnique(new GLchar[maxNameLength]);
GLsizei length = 0;
GLsizei size = 0;
GLenum type = 0;
@@ -2409,7 +2409,7 @@ String WebGL2RenderingContextBase::getActiveUniformBlockName(WebGLProgram* progr
synthesizeGLError(GL_INVALID_VALUE, "getActiveUniformBlockName", "invalid uniform block index");
return String();
}
- OwnPtr<GLchar[]> name = adoptArrayPtr(new GLchar[maxNameLength]);
+ std::unique_ptr<GLchar[]> name = wrapArrayUnique(new GLchar[maxNameLength]);
GLsizei length = 0;
contextGL()->GetActiveUniformBlockName(objectOrZero(program), uniformBlockIndex, maxNameLength, &length, name.get());

Powered by Google App Engine
This is Rietveld 408576698