Revert "Revert "Change call-sites now that SkCanvas is not ref-counted""

third_party/WebKit/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 61 matching lines @@
       m_hasMetaData(!!metaData) {
   if (metaData)
     m_metaData = *metaData;
 
   // 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.back().get();
 
   if (contextDisabled()) {
-    DEFINE_STATIC_LOCAL(SkCanvas*, nullCanvas, (SkCreateNullCanvas()));
+    DEFINE_STATIC_LOCAL(SkCanvas*, nullCanvas, (SkMakeNullCanvas().release()));
     m_canvas = nullCanvas;
   }
 }
 
 GraphicsContext::~GraphicsContext() {
 #if DCHECK_IS_ON()
   if (!m_disableDestructionChecks) {
     ASSERT(!m_paintStateIndex);
     ASSERT(!m_paintState->saveCount());
     ASSERT(!m_layerCount);
@@ skipping 1315 matching lines @@
   static const SkPMColor colors[] = {
       SkPreMultiplyARGB(0x60, 0xFF, 0x00, 0x00),  // More transparent red
       SkPreMultiplyARGB(0x60, 0xC0, 0xC0, 0xC0)   // More transparent gray
   };
 
   return colors[index];
 }
 #endif
 
 }  // namespace blink