Changeset 84982 in webkit

Timestamp:

Apr 26, 2011 4:53:03 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-26 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r84951.
​http://trac.webkit.org/changeset/84951
​https://bugs.webkit.org/show_bug.cgi?id=59558

"breaks chromium compile" (Requested by dpranke on #webkit).

• WebKit.gyp:
• public/WebFrame.h:
• public/WebWidget.h:
• public/mac/WebSubstringUtil.h: Removed.
• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::firstRectForCharacterRange):
• src/WebFrameImpl.h:
• src/WebPopupMenuImpl.cpp:
• src/WebPopupMenuImpl.h:
• src/WebViewImpl.cpp:
• src/WebViewImpl.h:
• src/mac/WebSubstringUtil.mm: Removed.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (2 diffs)
• public/WebFrame.h (modified) (1 diff)
• public/WebWidget.h (modified) (3 diffs)
• public/mac/WebSubstringUtil.h (deleted)
• src/WebFrameImpl.cpp (modified) (4 diffs)
• src/WebFrameImpl.h (modified) (1 diff)
• src/WebPopupMenuImpl.cpp (modified) (3 diffs)
• src/WebPopupMenuImpl.h (modified) (2 diffs)
• src/WebViewImpl.cpp (modified) (4 diffs)
• src/WebViewImpl.h (modified) (1 diff)
• src/mac/WebSubstringUtil.mm (deleted)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r84951.
+        http://trac.webkit.org/changeset/84951
+        https://bugs.webkit.org/show_bug.cgi?id=59558
+
+        "breaks chromium compile" (Requested by dpranke on #webkit).
+
+        * WebKit.gyp:
+        * public/WebFrame.h:
+        * public/WebWidget.h:
+        * public/mac/WebSubstringUtil.h: Removed.
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::firstRectForCharacterRange):
+        * src/WebFrameImpl.h:
+        * src/WebPopupMenuImpl.cpp:
+        * src/WebPopupMenuImpl.h:
+        * src/WebViewImpl.cpp:
+        * src/WebViewImpl.h:
+        * src/mac/WebSubstringUtil.mm: Removed.
+
 2011-04-26  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -97 +97 @@
                 'public/mac/WebSandboxSupport.h',
                 'public/mac/WebScreenInfoFactory.h',
-                'public/mac/WebSubstringUtil.h',
                 'public/mac/WebThemeEngine.h',
                 'public/WebAccessibilityCache.h',
@@ -386 +385 @@
                 'src/mac/WebInputEventFactory.mm',
                 'src/mac/WebScreenInfoFactory.mm',
-                'src/mac/WebSubstringUtil.mm',
                 'src/LocalFileSystemChromium.cpp',
                 'src/LocalizedStrings.cpp',

trunk/Source/WebKit/chromium/public/WebFrame.h

@@ -397 +397 @@
     virtual WebRange markedRange() const = 0;
 
-    // Returns the frame rectangle in window coordinate space of the given text
-    // range.
     virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const = 0;
-
-    // Returns the index of a character in the Frame's text stream at the given
-    // point. The point is in the window coordinate space. Will return
-    // WTF::notFound if the point is invalid.
-    virtual size_t characterIndexForPoint(const WebPoint&) const = 0;
 
     // Supports commands like Undo, Redo, Cut, Copy, Paste, SelectAll,

trunk/Source/WebKit/chromium/public/WebWidget.h

@@ -41 +41 @@
 
 class WebInputEvent;
-class WebRange;
 class WebString;
 struct WebPoint;
@@ -122 +121 @@
     virtual bool confirmComposition(const WebString& text) = 0;
 
-    // Fetches the character range of the current composition, also called the
-    // "marked range." Returns true and fills the out-paramters on success;
-    // returns false on failure.
-    virtual bool compositionRange(size_t* location, size_t* length) = 0;
-
     // Returns the current text input type of this WebWidget.
     virtual WebTextInputType textInputType() = 0;
@@ -137 +131 @@
     // bottom of the selected line.
     virtual bool selectionRange(WebPoint& start, WebPoint& end) const = 0;
-
-    // Fetch the current selection range of this WebWidget. If there is no
-    // selection, it will output a 0-length range with the location at the
-    // caret. Returns true and fills the out-paramters on success; returns false
-    // on failure.
-    virtual bool caretOrSelectionRange(size_t* location, size_t* length) = 0;
 
     // Changes the text direction of the selected input node.

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -86 +86 @@
 #include "Editor.h"
 #include "EventHandler.h"
-#include "FocusController.h"
 #include "FormState.h"
 #include "FrameLoadRequest.h"
@@ -92 +91 @@
 #include "FrameTree.h"
 #include "FrameView.h"
+#include "HitTestResult.h"
 #include "HTMLCollection.h"
 #include "HTMLFormElement.h"
@@ -100 +100 @@
 #include "HTMLNames.h"
 #include "HistoryItem.h"
-#include "HitTestResult.h"
 #include "InspectorController.h"
 #include "Page.h"
@@ -1165 +1164 @@
         return false;
     IntRect intRect = frame()->editor()->firstRectForRange(range.get());
-    rect = WebRect(intRect);
-    // When inside an text control, don't adjust the range.
-    if (!selectionRoot)
-        rect = frame()->view()->contentsToWindow(rect);
+    rect = WebRect(intRect.x(), intRect.y(), intRect.width(), intRect.height());
 
     return true;
-}
-
-size_t 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;
-
-    size_t location, length;
-    TextIterator::locationAndLengthFromRange(range.get(), location, length);
-    return location;
 }
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.h

@@ -153 +153 @@
     virtual WebRange markedRange() const;
     virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const;
-    virtual size_t characterIndexForPoint(const WebPoint&) const;
     virtual bool executeCommand(const WebString&);
     virtual bool executeCommand(const WebString&, const WebString& value);

trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

@@ -44 +44 @@
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
-#include "WebRange.h"
 #include "WebRect.h"
 #include "WebWidgetClient.h"
@@ -254 +253 @@
 }
 
-bool WebPopupMenuImpl::compositionRange(size_t* location, size_t* length)
-{
-    *location = 0;
-    *length = 0;
-    return false;
-}
-
 WebTextInputType WebPopupMenuImpl::textInputType()
 {
@@ -269 +261 @@
 {
     return WebRect();
-}
-
-bool WebPopupMenuImpl::caretOrSelectionRange(size_t* location, size_t* length)
-{
-    *location = 0;
-    *length = 0;
-    return false;
 }
 

trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h

@@ -52 +52 @@
 class WebMouseEvent;
 class WebMouseWheelEvent;
-class WebRange;
 struct WebRect;
 
@@ -78 +77 @@
     virtual bool confirmComposition();
     virtual bool confirmComposition(const WebString& text);
-    virtual bool compositionRange(size_t* location, size_t* length);
     virtual WebTextInputType textInputType();
     virtual WebRect caretOrSelectionBounds();
     virtual bool selectionRange(WebPoint& start, WebPoint& end) const { return false; }
-    virtual bool caretOrSelectionRange(size_t* location, size_t* length);
     virtual void setTextDirection(WebTextDirection direction);
     virtual bool isAcceleratedCompositingActive() const { return false; }

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -92 +92 @@
 #include "Settings.h"
 #include "SpeechInputClientImpl.h"
-#include "TextIterator.h"
 #include "Timer.h"
 #include "TraceEvent.h"
@@ -117 +116 @@
 #include "WebPoint.h"
 #include "WebPopupMenuImpl.h"
-#include "WebRange.h"
 #include "WebRect.h"
 #include "WebRuntimeFeatures.h"
@@ -1397 +1395 @@
 }
 
-bool WebViewImpl::compositionRange(size_t* location, size_t* length)
-{
-    Frame* focused = focusedWebCoreFrame();
-    if (!focused || !m_imeAcceptEvents)
-        return false;
-    Editor* editor = focused->editor();
-    if (!editor || !editor->hasComposition())
-        return false;
-
-    RefPtr<Range> range = editor->compositionRange();
-    if (!range.get())
-        return false;
-
-    if (TextIterator::locationAndLengthFromRange(range.get(), *location, *length))
-        return true;
-    return false;
-}
-
 WebTextInputType WebViewImpl::textInputType()
 {
@@ -1504 +1484 @@
     end = frame->view()->contentsToWindow(end);
     return true;
-}
-
-bool WebViewImpl::caretOrSelectionRange(size_t* location, size_t* length)
-{
-    const Frame* focused = focusedWebCoreFrame();
-    if (!focused)
-        return false;
-
-    SelectionController* controller = focused->selection();
-    if (!controller)
-        return false;
-
-    RefPtr<Range> range = controller->selection().firstRange();
-    if (!range.get())
-        return false;
-
-    if (TextIterator::locationAndLengthFromRange(range.get(), *location, *length))
-        return true;
-    return false;
 }
 

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -108 +108 @@
     virtual bool confirmComposition();
     virtual bool confirmComposition(const WebString& text);
-    virtual bool compositionRange(size_t* location, size_t* length);
     virtual WebTextInputType textInputType();
     virtual WebRect caretOrSelectionBounds();
     virtual bool selectionRange(WebPoint& start, WebPoint& end) const;
-    virtual bool caretOrSelectionRange(size_t* location, size_t* length);
     virtual void setTextDirection(WebTextDirection direction);
     virtual bool isAcceleratedCompositingActive() const;