| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> | 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> |
| 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "core/CSSPropertyNames.h" | 31 #include "core/CSSPropertyNames.h" |
| 32 #include "core/css/StylePropertySet.h" | 32 #include "core/css/StylePropertySet.h" |
| 33 #include "core/css/parser/CSSParser.h" | 33 #include "core/css/parser/CSSParser.h" |
| 34 #include "core/html/HTMLCanvasElement.h" | 34 #include "core/html/HTMLCanvasElement.h" |
| 35 #include "core/html/parser/HTMLParserIdioms.h" | 35 #include "core/html/parser/HTMLParserIdioms.h" |
| 36 #include "modules/canvas2d/CanvasGradient.h" | 36 #include "modules/canvas2d/CanvasGradient.h" |
| 37 #include "modules/canvas2d/CanvasPattern.h" | 37 #include "modules/canvas2d/CanvasPattern.h" |
| 38 #include "platform/graphics/paint/PaintFlags.h" | 38 #include "platform/graphics/paint/PaintFlags.h" |
| 39 #include "platform/graphics/skia/SkiaUtils.h" | 39 #include "platform/graphics/skia/SkiaUtils.h" |
| 40 #include "platform/wtf/PassRefPtr.h" |
| 40 #include "third_party/skia/include/core/SkShader.h" | 41 #include "third_party/skia/include/core/SkShader.h" |
| 41 #include "wtf/PassRefPtr.h" | |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 enum ColorParseResult { | 45 enum ColorParseResult { |
| 46 kParsedRGBA, | 46 kParsedRGBA, |
| 47 kParsedCurrentColor, | 47 kParsedCurrentColor, |
| 48 kParsedSystemColor, | 48 kParsedSystemColor, |
| 49 kParseFailed | 49 kParseFailed |
| 50 }; | 50 }; |
| 51 | 51 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 ASSERT(type_ == kGradient || type_ == kImagePattern); | 131 ASSERT(type_ == kGradient || type_ == kImagePattern); |
| 132 return Color::kBlack; | 132 return Color::kBlack; |
| 133 } | 133 } |
| 134 | 134 |
| 135 DEFINE_TRACE(CanvasStyle) { | 135 DEFINE_TRACE(CanvasStyle) { |
| 136 visitor->Trace(gradient_); | 136 visitor->Trace(gradient_); |
| 137 visitor->Trace(pattern_); | 137 visitor->Trace(pattern_); |
| 138 } | 138 } |
| 139 | 139 |
| 140 } // namespace blink | 140 } // namespace blink |
| OLD | NEW |