webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 13 insertions, 8 deletions

diff --git a/Source/WebCore/css/CSSCanvasValue.cpp b/Source/WebCore/css/CSSCanvasValue.cpp
index 4b2019313..c965f2ed4 100644
--- a/Source/WebCore/css/CSSCanvasValue.cpp
+++ b/Source/WebCore/css/CSSCanvasValue.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 INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, 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 INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, 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
@@ -28,6 +28,7 @@
 
 #include "ImageBuffer.h"
 #include "RenderElement.h"
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
@@ -39,7 +40,11 @@ CSSCanvasValue::~CSSCanvasValue()
 
 String CSSCanvasValue::customCSSText() const
 {
-    return makeString("-webkit-canvas(", m_name, ')');
+    StringBuilder result;
+    result.appendLiteral("-webkit-canvas(");
+    result.append(m_name);
+    result.append(')');
+    return result.toString();
 }
 
 void CSSCanvasValue::canvasChanged(HTMLCanvasElement&, const FloatRect& changedRect)
@@ -61,11 +66,11 @@ void CSSCanvasValue::canvasDestroyed(HTMLCanvasElement& element)
     m_element = nullptr;
 }
 
-FloatSize CSSCanvasValue::fixedSize(const RenderElement* renderer)
+IntSize CSSCanvasValue::fixedSize(const RenderElement* renderer)
 {
     if (HTMLCanvasElement* elt = element(renderer->document()))
-        return FloatSize(elt->width(), elt->height());
-    return FloatSize();
+        return IntSize(elt->width(), elt->height());
+    return IntSize();
 }
 
 HTMLCanvasElement* CSSCanvasValue::element(Document& document)
@@ -79,12 +84,12 @@ HTMLCanvasElement* CSSCanvasValue::element(Document& document)
     return m_element;
 }
 
-RefPtr<Image> CSSCanvasValue::image(RenderElement* renderer, const FloatSize& /*size*/)
+PassRefPtr<Image> CSSCanvasValue::image(RenderElement* renderer, const IntSize& /*size*/)
 {
     ASSERT(clients().contains(renderer));
     HTMLCanvasElement* element = this->element(renderer->document());
     if (!element || !element->buffer())
-        return nullptr;
+        return 0;
     return element->copiedImage();
 }