Experimental revert of 2170 to see if the buildbot issues are somehow related.
git-svn-id: http://skia.googlecode.com/svn/trunk@2178 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp
index a5f1c0c..925c372 100644
--- a/experimental/Debugger/DebuggerContentView.cpp
+++ b/experimental/Debugger/DebuggerContentView.cpp
@@ -43,7 +43,7 @@
int offset = 0;
int frameBound = 0;
size_t bytesRead;
- while (static_cast<unsigned>(offset) < size) {
+ while (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 4c76720..afae912 100644
--- a/gpu/src/GrPathRendererChain.cpp
+++ b/gpu/src/GrPathRendererChain.cpp
@@ -15,8 +15,8 @@
GrPathRendererChain::GrPathRendererChain(GrContext* context, UsageFlags flags)
: fInit(false)
- , fOwner(context)
, fFlags(flags)
+ , fOwner(context)
, fChain(fStorage.get(), kPreAllocCount) {
fInit = false;
}
diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index d6c7929..2db1955 100644
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -61,7 +61,7 @@
class SampleView : public SkView {
public:
- SampleView() : fBGColor(SK_ColorWHITE), fRepeatCount(1) {
+ SampleView() : fRepeatCount(1), fBGColor(SK_ColorWHITE) {
fUsePipe = false;
}