From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebKit2/WebProcess/WebPage/WebPage.messages.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/WebProcess/WebPage/WebPage.messages.in') diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in index e47a013..0c0eea5 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in @@ -70,10 +70,13 @@ messages -> WebPage { GetSourceForFrame(uint64_t frameID, uint64_t callbackID) GetWebArchiveOfFrame(uint64_t frameID, uint64_t callbackID) RunJavaScriptInMainFrame(WTF::String script, uint64_t callbackID) - - # FIXME: This should be a drawing area message. ForceRepaint(uint64_t callbackID) +#if PLATFORM(MAC) + # Dictionary support. + PerformDictionaryLookupAtLocation(WebCore::FloatPoint point) +#endif + PreferencesDidChange(WebKit::WebPreferencesStore store) SetUserAgent(WTF::String userAgent) @@ -87,7 +90,7 @@ messages -> WebPage { Close() TryClose() - ValidateMenuItem(WTF::String name) + ValidateCommand(WTF::String name, uint64_t callbackID) ExecuteEditCommand(WTF::String name) DidRemoveEditCommand(uint64_t commandID) @@ -153,15 +156,20 @@ messages -> WebPage { BeginPrinting(uint64_t frameID, WebKit::PrintInfo printInfo) EndPrinting(); ComputePagesForPrinting(uint64_t frameID, WebKit::PrintInfo printInfo, uint64_t callbackID) -#if PLATFORM(MAC) +#if PLATFORM(MAC) || PLATFORM(WIN) DrawRectToPDF(uint64_t frameID, WebCore::IntRect rect, uint64_t callbackID) DrawPagesToPDF(uint64_t frameID, uint32_t first, uint32_t count, uint64_t callbackID) #endif + SetMemoryCacheMessagesEnabled(bool memoryCacheMessagesEnabled) + // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require // any synchronous messages, and should be removed when is fixed. Dummy() -> (bool dummyReturn) + SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel) + SetCanRunModal(bool canRunModal) + #if PLATFORM(MAC) # Complex text input support for plug-ins. SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput) @@ -172,6 +180,7 @@ messages -> WebPage { CharacterIndexForPoint(WebCore::IntPoint point) -> (uint64_t result) FirstRectForCharacterRange(uint64_t location, uint64_t length) -> (WebCore::IntRect resultRect) RegisterUIProcessAccessibilityTokens(CoreIPC::DataReference elemenToken, CoreIPC::DataReference windowToken) + WriteSelectionToPasteboard(WTF::String pasteboardName, WTF::Vector pasteboardTypes) -> (bool result) #endif #if PLATFORM(WIN) ConfirmComposition(WTF::String compositionString) -- cgit v1.1