From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 Source/WebCore/html/canvas/CanvasPattern.h | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'Source/WebCore/html/canvas/CanvasPattern.h')

diff --git a/Source/WebCore/html/canvas/CanvasPattern.h b/Source/WebCore/html/canvas/CanvasPattern.h
index 9fed5759a..b8faaab1a 100644
--- a/Source/WebCore/html/canvas/CanvasPattern.h
+++ b/Source/WebCore/html/canvas/CanvasPattern.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,39 +23,34 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CanvasPattern_h
-#define CanvasPattern_h
+#pragma once
 
 #include <wtf/Forward.h>
-#include <wtf/PassRefPtr.h>
+#include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 class Image;
 class Pattern;
 
-typedef int ExceptionCode;
-
 class CanvasPattern : public RefCounted<CanvasPattern> {
 public:
-    static PassRefPtr<CanvasPattern> create(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
+    static Ref<CanvasPattern> create(Ref<Image>&&, bool repeatX, bool repeatY, bool originClean);
     ~CanvasPattern();
 
-    static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
+    static bool parseRepetitionType(const String&, bool& repeatX, bool& repeatY);
 
-    Pattern* pattern() const { return m_pattern.get(); }
+    Pattern& pattern() { return m_pattern; }
+    const Pattern& pattern() const { return m_pattern; }
 
     bool originClean() const { return m_originClean; }
 
 private:
-    CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
+    CanvasPattern(Ref<Image>&&, bool repeatX, bool repeatY, bool originClean);
 
-    RefPtr<Pattern> m_pattern;
+    Ref<Pattern> m_pattern;
     bool m_originClean;
 };
 
 } // namespace WebCore
-
-#endif
-- 
cgit v1.2.1