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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 2471853002: remove 'unsafe' from ES3 apis in gpu process (Closed)
Patch Set: forgot to save file Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 // All Tests should have read all their GLErrors before getting here. 534 // All Tests should have read all their GLErrors before getting here.
535 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 535 EXPECT_EQ(GL_NO_ERROR, GetGLError());
536 if (!decoder_->WasContextLost()) { 536 if (!decoder_->WasContextLost()) {
537 EXPECT_CALL(*gl_, DeleteBuffersARB(1, _)).Times(2).RetiresOnSaturation(); 537 EXPECT_CALL(*gl_, DeleteBuffersARB(1, _)).Times(2).RetiresOnSaturation();
538 if (group_->feature_info()->feature_flags().native_vertex_array_object) { 538 if (group_->feature_info()->feature_flags().native_vertex_array_object) {
539 EXPECT_CALL(*gl_, 539 EXPECT_CALL(*gl_,
540 DeleteVertexArraysOES(1, Pointee(kServiceVertexArrayId))) 540 DeleteVertexArraysOES(1, Pointee(kServiceVertexArrayId)))
541 .Times(1) 541 .Times(1)
542 .RetiresOnSaturation(); 542 .RetiresOnSaturation();
543 } 543 }
544 if (group_->feature_info()->IsES3Enabled()) { 544 if (group_->feature_info()->IsWebGL2OrES3Context()) {
545 // fake default transform feedback. 545 // fake default transform feedback.
546 EXPECT_CALL(*gl_, DeleteTransformFeedbacks(1, _)) 546 EXPECT_CALL(*gl_, DeleteTransformFeedbacks(1, _))
547 .Times(1) 547 .Times(1)
548 .RetiresOnSaturation(); 548 .RetiresOnSaturation();
549 } 549 }
550 if (group_->feature_info()->IsWebGL2OrES3Context()) { 550 if (group_->feature_info()->IsWebGL2OrES3Context()) {
551 // |client_transformfeedback_id_| 551 // |client_transformfeedback_id_|
552 EXPECT_CALL(*gl_, DeleteTransformFeedbacks(1, _)) 552 EXPECT_CALL(*gl_, DeleteTransformFeedbacks(1, _))
553 .Times(1) 553 .Times(1)
554 .RetiresOnSaturation(); 554 .RetiresOnSaturation();
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2113 SetupDefaultProgram(); 2113 SetupDefaultProgram();
2114 } 2114 }
2115 2115
2116 // Include the auto-generated part of this file. We split this because it means 2116 // Include the auto-generated part of this file. We split this because it means
2117 // we can easily edit the non-auto generated parts right here in this file 2117 // we can easily edit the non-auto generated parts right here in this file
2118 // instead of having to edit some template or the code generator. 2118 // instead of having to edit some template or the code generator.
2119 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 2119 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
2120 2120
2121 } // namespace gles2 2121 } // namespace gles2
2122 } // namespace gpu 2122 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698