summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 16:36:28 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 16:36:28 +0000
commit479d5bc48969f6de924471de27638409db848229 (patch)
tree0bff4fee34a82ad69f27f594199761d7c89dbd34 /webkit
parentef73807894f85700900b64917a4809bfec0002d7 (diff)
downloadchromium_src-479d5bc48969f6de924471de27638409db848229.zip
chromium_src-479d5bc48969f6de924471de27638409db848229.tar.gz
chromium_src-479d5bc48969f6de924471de27638409db848229.tar.bz2
Enables find in page match counts on Mac.
BUG=http://crbug.com/16148 TEST=Find in page should report match counts correctly. Review URL: http://codereview.chromium.org/155353 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webframe_impl.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index c941f91..73ae01bc 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -792,8 +792,6 @@ v8::Local<v8::Context> WebFrameImpl::GetScriptContext() {
void WebFrameImpl::InvalidateArea(AreaToInvalidate area) {
ASSERT(frame() && frame()->view());
-#if defined(OS_WIN) || defined(OS_LINUX)
- // TODO(pinkerton): Fix Mac invalidation to be more like Win ScrollView
FrameView* view = frame()->view();
if ((area & INVALIDATE_ALL) == INVALIDATE_ALL) {
@@ -814,7 +812,6 @@ void WebFrameImpl::InvalidateArea(AreaToInvalidate area) {
view->invalidateRect(scroll_bar_vert);
}
}
-#endif
}
void WebFrameImpl::IncreaseMatchCount(int count, int request_id) {
@@ -929,8 +926,6 @@ bool WebFrameImpl::Find(int request_id,
if (active_match_index_ + 1 == 0)
active_match_index_ = last_match_count_ - 1;
}
-#if defined(OS_WIN) || defined(OS_LINUX)
- // TODO(pinkerton): Fix Mac scrolling to be more like Win ScrollView
if (selection_rect) {
WebRect rect = webkit_glue::IntRectToWebRect(
frame()->view()->convertToContainingWindow(curr_selection_rect));
@@ -942,7 +937,6 @@ bool WebFrameImpl::Find(int request_id,
active_match_index_ + 1,
request_id);
}
-#endif
}
} else {
// Nothing was found in this frame.
@@ -1183,8 +1177,6 @@ void WebFrameImpl::ScopeStringMatches(int request_id,
// To stop looking for the active tickmark, we set this flag.
locating_active_rect_ = false;
-#if defined(OS_WIN) || defined(OS_LINUX)
- // TODO(pinkerton): Fix Mac invalidation to be more like Win ScrollView
// Notify browser of new location for the selected rectangle.
result_bounds.move(-frameview()->scrollOffset().width(),
-frameview()->scrollOffset().height());
@@ -1193,7 +1185,6 @@ void WebFrameImpl::ScopeStringMatches(int request_id,
frame()->view()->convertToContainingWindow(result_bounds)),
active_match_index_ + 1,
request_id);
-#endif
}
AddMarker(result_range.get(), found_active_match);