diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/graphics/Color.h | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/graphics/Color.h')
-rw-r--r-- | WebCore/platform/graphics/Color.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/Color.h b/WebCore/platform/graphics/Color.h index 22a8a8f..276e69f 100644 --- a/WebCore/platform/graphics/Color.h +++ b/WebCore/platform/graphics/Color.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-6 Apple Computer, Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,6 +31,7 @@ #include <wtf/unicode/Unicode.h> #if PLATFORM(CG) +#include "ColorSpace.h" typedef struct CGColor* CGColorRef; #endif @@ -180,7 +181,7 @@ Color colorFromPremultipliedARGB(unsigned); unsigned premultipliedARGBFromColor(const Color&); #if PLATFORM(CG) -CGColorRef createCGColor(const Color&); +CGColorRef cachedCGColor(const Color&, ColorSpace); #endif } // namespace WebCore |