aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--experimental/Debugger/DebuggerContentView.cpp2
-rw-r--r--gpu/src/GrPathRendererChain.cpp2
-rw-r--r--samplecode/SampleCode.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp
index 925c3726d2..a5f1c0ce23 100644
--- a/experimental/Debugger/DebuggerContentView.cpp
+++ b/experimental/Debugger/DebuggerContentView.cpp
@@ -43,7 +43,7 @@ public:
int offset = 0;
int frameBound = 0;
size_t bytesRead;
- while (offset < size) {
+ while (static_cast<unsigned>(offset) < size) {
SkGPipeReader::Status s = dumpReader->playback(data + offset,
size - offset,
&bytesRead,
diff --git a/gpu/src/GrPathRendererChain.cpp b/gpu/src/GrPathRendererChain.cpp
index afae912c75..4c76720f9a 100644
--- a/gpu/src/GrPathRendererChain.cpp
+++ b/gpu/src/GrPathRendererChain.cpp
@@ -15,8 +15,8 @@
GrPathRendererChain::GrPathRendererChain(GrContext* context, UsageFlags flags)
: fInit(false)
- , fFlags(flags)
, fOwner(context)
+ , fFlags(flags)
, fChain(fStorage.get(), kPreAllocCount) {
fInit = false;
}
diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index 2db1955b64..d6c7929758 100644
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -61,7 +61,7 @@ private:
class SampleView : public SkView {
public:
- SampleView() : fRepeatCount(1), fBGColor(SK_ColorWHITE) {
+ SampleView() : fBGColor(SK_ColorWHITE), fRepeatCount(1) {
fUsePipe = false;
}