WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 601 matching lines @@
     int width = 0;
     if (!printing() && m_frameView) {
         width = m_frameView->layoutWidth();
         width = m_frameView->useFixedLayout() ? ceilf(style()->effectiveZoom() * float(width)) : width;
     }
     return width;
 }
 
 // The idea here is to take into account what object is moving the pagination point, and
 // thus choose the best place to chop it.
-void RenderView::setBestTruncatedAt(int y, RenderBox* forRenderer, bool forcedBreak)
+void RenderView::setBestTruncatedAt(int y, RenderBoxModelObject* forRenderer, bool forcedBreak)
 {
     // Nobody else can set a page break once we have a forced break.
     if (m_forcedPageBreak)
         return;
 
     // Forced breaks always win over unforced breaks.
     if (forcedBreak) {
         m_forcedPageBreak = true;
         m_bestTruncatedAt = y;
         return;
     }
 
-    // prefer the widest object who tries to move the pagination point
-    if (forRenderer->width() > m_truncatorWidth) {
-        m_truncatorWidth = forRenderer->width();
+    // Prefer the widest object that tries to move the pagination point
+    IntRect boundingBox = forRenderer->borderBoundingBox();
+    if (boundingBox.width() > m_truncatorWidth) {
+        m_truncatorWidth = boundingBox.width();
         m_bestTruncatedAt = y;
     }
 }
 
 void RenderView::pushLayoutState(RenderObject* root)
 {
     ASSERT(!doingFullRepaint());
     ASSERT(m_layoutStateDisableCount == 0);
     ASSERT(m_layoutState == 0);
 
@@ skipping 40 matching lines @@
 void RenderView::willMoveOffscreen()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_compositor)
         m_compositor->willMoveOffscreen();
 #endif
 }
 
 } // namespace WebCore