diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 69cd659f43a148daaec6cfa54709f57a9fda0d52..41687be119b92ca11eb8ebf17a552f40cfdf9858 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2010-12-09 Brady Eidson + + Reviewed by Anders Carlsson. + + and https://bugs.webkit.org/show_bug.cgi?id=50777 + WebKit2 ContextMenuClient support + + Export some symbols and headers needed by WebKit2 Mac: + * WebCore.exp.in: + * WebCore.xcodeproj/project.pbxproj: + 2010-12-09 Sheriff Bot Unreviewed, rolling out r73635. diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in index d8018d2e17f333d1830d4696f006f366793752e9..e1597a009cde347529647e29a66efa9feefb4f81 100644 --- a/WebCore/WebCore.exp.in +++ b/WebCore/WebCore.exp.in @@ -158,6 +158,7 @@ __ZN7WebCore11FileChooserD1Ev __ZN7WebCore11FrameLoader11completeURLERKN3WTF6StringE __ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE __ZN7WebCore11FrameLoader11shouldCloseEv +__ZN7WebCore11FrameLoader11urlSelectedERKNS_4KURLERKN3WTF6StringENS4_10PassRefPtrINS_5EventEEEbbNS_14ReferrerPolicyE __ZN7WebCore11FrameLoader12shouldReloadERKNS_4KURLES3_ __ZN7WebCore11FrameLoader14detachChildrenEv __ZN7WebCore11FrameLoader14stopAllLoadersENS_14DatabasePolicyE @@ -326,11 +327,11 @@ __ZN7WebCore14SchemeRegistry24registerURLSchemeAsLocalERKN3WTF6StringE __ZN7WebCore14SchemeRegistry25registerURLSchemeAsSecureERKN3WTF6StringE __ZN7WebCore14SchemeRegistry32registerURLSchemeAsEmptyDocumentERKN3WTF6StringE __ZN7WebCore14SecurityOrigin14threadsafeCopyEv -__ZN7WebCore14SecurityOrigin28createFromDatabaseIdentifierERKN3WTF6StringE __ZN7WebCore14SecurityOrigin16createFromStringERKN3WTF6StringE __ZN7WebCore14SecurityOrigin18setLocalLoadPolicyENS0_15LocalLoadPolicyE __ZN7WebCore14SecurityOrigin18shouldHideReferrerERKNS_4KURLERKN3WTF6StringE __ZN7WebCore14SecurityOrigin27resetOriginAccessWhitelistsEv +__ZN7WebCore14SecurityOrigin28createFromDatabaseIdentifierERKN3WTF6StringE __ZN7WebCore14SecurityOrigin29addOriginAccessWhitelistEntryERKS0_RKN3WTF6StringES6_b __ZN7WebCore14SecurityOrigin32removeOriginAccessWhitelistEntryERKS0_RKN3WTF6StringES6_b __ZN7WebCore14SecurityOrigin40setDomainRelaxationForbiddenForURLSchemeEbRKN3WTF6StringE @@ -483,6 +484,8 @@ __ZN7WebCore20RenderEmbeddedObject30setShowsCrashedPluginIndicatorEv __ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx __ZN7WebCore20ResourceResponseBaseC2Ev __ZN7WebCore20SpaceSplitStringData12createVectorEv +__ZN7WebCore20UserGestureIndicatorC1ENS_26ProcessingUserGestureStateE +__ZN7WebCore20UserGestureIndicatorD1Ev __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE __ZN7WebCore21BackForwardController11itemAtIndexEi __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS0_4TypeEb @@ -554,6 +557,7 @@ __ZN7WebCore28contextMenuItemTagCapitalizeEv __ZN7WebCore28contextMenuItemTagShowColorsEv __ZN7WebCore28contextMenuItemTagSmartLinksEv __ZN7WebCore28contextMenuItemTagSpeechMenuEv +__ZN7WebCore28encodeWithURLEscapeSequencesERKN3WTF6StringE __ZN7WebCore28removeLanguageChangeObserverEPv __ZN7WebCore29contextMenuItemTagLeftToRightEv __ZN7WebCore29contextMenuItemTagRightToLeftEv @@ -942,9 +946,9 @@ __ZNK7WebCore11FrameLoader27numPendingOrLoadingRequestsEb __ZNK7WebCore11FrameLoader8loadTypeEv __ZNK7WebCore11HistoryItem10visitCountEv __ZNK7WebCore11HistoryItem11hasChildrenEv +__ZNK7WebCore11HistoryItem11originalURLEv __ZNK7WebCore11HistoryItem11scrollPointEv __ZNK7WebCore11HistoryItem12isTargetItemEv -__ZNK7WebCore11HistoryItem11originalURLEv __ZNK7WebCore11HistoryItem12redirectURLsEv __ZNK7WebCore11HistoryItem14alternateTitleEv __ZNK7WebCore11HistoryItem15lastVisitedTimeEv diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index 2eaf3373022d58c7ae2d8f7e328759d6e9390443..b5daae9f26642d984df199d0fcbeca47e029d581 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -692,7 +692,7 @@ 24F54EAC101FE914000AE741 /* ApplicationCacheHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24F54EAA101FE914000AE741 /* ApplicationCacheHost.cpp */; }; 24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (); }; }; 2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */; }; - 2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; }; + 2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; }; 29A812260FBB9C1D00510293 /* AccessibilityRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */; }; 29A812270FBB9C1D00510293 /* AccessibilityTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A812090FBB9C1D00510293 /* AccessibilityTable.cpp */; }; 29A812280FBB9C1D00510293 /* AccessibilityARIAGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8120A0FBB9C1D00510293 /* AccessibilityARIAGrid.cpp */; }; diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog index 80b361d166efffc4ec65b2b6206c84bc586a6c58..529b3ba40b1bbce0364b06e8a5878ab0967a3017 100644 --- a/WebKit2/ChangeLog +++ b/WebKit2/ChangeLog @@ -1,3 +1,40 @@ +2010-12-09 Brady Eidson + + Reviewed by Anders Carlsson. + + and https://bugs.webkit.org/show_bug.cgi?id=50777 + WebKit2 ContextMenuClient support + + Implement google search in a cross platform manner, and add a FIXME for download support: + * WebProcess/WebCoreSupport/WebContextMenuClient.cpp: + (WebKit::WebContextMenuClient::downloadURL): + (WebKit::WebContextMenuClient::searchWithGoogle): + + Mac implementations for speaking and searching: + * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm: Added. + (WebKit::WebContextMenuClient::lookUpInDictionary): Add a FIXME for now. + (WebKit::WebContextMenuClient::isSpeaking): + (WebKit::WebContextMenuClient::speak): + (WebKit::WebContextMenuClient::stopSpeaking): + (WebKit::WebContextMenuClient::searchWithSpotlight): + + Stubs for Win and Qt: + * WebProcess/WebCoreSupport/qt/WebContextMenuClientQt.cpp: Added. + (WebKit::WebContextMenuClient::lookUpInDictionary): + (WebKit::WebContextMenuClient::isSpeaking): + (WebKit::WebContextMenuClient::speak): + (WebKit::WebContextMenuClient::stopSpeaking): + * WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp: Added. + (WebKit::WebContextMenuClient::lookUpInDictionary): + (WebKit::WebContextMenuClient::isSpeaking): + (WebKit::WebContextMenuClient::speak): + (WebKit::WebContextMenuClient::stopSpeaking): + + Project file stuffs: + * WebKit2.pro: + * WebKit2.xcodeproj/project.pbxproj: + * win/WebKit2.vcproj: + 2010-12-09 Anders Carlsson Reviewed by Sam Weinig. diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro index 46fbd682f113746f3193446c5887faf4d2d5ec06..0fe2b3ccbc6ef020368186d9f210530d9c4e9973 100644 --- a/WebKit2/WebKit2.pro +++ b/WebKit2/WebKit2.pro @@ -591,6 +591,7 @@ SOURCES += \ WebProcess/WebCoreSupport/WebPlatformStrategies.cpp \ WebProcess/WebCoreSupport/WebPopupMenu.cpp \ WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \ + WebProcess/WebCoreSupport/qt/WebContextMenuClientQt.cpp \ WebProcess/WebCoreSupport/qt/WebDatabaseManagerQt.cpp \ WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \ WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp \ diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj index 2d4c34a16029881f26bfeddeb7d1a66c1643f140..688a9c2a7584f69f01e65498ff47d1bc65b74d51 100644 --- a/WebKit2/WebKit2.xcodeproj/project.pbxproj +++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj @@ -201,6 +201,7 @@ 1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; }; 1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2DAD1278C5B200BC7BD0 /* WebInspectorMac.mm */; }; 37F623B812A57B6200E3FDF6 /* WKFindOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */; }; 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */; }; 510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; }; 512935D71288D19400A4B695 /* WebContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512935D51288D19400A4B695 /* WebContextMenuItem.cpp */; }; @@ -836,6 +837,7 @@ 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorProxyMessages.h; sourceTree = ""; }; 32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2Prefix.h; sourceTree = ""; }; 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFindOptions.h; sourceTree = ""; }; + 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClientMac.mm; sourceTree = ""; }; 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuItemData.cpp; sourceTree = ""; }; 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuItemData.h; sourceTree = ""; }; 512935D51288D19400A4B695 /* WebContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuItem.cpp; sourceTree = ""; }; @@ -1946,6 +1948,7 @@ BC111ADE112F5B9A00337BAB /* mac */ = { isa = PBXGroup; children = ( + 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */, F6A25FD812ADC6BD00DC40CC /* WebDatabaseManagerMac.mm */, C5237F5F12441CA300780472 /* WebEditorClientMac.mm */, BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */, @@ -3061,6 +3064,7 @@ F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */, F6A25FD912ADC6BD00DC40CC /* WebDatabaseManagerMac.mm in Sources */, F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */, + 51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */, 1AAF061512B01131008E49E2 /* PDFViewController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp index 2fad128d907615327449a5148f0e6353eedb4eef..839869fabbe760d848eb2269d160b5baafab9508 100644 --- a/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp +++ b/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp @@ -28,6 +28,9 @@ #include "WebContextMenuItemData.h" #include "WebPage.h" #include +#include +#include +#include #define DISABLE_NOT_IMPLEMENTED_WARNINGS 1 #include "NotImplemented.h" @@ -54,40 +57,25 @@ void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem*, const Conte void WebContextMenuClient::downloadURL(const KURL& url) { + // FIXME - Need the ability to start a Download from an arbitrary URL notImplemented(); } -void WebContextMenuClient::searchWithGoogle(const Frame*) +void WebContextMenuClient::searchWithGoogle(const Frame* frame) { - notImplemented(); -} - -void WebContextMenuClient::lookUpInDictionary(Frame*) -{ - notImplemented(); -} - -bool WebContextMenuClient::isSpeaking() -{ - notImplemented(); - return false; -} - -void WebContextMenuClient::speak(const String&) -{ - notImplemented(); -} - -void WebContextMenuClient::stopSpeaking() -{ - notImplemented(); -} - -#if PLATFORM(MAC) -void WebContextMenuClient::searchWithSpotlight() -{ - notImplemented(); + String searchString = frame->editor()->selectedText(); + searchString.stripWhiteSpace(); + String encoded = encodeWithURLEscapeSequences(searchString); + encoded.replace("%20", "+"); + + String url("http://www.google.com/search?q="); + url.append(encoded); + url.append("&ie=UTF-8&oe=UTF-8"); + + if (Page* page = frame->page()) { + UserGestureIndicator indicator(DefinitelyProcessingUserGesture); + page->mainFrame()->loader()->urlSelected(KURL(ParsedURLString, url), String(), 0, false, false, SendReferrer); + } } -#endif } // namespace WebKit diff --git a/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm b/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm new file mode 100644 index 0000000000000000000000000000000000000000..66277af279c1e465e74e83350bd0d047a9133d11 --- /dev/null +++ b/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2010 Apple 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: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "WebContextMenuClient.h" + +#include "WebPage.h" + +#include +#include +#include + +#include "NotImplemented.h" + +@interface NSApplication (AppKitSecretsIKnowAbout) +- (void)speakString:(NSString *)string; +@end + +using namespace WebCore; + +namespace WebKit { + +void WebContextMenuClient::lookUpInDictionary(Frame*) +{ + // FIXME: - Implement + notImplemented(); +} + +bool WebContextMenuClient::isSpeaking() +{ + return [NSApp isSpeaking]; +} + +void WebContextMenuClient::speak(const String& string) +{ + [NSApp speakString:[[(NSString*)string copy] autorelease]]; +} + +void WebContextMenuClient::stopSpeaking() +{ + [NSApp stopSpeaking:nil]; +} + +void WebContextMenuClient::searchWithSpotlight() +{ + Frame* mainFrame = m_page->corePage()->mainFrame(); + + Frame* selectionFrame = mainFrame; + for (; selectionFrame; selectionFrame = selectionFrame->tree()->traverseNext(mainFrame)) { + if (selectionFrame->selection()->isRange()) + break; + } + if (!selectionFrame) + selectionFrame = mainFrame; + + String selectedString = selectionFrame->displayStringModifiedByEncoding(selectionFrame->editor()->selectedText()); + + if (selectedString.isEmpty()) + return; + + [[NSWorkspace sharedWorkspace] showSearchResultsForQueryString:(NSString *)selectedString]; +} + +} // namespace WebKit diff --git a/WebKit2/WebProcess/WebCoreSupport/qt/WebContextMenuClientQt.cpp b/WebKit2/WebProcess/WebCoreSupport/qt/WebContextMenuClientQt.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ccd59094df937a1bfc1df0ff650cc564ce330f9c --- /dev/null +++ b/WebKit2/WebProcess/WebCoreSupport/qt/WebContextMenuClientQt.cpp @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2010 Apple 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: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "WebContextMenuClient.h" + +using namespace WebCore; + +namespace WebKit { + +void WebContextMenuClient::lookUpInDictionary(Frame*) +{ + notImplemented(); +} + +bool WebContextMenuClient::isSpeaking() +{ + notImplemented(); + return false; +} + +void WebContextMenuClient::speak(const String&) +{ + notImplemented(); +} + +void WebContextMenuClient::stopSpeaking() +{ + notImplemented(); +} + +} // namespace WebKit diff --git a/WebKit2/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp b/WebKit2/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ccd59094df937a1bfc1df0ff650cc564ce330f9c --- /dev/null +++ b/WebKit2/WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2010 Apple 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: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "WebContextMenuClient.h" + +using namespace WebCore; + +namespace WebKit { + +void WebContextMenuClient::lookUpInDictionary(Frame*) +{ + notImplemented(); +} + +bool WebContextMenuClient::isSpeaking() +{ + notImplemented(); + return false; +} + +void WebContextMenuClient::speak(const String&) +{ + notImplemented(); +} + +void WebContextMenuClient::stopSpeaking() +{ + notImplemented(); +} + +} // namespace WebKit diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj index f898bc907da5a74b2aed74138bdbd5ffa0085c17..f24372fd23903ef4a23dfd9e3d3a73f33f1a0916 100755 --- a/WebKit2/win/WebKit2.vcproj +++ b/WebKit2/win/WebKit2.vcproj @@ -1220,6 +1220,10 @@ + +