summaryrefslogtreecommitdiffstats
path: root/WebCore/css/CSSCanvasValue.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-16 13:59:45 +0000
committerBen Murdoch <benm@google.com>2011-01-16 14:14:41 +0000
commit8a26975f9657a07318a10d481d7f332dad759325 (patch)
tree3d4270ff2d0aa27bdbb26e83c1de9d6ac18cb4fc /WebCore/css/CSSCanvasValue.cpp
parente137c43847f22807f1276afc87027711cc3f4e77 (diff)
downloadexternal_webkit-8a26975f9657a07318a10d481d7f332dad759325.zip
external_webkit-8a26975f9657a07318a10d481d7f332dad759325.tar.gz
external_webkit-8a26975f9657a07318a10d481d7f332dad759325.tar.bz2
Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
Diffstat (limited to 'WebCore/css/CSSCanvasValue.cpp')
-rw-r--r--WebCore/css/CSSCanvasValue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/css/CSSCanvasValue.cpp b/WebCore/css/CSSCanvasValue.cpp
index 767c11e..948dc74 100644
--- a/WebCore/css/CSSCanvasValue.cpp
+++ b/WebCore/css/CSSCanvasValue.cpp
@@ -34,7 +34,7 @@ namespace WebCore {
CSSCanvasValue::~CSSCanvasValue()
{
if (m_element)
- m_element->setObserver(0);
+ m_element->removeObserver(this);
}
String CSSCanvasValue::cssText() const
@@ -79,7 +79,7 @@ HTMLCanvasElement* CSSCanvasValue::element(Document* document)
m_element = document->getCSSCanvasElement(m_name);
if (!m_element)
return 0;
- m_element->setObserver(this);
+ m_element->addObserver(this);
}
return m_element;
}