← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to khtml/rendering/render_block.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-08-01 16:16:35 UTC
  • mfrom: (1.14.20)
  • Revision ID: package-import@ubuntu.com-20120801161635-qewual50h0fwfeju
Tags: 4:4.9.0a-0ubuntu1
New tar from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
khtml/rendering/render_block.cpp
3080
3080
            // the width of the last non-breakable run and use that to start a new line
3081
3081
            // (unless we end in whitespace).
3082
3082
            RenderStyle* cstyle = child->style();
3083
 
            short childMin = 0;
3084
 
            short childMax = 0;
 
3083
            int childMin = 0;
 
3084
            int childMax = 0;
3085
3085
 
3086
3086
            if (!child->isText()) {
3087
3087
                // Case (1) and (2).  Inline replaced and inline flow elements.
3161
3161
                    inlineMin += childMin;
3162
3162
                } else {
3163
3163
                    // Now check our line.
3164
 
                    m_minWidth = qMax(childMin, m_minWidth);
 
3164
                    m_minWidth = qMax(childMin, (int)m_minWidth);
3165
3165
 
3166
3166
                    // Now start a new line.
3167
3167
                    inlineMin = 0;
3185
3185
                // then they shouldn't be considered in the breakable char
3186
3186
                // check.
3187
3187
                bool hasBreakableChar, hasBreak;
3188
 
                short beginMin, endMin;
 
3188
                int beginMin, endMin;
3189
3189
                bool beginWS, endWS;
3190
 
                short beginMax, endMax;
 
3190
                int beginMax, endMax;
3191
3191
                t->trimmedMinMaxWidth(beginMin, beginWS, endMin, endWS, hasBreakableChar,
3192
3192
                                      hasBreak, beginMax, endMax,
3193
3193
                                      childMin, childMax, stripFrontSpaces);