Merge 75007 - Merge 73927

WebCore/css/CSSCanvasValue.cpp

 /*
  * Copyright (C) 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #include "CSSCanvasValue.h"
 
 #include "ImageBuffer.h"
 #include "RenderObject.h"
 
 namespace WebCore {
 
 CSSCanvasValue::~CSSCanvasValue()
 {
     if (m_element)
-        m_element->setObserver(0);
+        m_element->removeObserver(this);
 }
 
 String CSSCanvasValue::cssText() const
 {
     String result = "-webkit-canvas(";
     result += m_name  + ")";
     return result;
 }
 
 void CSSCanvasValue::canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect)
@@ skipping 24 matching lines @@
         return IntSize(elt->width(), elt->height());
     return IntSize();
 }
 
 HTMLCanvasElement* CSSCanvasValue::element(Document* document)
 {
      if (!m_element) {
         m_element = document->getCSSCanvasElement(m_name);
         if (!m_element)
             return 0;
-        m_element->setObserver(this);
+        m_element->addObserver(this);
     }
     return m_element;
 }
 
 Image* CSSCanvasValue::image(RenderObject* renderer, const IntSize& /*size*/)
 {
     ASSERT(m_clients.contains(renderer));
     HTMLCanvasElement* elt = element(renderer->document());
     if (!elt || !elt->buffer())
         return 0;
     return elt->copiedImage();
 }
 
 } // namespace WebCore