Move releaseIfNeeded to start, since it can change bitmapIsDummy_

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 294 matching lines @@
     canvas_->drawBitmap(subset, 0, 0);
     canvas_->restore();
   }
   CGContextRelease(cgContext_);
   cgContext_ = 0;
   useDeviceBits_ = false;
   bitmapIsDummy_ = false;
 }
 
 CGContextRef SkiaBitLocker::cgContext() {
+  releaseIfNeeded(); // This flushes any prior bitmap use
+
   SkIRect clip_bounds;
   if (!canvas_->getClipDeviceBounds(&clip_bounds)) {
     // If the clip is empty, then there is nothing to draw. The caller may
     // attempt to draw (to-be-clipped) results, so ensure there is a dummy
     // non-NULL CGContext to use.
     bitmapIsDummy_ = true;
     clip_bounds = SkIRect::MakeXYWH(0, 0, 1, 1);
   }
 
-  releaseIfNeeded(); // This flushes any prior bitmap use
-
   // remember the top/left, in case we need to compose this later
   bitmapOffset_.set(clip_bounds.x(), clip_bounds.y());
 
   // Now make clip_bounds be relative to the current layer/device
   if (!bitmapIsDummy_) {
     canvas_->temporary_internal_describeTopLayer(nullptr, &clip_bounds);
   }
 
   SkPixmap devicePixels;
   skia::GetWritablePixels(canvas_, &devicePixels);
@@ skipping 42 matching lines @@
   CGContextConcatCTM(cgContext_, SkMatrixToCGAffineTransform(matrix));
   
   return cgContext_;
 }
 
 bool SkiaBitLocker::hasEmptyClipRegion() const {
   return canvas_->isClipEmpty();
 }
 
 }  // namespace skia