Merge 143356

Source/WebCore/rendering/TextAutosizer.h

 /*
  * Copyright (C) 2012 Google 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
@@ skipping 32 matching lines @@
 
 class TextAutosizer {
     WTF_MAKE_NONCOPYABLE(TextAutosizer);
 
 public:
     static PassOwnPtr<TextAutosizer> create(Document* document) { return adoptPtr(new TextAutosizer(document)); }
 
     virtual ~TextAutosizer();
 
     bool processSubtree(RenderObject* layoutRoot);
+    void recalculateMultipliers();
 
     static float computeAutosizedFontSize(float specifiedSize, float multiplier);
 
 private:
     enum TraversalDirection {
         FirstToLast,
         LastToFirst
     };
 
     explicit TextAutosizer(Document*);
@@ skipping 34 matching lines @@
     static void getNarrowDescendantsGroupedByWidth(const TextAutosizingClusterInfo& parentClusterInfo, Vector<Vector<TextAutosizingClusterInfo> >&);
 
     Document* m_document;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(TEXT_AUTOSIZING)
 
 #endif // TextAutosizer_h