Oilpan: Remove guardRef and guardDeref from TreeScope.

Source/core/html/canvas/CanvasRenderingContext2D.cpp

Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp
diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
index 8fb31fa2206334a4892cae55288da7a9b2a5c53e..0c9797b0274c72a8c630a6503cc64b08c70528c7 100644
--- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
@@ -115,9 +115,11 @@ void CanvasRenderingContext2D::unwindStateStack()
 
 CanvasRenderingContext2D::~CanvasRenderingContext2D()
 {
+#if !ENABLE(OILPAN)
 #if !ASSERT_DISABLED
     unwindStateStack();
 #endif
+#endif
 }
 
 bool CanvasRenderingContext2D::isAccelerated() const
@@ -160,6 +162,15 @@ void CanvasRenderingContext2D::restoreContext()
     }
 }
 
+void CanvasRenderingContext2D::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+    visitor->trace(m_stateStack);

[Erik Corry, 2014/04/25 09:23:48]

This makes it look as if the m_stateStack is different from the others in some
significant way, but actually there's just some prosaic reason that it the trace
call won't compile in non-oilpan-mode.  I would just put the ifdef around the
whole thing.

[Mads Ager (chromium), 2014/04/25 10:58:25]

Yeah, done.

+#endif
+    visitor->trace(m_fetchedFonts);
+    CanvasRenderingContext::trace(visitor);
+}
+
 void CanvasRenderingContext2D::dispatchContextLostEvent(Timer<CanvasRenderingContext2D>*)
 {
     if (contextLostRestoredEventsEnabled()) {