WebCore/ChangeLog

2010-12-09  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by NOBODY (OOPS!).

        Implement "Use Selection for Find" in WebKit2

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

        Implement a TakeFindStringFromSelection editor command. This is

        used solely to implement the "Use Selection for Find" menu command

        on Mac, and is not made available to script. On WebKit2, it is

        very convenient to reuse the editing machinery since this command

        is very similar to Copy.

        * editing/Editor.h:

        * editing/EditorCommand.cpp:

        (WebCore::executeTakeFindStringFromSelection): Call to a mac-only Editor function.

        (WebCore::enabledTakeFindStringFromSelection): Check using Editor::canCopyExcludingStandaloneImage

        (WebCore::createCommandMap): Add "TakeFindStringFromSelection" command.

        * editing/mac/EditorMac.mm:

        (WebCore::Editor::canCopyExcludingStandaloneImages): Helper function; we can't use Editor::canCopy

        since it would make no sense to enable "Use Selection for Find" when viewing a standalone image

        document.

        (WebCore::Editor::takeFindStringFromSelection): Implement by copying the selected text

        to the special Find pasteboard.

2010-12-08  Erik Arvidsson  <arv@chromium.org>

        Reviewed by Darin Adler.

73596

WebCore/editing/Editor.h

@@public:

#if PLATFORM(MAC)

    NSDictionary* fontAttributesForSelectionStart() const;

    NSWritingDirection baseWritingDirectionForSelectionStart() const;

367 bool canCopyExcludingStandaloneImages();

368 void takeFindStringFromSelection();

#endif

    bool selectionStartHasSpellingMarkerFor(int from, int length) const;

73583

WebCore/editing/EditorCommand.cpp

@@static bool executeSwapWithMark(Frame* f

    return true;

}

#if PLATFORM(MAC)

static bool executeTakeFindStringFromSelection(Frame* frame, Event*, EditorCommandSource, const String&)

{

    frame->editor()->takeFindStringFromSelection();

    return true;

}

#endif

static bool executeToggleBold(Frame* frame, Event*, EditorCommandSource source, const String&)

{

    return executeToggleStyle(frame, source, EditActionChangeAttributes, CSSPropertyFontWeight, "normal", "bold");

@@static bool enabledRedo(Frame* frame, Ev

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

}

#if PLATFORM(MAC)

static bool enabledTakeFindStringFromSelection(Frame* frame, Event*, EditorCommandSource)

{

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

}

#endif

static bool enabledUndo(Frame* frame, Event*, EditorCommandSource)

{

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

@@static const CommandMap& createCommandMa

        { "Subscript", { executeSubscript, supported, enabledInRichlyEditableText, stateSubscript, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

        { "Superscript", { executeSuperscript, supported, enabledInRichlyEditableText, stateSuperscript, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

        { "SwapWithMark", { executeSwapWithMark, supportedFromMenuOrKeyBinding, enabledVisibleSelectionAndMark, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

#if PLATFORM(MAC)

        { "TakeFindStringFromSelection", { executeTakeFindStringFromSelection, supportedFromMenuOrKeyBinding, enabledCopy, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

#endif

        { "ToggleBold", { executeToggleBold, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateBold, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

        { "ToggleItalic", { executeToggleItalic, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateItalic, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

        { "ToggleUnderline", { executeUnderline, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateUnderline, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

73583

WebCore/editing/mac/EditorMac.mm

#import "Pasteboard.h"

#import "RenderBlock.h"

#import "RuntimeApplicationChecks.h"

40#import "Sound.h"

namespace WebCore {

@@NSWritingDirection Editor::baseWritingDi

    return result;

}

bool Editor::canCopyExcludingStandaloneImages()

{

    SelectionController* selection = m_frame->selection();

    return selection->isRange() && !selection->isInPasswordField();

}

void Editor::takeFindStringFromSelection()

{

    if (!canCopyExcludingStandaloneImages()) {

        systemBeep();

        return;

    }

    NSString* nsSelectedText = m_frame->displayStringModifiedByEncoding(selectedText());

    NSPasteboard *findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];

    [findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];

    [findPasteboard setString:nsSelectedText forType:NSStringPboardType];

}

190211} // namespace WebCore

73583

WebKit2/ChangeLog

2010-12-09  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by NOBODY (OOPS!).

        Implement "Use Selection for Find" in WebKit2

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

        * UIProcess/API/mac/WKView.mm: Add support for the takeFindStringFromSelection:

        selector as a command.

2010-12-08  Sam Weinig  <sam@webkit.org>

        Reviewed by Geoffrey "Error" Garen.

73596

WebKit2/UIProcess/API/mac/WKView.mm

@@WEBCORE_COMMAND(paste)

WEBCORE_COMMAND(delete)

WEBCORE_COMMAND(pasteAsPlainText)

WEBCORE_COMMAND(selectAll)

276WEBCORE_COMMAND(takeFindStringFromSelection)

#undef WEBCORE_COMMAND

73583