Chromium Code Reviews| Index: Source/platform/graphics/GraphicsContext.cpp |
| diff --git a/Source/platform/graphics/GraphicsContext.cpp b/Source/platform/graphics/GraphicsContext.cpp |
| index e2b091292f892a9b8631b9a334c861099df9771b..5c60a10c1674215daa7e0ea05bdea4eaad253216 100644 |
| --- a/Source/platform/graphics/GraphicsContext.cpp |
| +++ b/Source/platform/graphics/GraphicsContext.cpp |
| @@ -140,11 +140,18 @@ GraphicsContext::GraphicsContext(SkCanvas* canvas) |
| GraphicsContext::~GraphicsContext() |
| { |
| +#if !ENABLE(OILPAN) |
| + // These asserts are only valid in debug mode and therefore do not seem |
| + // useful. We cannot rely on them in any case. With Oilpan we cannot run |
|
haraken
2014/04/24 04:18:43
Nit: I'd drop the first two sentences. These asser
Mads Ager (chromium)
2014/04/24 10:57:36
I do want the first two sentences here. This code
|
| + // the debug mode only code in CanvasRendingContext2D's destructor which |
|
haraken
2014/04/24 04:18:43
we cannot run CanvasRendingContext2D's destructor
Mads Ager (chromium)
2014/04/24 10:57:36
We can run the destructor. But we cannot run the d
|
| + // touches other objects that are dead. Therefore, we disable these asserts |
| + // with Oilpan and should probably consider just disabling them. |
| ASSERT(!m_paintStateIndex); |
| ASSERT(!m_paintState->saveCount()); |
| ASSERT(!m_annotationCount); |
| ASSERT(!m_layerCount); |
| ASSERT(m_recordingStateStack.isEmpty()); |
| +#endif |
| } |
| void GraphicsContext::save() |