Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 476303002: Remove obsolete HitTestResult.targetNode (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merge with trunk Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/HitTestResult.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 // be ad hoc and explicit. 1234 // be ad hoc and explicit.
1235 PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport(); 1235 PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
1236 FloatPoint unscaledPoint(point); 1236 FloatPoint unscaledPoint(point);
1237 unscaledPoint.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFact or()); 1237 unscaledPoint.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFact or());
1238 unscaledPoint.moveBy(pinchViewport.visibleRect().location()); 1238 unscaledPoint.moveBy(pinchViewport.visibleRect().location());
1239 1239
1240 HitTestRequest request = HitTestRequest::Move | HitTestRequest::ReadOnly | H itTestRequest::Active | HitTestRequest::IgnoreClipping; 1240 HitTestRequest request = HitTestRequest::Move | HitTestRequest::ReadOnly | H itTestRequest::Active | HitTestRequest::IgnoreClipping;
1241 HitTestResult result(frame()->view()->windowToContents(roundedIntPoint(unsca ledPoint))); 1241 HitTestResult result(frame()->view()->windowToContents(roundedIntPoint(unsca ledPoint)));
1242 frame()->document()->renderView()->layer()->hitTest(request, result); 1242 frame()->document()->renderView()->layer()->hitTest(request, result);
1243 1243
1244 if (Node* node = result.targetNode()) 1244 if (Node* node = result.innerNode())
1245 return frame()->selection().selection().visiblePositionRespectingEditing Boundary(result.localPoint(), node); 1245 return frame()->selection().selection().visiblePositionRespectingEditing Boundary(result.localPoint(), node);
1246 return VisiblePosition(); 1246 return VisiblePosition();
1247 } 1247 }
1248 1248
1249 WebPlugin* WebLocalFrameImpl::focusedPluginIfInputMethodSupported() 1249 WebPlugin* WebLocalFrameImpl::focusedPluginIfInputMethodSupported()
1250 { 1250 {
1251 WebPluginContainerImpl* container = WebLocalFrameImpl::pluginContainerFromNo de(frame(), WebNode(frame()->document()->focusedElement())); 1251 WebPluginContainerImpl* container = WebLocalFrameImpl::pluginContainerFromNo de(frame(), WebNode(frame()->document()->focusedElement()));
1252 if (container && container->supportsInputMethod()) 1252 if (container && container->supportsInputMethod())
1253 return container->plugin(); 1253 return container->plugin();
1254 return 0; 1254 return 0;
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1872 1872
1873 void WebLocalFrameImpl::invalidateAll() const 1873 void WebLocalFrameImpl::invalidateAll() const
1874 { 1874 {
1875 ASSERT(frame() && frame()->view()); 1875 ASSERT(frame() && frame()->view());
1876 FrameView* view = frame()->view(); 1876 FrameView* view = frame()->view();
1877 view->invalidateRect(view->frameRect()); 1877 view->invalidateRect(view->frameRect());
1878 invalidateScrollbar(); 1878 invalidateScrollbar();
1879 } 1879 }
1880 1880
1881 } // namespace blink 1881 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/HitTestResult.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698