OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. |
3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 m_hasMetaData(!!metaData) { | 71 m_hasMetaData(!!metaData) { |
72 if (metaData) | 72 if (metaData) |
73 m_metaData = *metaData; | 73 m_metaData = *metaData; |
74 | 74 |
75 // FIXME: Do some tests to determine how many states are typically used, and | 75 // FIXME: Do some tests to determine how many states are typically used, and |
76 // allocate several here. | 76 // allocate several here. |
77 m_paintStateStack.append(GraphicsContextState::create()); | 77 m_paintStateStack.append(GraphicsContextState::create()); |
78 m_paintState = m_paintStateStack.last().get(); | 78 m_paintState = m_paintStateStack.last().get(); |
79 | 79 |
80 if (contextDisabled()) { | 80 if (contextDisabled()) { |
81 DEFINE_STATIC_LOCAL(SkCanvas*, nullCanvas, (SkCreateNullCanvas())); | 81 DEFINE_STATIC_LOCAL(SkCanvas*, nullCanvas, (SkMakeNullCanvas().release())); |
82 m_canvas = nullCanvas; | 82 m_canvas = nullCanvas; |
83 } | 83 } |
84 } | 84 } |
85 | 85 |
86 GraphicsContext::~GraphicsContext() { | 86 GraphicsContext::~GraphicsContext() { |
87 #if DCHECK_IS_ON() | 87 #if DCHECK_IS_ON() |
88 if (!m_disableDestructionChecks) { | 88 if (!m_disableDestructionChecks) { |
89 ASSERT(!m_paintStateIndex); | 89 ASSERT(!m_paintStateIndex); |
90 ASSERT(!m_paintState->saveCount()); | 90 ASSERT(!m_paintState->saveCount()); |
91 ASSERT(!m_layerCount); | 91 ASSERT(!m_layerCount); |
(...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1412 static const SkPMColor colors[] = { | 1412 static const SkPMColor colors[] = { |
1413 SkPreMultiplyARGB(0x60, 0xFF, 0x00, 0x00), // More transparent red | 1413 SkPreMultiplyARGB(0x60, 0xFF, 0x00, 0x00), // More transparent red |
1414 SkPreMultiplyARGB(0x60, 0xC0, 0xC0, 0xC0) // More transparent gray | 1414 SkPreMultiplyARGB(0x60, 0xC0, 0xC0, 0xC0) // More transparent gray |
1415 }; | 1415 }; |
1416 | 1416 |
1417 return colors[index]; | 1417 return colors[index]; |
1418 } | 1418 } |
1419 #endif | 1419 #endif |
1420 | 1420 |
1421 } // namespace blink | 1421 } // namespace blink |
OLD | NEW |