summaryrefslogtreecommitdiffstats
path: root/WebCore/html/canvas/CanvasPattern.h
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-08-19 17:55:56 +0100
committerIain Merrick <husky@google.com>2010-08-23 11:05:40 +0100
commitf486d19d62f1bc33246748b14b14a9dfa617b57f (patch)
tree195485454c93125455a30e553a73981c3816144d /WebCore/html/canvas/CanvasPattern.h
parent6ba0b43722d16bc295606bec39f396f596e4fef1 (diff)
downloadexternal_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip
external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz
external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebCore/html/canvas/CanvasPattern.h')
-rw-r--r--WebCore/html/canvas/CanvasPattern.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/canvas/CanvasPattern.h b/WebCore/html/canvas/CanvasPattern.h
index 91e0794..58848a9 100644
--- a/WebCore/html/canvas/CanvasPattern.h
+++ b/WebCore/html/canvas/CanvasPattern.h
@@ -41,7 +41,7 @@ namespace WebCore {
public:
static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
- static PassRefPtr<CanvasPattern> create(Image* image, bool repeatX, bool repeatY, bool originClean)
+ static PassRefPtr<CanvasPattern> create(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
{
return adoptRef(new CanvasPattern(image, repeatX, repeatY, originClean));
}
@@ -51,7 +51,7 @@ namespace WebCore {
bool originClean() const { return m_originClean; }
private:
- CanvasPattern(Image*, bool repeatX, bool repeatY, bool originClean);
+ CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
RefPtr<Pattern> m_pattern;
bool m_originClean;