Changeset 86862 in webkit


Ignore:
Timestamp:
May 19, 2011, 11:39:59 AM (14 years ago)
Author:
inferno@chromium.org
Message:

Merge 86448
BUG=82546
Review URL: http://codereview.chromium.org/7050016

Location:
branches/chromium/742
Files:
1 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/chromium/742/Source/WebCore/rendering/RenderBox.cpp

    r84283 r86862  
    224224            if (curr->isRenderBlock()) {
    225225                RenderBlock* currBlock = toRenderBlock(curr);
    226                 if (currBlock->containsFloat(this))
     226                if (!parentBlock || currBlock->containsFloat(this))
    227227                    parentBlock = currBlock;
    228228            }
Note: See TracChangeset for help on using the changeset viewer.