Merge 143060

Source/WebCore/rendering/RenderQuote.h

 /*
  * Copyright (C) 2011 Nokia Inc. All rights reserved.
  * Copyright (C) 2012 Google 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,
@@ skipping 18 matching lines @@
 
 namespace WebCore {
 
 class Document;
 
 class RenderQuote : public RenderText {
 public:
     RenderQuote(Document*, const QuoteType);
     virtual ~RenderQuote();
     void attachQuote();
+
+    virtual void updateText() OVERRIDE;
+
+private:
     void detachQuote();
 
-private:
     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 updateText() OVERRIDE;
-    virtual void computePreferredLogicalWidths(float leadWidth) OVERRIDE;
+    virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE;
 
     // We don't override insertedIntoTree to call attachQuote() as it would be attached
     // too early and get the wrong depth since generated content is inserted into anonymous
     // renderers before going into the main render tree. Once we can ensure that insertIntoTree,
     // is called on an attached tree, we should override it here.
 
     virtual void willBeRemovedFromTree() OVERRIDE;
 
     const QuotesData* quotesData() const;
     void updateDepth();
@@ skipping 11 matching lines @@
     ASSERT_WITH_SECURITY_IMPLICATION(!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