diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 20:32:42 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 20:32:42 +0000 |
commit | 34b9de55b7843a44963efc5b0a460871a4d27a80 (patch) | |
tree | 0a72c14bf5f227a528210239f1e385336874afca /webkit/glue | |
parent | acbfe5da0789a704455f491978073c6ab409e268 (diff) | |
download | chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.zip chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.tar.gz chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.tar.bz2 |
chrome side of the webkit merge
- Add platform specific chromiumclipboard files.
- Some methods got renamed in renderlayer, so change some method names in our glue code.
Review URL: http://codereview.chromium.org/27096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rwxr-xr-x | webkit/glue/stacking_order_iterator.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/stacking_order_iterator.cc b/webkit/glue/stacking_order_iterator.cc index 2d77ae9..c839394 100755 --- a/webkit/glue/stacking_order_iterator.cc +++ b/webkit/glue/stacking_order_iterator.cc @@ -60,7 +60,7 @@ RenderLayerIterator::Context::Context(WebCore::RenderLayer* layer) next_pos_(0) { ASSERT(layer_); layer_->updateZOrderLists(); - layer_->updateOverflowList(); + layer_->updateNormalFlowList(); } bool RenderLayerIterator::Context::HasMoreNeg() { @@ -84,14 +84,14 @@ WebCore::RenderLayer* RenderLayerIterator::Context::NextSelf() { } bool RenderLayerIterator::Context::HasMoreOverflow() { - return layer_->overflowList() && + return layer_->normalFlowList() && next_overflow_ >= 0 && - next_overflow_ < layer_->overflowList()->size(); + next_overflow_ < layer_->normalFlowList()->size(); } RenderLayerIterator::Context RenderLayerIterator::Context::NextOverflow() { ASSERT(HasMoreOverflow()); - return Context(layer_->overflowList()->at(next_overflow_++)); + return Context(layer_->normalFlowList()->at(next_overflow_++)); } bool RenderLayerIterator::Context::HasMorePos() { |