Fix for canvas breakage caused by r108597 from the following:

https://bugs.webkit.org/show_bug.cgi?id=79317

Reviewed by Oliver Hunt.

* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::paintsIntoCanvasBuffer):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 032e428..98b142e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-23  Matthew Delaney  <mdelaney@apple.com>
+
+        Fix for canvas breakage caused by r108597 from the following:
+        https://bugs.webkit.org/show_bug.cgi?id=79317
+
+        Reviewed by Oliver Hunt.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::paintsIntoCanvasBuffer):
+
 2012-02-23  Pavel Feldman  <pfeldman@chromium.org>
 
         Web Inspector: mad Redo to Cmd+Shift+Z, not Cmd+Y on a Mac.

diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
index 7a44d72..d1d259c 100644 (file)
--- a/Source/WebCore/html/HTMLCanvasElement.cpp
+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -273,6 +273,10 @@ void HTMLCanvasElement::reset()
 bool HTMLCanvasElement::paintsIntoCanvasBuffer() const
 {
     ASSERT(m_context);
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
+    return true;
+#endif
+
 #if USE(ACCELERATED_COMPOSITING)
     if (!m_context->isAccelerated())
         return true;