Revert to enabling all of -O2 as it exposes a bug in the toolchain.

gm/bitmaprect.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 27 matching lines @@
     virtual SkString onShortName() SK_OVERRIDE {
         SkString str;
         str.printf("bitmaprect_%s", fUseIRect ? "i" : "s");
         return str;
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(640, 480);
     }
 
+#ifdef SK_CPU_ARM64
+    // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed.
+    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+        return this->INHERITED::onGetFlags() | GM::kSkipTiled_Flag;

[mtklein, 2014/09/03 20:24:13]

Seems fine, but all these can just be

return kSkipTiled_Flag;

+    }
+#endif
+
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         canvas->drawColor(0xFFCCCCCC);
 
         const SkIRect src[] = {
             { 0, 0, 32, 32 },
             { 0, 0, 80, 80 },
             { 32, 32, 96, 96 },
             { -32, -32, 32, 32, }
         };
 
@@ skipping 182 matching lines @@
 
 static skiagm::GMRegistry reg0(MyFactory0);
 static skiagm::GMRegistry reg1(MyFactory1);
 
 static skiagm::GMRegistry reg2(MyFactory2);
 
 #ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GMRegistry reg3(MyFactory3);
 static skiagm::GMRegistry reg4(MyFactory4);
 #endif