| Index: webkit/glue/webframe_impl.cc
|
| ===================================================================
|
| --- webkit/glue/webframe_impl.cc (revision 27616)
|
| +++ webkit/glue/webframe_impl.cc (working copy)
|
| @@ -1643,7 +1643,7 @@
|
|
|
| frame_->setView(view);
|
|
|
| - if (web_view->GetIsTransparent())
|
| + if (web_view->isTransparent())
|
| view->setTransparent(true);
|
|
|
| // TODO(darin): The Mac code has a comment about this possibly being
|
| @@ -1827,14 +1827,12 @@
|
|
|
| int WebFrameImpl::OrdinalOfFirstMatchForFrame(WebFrameImpl* frame) const {
|
| int ordinal = 0;
|
| - WebViewImpl* web_view = GetWebViewImpl();
|
| - WebFrameImpl* const main_frame_impl = GetWebViewImpl()->main_frame();
|
| + WebFrameImpl* main_frame_impl = GetWebViewImpl()->main_frame();
|
| // Iterate from the main frame up to (but not including) |frame| and
|
| // add up the number of matches found so far.
|
| for (WebFrameImpl* it = main_frame_impl;
|
| it != frame;
|
| - it = static_cast<WebFrameImpl*>(
|
| - web_view->GetNextFrameAfter(it, true))) {
|
| + it = static_cast<WebFrameImpl*>(it->traverseNext(true))) {
|
| if (it->last_match_count_ > 0)
|
| ordinal += it->last_match_count_;
|
| }
|
|
|