DO NOT SUBMIT

Source/WebKit/chromium/src/WebFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 67 matching lines @@
 #include "Console.h"
 #include "DOMUtilitiesPrivate.h"
 #include "DOMWindow.h"
 #include "Document.h"
 #include "DocumentFragment.h" // Only needed for ReplaceSelectionCommand.h :(
 #include "DocumentLoader.h"
 #include "DocumentMarker.h"
 #include "DocumentMarkerController.h"
 #include "Editor.h"
 #include "EventHandler.h"
+#include "FocusController.h"
 #include "FormState.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "HTMLCollection.h"
 #include "HTMLFormElement.h"
 #include "HTMLFrameOwnerElement.h"
 #include "HTMLHeadElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLLinkElement.h"
 #include "HTMLNames.h"
 #include "HistoryItem.h"
+#include "HitTestResult.h"
 #include "InspectorController.h"
 #include "Page.h"
 #include "painting/GraphicsContextBuilder.h"
 #include "Performance.h"
 #include "PlatformBridge.h"
 #include "PluginDocument.h"
 #include "PrintContext.h"
 #include "RenderFrame.h"
 #include "RenderObject.h"
 #include "RenderTreeAsText.h"
@@ skipping 1012 matching lines @@
 {
     if ((location + length < location) && (location + length))
         length = 0;
 
     Element* selectionRoot = frame()->selection()->rootEditableElement();
     Element* scope = selectionRoot ? selectionRoot : frame()->document()->documentElement();
     RefPtr<Range> range = TextIterator::rangeFromLocationAndLength(scope, location, length);
     if (!range)
         return false;
     IntRect intRect = frame()->editor()->firstRectForRange(range.get());
-    rect = WebRect(intRect.x(), intRect.y(), intRect.width(), intRect.height());
+    rect = WebRect(intRect);
+    // When inside an text control, don't adjust the range.
+    if (!selectionRoot)
+        rect = frame()->view()->contentsToWindow(rect);
 
     return true;
 }
 
+unsigned WebFrameImpl::characterIndexForPoint(const WebPoint& webPoint) const
+{
+    if (!frame())
+        return notFound;
+
+    IntPoint point = frame()->view()->windowToContents(webPoint);
+    HitTestResult result = frame()->eventHandler()->hitTestResultAtPoint(point, false);
+    RefPtr<Range> range = frame()->rangeForPoint(result.point());
+    if (!range.get())
+        return notFound;
+
+    unsigned location, length;
+    range->getLocationAndLength(location, length);
+    return location;
+}
+
 bool WebFrameImpl::executeCommand(const WebString& name)
 {
     ASSERT(frame());
 
     if (name.length() <= 2)
         return false;
 
     // Since we don't have NSControl, we will convert the format of command
     // string and call the function on Editor directly.
     String command = name;
@@ skipping 1139 matching lines @@
 
     String scriptResult;
     if (!result.getString(scriptResult))
         return;
 
     if (!m_frame->navigationScheduler()->locationChangePending())
         m_frame->document()->loader()->writer()->replaceDocument(scriptResult);
 }
 
 } // namespace WebKit