Merge 124969

Source/WebCore/rendering/RenderQuote.h

 /*
  * Copyright (C) 2011 Nokia Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef RenderQuote_h
 #define RenderQuote_h
 
+#include "Document.h"
+#include "QuotesData.h"
+#include "RenderStyle.h"
 #include "RenderStyleConstants.h"
 #include "RenderText.h"
 
 namespace WebCore {
 
 class RenderQuote : public RenderText {
 public:
     RenderQuote(Document*, const QuoteType);
     virtual ~RenderQuote();
+    void attachQuote();
+    void detachQuote();
 
-    static void rendererSubtreeAttached(RenderObject*);
-    static void rendererRemovedFromTree(RenderObject*);
-protected:
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
-    virtual void willBeDestroyed();
 private:
-    virtual const char* renderName() const;
-    virtual bool isQuote() const { return true; };
-    virtual PassRefPtr<StringImpl> originalText() const;
-    virtual void computePreferredLogicalWidths(float leadWidth);
+    virtual void willBeDestroyed() OVERRIDE;
+    virtual const char* renderName() const OVERRIDE { return "RenderQuote"; };
+    virtual bool isQuote() const OVERRIDE { return true; };
+    virtual PassRefPtr<StringImpl> originalText() const OVERRIDE;
+    virtual void computePreferredLogicalWidths(float leadWidth) OVERRIDE;
+
     const QuotesData* quotesData() const;
+    void updateDepth();
 
     QuoteType m_type;
     int m_depth;
     RenderQuote* m_next;
     RenderQuote* m_previous;
-    void placeQuote();
+    bool m_attached;
 };
 
 inline RenderQuote* toRenderQuote(RenderObject* object)
 {
     ASSERT(!object || object->isQuote());
     return static_cast<RenderQuote*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderQuote(const RenderQuote*);
 
 } // namespace WebCore
 
 #endif // RenderQuote_h