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

Unified Diff: gpu/command_buffer/service/error_state.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years 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
« no previous file with comments | « gpu/command_buffer/service/context_state_unittest.cc ('k') | gpu/command_buffer/service/error_state_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/error_state.cc
diff --git a/gpu/command_buffer/service/error_state.cc b/gpu/command_buffer/service/error_state.cc
index 6667e1d445458f62a25450fc056bc65707773349..6e05c37556c0940cc136d79ae6cd313e0a13419d 100644
--- a/gpu/command_buffer/service/error_state.cc
+++ b/gpu/command_buffer/service/error_state.cc
@@ -4,8 +4,11 @@
#include "gpu/command_buffer/service/error_state.h"
+#include <stdint.h>
+
#include <string>
+#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ -20,7 +23,7 @@ class ErrorStateImpl : public ErrorState {
explicit ErrorStateImpl(ErrorStateClient* client, Logger* logger);
~ErrorStateImpl() override;
- uint32 GetGLError() override;
+ uint32_t GetGLError() override;
void SetGLError(const char* filename,
int line,
@@ -63,7 +66,7 @@ class ErrorStateImpl : public ErrorState {
// The last error message set.
std::string last_error_;
// Current GL error bits.
- uint32 error_bits_;
+ uint32_t error_bits_;
ErrorStateClient* client_;
Logger* logger_;
@@ -84,11 +87,11 @@ ErrorStateImpl::ErrorStateImpl(ErrorStateClient* client, Logger* logger)
ErrorStateImpl::~ErrorStateImpl() {}
-uint32 ErrorStateImpl::GetGLError() {
+uint32_t ErrorStateImpl::GetGLError() {
// Check the GL error first, then our wrapped error.
GLenum error = GetErrorHandleContextLoss();
if (error == GL_NO_ERROR && error_bits_ != 0) {
- for (uint32 mask = 1; mask != 0; mask = mask << 1) {
+ for (uint32_t mask = 1; mask != 0; mask = mask << 1) {
if ((error_bits_ & mask) != 0) {
error = GLES2Util::GLErrorBitToGLError(mask);
break;
« no previous file with comments | « gpu/command_buffer/service/context_state_unittest.cc ('k') | gpu/command_buffer/service/error_state_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698