WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderBox.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007 Apple 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.
  *
@@ skipping 286 matching lines @@
         if (oldWidth != width())
             return;
         calcHeight();
         setNeedsLayout(false);
     }
 
     IntRect maskClipRect();
 
     virtual void childBecameNonInline(RenderObject* /*child*/) { }
 
+    virtual VisiblePosition positionForCoordinates(int x, int y);
+
 #if ENABLE(SVG)
     virtual TransformationMatrix localTransform() const;
 #endif
 
 protected:
     virtual void styleWillChange(RenderStyle::Diff, const RenderStyle* newStyle);
     virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle);
 
     void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, int clipY, int clipHeight, int tx, int ty, int width, int height, CompositeOperator = CompositeSourceOver);
     void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, int clipY, int clipHeight, int tx, int ty, int width, int height, CompositeOperator = CompositeSourceOver);
@@ skipping 30 matching lines @@
                                     int containerHeight, int bordersPlusPadding,
                                     Length top, Length bottom, Length marginTop, Length marginBottom,
                                     int& heightValue, int& marginTopValue, int& marginBottomValue, int& yPos);
 
     void calcAbsoluteVerticalReplaced();
     void calcAbsoluteHorizontalReplaced();
 
     // This function calculates the minimum and maximum preferred widths for an object.
     // These values are used in shrink-to-fit layout systems.
     // These include tables, positioned objects, floats and flexible boxes.
-    virtual void calcPrefWidths() = 0;
+    virtual void calcPrefWidths() { setPrefWidthsDirty(false); }
+
+protected:
+    bool isAfterContent(RenderObject* child) const;
 
 private:
     // The width/height of the contents + borders + padding.  The x/y location is relative to our container (which is not always our parent).
     IntRect m_frameRect;
 
 protected:
     int m_marginLeft;
     int m_marginRight;
     int m_marginTop;
     int m_marginBottom;
@@ skipping 52 matching lines @@
 }
 
 inline RenderBox* RenderBox::lastChildBox() const
 {
     return toRenderBox(lastChild());
 }
 
 } // namespace WebCore
 
 #endif // RenderBox_h