ChangeLog

2011-10-11  Nico Weber  <[email protected]>

        [chromium] Add a setSelectionToRange() method to WebFrame.

        https://bugs.webkit.org/show_bug.cgi?id=69846

        Also add a method to WebRange to create a range given a frame and an

        interval.

        This will be used to implement the "replacement range" feature of OS X

        IMEs, see http://codereview.chromium.org/8227018 (the change to

        render_widget.cc).

        The renderer will set the selection to the replacement range before

        calling confirmComposition(). This matches how WK2 does this, see

        Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm,

        WebPage::setComposition(). The function convertToRange() was taken

        from there, too.

        Reviewed by NOBODY (OOPS!).

        * public/WebFrame.h:

        (WebKit::WebFrame::setSelection):

        * src/WebFrameImpl.cpp:

        (WebKit::convertToRange):

        (WebKit::WebViewImpl::setSelection):

        * src/WebFrameImpl.h:

2011-10-10  Pavel Podivilov  <[email protected]>

        Unreviewed, mark CCThreadTest.startPostAndWaitOnCondition as flaky on win and mac.

Source/WebKit/chromium/public/WebFrame.h

@@public:

    virtual WebRange markedRange() const = 0;

385 virtual void setSelectionToRange(const WebRange&) = 0;

386

    // Returns the frame rectangle in window coordinate space of the given text

    // range.

    virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const = 0;

Source/WebKit/chromium/public/WebRange.h

@@namespace WTF { template <typename T> class PassRefPtr; }

namespace WebKit {

43class WebFrame;

class WebNode;

class WebRangePrivate;

class WebString;

@@public:

    WEBKIT_EXPORT WebString toHTMLText() const;

    WEBKIT_EXPORT WebString toPlainText() const;

74 WEBKIT_EXPORT static WebRange fromGlobalRange(WebFrame*, int start, int length);

75

#if WEBKIT_IMPLEMENTATION

    WebRange(const WTF::PassRefPtr<WebCore::Range>&);

    WebRange& operator=(const WTF::PassRefPtr<WebCore::Range>&);

Source/WebKit/chromium/src/WebFrameImpl.cpp

@@WebRange WebFrameImpl::markedRange() const

    return frame()->editor()->compositionRange();

}

void WebFrameImpl::setSelectionToRange(const WebRange& range)

{

    if (frame()->selection()->isContentEditable()) {

        RefPtr<Range> replacementRange = static_cast<PassRefPtr<WebCore::Range> >(range);

        frame()->selection()->setSelection(VisibleSelection(replacementRange.get(), SEL_DEFAULT_AFFINITY));

    }

}

bool WebFrameImpl::firstRectForCharacterRange(unsigned location, unsigned length, WebRect& rect) const

{

    if ((location + length < location) && (location + length))

Source/WebKit/chromium/src/WebFrameImpl.h

#include "Frame.h"

#include "FrameLoaderClientImpl.h"

#include "PlatformString.h"

40#include <wtf/Compiler.h>

#include <wtf/OwnPtr.h>

#include <wtf/RefCounted.h>

@@public:

    virtual void unmarkText();

    virtual bool hasMarkedText() const;

    virtual WebRange markedRange() const;

152 virtual void setSelectionToRange(const WebRange&) OVERRIDE;

    virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const;

    virtual size_t characterIndexForPoint(const WebPoint&) const;

    virtual bool executeCommand(const WebString&, const WebNode& = WebNode());

Source/WebKit/chromium/src/WebRange.cpp

#include "config.h"

#include "WebRange.h"

34#include "Document.h"

35#include "Frame.h"

3436#include "Range.h"

37#include "TextIterator.h"

38#include "WebFrameImpl.h"

#include "WebNode.h"

#include "WebString.h"

#include <wtf/PassRefPtr.h>

@@WebString WebRange::toPlainText() const

    return m_private->text();

}

// static

WebRange WebRange::fromGlobalRange(WebFrame* frame, int start, int length)

{

    WebCore::Frame* webFrame = static_cast<WebFrameImpl*>(frame)->frame();

    Element* selectionRoot = webFrame->selection()->rootEditableElement();

    Element* scope = selectionRoot ? selectionRoot : webFrame->document()->documentElement();

    return TextIterator::rangeFromLocationAndLength(scope, start, length);

}

WebRange::WebRange(const WTF::PassRefPtr<WebCore::Range>& range)

    : m_private(static_cast<WebRangePrivate*>(range.releaseRef()))

{