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

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

Issue 1916663002: Add null check to WebGLRenderingContextBase::contextGL(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 // Restore as soon as possible, but only when 373 // Restore as soon as possible, but only when
374 // the canvas is visible. 374 // the canvas is visible.
375 Auto 375 Auto
376 }; 376 };
377 void loseContext(LostContextMode) override; 377 void loseContext(LostContextMode) override;
378 void forceLostContext(LostContextMode, AutoRecoveryMethod); 378 void forceLostContext(LostContextMode, AutoRecoveryMethod);
379 void forceRestoreContext(); 379 void forceRestoreContext();
380 void loseContextImpl(LostContextMode, AutoRecoveryMethod); 380 void loseContextImpl(LostContextMode, AutoRecoveryMethod);
381 381
382 WebGraphicsContext3D* webContext() const { return drawingBuffer()->context() ; } 382 WebGraphicsContext3D* webContext() const { return drawingBuffer()->context() ; }
383 gpu::gles2::GLES2Interface* contextGL() const { return drawingBuffer()->cont extGL(); } 383 gpu::gles2::GLES2Interface* contextGL() const
384 {
385 DrawingBuffer* d = drawingBuffer();
386 if (!d)
387 return nullptr;
388 return d->contextGL();
389 }
384 WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); } 390 WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); }
385 Extensions3DUtil* extensionsUtil(); 391 Extensions3DUtil* extensionsUtil();
386 392
387 void reshape(int width, int height) override; 393 void reshape(int width, int height) override;
388 394
389 void markLayerComposited() override; 395 void markLayerComposited() override;
390 ImageData* paintRenderingResultsToImageData(SourceDrawingBuffer) override; 396 ImageData* paintRenderingResultsToImageData(SourceDrawingBuffer) override;
391 397
392 void removeSharedObject(WebGLSharedObject*); 398 void removeSharedObject(WebGLSharedObject*);
393 void removeContextObject(WebGLContextObject*); 399 void removeContextObject(WebGLContextObject*);
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 CrossThreadWeakPersistentThisPointer<WebGLRenderingContextBase> createWeakTh isPointer() { return CrossThreadWeakPersistentThisPointer<WebGLRenderingContextB ase>(this); } 1076 CrossThreadWeakPersistentThisPointer<WebGLRenderingContextBase> createWeakTh isPointer() { return CrossThreadWeakPersistentThisPointer<WebGLRenderingContextB ase>(this); }
1071 }; 1077 };
1072 1078
1073 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d()); 1079 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d());
1074 1080
1075 } // namespace blink 1081 } // namespace blink
1076 1082
1077 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState); 1083 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState);
1078 1084
1079 #endif // WebGLRenderingContextBase_h 1085 #endif // WebGLRenderingContextBase_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698