Fixing GraphicsContext state checks to support oilpan

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 104 matching lines @@
 
 GraphicsContext::GraphicsContext(SkCanvas* canvas, DisabledMode disableContextOrPainting)
     : m_canvas(canvas)
     , m_paintStateStack()
     , m_paintStateIndex(0)
     , m_pendingCanvasSave(false)
     , m_annotationMode(0)
 #if !ASSERT_DISABLED
     , m_annotationCount(0)
     , m_layerCount(0)
+    , m_disableDestructionChecks(false)
 #endif
     , m_disabledState(disableContextOrPainting)
     , m_trackOpaqueRegion(false)
     , m_trackTextRegion(false)
     , m_useHighResMarker(false)
     , m_updatingControlTints(false)
     , m_accelerated(false)
     , m_isCertainlyOpaque(true)
     , m_printing(false)
     , m_antialiasHairlineImages(false)
 {
     if (!canvas)
         m_disabledState |= PaintingDisabled;
 
     // FIXME: Do some tests to determine how many states are typically used, and allocate
     // several here.
     m_paintStateStack.append(GraphicsContextState::create());
     m_paintState = m_paintStateStack.last().get();
 }
 
 GraphicsContext::~GraphicsContext()
 {
-#if !ENABLE(OILPAN)
-    // FIXME: Oilpan: These asserts are not true for
-    // CanvasRenderingContext2D. Therefore, there is debug mode code
-    // in the CanvasRenderingContext2D that forces this to be true so
-    // that the assertions can be here for all the other cases. With
-    // Oilpan we cannot run that code in the CanvasRenderingContext2D
-    // destructor because it touches other objects that are already
-    // dead. We need to find another way of doing these asserts when
-    // Oilpan is enabled.
-    ASSERT(!m_paintStateIndex);
-    ASSERT(!m_paintState->saveCount());
-    ASSERT(!m_annotationCount);
-    ASSERT(!m_layerCount);
-    ASSERT(m_recordingStateStack.isEmpty());
+#if !ASSERT_DISABLED

[Stephen White, 2014/05/28 13:23:34]

UberNit: isn't this unnecessary, strictly speaking, since all of the ASSERTS
will expand to whitespace in Release builds anyway?

[Justin Novosad, 2014/05/28 15:39:07]

You would think. But m_disableDestructionChecks is not defined in release
builds.

+    if (!m_disableDestructionChecks) {
+        ASSERT(!m_paintStateIndex);
+        ASSERT(!m_paintState->saveCount());
+        ASSERT(!m_annotationCount);
+        ASSERT(!m_layerCount);
+        ASSERT(m_recordingStateStack.isEmpty());
+        ASSERT(m_canvasStateStack.isEmpty());
+    }
 #endif
 }
 
 void GraphicsContext::save()
 {
     if (contextDisabled())
         return;
 
     m_paintState->incrementSaveCount();
 
@@ skipping 1675 matching lines @@
 
 void GraphicsContext::didDrawTextInRect(const SkRect& textRect)
 {
     if (m_trackTextRegion) {
         TRACE_EVENT0("skia", "PlatformContextSkia::trackTextRegion");
         m_textRegion.join(textRect);
     }
 }
 
 }