webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 14 deletions

diff --git a/Source/WebCore/html/canvas/CanvasPattern.cpp b/Source/WebCore/html/canvas/CanvasPattern.cpp
index a4557418e..e95eb6330 100644
--- a/Source/WebCore/html/canvas/CanvasPattern.cpp
+++ b/Source/WebCore/html/canvas/CanvasPattern.cpp
@@ -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
@@ -26,20 +26,19 @@
 #include "config.h"
 #include "CanvasPattern.h"
 
-#include "ExceptionCode.h"
 #include "Image.h"
 #include "Pattern.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-PassRefPtr<CanvasPattern> CanvasPattern::create(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
+Ref<CanvasPattern> CanvasPattern::create(Ref<Image>&& image, bool repeatX, bool repeatY, bool originClean)
 {
-    return adoptRef(new CanvasPattern(image, repeatX, repeatY, originClean));
+    return adoptRef(*new CanvasPattern(WTFMove(image), repeatX, repeatY, originClean));
 }
 
-CanvasPattern::CanvasPattern(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
-    : m_pattern(Pattern::create(image, repeatX, repeatY))
+CanvasPattern::CanvasPattern(Ref<Image>&& image, bool repeatX, bool repeatY, bool originClean)
+    : m_pattern(Pattern::create(WTFMove(image), repeatX, repeatY))
     , m_originClean(originClean)
 {
 }
@@ -48,30 +47,29 @@ CanvasPattern::~CanvasPattern()
 {
 }
 
-void CanvasPattern::parseRepetitionType(const String& type, bool& repeatX, bool& repeatY, ExceptionCode& ec)
+bool CanvasPattern::parseRepetitionType(const String& type, bool& repeatX, bool& repeatY)
 {
-    ec = 0;
     if (type.isEmpty() || type == "repeat") {
         repeatX = true;
         repeatY = true;
-        return;
+        return true;
     }
     if (type == "no-repeat") {
         repeatX = false;
         repeatY = false;
-        return;
+        return true;
     }
     if (type == "repeat-x") {
         repeatX = true;
         repeatY = false;
-        return;
+        return true;
     }
     if (type == "repeat-y") {
         repeatX = false;
         repeatY = true;
-        return;
+        return true;
     }
-    ec = SYNTAX_ERR;
+    return false;
 }
 
 } // namespace WebCore