Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 87 matching lines @@
     }
 
     ~CanvasRenderingContext2DAutoRestoreSkCanvas()
     {
         SkCanvas* c = m_context->drawingCanvas();
         if (c)
             c->restoreToCount(m_saveCount);
         m_context->validateStateStack();
     }
 private:
-    RawPtrWillBeMember<CanvasRenderingContext2D> m_context;
+    Member<CanvasRenderingContext2D> m_context;
     int m_saveCount;
 };
 
 CanvasRenderingContext2D::CanvasRenderingContext2D(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document& document)
     : CanvasRenderingContext(canvas)
     , m_hasAlpha(attrs.alpha())
     , m_contextLostMode(NotLostContext)
     , m_contextRestorable(true)
     , m_tryRestoreContextAttemptCount(0)
     , m_dispatchContextLostEventTimer(this, &CanvasRenderingContext2D::dispatchContextLostEvent)
     , m_dispatchContextRestoredEventTimer(this, &CanvasRenderingContext2D::dispatchContextRestoredEvent)
     , m_tryRestoreContextEventTimer(this, &CanvasRenderingContext2D::tryRestoreContextEvent)
     , m_pruneLocalFontCacheScheduled(false)
 {
     if (document.settings() && document.settings()->antialiasedClips2dCanvasEnabled())
         m_clipAntialiasing = AntiAliased;
     setShouldAntialias(true);
 #if ENABLE(OILPAN)
     ThreadState::current()->registerPreFinalizer(this);
 #endif
 }
 
 void CanvasRenderingContext2D::setCanvasGetContextResult(RenderingContext& result)
 {
-    result.setCanvasRenderingContext2D(PassRefPtrWillBeRawPtr<CanvasRenderingContext2D>(this));
+    result.setCanvasRenderingContext2D(RawPtr<CanvasRenderingContext2D>(this));
 }
 
 void CanvasRenderingContext2D::unwindStateStack()
 {
     if (size_t stackSize = m_stateStack.size()) {
         if (SkCanvas* skCanvas = canvas()->existingDrawingCanvas()) {
             while (--stackSize)
                 skCanvas->restore();
         }
     }
@@ skipping 77 matching lines @@
 DEFINE_TRACE(CanvasRenderingContext2D)
 {
     visitor->trace(m_hitRegionManager);
     CanvasRenderingContext::trace(visitor);
     BaseRenderingContext2D::trace(visitor);
 }
 
 void CanvasRenderingContext2D::dispatchContextLostEvent(Timer<CanvasRenderingContext2D>*)
 {
     if (contextLostRestoredEventsEnabled()) {
-        RefPtrWillBeRawPtr<Event> event = Event::createCancelable(EventTypeNames::contextlost);
+        RawPtr<Event> event = Event::createCancelable(EventTypeNames::contextlost);
         canvas()->dispatchEvent(event);
         if (event->defaultPrevented()) {
             m_contextRestorable = false;
         }
     }
 
     // If RealLostContext, it means the context was not lost due to surface failure
     // but rather due to a an eviction, which means image buffer exists.
     if (m_contextRestorable && m_contextLostMode == RealLostContext) {
         m_tryRestoreContextAttemptCount = 0;
@@ skipping 24 matching lines @@
     }
 }
 
 void CanvasRenderingContext2D::dispatchContextRestoredEvent(Timer<CanvasRenderingContext2D>*)
 {
     if (m_contextLostMode == NotLostContext)
         return;
     reset();
     m_contextLostMode = NotLostContext;
     if (contextLostRestoredEventsEnabled()) {
-        RefPtrWillBeRawPtr<Event> event(Event::create(EventTypeNames::contextrestored));
+        RawPtr<Event> event(Event::create(EventTypeNames::contextrestored));
         canvas()->dispatchEvent(event);
     }
 }
 
 void CanvasRenderingContext2D::reset()
 {
     validateStateStack();
     unwindStateStack();
     m_stateStack.resize(1);
     m_stateStack.first() = CanvasRenderingContext2DState::create();
     m_path.clear();
     SkCanvas* c = canvas()->existingDrawingCanvas();
     if (c) {
         c->resetMatrix();
         c->clipRect(SkRect::MakeWH(canvas()->width(), canvas()->height()), SkRegion::kReplace_Op);
     }
     validateStateStack();
 }
 
 void CanvasRenderingContext2D::restoreCanvasMatrixClipStack(SkCanvas* c) const
 {
     if (!c)
         return;
-    WillBeHeapVector<OwnPtrWillBeMember<CanvasRenderingContext2DState>>::const_iterator currState;
+    HeapVector<Member<CanvasRenderingContext2DState>>::const_iterator currState;
     ASSERT(m_stateStack.begin() < m_stateStack.end());
     for (currState = m_stateStack.begin(); currState < m_stateStack.end(); currState++) {
         c->setMatrix(SkMatrix::I());
         currState->get()->playbackClips(c);
         c->setMatrix(affineTransformToSkMatrix(currState->get()->transform()));
         c->save();
     }
     c->restore();
 }
 
@@ skipping 693 matching lines @@
         hitRegionPath.intersectPath(state().getCurrentClipPath());
         if (hitRegionPath.isEmpty())
             exceptionState.throwDOMException(NotSupportedError, "The specified path has no pixels.");
     }
 
     if (!m_hitRegionManager)
         m_hitRegionManager = HitRegionManager::create();
 
     // Remove previous region (with id or control)
     m_hitRegionManager->removeHitRegionById(options.id());
-    m_hitRegionManager->removeHitRegionByControl(options.control().get());
+    m_hitRegionManager->removeHitRegionByControl(options.control());
 
-    RefPtrWillBeRawPtr<HitRegion> hitRegion = HitRegion::create(hitRegionPath, options);
+    RawPtr<HitRegion> hitRegion = HitRegion::create(hitRegionPath, options);
     Element* element = hitRegion->control();
     if (element && element->isDescendantOf(canvas()))
         updateElementAccessibility(hitRegion->path(), hitRegion->control());
     m_hitRegionManager->addHitRegion(hitRegion.release());
 }
 
 void CanvasRenderingContext2D::removeHitRegion(const String& id)
 {
     if (m_hitRegionManager)
         m_hitRegionManager->removeHitRegionById(id);
@@ skipping 15 matching lines @@
 
 unsigned CanvasRenderingContext2D::hitRegionsCount() const
 {
     if (m_hitRegionManager)
         return m_hitRegionManager->getHitRegionsCount();
 
     return 0;
 }
 
 } // namespace blink