Changeset 73927 in webkit

Timestamp:

Dec 13, 2010 10:21:38 AM (13 years ago)

Author:

jschuh@chromium.org

Message:

2010-12-13 Justin Schuh <​jschuh@chromium.org>

Reviewed by Dimitri Glazkov.

HTMLCanvasElement should handle multiple observers.
​https://bugs.webkit.org/show_bug.cgi?id=50899

Test: fast/canvas/canvas-bg-multiple-removal.html

• css/CSSCanvasValue.cpp: (WebCore::CSSCanvasValue::~CSSCanvasValue): (WebCore::CSSCanvasValue::canvasDestroyed): (WebCore::CSSCanvasValue::element):
• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::HTMLCanvasElement): (WebCore::HTMLCanvasElement::~HTMLCanvasElement): (WebCore::HTMLCanvasElement::addObserver): (WebCore::HTMLCanvasElement::removeObserver): (WebCore::HTMLCanvasElement::didDraw): (WebCore::HTMLCanvasElement::reset):
• html/HTMLCanvasElement.h:

2010-12-13 Justin Schuh <​jschuh@chromium.org>

Reviewed by Dimitri Glazkov.

HTMLCanvasElement should handle multiple observers.
​https://bugs.webkit.org/show_bug.cgi?id=50899

• fast/canvas/canvas-bg-multiple-removal-expected.txt: Added.
• fast/canvas/canvas-bg-multiple-removal.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-bg-multiple-removal-expected.txt (added)
• LayoutTests/fast/canvas/canvas-bg-multiple-removal.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSCanvasValue.cpp (modified) (3 diffs)
• WebCore/html/HTMLCanvasElement.cpp (modified) (5 diffs)
• WebCore/html/HTMLCanvasElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-13  Justin Schuh  <jschuh@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        HTMLCanvasElement should handle multiple observers.
+        https://bugs.webkit.org/show_bug.cgi?id=50899
+
+        * fast/canvas/canvas-bg-multiple-removal-expected.txt: Added.
+        * fast/canvas/canvas-bg-multiple-removal.html: Added.
+
 2010-12-13  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Justin Schuh  <jschuh@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        HTMLCanvasElement should handle multiple observers.
+        https://bugs.webkit.org/show_bug.cgi?id=50899
+
+        Test: fast/canvas/canvas-bg-multiple-removal.html
+
+        * css/CSSCanvasValue.cpp:
+        (WebCore::CSSCanvasValue::~CSSCanvasValue):
+        (WebCore::CSSCanvasValue::canvasDestroyed):
+        (WebCore::CSSCanvasValue::element):
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::HTMLCanvasElement):
+        (WebCore::HTMLCanvasElement::~HTMLCanvasElement):
+        (WebCore::HTMLCanvasElement::addObserver):
+        (WebCore::HTMLCanvasElement::removeObserver):
+        (WebCore::HTMLCanvasElement::didDraw):
+        (WebCore::HTMLCanvasElement::reset):
+        * html/HTMLCanvasElement.h:
+
 2010-12-13  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebCore/css/CSSCanvasValue.cpp

@@ -35 +35 @@
 {
     if (m_element)
-        m_element->setObserver(0);
+        m_element->removeObserver(this);
 }
 
@@ -63 +63 @@
 {
     ASSERT(element == m_element);
-    if (element == m_element)
-        m_element = 0;
+    m_element = 0;
 }
 
@@ -80 +79 @@
         if (!m_element)
             return 0;
-        m_element->setObserver(this);
+        m_element->addObserver(this);
     }
     return m_element;

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -72 +72 @@
 HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document)
-    , m_observer(0)
     , m_size(DefaultWidth, DefaultHeight)
     , m_ignoreReset(false)
@@ -94 +93 @@
 HTMLCanvasElement::~HTMLCanvasElement()
 {
-    if (m_observer)
-        m_observer->canvasDestroyed(this);
+    HashSet<CanvasObserver*>::iterator end = m_observers.end();
+    for (HashSet<CanvasObserver*>::iterator it = m_observers.begin(); it != end; ++it)
+        (*it)->canvasDestroyed(this);
 }
 
@@ -116 +116 @@
     m_rendererIsCanvas = false;
     return HTMLElement::createRenderer(arena, style);
+}
+
+void HTMLCanvasElement::addObserver(CanvasObserver* observer)
+{
+    m_observers.add(observer);
+}
+
+void HTMLCanvasElement::removeObserver(CanvasObserver* observer)
+{
+    m_observers.remove(observer);
 }
 
@@ -201 +211 @@
     }
 
-    if (m_observer)
-        m_observer->canvasChanged(this, rect);
+    HashSet<CanvasObserver*>::iterator end = m_observers.end();
+    for (HashSet<CanvasObserver*>::iterator it = m_observers.begin(); it != end; ++it)
+        (*it)->canvasChanged(this, rect);
 }
 
@@ -239 +250 @@
     }
 
-    if (m_observer)
-        m_observer->canvasResized(this);
+    HashSet<CanvasObserver*>::iterator end = m_observers.end();
+    for (HashSet<CanvasObserver*>::iterator it = m_observers.begin(); it != end; ++it)
+        (*it)->canvasResized(this);
 }
 

trunk/WebCore/html/HTMLCanvasElement.h

@@ -66 +66 @@
     virtual ~HTMLCanvasElement();
 
-    void setObserver(CanvasObserver* observer) { m_observer = observer; }
+    void addObserver(CanvasObserver* observer);
+    void removeObserver(CanvasObserver* observer);
 
     // Attributes and functions exposed to script
@@ -139 +140 @@
     bool hasCreatedImageBuffer() const { return m_hasCreatedImageBuffer; }
 
-    CanvasObserver* m_observer;
+    HashSet<CanvasObserver*> m_observers;
 
     IntSize m_size;