diff options
Diffstat (limited to 'Source/WebKit/win')
47 files changed, 468 insertions, 954 deletions
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog index 870b692..21b04c7 100644 --- a/Source/WebKit/win/ChangeLog +++ b/Source/WebKit/win/ChangeLog @@ -1,6 +1,173 @@ -2011-03-30 Martin Robinson <mrobinson@igalia.com> +2011-04-19 Vsevolod Vlasov <vsevik@chromium.org> - Reviewed by Dirk Schulze. + Reviewed by Pavel Feldman. + + Web Inspector: Rename lengthReceived to encodedDataLength/dataLength + https://bugs.webkit.org/show_bug.cgi?id=58883 + + * WebCoreSupport/WebFrameLoaderClient.h: + +2011-04-18 Timothy Hatcher <timothy@apple.com> + + Remove the two commands that make en.lproj and copy Localizable.strings. + + Rubber-stamped by Adam Roben. + + * WebKit.vcproj/WebKitLibPostBuild.cmd: + +2011-04-18 Patrick Gansterer <paroga@webkit.org> + + Reviewed by Adam Roben. + + Include <WebCore/COMPtr.h> instead of "COMPtr.h" + https://bugs.webkit.org/show_bug.cgi?id=58744 + + * DOMCoreClasses.cpp: + * DOMHTMLClasses.cpp: + * WebActionPropertyBag.cpp: + * WebBackForwardList.cpp: + * WebCoreSupport/WebGeolocationClient.h: + * WebDownload.h: + * WebDropSource.h: + * WebFrame.cpp: + * WebHistoryItem.cpp: + * WebIconDatabase.cpp: + * WebNavigationData.h: + * WebPreferences.cpp: + * WebResource.h: + * WebURLAuthenticationChallenge.cpp: + * WebURLAuthenticationChallengeSender.cpp: + * WebURLAuthenticationChallengeSenderCFNet.cpp: + * WebURLAuthenticationChallengeSenderCurl.cpp: + * WebView.h: + +2011-04-17 Patrick Gansterer <paroga@webkit.org> + + Reviewed by Adam Barth. + + Rename PLATFORM(CG) to USE(CG) + https://bugs.webkit.org/show_bug.cgi?id=58729 + + * WebFrame.cpp: + (WebFrame::spoolPages): + * WebFrame.h: + * WebPreferences.cpp: + (WebPreferences::setFontSmoothing): + (WebPreferences::setFontSmoothingContrast): + * WebView.cpp: + (systemParameterChanged): + +2011-04-16 Sam Weinig <sam@webkit.org> + + Reviewed by Simon Fraser. + + Windows should use WebCore localized strings + <rdar://problem/9119405> + https://bugs.webkit.org/show_bug.cgi?id=58733 + + * WebCoreSupport/WebEditorClient.cpp: + (undoNameForEditAction): + (WebEditorClient::registerCommandForUndo): + * WebPreferences.cpp: + (WebPreferences::initializeDefaultSettings): + * WebURLResponse.cpp: + (CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode): + (WebURLResponse::localizedStringForStatusCode): + Change to use WEB_UI_STRING. + + * WebCoreSupport/WebPlatformStrategies.cpp: + * WebCoreSupport/WebPlatformStrategies.h: + Remove the localization strategy in favor of using the default one. + +2011-04-16 Patrick Gansterer <paroga@webkit.org> + + Reviewed by Eric Seidel. + + Rename PLATFORM(CAIRO) to USE(CAIRO) + https://bugs.webkit.org/show_bug.cgi?id=55192 + + * WebFrame.cpp: + (WebFrame::spoolPages): + * WebFrame.h: + +2011-04-14 Adam Roben <aroben@apple.com> + + Replace some known-to-fail assertions with FIXMEs + + These assertions get hit during various layout tests. They indicate that we're sometimes + doing some extra work when a page goes into accelerated compositing mode, but otherwise + there's no bad effect. + + See <http://webkit.org/b/58539> for more details. + + Rubber-stamped by John Sullivan. + + * WebView.cpp: + (WebView::paintIntoBackingStore): + (WebView::paintIntoWindow): + Replaced assertions with FIXMEs. + +2011-04-13 James Robinson <jamesr@chromium.org> + + Reviewed by Simon Fraser. + + Allow setting composited backing stores for scrollbars and scroll corners + https://bugs.webkit.org/show_bug.cgi?id=57202 + + Update WebScrollBar to reflect ScrollableArea interface changes. + + * WebScrollBar.h: + (WebScrollBar::invalidateScrollCornerRect): + (WebScrollBar::scrollCornerPresent): + (WebScrollBar::scrollCornerRect): + +2011-04-12 Alice Liu <alice.liu@apple.com> + + Reviewed by Sam Weinig. + + https://bugs.webkit.org/show_bug.cgi?id=58292 + Provide new setting to allow site icon loading despite disabling automatic image loading in general. + + * Interfaces/IWebPreferencesPrivate.idl: Added prefs. + * Interfaces/WebKit.idl: Touch file to force autogeneration + * WebPreferenceKeysPrivate.h: Add preference key. + * WebPreferences.cpp: + (WebPreferences::initializeDefaultSettings): Initialize setting to false. + (WebPreferences::setLoadsSiteIconsIgnoringImageLoadingPreference): Added setter + (WebPreferences::loadsSiteIconsIgnoringImageLoadingPreference): Added getter + * WebPreferences.h: + * WebView.cpp: + (WebView::notifyPreferencesChanged): Add to settings that get propagated upon changes. + +2011-04-11 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Maciej Stachowiak. + + WebKit2: Cannot use Ctrl-Delete as a custom keyboard shortcut + https://bugs.webkit.org/show_bug.cgi?id=58265 + <rdar://problem/9221468> + + * WebView.cpp: (WebView::keyDown): Removed special handling of Backspace, which is unnecessary + now that WebCore implements it. + +2011-04-06 Brian Weinstein <bweinstein@apple.com> + + Reviewed by Adam Roben. + + WebKit2: Support Windows 7 Gestures + https://bugs.webkit.org/show_bug.cgi?id=49824 + <rdar://problem/8689728> + + Move WindowsTouch.h from WebKit/win to WebCore/platform/win, so it can be + used in both WebKit and WebKit2. + + * WebKit.vcproj/WebKit.vcproj: Remove WindowsTouch.h. + * WebView.cpp: Include WindowsTouch.h from WebCore instead of WebKit. + * WindowsTouch.h: Removed. + +2011-04-05 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Eric Seidel. [Cairo] Better separate the concerns of GraphicsContextCairo https://bugs.webkit.org/show_bug.cgi?id=55150 @@ -12,6 +179,90 @@ (WebFrame::spoolPages): Ditto. * WebFrame.h: Ditto. +2011-04-04 MORITA Hajime <morrita@google.com> + + Reviewed by Ryosuke Niwa. + + [Refactoring] SpellCheckingResult should be replaced with TextCheckingResult + https://bugs.webkit.org/show_bug.cgi?id=56085 + + * WebCoreSupport/WebEditorClient.h: + (WebEditorClient::requestCheckingOfString): + +2011-04-04 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Dan Bernstein. + + REGRESSION (WebKit2): Caps-Lock indicator sometimes doesn't appear in WebKit2 + https://bugs.webkit.org/show_bug.cgi?id=51230 + <rdar://problem/8780989> + + * WebView.cpp: (WebView::keyDown): Moved Caps Lock handling from WebKits to WebCore, + because WebKit shouldn't be smart. + +2011-04-04 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + Remove unused AnalyzeWithLargeStack code from Windows build files + https://bugs.webkit.org/show_bug.cgi?id=57771 + + This was used for us to build with prefast automatically, + but it is out-of-date and hasn't been used for some time. + Removing completely for now. + + * WebKit.vcproj/WebKitLibPreBuild.cmd: + +2011-04-01 Adam Roben <aroben@apple.com> + + Remove the WebView's "this" pointer from its HWND when WM_DESTROY is received + + This will ensure we don't try to process any window messages after the window has been + destroyed. + + Covered by existing tests. + + Fixes <http://webkit.org/b/55054>. + + Reviewed by Steve Falkenburg and John Sullivan. + + * WebView.cpp: + (WebView::setIsBeingDestroyed): Moved here from the header file, and added a call to clear + out the this pointer from the HWND. + (WebView::WebViewWndProc): Changed a runtime check into an assertion. + + * WebView.h: Moved setIsBeingDestroyed from here to the .cpp file. + +2011-03-31 Evan Martin <evan@chromium.org> + + Reviewed by Eric Seidel. + + <title> should support dir attribute + https://bugs.webkit.org/show_bug.cgi?id=50961 + + Update to new FrameLoaderClient interface. + + * WebCoreSupport/WebFrameLoaderClient.cpp: + (WebFrameLoaderClient::dispatchDidReceiveTitle): + * WebCoreSupport/WebFrameLoaderClient.h: + +2011-03-30 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + Share most vsprops between Release and Production builds in releaseproduction.vsprops + https://bugs.webkit.org/show_bug.cgi?id=57508 + + * WebKit.vcproj/InterfacesProduction.vsprops: + * WebKit.vcproj/InterfacesRelease.vsprops: + * WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops: + * WebKit.vcproj/WebKitGUIDProduction.vsprops: + * WebKit.vcproj/WebKitGUIDRelease.vsprops: + * WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops: + * WebKit.vcproj/WebKitLibProduction.vsprops: + * WebKit.vcproj/WebKitLibRelease.vsprops: + * WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops: + 2011-03-30 Steve Falkenburg <sfalken@apple.com> Reviewed by Adam Roben. diff --git a/Source/WebKit/win/DOMCoreClasses.cpp b/Source/WebKit/win/DOMCoreClasses.cpp index b0a6031..7137449 100644 --- a/Source/WebKit/win/DOMCoreClasses.cpp +++ b/Source/WebKit/win/DOMCoreClasses.cpp @@ -27,13 +27,13 @@ #include "WebKitDLL.h" #include "DOMCoreClasses.h" -#include "COMPtr.h" #include "DOMCSSClasses.h" #include "DOMEventsClasses.h" #include "DOMHTMLClasses.h" #include "WebKitGraphics.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/DOMWindow.h> #include <WebCore/Document.h> #include <WebCore/Element.h> diff --git a/Source/WebKit/win/DOMHTMLClasses.cpp b/Source/WebKit/win/DOMHTMLClasses.cpp index c163ec4..d7fdbf6 100644 --- a/Source/WebKit/win/DOMHTMLClasses.cpp +++ b/Source/WebKit/win/DOMHTMLClasses.cpp @@ -26,10 +26,10 @@ #include "config.h" #include "WebKitDLL.h" #include "DOMHTMLClasses.h" -#include "COMPtr.h" #include "WebFrame.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/Document.h> #include <WebCore/Element.h> #include <WebCore/FrameView.h> diff --git a/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl b/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl index 68cbcf3..e3fabd3 100644 --- a/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl +++ b/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl @@ -121,4 +121,7 @@ interface IWebPreferencesPrivate : IUnknown HRESULT hyperlinkAuditingEnabled(BOOL *hyperlinkAuditingEnabled); HRESULT setHyperlinkAuditingEnabled(BOOL hyperlinkAuditingEnabled); + + HRESULT setLoadsSiteIconsIgnoringImageLoadingPreference([in] BOOL enabled); + HRESULT loadsSiteIconsIgnoringImageLoadingPreference([out, retval] BOOL* enabled); } diff --git a/Source/WebKit/win/Interfaces/WebKit.idl b/Source/WebKit/win/Interfaces/WebKit.idl index 3f401be..88158a4 100644 --- a/Source/WebKit/win/Interfaces/WebKit.idl +++ b/Source/WebKit/win/Interfaces/WebKit.idl @@ -301,4 +301,3 @@ library WebKit [default] interface IWebUserContentURLPattern; } } - diff --git a/Source/WebKit/win/WebActionPropertyBag.cpp b/Source/WebKit/win/WebActionPropertyBag.cpp index b20da91..fca83be 100644 --- a/Source/WebKit/win/WebActionPropertyBag.cpp +++ b/Source/WebKit/win/WebActionPropertyBag.cpp @@ -27,11 +27,11 @@ #include "WebKitDLL.h" #include "WebActionPropertyBag.h" -#include "COMPtr.h" #include "DOMCoreClasses.h" #include "WebElementPropertyBag.h" #include "WebKit.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/EventHandler.h> #include <WebCore/HitTestResult.h> #include <WebCore/MouseEvent.h> diff --git a/Source/WebKit/win/WebBackForwardList.cpp b/Source/WebKit/win/WebBackForwardList.cpp index 2faaf7e..bd23d26 100644 --- a/Source/WebKit/win/WebBackForwardList.cpp +++ b/Source/WebKit/win/WebBackForwardList.cpp @@ -27,12 +27,12 @@ #include "WebKitDLL.h" #include "WebBackForwardList.h" -#include "COMPtr.h" #include "WebFrame.h" #include "WebKit.h" #include "WebPreferences.h" #include <WebCore/BackForwardListImpl.h> +#include <WebCore/COMPtr.h> #include <WebCore/HistoryItem.h> using std::min; diff --git a/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp index 1105904..dda0cc3 100644 --- a/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,7 +28,6 @@ #include "WebEditorClient.h" #include "WebKit.h" -#include "WebLocalizableStrings.h" #include "WebNotification.h" #include "WebNotificationCenter.h" #include "WebView.h" @@ -40,6 +39,7 @@ #include <WebCore/HTMLInputElement.h> #include <WebCore/HTMLNames.h> #include <WebCore/KeyboardEvent.h> +#include <WebCore/LocalizedStrings.h> #include <WebCore/NotImplemented.h> #include <WebCore/PlatformKeyboardEvent.h> #include <WebCore/Range.h> @@ -482,65 +482,62 @@ ULONG STDMETHODCALLTYPE WebEditorUndoCommand::Release(void) return newRef; } -static LPCTSTR undoNameForEditAction(EditAction editAction) +static String undoNameForEditAction(EditAction editAction) { switch (editAction) { - case EditActionUnspecified: return 0; - case EditActionSetColor: return LPCTSTR_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name"); - case EditActionSetBackgroundColor: return LPCTSTR_UI_STRING_KEY("Set Background Color", "Set Background Color (Undo action name)", "Undo action name"); - case EditActionTurnOffKerning: return LPCTSTR_UI_STRING_KEY("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name"); - case EditActionTightenKerning: return LPCTSTR_UI_STRING_KEY("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name"); - case EditActionLoosenKerning: return LPCTSTR_UI_STRING_KEY("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name"); - case EditActionUseStandardKerning: return LPCTSTR_UI_STRING_KEY("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name"); - case EditActionTurnOffLigatures: return LPCTSTR_UI_STRING_KEY("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name"); - case EditActionUseStandardLigatures: return LPCTSTR_UI_STRING_KEY("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name"); - case EditActionUseAllLigatures: return LPCTSTR_UI_STRING_KEY("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name"); - case EditActionRaiseBaseline: return LPCTSTR_UI_STRING_KEY("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name"); - case EditActionLowerBaseline: return LPCTSTR_UI_STRING_KEY("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name"); - case EditActionSetTraditionalCharacterShape: return LPCTSTR_UI_STRING_KEY("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name"); - case EditActionSetFont: return LPCTSTR_UI_STRING_KEY("Set Font", "Set Font (Undo action name)", "Undo action name"); - case EditActionChangeAttributes: return LPCTSTR_UI_STRING_KEY("Change Attributes", "Change Attributes (Undo action name)", "Undo action name"); - case EditActionAlignLeft: return LPCTSTR_UI_STRING_KEY("Align Left", "Align Left (Undo action name)", "Undo action name"); - case EditActionAlignRight: return LPCTSTR_UI_STRING_KEY("Align Right", "Align Right (Undo action name)", "Undo action name"); - case EditActionCenter: return LPCTSTR_UI_STRING_KEY("Center", "Center (Undo action name)", "Undo action name"); - case EditActionJustify: return LPCTSTR_UI_STRING_KEY("Justify", "Justify (Undo action name)", "Undo action name"); - case EditActionSetWritingDirection: return LPCTSTR_UI_STRING_KEY("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name"); - case EditActionSubscript: return LPCTSTR_UI_STRING_KEY("Subscript", "Subscript (Undo action name)", "Undo action name"); - case EditActionSuperscript: return LPCTSTR_UI_STRING_KEY("Superscript", "Superscript (Undo action name)", "Undo action name"); - case EditActionUnderline: return LPCTSTR_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name"); - case EditActionOutline: return LPCTSTR_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name"); - case EditActionUnscript: return LPCTSTR_UI_STRING_KEY("Unscript", "Unscript (Undo action name)", "Undo action name"); - case EditActionDrag: return LPCTSTR_UI_STRING_KEY("Drag", "Drag (Undo action name)", "Undo action name"); - case EditActionCut: return LPCTSTR_UI_STRING_KEY("Cut", "Cut (Undo action name)", "Undo action name"); - case EditActionPaste: return LPCTSTR_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name"); - case EditActionPasteFont: return LPCTSTR_UI_STRING_KEY("Paste Font", "Paste Font (Undo action name)", "Undo action name"); - case EditActionPasteRuler: return LPCTSTR_UI_STRING_KEY("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name"); - case EditActionTyping: return LPCTSTR_UI_STRING_KEY("Typing", "Typing (Undo action name)", "Undo action name"); - case EditActionCreateLink: return LPCTSTR_UI_STRING_KEY("Create Link", "Create Link (Undo action name)", "Undo action name"); - case EditActionUnlink: return LPCTSTR_UI_STRING_KEY("Unlink", "Unlink (Undo action name)", "Undo action name"); - case EditActionInsertList: return LPCTSTR_UI_STRING_KEY("Insert List", "Insert List (Undo action name)", "Undo action name"); - case EditActionFormatBlock: return LPCTSTR_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name"); - case EditActionIndent: return LPCTSTR_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name"); - case EditActionOutdent: return LPCTSTR_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name"); + case EditActionUnspecified: return String(); + case EditActionSetColor: return WEB_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name"); + case EditActionSetBackgroundColor: return WEB_UI_STRING_KEY("Set Background Color", "Set Background Color (Undo action name)", "Undo action name"); + case EditActionTurnOffKerning: return WEB_UI_STRING_KEY("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name"); + case EditActionTightenKerning: return WEB_UI_STRING_KEY("Tighten Kerning", "Tighten Kerning (Undo action name)", "Undo action name"); + case EditActionLoosenKerning: return WEB_UI_STRING_KEY("Loosen Kerning", "Loosen Kerning (Undo action name)", "Undo action name"); + case EditActionUseStandardKerning: return WEB_UI_STRING_KEY("Use Standard Kerning", "Use Standard Kerning (Undo action name)", "Undo action name"); + case EditActionTurnOffLigatures: return WEB_UI_STRING_KEY("Turn Off Ligatures", "Turn Off Ligatures (Undo action name)", "Undo action name"); + case EditActionUseStandardLigatures: return WEB_UI_STRING_KEY("Use Standard Ligatures", "Use Standard Ligatures (Undo action name)", "Undo action name"); + case EditActionUseAllLigatures: return WEB_UI_STRING_KEY("Use All Ligatures", "Use All Ligatures (Undo action name)", "Undo action name"); + case EditActionRaiseBaseline: return WEB_UI_STRING_KEY("Raise Baseline", "Raise Baseline (Undo action name)", "Undo action name"); + case EditActionLowerBaseline: return WEB_UI_STRING_KEY("Lower Baseline", "Lower Baseline (Undo action name)", "Undo action name"); + case EditActionSetTraditionalCharacterShape: return WEB_UI_STRING_KEY("Set Traditional Character Shape", "Set Traditional Character Shape (Undo action name)", "Undo action name"); + case EditActionSetFont: return WEB_UI_STRING_KEY("Set Font", "Set Font (Undo action name)", "Undo action name"); + case EditActionChangeAttributes: return WEB_UI_STRING_KEY("Change Attributes", "Change Attributes (Undo action name)", "Undo action name"); + case EditActionAlignLeft: return WEB_UI_STRING_KEY("Align Left", "Align Left (Undo action name)", "Undo action name"); + case EditActionAlignRight: return WEB_UI_STRING_KEY("Align Right", "Align Right (Undo action name)", "Undo action name"); + case EditActionCenter: return WEB_UI_STRING_KEY("Center", "Center (Undo action name)", "Undo action name"); + case EditActionJustify: return WEB_UI_STRING_KEY("Justify", "Justify (Undo action name)", "Undo action name"); + case EditActionSetWritingDirection: return WEB_UI_STRING_KEY("Set Writing Direction", "Set Writing Direction (Undo action name)", "Undo action name"); + case EditActionSubscript: return WEB_UI_STRING_KEY("Subscript", "Subscript (Undo action name)", "Undo action name"); + case EditActionSuperscript: return WEB_UI_STRING_KEY("Superscript", "Superscript (Undo action name)", "Undo action name"); + case EditActionUnderline: return WEB_UI_STRING_KEY("Underline", "Underline (Undo action name)", "Undo action name"); + case EditActionOutline: return WEB_UI_STRING_KEY("Outline", "Outline (Undo action name)", "Undo action name"); + case EditActionUnscript: return WEB_UI_STRING_KEY("Unscript", "Unscript (Undo action name)", "Undo action name"); + case EditActionDrag: return WEB_UI_STRING_KEY("Drag", "Drag (Undo action name)", "Undo action name"); + case EditActionCut: return WEB_UI_STRING_KEY("Cut", "Cut (Undo action name)", "Undo action name"); + case EditActionPaste: return WEB_UI_STRING_KEY("Paste", "Paste (Undo action name)", "Undo action name"); + case EditActionPasteFont: return WEB_UI_STRING_KEY("Paste Font", "Paste Font (Undo action name)", "Undo action name"); + case EditActionPasteRuler: return WEB_UI_STRING_KEY("Paste Ruler", "Paste Ruler (Undo action name)", "Undo action name"); + case EditActionTyping: return WEB_UI_STRING_KEY("Typing", "Typing (Undo action name)", "Undo action name"); + case EditActionCreateLink: return WEB_UI_STRING_KEY("Create Link", "Create Link (Undo action name)", "Undo action name"); + case EditActionUnlink: return WEB_UI_STRING_KEY("Unlink", "Unlink (Undo action name)", "Undo action name"); + case EditActionInsertList: return WEB_UI_STRING_KEY("Insert List", "Insert List (Undo action name)", "Undo action name"); + case EditActionFormatBlock: return WEB_UI_STRING_KEY("Formatting", "Format Block (Undo action name)", "Undo action name"); + case EditActionIndent: return WEB_UI_STRING_KEY("Indent", "Indent (Undo action name)", "Undo action name"); + case EditActionOutdent: return WEB_UI_STRING_KEY("Outdent", "Outdent (Undo action name)", "Undo action name"); } - return 0; + return String(); } void WebEditorClient::registerCommandForUndo(PassRefPtr<EditCommand> command) { IWebUIDelegate* uiDelegate = 0; if (SUCCEEDED(m_webView->uiDelegate(&uiDelegate))) { - LPCTSTR actionName = undoNameForEditAction(command->editingAction()); + String actionName = undoNameForEditAction(command->editingAction()); WebEditorUndoCommand* undoCommand = new WebEditorUndoCommand(command, true); if (!undoCommand) return; uiDelegate->registerUndoWithTarget(m_undoTarget, 0, undoCommand); undoCommand->Release(); // the undo manager owns the reference - BSTR actionNameBSTR = SysAllocString(actionName); - if (actionNameBSTR) { - uiDelegate->setActionTitle(actionNameBSTR); - SysFreeString(actionNameBSTR); - } + if (!actionName.isEmpty()) + uiDelegate->setActionTitle(BString(actionName)); uiDelegate->Release(); } } diff --git a/Source/WebKit/win/WebCoreSupport/WebEditorClient.h b/Source/WebKit/win/WebCoreSupport/WebEditorClient.h index 1d0a7d0..d456cc9 100644 --- a/Source/WebKit/win/WebCoreSupport/WebEditorClient.h +++ b/Source/WebKit/win/WebCoreSupport/WebEditorClient.h @@ -110,7 +110,7 @@ public: virtual void willSetInputMethodState(); virtual void setInputMethodState(bool); - virtual void requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&) {} + virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) {} virtual WebCore::TextCheckerClient* textChecker() { return this; } private: diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp index 10a3190..ca61d30 100644 --- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp @@ -364,12 +364,13 @@ void WebFrameLoaderClient::dispatchDidStartProvisionalLoad() frameLoadDelegate->didStartProvisionalLoadForFrame(webView, m_webFrame); } -void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title) +void WebFrameLoaderClient::dispatchDidReceiveTitle(const StringWithDirection& title) { WebView* webView = m_webFrame->webView(); COMPtr<IWebFrameLoadDelegate> frameLoadDelegate; if (SUCCEEDED(webView->frameLoadDelegate(&frameLoadDelegate))) - frameLoadDelegate->didReceiveTitle(webView, BString(title), m_webFrame); + // FIXME: use direction of title. + frameLoadDelegate->didReceiveTitle(webView, BString(title.string()), m_webFrame); } void WebFrameLoaderClient::dispatchDidChangeIcons() @@ -542,7 +543,7 @@ void WebFrameLoaderClient::updateGlobalHistory() COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(loader->originalRequestCopy())); COMPtr<IWebNavigationData> navigationData(AdoptCOM, WebNavigationData::createInstance( - loader->urlForHistory(), loader->title(), urlRequest.get(), urlResponse.get(), loader->substituteData().isValid(), loader->clientRedirectSourceForHistory())); + loader->urlForHistory(), loader->title().string(), urlRequest.get(), urlResponse.get(), loader->substituteData().isValid(), loader->clientRedirectSourceForHistory())); historyDelegate->didNavigateWithNavigationData(webView, navigationData.get(), m_webFrame); return; @@ -552,7 +553,7 @@ void WebFrameLoaderClient::updateGlobalHistory() if (!history) return; - history->visitedURL(loader->urlForHistory(), loader->title(), loader->originalRequestCopy().httpMethod(), loader->urlForHistoryReflectsFailure(), !loader->clientRedirectSourceForHistory()); + history->visitedURL(loader->urlForHistory(), loader->title().string(), loader->originalRequestCopy().httpMethod(), loader->urlForHistoryReflectsFailure(), !loader->clientRedirectSourceForHistory()); } void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks() @@ -672,13 +673,13 @@ PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(const Reso return loader.release(); } -void WebFrameLoaderClient::setTitle(const String& title, const KURL& url) +void WebFrameLoaderClient::setTitle(const StringWithDirection& title, const KURL& url) { WebView* webView = m_webFrame->webView(); COMPtr<IWebHistoryDelegate> historyDelegate; webView->historyDelegate(&historyDelegate); if (historyDelegate) { - BString titleBSTR(title); + BString titleBSTR(title.string()); BString urlBSTR(url.string()); historyDelegate->updateHistoryTitle(webView, titleBSTR, urlBSTR); return; @@ -704,7 +705,7 @@ void WebFrameLoaderClient::setTitle(const String& title, const KURL& url) if (!itemPrivate) return; - itemPrivate->setTitle(BString(title)); + itemPrivate->setTitle(BString(title.string())); } void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame* cachedFrame) diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h index d864b23..c80f76c 100644 --- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h +++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h @@ -53,7 +53,7 @@ public: virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&); virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&); virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&); - virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int lengthReceived); + virtual void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength); virtual void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier); virtual void dispatchDidFailLoading(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceError&); virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length); @@ -69,7 +69,7 @@ public: virtual void dispatchWillClose(); virtual void dispatchDidReceiveIcon(); virtual void dispatchDidStartProvisionalLoad(); - virtual void dispatchDidReceiveTitle(const WTF::String&); + virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&); virtual void dispatchDidChangeIcons(); virtual void dispatchDidCommitLoad(); virtual void dispatchDidFinishDocumentLoad(); @@ -103,7 +103,7 @@ public: virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&); virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&); - virtual void setTitle(const WTF::String& title, const WebCore::KURL&); + virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::KURL&); virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*); virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*); diff --git a/Source/WebKit/win/WebCoreSupport/WebGeolocationClient.h b/Source/WebKit/win/WebCoreSupport/WebGeolocationClient.h index c5db134..2bd29af 100644 --- a/Source/WebKit/win/WebCoreSupport/WebGeolocationClient.h +++ b/Source/WebKit/win/WebCoreSupport/WebGeolocationClient.h @@ -26,7 +26,7 @@ #ifndef WebGeolocationClient_h #define WebGeolocationClient_h -#include "COMPtr.h" +#include <WebCore/COMPtr.h> #include <WebCore/GeolocationClient.h> namespace WebCore { diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp index e87777e..fdafa25 100644 --- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,13 +26,9 @@ #include "config.h" #include "WebPlatformStrategies.h" -#include "WebLocalizableStrings.h" -#include <WebCore/IntSize.h> #include <WebCore/Page.h> #include <WebCore/PageGroup.h> #include <WebCore/PluginDatabase.h> -#include <wtf/MathExtras.h> -#include <wtf/RetainPtr.h> using namespace WebCore; @@ -56,11 +52,6 @@ PluginStrategy* WebPlatformStrategies::createPluginStrategy() return this; } -LocalizationStrategy* WebPlatformStrategies::createLocalizationStrategy() -{ - return this; -} - VisitedLinkStrategy* WebPlatformStrategies::createVisitedLinkStrategy() { return this; @@ -108,560 +99,6 @@ void WebPlatformStrategies::getPluginInfo(const WebCore::Page*, Vector<WebCore:: } } -// LocalizationStrategy - -String WebPlatformStrategies::searchableIndexIntroduction() -{ - return UI_STRING("This is a searchable index. Enter search keywords: ", "text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index'"); -} - -String WebPlatformStrategies::submitButtonDefaultLabel() -{ - return UI_STRING("Submit", "default label for Submit buttons in forms on web pages"); -} - -String WebPlatformStrategies::inputElementAltText() -{ - return UI_STRING_KEY("Submit", "Submit (input element)", "alt text for <input> elements with no alt, title, or value"); -} - -String WebPlatformStrategies::resetButtonDefaultLabel() -{ - return UI_STRING("Reset", "default label for Reset buttons in forms on web pages"); -} - -String WebPlatformStrategies::fileButtonChooseFileLabel() -{ - return UI_STRING("Choose File", "title for file button used in HTML forms"); -} - -String WebPlatformStrategies::fileButtonNoFileSelectedLabel() -{ - return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected"); -} - -String WebPlatformStrategies::defaultDetailsSummaryText() -{ - return UI_STRING("Details", "text to display in <details> tag when it has no <summary> child"); -} - -String WebPlatformStrategies::contextMenuItemTagOpenLinkInNewWindow() -{ - return UI_STRING("Open Link in New Window", "Open in New Window context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagDownloadLinkToDisk() -{ - return UI_STRING("Download Linked File", "Download Linked File context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCopyLinkToClipboard() -{ - return UI_STRING("Copy Link", "Copy Link context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagOpenImageInNewWindow() -{ - return UI_STRING("Open Image in New Window", "Open Image in New Window context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagDownloadImageToDisk() -{ - return UI_STRING("Download Image", "Download Image context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCopyImageToClipboard() -{ - return UI_STRING("Copy Image", "Copy Image context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagOpenVideoInNewWindow() -{ - return UI_STRING("Open Video in New Window", "Open Video in New Window context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagOpenAudioInNewWindow() -{ - return UI_STRING("Open Audio in New Window", "Open Audio in New Window context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCopyVideoLinkToClipboard() -{ - return UI_STRING("Copy Video Address", "Copy Video Address Location context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCopyAudioLinkToClipboard() -{ - return UI_STRING("Copy Audio Address", "Copy Audio Address Location context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagToggleMediaControls() -{ - return UI_STRING("Controls", "Media Controls context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagToggleMediaLoop() -{ - return UI_STRING("Loop", "Media Loop context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagEnterVideoFullscreen() -{ - return UI_STRING("Enter Fullscreen", "Video Enter Fullscreen context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagMediaPlay() -{ - return UI_STRING("Play", "Media Play context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagMediaPause() -{ - return UI_STRING("Pause", "Media Pause context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagMediaMute() -{ - return UI_STRING("Mute", "Media Mute context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagOpenFrameInNewWindow() -{ - return UI_STRING("Open Frame in New Window", "Open Frame in New Window context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCopy() -{ - return UI_STRING("Copy", "Copy context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagGoBack() -{ - return UI_STRING("Back", "Back context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagGoForward() -{ - return UI_STRING("Forward", "Forward context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagStop() -{ - return UI_STRING("Stop", "Stop context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagReload() -{ - return UI_STRING("Reload", "Reload context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCut() -{ - return UI_STRING("Cut", "Cut context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagPaste() -{ - return UI_STRING("Paste", "Paste context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagNoGuessesFound() -{ - return UI_STRING("No Guesses Found", "No Guesses Found context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagIgnoreSpelling() -{ - return UI_STRING("Ignore Spelling", "Ignore Spelling context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagLearnSpelling() -{ - return UI_STRING("Learn Spelling", "Learn Spelling context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagSearchWeb() -{ - return UI_STRING("Search with Google", "Search in Google context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagLookUpInDictionary(const String&) -{ - return UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagOpenLink() -{ - return UI_STRING("Open Link", "Open Link context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagIgnoreGrammar() -{ - return UI_STRING("Ignore Grammar", "Ignore Grammar context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagSpellingMenu() -{ - return UI_STRING("Spelling and Grammar", "Spelling and Grammar context sub-menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCheckSpelling() -{ - return UI_STRING("Check Document Now", "Check spelling context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCheckSpellingWhileTyping() -{ - return UI_STRING("Check Spelling While Typing", "Check spelling while typing context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagCheckGrammarWithSpelling() -{ - return UI_STRING("Check Grammar With Spelling", "Check grammar with spelling context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagFontMenu() -{ - return UI_STRING("Font", "Font context sub-menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagBold() -{ - return UI_STRING("Bold", "Bold context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagItalic() -{ - return UI_STRING("Italic", "Italic context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagUnderline() -{ - return UI_STRING("Underline", "Underline context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagOutline() -{ - return UI_STRING("Outline", "Outline context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagWritingDirectionMenu() -{ - return UI_STRING("Paragraph Direction", "Paragraph direction context sub-menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagTextDirectionMenu() -{ - return UI_STRING("Selection Direction", "Selection direction context sub-menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagDefaultDirection() -{ - return UI_STRING("Default", "Default writing direction context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagLeftToRight() -{ - return UI_STRING("Left to Right", "Left to Right context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagRightToLeft() -{ - return UI_STRING("Right to Left", "Right to Left context menu item"); -} - -String WebPlatformStrategies::contextMenuItemTagShowSpellingPanel(bool show) -{ - if (show) - return UI_STRING("Show Spelling and Grammar", "menu item title"); - return UI_STRING("Hide Spelling and Grammar", "menu item title"); -} - -String WebPlatformStrategies::contextMenuItemTagInspectElement() -{ - return UI_STRING("Inspect Element", "Inspect Element context menu item"); -} - -String WebPlatformStrategies::searchMenuNoRecentSearchesText() -{ - return UI_STRING("No recent searches", "Label for only item in menu that appears when clicking on the search field image, when no searches have been performed"); -} - -String WebPlatformStrategies::searchMenuRecentSearchesText() -{ - return UI_STRING("Recent Searches", "label for first item in the menu that appears when clicking on the search field image, used as embedded menu title"); -} - -String WebPlatformStrategies::searchMenuClearRecentSearchesText() -{ - return UI_STRING("Clear Recent Searches", "menu item in Recent Searches menu that empties menu's contents"); -} - -String WebPlatformStrategies::AXWebAreaText() -{ - return UI_STRING("web area", "accessibility role description for web area"); -} - -String WebPlatformStrategies::AXLinkText() -{ - return UI_STRING("link", "accessibility role description for link"); -} - -String WebPlatformStrategies::AXListMarkerText() -{ - return UI_STRING("list marker", "accessibility role description for list marker"); -} - -String WebPlatformStrategies::AXImageMapText() -{ - return UI_STRING("image map", "accessibility role description for image map"); -} - -String WebPlatformStrategies::AXHeadingText() -{ - return UI_STRING("heading", "accessibility role description for headings"); -} - -String WebPlatformStrategies::AXDefinitionListTermText() -{ - return UI_STRING("term", "term word of a definition"); -} - -String WebPlatformStrategies::AXDefinitionListDefinitionText() -{ - return UI_STRING("definition", "definition phrase"); -} - -String WebPlatformStrategies::AXButtonActionVerb() -{ - return UI_STRING("press", "Verb stating the action that will occur when a button is pressed, as used by accessibility"); -} - -String WebPlatformStrategies::AXRadioButtonActionVerb() -{ - return UI_STRING("select", "Verb stating the action that will occur when a radio button is clicked, as used by accessibility"); -} - -String WebPlatformStrategies::AXTextFieldActionVerb() -{ - return UI_STRING("activate", "Verb stating the action that will occur when a text field is selected, as used by accessibility"); -} - -String WebPlatformStrategies::AXCheckedCheckBoxActionVerb() -{ - return UI_STRING("uncheck", "Verb stating the action that will occur when a checked checkbox is clicked, as used by accessibility"); -} - -String WebPlatformStrategies::AXUncheckedCheckBoxActionVerb() -{ - return UI_STRING("check", "Verb stating the action that will occur when an unchecked checkbox is clicked, as used by accessibility"); -} - -String WebPlatformStrategies::AXLinkActionVerb() -{ - return UI_STRING("jump", "Verb stating the action that will occur when a link is clicked, as used by accessibility"); -} - -String WebPlatformStrategies::AXMenuListActionVerb() -{ - return UI_STRING("open", "Verb stating the action that will occur when a select element is clicked, as used by accessibility"); -} - -String WebPlatformStrategies::AXMenuListPopupActionVerb() -{ - return UI_STRING_KEY("press", "press (select element)", "Verb stating the action that will occur when a select element's popup list is clicked, as used by accessibility"); -} - -String WebPlatformStrategies::unknownFileSizeText() -{ - return UI_STRING("Unknown", "Unknown filesize FTP directory listing item"); -} - -String WebPlatformStrategies::uploadFileText() -{ - return UI_STRING("Upload file", "(Windows) Form submit file upload dialog title"); -} - -String WebPlatformStrategies::allFilesText() -{ - return UI_STRING("All Files", "(Windows) Form submit file upload all files pop-up"); -} - -String WebPlatformStrategies::missingPluginText() -{ - return UI_STRING("Missing Plug-in", "Label text to be used when a plugin is missing"); -} - -String WebPlatformStrategies::crashedPluginText() -{ - return UI_STRING("Plug-in Failure", "Label text to be used if plugin host process has crashed"); -} - -String WebPlatformStrategies::imageTitle(const String& filename, const IntSize& size) -{ - RetainPtr<CFStringRef> filenameCF(AdoptCF, filename.createCFString()); - return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithFormat(0, 0, UI_STRING("%@ %d\xC3\x97%d pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filenameCF.get(), size.width(), size.height())).get(); -} - -String WebPlatformStrategies::multipleFileUploadText(unsigned numberOfFiles) -{ - return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithFormat(0, 0, UI_STRING("%d files", "Label to describe the number of files selected in a file upload control that allows multiple files"), numberOfFiles)).get(); -} - -String WebPlatformStrategies::mediaElementLoadingStateText() -{ - return UI_STRING("Loading...", "Media controller status message when the media is loading"); -} - -String WebPlatformStrategies::mediaElementLiveBroadcastStateText() -{ - return UI_STRING("Live Broadcast", "Media controller status message when watching a live broadcast"); -} - -String WebPlatformStrategies::localizedMediaControlElementString(const String& name) -{ - if (name == "AudioElement") - return UI_STRING("audio element controller", "accessibility role description for audio element controller"); - if (name == "VideoElement") - return UI_STRING("video element controller", "accessibility role description for video element controller"); - if (name == "MuteButton") - return UI_STRING("mute", "accessibility role description for mute button"); - if (name == "UnMuteButton") - return UI_STRING("unmute", "accessibility role description for turn mute off button"); - if (name == "PlayButton") - return UI_STRING("play", "accessibility role description for play button"); - if (name == "PauseButton") - return UI_STRING("pause", "accessibility role description for pause button"); - if (name == "Slider") - return UI_STRING("movie time", "accessibility role description for timeline slider"); - if (name == "SliderThumb") - return UI_STRING("timeline slider thumb", "accessibility role description for timeline thumb"); - if (name == "RewindButton") - return UI_STRING("back 30 seconds", "accessibility role description for seek back 30 seconds button"); - if (name == "ReturnToRealtimeButton") - return UI_STRING("return to realtime", "accessibility role description for return to real time button"); - if (name == "CurrentTimeDisplay") - return UI_STRING("elapsed time", "accessibility role description for elapsed time display"); - if (name == "TimeRemainingDisplay") - return UI_STRING("remaining time", "accessibility role description for time remaining display"); - if (name == "StatusDisplay") - return UI_STRING("status", "accessibility role description for movie status"); - if (name == "FullscreenButton") - return UI_STRING("fullscreen", "accessibility role description for enter fullscreen button"); - if (name == "SeekForwardButton") - return UI_STRING("fast forward", "accessibility role description for fast forward button"); - if (name == "SeekBackButton") - return UI_STRING("fast reverse", "accessibility role description for fast reverse button"); - if (name == "ShowClosedCaptionsButton") - return UI_STRING("show closed captions", "accessibility role description for show closed captions button"); - if (name == "HideClosedCaptionsButton") - return UI_STRING("hide closed captions", "accessibility role description for hide closed captions button"); - - ASSERT_NOT_REACHED(); - return String(); -} - -String WebPlatformStrategies::localizedMediaControlElementHelpText(const String& name) -{ - if (name == "AudioElement") - return UI_STRING("audio element playback controls and status display", "accessibility role description for audio element controller"); - if (name == "VideoElement") - return UI_STRING("video element playback controls and status display", "accessibility role description for video element controller"); - if (name == "MuteButton") - return UI_STRING("mute audio tracks", "accessibility help text for mute button"); - if (name == "UnMuteButton") - return UI_STRING("unmute audio tracks", "accessibility help text for un mute button"); - if (name == "PlayButton") - return UI_STRING("begin playback", "accessibility help text for play button"); - if (name == "PauseButton") - return UI_STRING("pause playback", "accessibility help text for pause button"); - if (name == "Slider") - return UI_STRING("movie time scrubber", "accessibility help text for timeline slider"); - if (name == "SliderThumb") - return UI_STRING("movie time scrubber thumb", "accessibility help text for timeline slider thumb"); - if (name == "RewindButton") - return UI_STRING("seek movie back 30 seconds", "accessibility help text for jump back 30 seconds button"); - if (name == "ReturnToRealtimeButton") - return UI_STRING("return streaming movie to real time", "accessibility help text for return streaming movie to real time button"); - if (name == "CurrentTimeDisplay") - return UI_STRING("current movie time in seconds", "accessibility help text for elapsed time display"); - if (name == "TimeRemainingDisplay") - return UI_STRING("number of seconds of movie remaining", "accessibility help text for remaining time display"); - if (name == "StatusDisplay") - return UI_STRING("current movie status", "accessibility help text for movie status display"); - if (name == "SeekBackButton") - return UI_STRING("seek quickly back", "accessibility help text for fast rewind button"); - if (name == "SeekForwardButton") - return UI_STRING("seek quickly forward", "accessibility help text for fast forward button"); - if (name == "FullscreenButton") - return UI_STRING("Play movie in fullscreen mode", "accessibility help text for enter fullscreen button"); - if (name == "ShowClosedCaptionsButton") - return UI_STRING("start displaying closed captions", "accessibility help text for show closed captions button"); - if (name == "HideClosedCaptionsButton") - return UI_STRING("stop displaying closed captions", "accessibility help text for hide closed captions button"); - - ASSERT_NOT_REACHED(); - return String(); -} - -String WebPlatformStrategies::localizedMediaTimeDescription(float time) -{ - if (!isfinite(time)) - return UI_STRING("indefinite time", "accessibility help text for an indefinite media controller time value"); - - int seconds = (int)fabsf(time); - int days = seconds / (60 * 60 * 24); - int hours = seconds / (60 * 60); - int minutes = (seconds / 60) % 60; - seconds %= 60; - - if (days) - return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithFormat(0, 0, UI_STRING("%1$d days %2$d hours %3$d minutes %4$d seconds", "accessibility help text for media controller time value >= 1 day"), days, hours, minutes, seconds)).get(); - - if (hours) - return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithFormat(0, 0, UI_STRING("%1$d hours %2$d minutes %3$d seconds", "accessibility help text for media controller time value >= 60 minutes"), hours, minutes, seconds)).get(); - - if (minutes) - return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithFormat(0, 0, UI_STRING("%1$d minutes %2$d seconds", "accessibility help text for media controller time value >= 60 seconds"), minutes, seconds)).get(); - - return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithFormat(0, 0, UI_STRING("%1$d seconds", "accessibility help text for media controller time value < 60 seconds"), seconds)).get(); -} - -String WebPlatformStrategies::validationMessageValueMissingText() -{ - return UI_STRING("value missing", "Validation message for required form control elements that have no value"); -} - -String WebPlatformStrategies::validationMessageTypeMismatchText() -{ - return UI_STRING("type mismatch", "Validation message for input form controls with a value not matching type"); -} - -String WebPlatformStrategies::validationMessagePatternMismatchText() -{ - return UI_STRING("pattern mismatch", "Validation message for input form controls requiring a constrained value according to pattern"); -} - -String WebPlatformStrategies::validationMessageTooLongText() -{ - return UI_STRING("too long", "Validation message for form control elements with a value longer than maximum allowed length"); -} - -String WebPlatformStrategies::validationMessageRangeUnderflowText() -{ - return UI_STRING("range underflow", "Validation message for input form controls with value lower than allowed minimum"); -} - -String WebPlatformStrategies::validationMessageRangeOverflowText() -{ - return UI_STRING("range overflow", "Validation message for input form controls with value higher than allowed maximum"); -} - -String WebPlatformStrategies::validationMessageStepMismatchText() -{ - return UI_STRING("step mismatch", "Validation message for input form controls with value not respecting the step attribute"); -} - bool WebPlatformStrategies::isLinkVisited(Page* page, LinkHash hash) { return page->group().isLinkVisited(hash); diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h index 6d2949d..c4f199b 100644 --- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h +++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,12 +27,11 @@ #define WebPlatformStrategies_h #include <WebCore/CookiesStrategy.h> -#include <WebCore/LocalizationStrategy.h> #include <WebCore/PlatformStrategies.h> #include <WebCore/PluginStrategy.h> #include <WebCore/VisitedLinkStrategy.h> -class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::LocalizationStrategy, private WebCore::VisitedLinkStrategy { +class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::VisitedLinkStrategy { public: static void initialize(); @@ -42,7 +41,6 @@ private: // WebCore::PlatformStrategies virtual WebCore::CookiesStrategy* createCookiesStrategy(); virtual WebCore::PluginStrategy* createPluginStrategy(); - virtual WebCore::LocalizationStrategy* createLocalizationStrategy(); virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy(); // WebCore::CookiesStrategy @@ -52,101 +50,6 @@ private: virtual void refreshPlugins(); virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&); - // WebCore::LocalizationStrategy - virtual WTF::String inputElementAltText(); - virtual WTF::String resetButtonDefaultLabel(); - virtual WTF::String searchableIndexIntroduction(); - virtual WTF::String submitButtonDefaultLabel(); - virtual WTF::String fileButtonChooseFileLabel(); - virtual WTF::String fileButtonNoFileSelectedLabel(); - virtual WTF::String defaultDetailsSummaryText(); -#if ENABLE(CONTEXT_MENUS) - virtual WTF::String contextMenuItemTagOpenLinkInNewWindow(); - virtual WTF::String contextMenuItemTagDownloadLinkToDisk(); - virtual WTF::String contextMenuItemTagCopyLinkToClipboard(); - virtual WTF::String contextMenuItemTagOpenImageInNewWindow(); - virtual WTF::String contextMenuItemTagDownloadImageToDisk(); - virtual WTF::String contextMenuItemTagCopyImageToClipboard(); - virtual WTF::String contextMenuItemTagOpenFrameInNewWindow(); - virtual WTF::String contextMenuItemTagCopy(); - virtual WTF::String contextMenuItemTagGoBack(); - virtual WTF::String contextMenuItemTagGoForward(); - virtual WTF::String contextMenuItemTagStop(); - virtual WTF::String contextMenuItemTagReload(); - virtual WTF::String contextMenuItemTagCut(); - virtual WTF::String contextMenuItemTagPaste(); - virtual WTF::String contextMenuItemTagNoGuessesFound(); - virtual WTF::String contextMenuItemTagIgnoreSpelling(); - virtual WTF::String contextMenuItemTagLearnSpelling(); - virtual WTF::String contextMenuItemTagSearchWeb(); - virtual WTF::String contextMenuItemTagLookUpInDictionary(const WTF::String&); - virtual WTF::String contextMenuItemTagOpenLink(); - virtual WTF::String contextMenuItemTagIgnoreGrammar(); - virtual WTF::String contextMenuItemTagSpellingMenu(); - virtual WTF::String contextMenuItemTagShowSpellingPanel(bool show); - virtual WTF::String contextMenuItemTagCheckSpelling(); - virtual WTF::String contextMenuItemTagCheckSpellingWhileTyping(); - virtual WTF::String contextMenuItemTagCheckGrammarWithSpelling(); - virtual WTF::String contextMenuItemTagFontMenu(); - virtual WTF::String contextMenuItemTagBold(); - virtual WTF::String contextMenuItemTagItalic(); - virtual WTF::String contextMenuItemTagUnderline(); - virtual WTF::String contextMenuItemTagOutline(); - virtual WTF::String contextMenuItemTagWritingDirectionMenu(); - virtual WTF::String contextMenuItemTagTextDirectionMenu(); - virtual WTF::String contextMenuItemTagDefaultDirection(); - virtual WTF::String contextMenuItemTagLeftToRight(); - virtual WTF::String contextMenuItemTagRightToLeft(); - virtual WTF::String contextMenuItemTagInspectElement(); - virtual WTF::String contextMenuItemTagOpenVideoInNewWindow(); - virtual WTF::String contextMenuItemTagOpenAudioInNewWindow(); - virtual WTF::String contextMenuItemTagCopyVideoLinkToClipboard(); - virtual WTF::String contextMenuItemTagCopyAudioLinkToClipboard(); - virtual WTF::String contextMenuItemTagToggleMediaControls(); - virtual WTF::String contextMenuItemTagToggleMediaLoop(); - virtual WTF::String contextMenuItemTagEnterVideoFullscreen(); - virtual WTF::String contextMenuItemTagMediaPlay(); - virtual WTF::String contextMenuItemTagMediaPause(); - virtual WTF::String contextMenuItemTagMediaMute(); -#endif // ENABLE(CONTEXT_MENUS) - virtual WTF::String searchMenuNoRecentSearchesText(); - virtual WTF::String searchMenuRecentSearchesText(); - virtual WTF::String searchMenuClearRecentSearchesText(); - virtual WTF::String AXWebAreaText(); - virtual WTF::String AXLinkText(); - virtual WTF::String AXListMarkerText(); - virtual WTF::String AXImageMapText(); - virtual WTF::String AXHeadingText(); - virtual WTF::String AXDefinitionListTermText(); - virtual WTF::String AXDefinitionListDefinitionText(); - virtual WTF::String AXButtonActionVerb(); - virtual WTF::String AXRadioButtonActionVerb(); - virtual WTF::String AXTextFieldActionVerb(); - virtual WTF::String AXCheckedCheckBoxActionVerb(); - virtual WTF::String AXUncheckedCheckBoxActionVerb(); - virtual WTF::String AXMenuListActionVerb(); - virtual WTF::String AXMenuListPopupActionVerb(); - virtual WTF::String AXLinkActionVerb(); - virtual WTF::String missingPluginText(); - virtual WTF::String crashedPluginText(); - virtual WTF::String multipleFileUploadText(unsigned numberOfFiles); - virtual WTF::String unknownFileSizeText(); - virtual WTF::String uploadFileText(); - virtual WTF::String allFilesText(); - virtual WTF::String imageTitle(const WTF::String& filename, const WebCore::IntSize&); - virtual WTF::String mediaElementLoadingStateText(); - virtual WTF::String mediaElementLiveBroadcastStateText(); - virtual WTF::String localizedMediaControlElementString(const WTF::String&); - virtual WTF::String localizedMediaControlElementHelpText(const WTF::String&); - virtual WTF::String localizedMediaTimeDescription(float); - virtual WTF::String validationMessageValueMissingText(); - virtual WTF::String validationMessageTypeMismatchText(); - virtual WTF::String validationMessagePatternMismatchText(); - virtual WTF::String validationMessageTooLongText(); - virtual WTF::String validationMessageRangeUnderflowText(); - virtual WTF::String validationMessageRangeOverflowText(); - virtual WTF::String validationMessageStepMismatchText(); - // WebCore::VisitedLinkStrategy virtual bool isLinkVisited(WebCore::Page*, WebCore::LinkHash); virtual void addVisitedLink(WebCore::Page*, WebCore::LinkHash); diff --git a/Source/WebKit/win/WebDataSource.cpp b/Source/WebKit/win/WebDataSource.cpp index 0350373..1498f6e 100644 --- a/Source/WebKit/win/WebDataSource.cpp +++ b/Source/WebKit/win/WebDataSource.cpp @@ -246,7 +246,7 @@ HRESULT STDMETHODCALLTYPE WebDataSource::isLoading( HRESULT STDMETHODCALLTYPE WebDataSource::pageTitle( /* [retval][out] */ BSTR* title) { - *title = BString(m_loader->title()).release(); + *title = BString(m_loader->title().string()).release(); return S_OK; } diff --git a/Source/WebKit/win/WebDownload.h b/Source/WebKit/win/WebDownload.h index 3e8e734..446be46 100644 --- a/Source/WebKit/win/WebDownload.h +++ b/Source/WebKit/win/WebDownload.h @@ -26,8 +26,8 @@ #ifndef WebDownload_h #define WebDownload_h -#include "COMPtr.h" #include "WebKit.h" +#include <WebCore/COMPtr.h> #include <WebCore/PlatformString.h> #include <wtf/RetainPtr.h> diff --git a/Source/WebKit/win/WebDropSource.h b/Source/WebKit/win/WebDropSource.h index 5f06355..5b7ab8c 100644 --- a/Source/WebKit/win/WebDropSource.h +++ b/Source/WebKit/win/WebDropSource.h @@ -27,7 +27,7 @@ #ifndef WebDropSource_h #define WebDropSource_h -#include "COMPtr.h" +#include <WebCore/COMPtr.h> #include <objidl.h> class WebView; diff --git a/Source/WebKit/win/WebFrame.cpp b/Source/WebKit/win/WebFrame.cpp index 4b9e35d..5a99b66 100644 --- a/Source/WebKit/win/WebFrame.cpp +++ b/Source/WebKit/win/WebFrame.cpp @@ -30,7 +30,6 @@ #include "CFDictionaryPropertyBag.h" #include "COMPropertyBag.h" -#include "COMPtr.h" #include "DOMCoreClasses.h" #include "DefaultPolicyDelegate.h" #include "HTMLFrameOwnerElement.h" @@ -54,6 +53,7 @@ #include "WebURLResponse.h" #include "WebView.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/MemoryCache.h> #include <WebCore/Document.h> #include <WebCore/DocumentLoader.h> @@ -104,14 +104,14 @@ #include <JavaScriptCore/JSValue.h> #include <wtf/MathExtras.h> -#if PLATFORM(CG) +#if USE(CG) #include <CoreGraphics/CoreGraphics.h> -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) #include "PlatformContextCairo.h" #include <cairo-win32.h> #endif -#if PLATFORM(CG) +#if USE(CG) // CG SPI used for printing extern "C" { CGAffineTransform CGContextGetBaseCTM(CGContextRef c); @@ -2113,7 +2113,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::getPrintedPageCount( return S_OK; } -#if PLATFORM(CG) +#if USE(CG) void WebFrame::drawHeader(PlatformGraphicsContext* pctx, IWebUIDelegate* ui, const IntRect& pageRect, float headerHeight) { int x = pageRect.x(); @@ -2167,7 +2167,7 @@ void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCt CGContextEndPage(pctx); CGContextRestoreGState(pctx); } -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) static float scaleFactor(HDC printDC, const IntRect& marginRect, const IntRect& pageRect) { const IntRect& printRect = printerRect(printDC); @@ -2320,12 +2320,12 @@ HRESULT STDMETHODCALLTYPE WebFrame::spoolPages( /* [in] */ UINT endPage, /* [retval][out] */ void* ctx) { -#if PLATFORM(CG) +#if USE(CG) if (!printDC || !ctx) { ASSERT_NOT_REACHED(); return E_POINTER; } -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) if (!printDC) { ASSERT_NOT_REACHED(); return E_POINTER; @@ -2369,7 +2369,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::spoolPages( return E_FAIL; UINT pageCount = (UINT) m_pageRects.size(); -#if PLATFORM(CG) +#if USE(CG) PlatformGraphicsContext* pctx = (PlatformGraphicsContext*)ctx; #endif @@ -2396,7 +2396,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::spoolPages( for (UINT ii = startPage; ii < endPage; ii++) spoolPage(pctx, &spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount); -#if PLATFORM(CAIRO) +#if USE(CAIRO) cairo_surface_finish(printSurface); ASSERT(!cairo_surface_status(printSurface)); cairo_surface_destroy(printSurface); diff --git a/Source/WebKit/win/WebFrame.h b/Source/WebKit/win/WebFrame.h index 9158fb3..95f2875 100644 --- a/Source/WebKit/win/WebFrame.h +++ b/Source/WebKit/win/WebFrame.h @@ -59,9 +59,9 @@ namespace WebCore { typedef const struct OpaqueJSContext* JSContextRef; typedef struct OpaqueJSValue* JSObjectRef; -#if PLATFORM(CG) +#if USE(CG) typedef struct CGContext PlatformGraphicsContext; -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) namespace WebCore { class PlatformContextCairo; } diff --git a/Source/WebKit/win/WebHistoryItem.cpp b/Source/WebKit/win/WebHistoryItem.cpp index 031f8ab..f8ba2f1 100644 --- a/Source/WebKit/win/WebHistoryItem.cpp +++ b/Source/WebKit/win/WebHistoryItem.cpp @@ -28,10 +28,10 @@ #include "WebHistoryItem.h" #include "COMEnumVariant.h" -#include "COMPtr.h" #include "MarshallingHelpers.h" #include "WebKit.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/HistoryItem.h> #include <WebCore/KURL.h> #include <wtf/PassOwnPtr.h> diff --git a/Source/WebKit/win/WebIconDatabase.cpp b/Source/WebKit/win/WebIconDatabase.cpp index 24e8f41..664cac4 100644 --- a/Source/WebKit/win/WebIconDatabase.cpp +++ b/Source/WebKit/win/WebIconDatabase.cpp @@ -28,11 +28,11 @@ #include "WebIconDatabase.h" #include "CFDictionaryPropertyBag.h" -#include "COMPtr.h" #include "WebPreferences.h" #include "WebNotificationCenter.h" #include <WebCore/BitmapInfo.h> #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/FileSystem.h> #include <WebCore/IconDatabase.h> #include <WebCore/Image.h> diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops index 5e71307..03cb439 100644 --- a/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\InterfacesCommon.vsprops" > diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops index 77c4b1f..9329ecb 100644 --- a/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; .\InterfacesCommon.vsprops" > diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops index 5e17aee..64f5ee7 100644 --- a/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; .\InterfacesCommon.vsprops" diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj b/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj index a8b9cc3..4d25f44 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj +++ b/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj @@ -699,10 +699,6 @@ RelativePath="..\WebWorkersPrivate.h" > </File> - <File - RelativePath="..\WindowsTouch.h" - > - </File> </Filter> <Filter Name="Classes" diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops index 941bf46..61ade23 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\WebKitGUIDCommon.vsprops" > diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops index 39566ea..c7628df 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; .\WebKitGUIDCommon.vsprops" > diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops index bc0b7a1..d4a09a3 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; .\WebKitGUIDCommon.vsprops" diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibPostBuild.cmd b/Source/WebKit/win/WebKit.vcproj/WebKitLibPostBuild.cmd index 7968952..02ecee5 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitLibPostBuild.cmd +++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibPostBuild.cmd @@ -13,7 +13,5 @@ xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONB mkdir 2>NUL "%OUTDIR%\..\bin\WebKit.resources" xcopy /y /d "%PROJECTDIR%..\WebKit.resources\*" "%OUTDIR%\..\bin\WebKit.resources" -mkdir 2>NUL "%OUTDIR%\..\bin\WebKit.resources\en.lproj" -xcopy /y /d "%PROJECTDIR%..\..\English.lproj\Localizable.strings" "%OUTDIR%\..\bin\WebKit.resources\en.lproj\" if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed" diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibPreBuild.cmd b/Source/WebKit/win/WebKit.vcproj/WebKitLibPreBuild.cmd index b6f0bd4..82f02e9 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitLibPreBuild.cmd +++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibPreBuild.cmd @@ -5,11 +5,6 @@ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGUR if errorlevel 1 exit 1 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed" -touch "%CONFIGURATIONBUILDDIR%\tmp.cpp" -cl /analyze /nologo /c "%CONFIGURATIONBUILDDIR%\tmp.cpp" /Fo"%INTDIR%\tmp.obj" 2>&1 | findstr D9040 -if ERRORLEVEL 1 (set EnablePREfast="true") else (set EnablePREfast="false") -if ERRORLEVEL 1 (set AnalyzeWithLargeStack="/analyze:65536") else (set AnalyzeWithLargeStack="") - mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore" xcopy /y /d "%WEBKITLIBRARIESDIR%\include\JavaScriptCore\*" "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore" diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops index 127707e..cca57e1 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\WebKitLibCommon.vsprops" > diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops index 82f6dfd..18637a4 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; .\WebKitLibCommon.vsprops" > diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops index 692fdc0..4053bbe 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops @@ -7,6 +7,7 @@ $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops; diff --git a/Source/WebKit/win/WebNavigationData.h b/Source/WebKit/win/WebNavigationData.h index f4793dc..54e5782 100644 --- a/Source/WebKit/win/WebNavigationData.h +++ b/Source/WebKit/win/WebNavigationData.h @@ -28,8 +28,8 @@ #include "WebKit.h" -#include "COMPtr.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> class WebNavigationData : public IWebNavigationData { public: diff --git a/Source/WebKit/win/WebPreferenceKeysPrivate.h b/Source/WebKit/win/WebPreferenceKeysPrivate.h index be0ebe5..9dd14ed 100644 --- a/Source/WebKit/win/WebPreferenceKeysPrivate.h +++ b/Source/WebKit/win/WebPreferenceKeysPrivate.h @@ -58,6 +58,7 @@ #define WebKitAllowAnimatedImagesPreferenceKey "WebKitAllowAnimatedImagesPreferenceKey" #define WebKitAllowAnimatedImageLoopingPreferenceKey "WebKitAllowAnimatedImageLoopingPreferenceKey" #define WebKitDisplayImagesKey "WebKitDisplayImagesKey" +#define WebKitLoadSiteIconsKey "WebKitLoadSiteIconsKey" #define WebKitBackForwardCacheExpirationIntervalKey "WebKitBackForwardCacheExpirationIntervalKey" #define WebKitTabToLinksPreferenceKey "WebKitTabToLinksPreferenceKey" #define WebKitPrivateBrowsingEnabledPreferenceKey "WebKitPrivateBrowsingEnabled" diff --git a/Source/WebKit/win/WebPreferences.cpp b/Source/WebKit/win/WebPreferences.cpp index a4869b6..0686c2b 100644 --- a/Source/WebKit/win/WebPreferences.cpp +++ b/Source/WebKit/win/WebPreferences.cpp @@ -28,16 +28,15 @@ #include "WebKitDLL.h" #include "WebPreferences.h" -#include "COMPtr.h" -#include "WebLocalizableStrings.h" #include "WebNotificationCenter.h" #include "WebPreferenceKeysPrivate.h" #include <CoreFoundation/CoreFoundation.h> #include <WebCore/CACFLayerTreeHost.h> +#include <WebCore/COMPtr.h> #include <WebCore/FileSystem.h> #include <WebCore/Font.h> -#include <WebCore/PlatformString.h> +#include <WebCore/LocalizedStrings.h> #include <limits> #include <shlobj.h> #include <wchar.h> @@ -45,8 +44,9 @@ #include <wtf/OwnArrayPtr.h> #include <wtf/text/CString.h> #include <wtf/text/StringHash.h> +#include <wtf/text/WTFString.h> -#if PLATFORM(CG) +#if USE(CG) #include <CoreGraphics/CoreGraphics.h> #include <WebKitSystemInterface/WebKitSystemInterface.h> #endif @@ -193,7 +193,8 @@ void WebPreferences::initializeDefaultSettings() CFDictionaryAddValue(defaults, CFSTR(WebKitMinimumLogicalFontSizePreferenceKey), CFSTR("9")); CFDictionaryAddValue(defaults, CFSTR(WebKitDefaultFontSizePreferenceKey), CFSTR("16")); CFDictionaryAddValue(defaults, CFSTR(WebKitDefaultFixedFontSizePreferenceKey), CFSTR("13")); - WTF::String defaultDefaultEncoding(LPCTSTR_UI_STRING("ISO-8859-1", "The default, default character encoding")); + + String defaultDefaultEncoding(WEB_UI_STRING("ISO-8859-1", "The default, default character encoding")); CFDictionaryAddValue(defaults, CFSTR(WebKitDefaultTextEncodingNamePreferenceKey), defaultDefaultEncoding.createCFString()); CFDictionaryAddValue(defaults, CFSTR(WebKitUserStyleSheetEnabledPreferenceKey), kCFBooleanFalse); @@ -217,6 +218,7 @@ void WebPreferences::initializeDefaultSettings() CFDictionaryAddValue(defaults, CFSTR(WebKitAllowAnimatedImagesPreferenceKey), kCFBooleanTrue); CFDictionaryAddValue(defaults, CFSTR(WebKitAllowAnimatedImageLoopingPreferenceKey), kCFBooleanTrue); CFDictionaryAddValue(defaults, CFSTR(WebKitDisplayImagesKey), kCFBooleanTrue); + CFDictionaryAddValue(defaults, CFSTR(WebKitLoadSiteIconsKey), kCFBooleanFalse); CFDictionaryAddValue(defaults, CFSTR(WebKitBackForwardCacheExpirationIntervalKey), CFSTR("1800")); CFDictionaryAddValue(defaults, CFSTR(WebKitTabToLinksPreferenceKey), kCFBooleanFalse); CFDictionaryAddValue(defaults, CFSTR(WebKitPrivateBrowsingEnabledPreferenceKey), kCFBooleanFalse); @@ -926,6 +928,20 @@ HRESULT STDMETHODCALLTYPE WebPreferences::loadsImagesAutomatically( return S_OK; } +HRESULT STDMETHODCALLTYPE WebPreferences::setLoadsSiteIconsIgnoringImageLoadingPreference( + /* [in] */ BOOL enabled) +{ + setBoolValue(CFSTR(WebKitLoadSiteIconsKey), enabled); + return S_OK; +} + +HRESULT STDMETHODCALLTYPE WebPreferences::loadsSiteIconsIgnoringImageLoadingPreference( + /* [retval][out] */ BOOL* enabled) +{ + *enabled = boolValueForKey(CFSTR(WebKitLoadSiteIconsKey)); + return S_OK; +} + HRESULT STDMETHODCALLTYPE WebPreferences::setAutosaves( /* [in] */ BOOL enabled) { @@ -1085,7 +1101,7 @@ HRESULT STDMETHODCALLTYPE WebPreferences::setFontSmoothing( setIntegerValue(CFSTR(WebKitFontSmoothingTypePreferenceKey), smoothingType); if (smoothingType == FontSmoothingTypeWindows) smoothingType = FontSmoothingTypeMedium; -#if PLATFORM(CG) +#if USE(CG) wkSetFontSmoothingLevel((int)smoothingType); #endif return S_OK; @@ -1102,7 +1118,7 @@ HRESULT STDMETHODCALLTYPE WebPreferences::setFontSmoothingContrast( /* [in] */ float contrast) { setFloatValue(CFSTR(WebKitFontSmoothingContrastPreferenceKey), contrast); -#if PLATFORM(CG) +#if USE(CG) wkSetFontSmoothingContrast(contrast); #endif return S_OK; diff --git a/Source/WebKit/win/WebPreferences.h b/Source/WebKit/win/WebPreferences.h index d09945a..8996035 100644 --- a/Source/WebKit/win/WebPreferences.h +++ b/Source/WebKit/win/WebPreferences.h @@ -429,6 +429,9 @@ public: virtual HRESULT STDMETHODCALLTYPE hyperlinkAuditingEnabled(BOOL*); virtual HRESULT STDMETHODCALLTYPE setHyperlinkAuditingEnabled(BOOL); + virtual HRESULT STDMETHODCALLTYPE loadsSiteIconsIgnoringImageLoadingPreference(BOOL*); + virtual HRESULT STDMETHODCALLTYPE setLoadsSiteIconsIgnoringImageLoadingPreference(BOOL); + // WebPreferences // This method accesses a different preference key than developerExtrasEnabled. diff --git a/Source/WebKit/win/WebResource.h b/Source/WebKit/win/WebResource.h index 611803e..d5a01ac 100644 --- a/Source/WebKit/win/WebResource.h +++ b/Source/WebKit/win/WebResource.h @@ -27,7 +27,7 @@ #define WebResource_h #include "WebKit.h" -#include "COMPtr.h" +#include <WebCore/COMPtr.h> #include <WebCore/KURL.h> #include <WebCore/PlatformString.h> #include <WebCore/ResourceResponse.h> diff --git a/Source/WebKit/win/WebScrollBar.h b/Source/WebKit/win/WebScrollBar.h index 0482419..a741ffd 100644 --- a/Source/WebKit/win/WebScrollBar.h +++ b/Source/WebKit/win/WebScrollBar.h @@ -115,11 +115,13 @@ protected: virtual int scrollPosition(WebCore::Scrollbar*) const; virtual void setScrollOffset(const WebCore::IntPoint&); virtual void invalidateScrollbarRect(WebCore::Scrollbar*, const WebCore::IntRect&); + virtual void invalidateScrollCornerRect(const WebCore::IntRect&) { } // FIXME: We should provide a way to set this value. virtual bool isActive() const { return true; } - virtual bool scrollbarCornerPresent() const { return false; } + virtual bool isScrollCornerVisible() const { return false; } + virtual WebCore::IntRect scrollCornerRect() const { return WebCore::IntRect(); } virtual WebCore::Scrollbar* horizontalScrollbar() const; virtual WebCore::Scrollbar* verticalScrollbar() const; diff --git a/Source/WebKit/win/WebURLAuthenticationChallenge.cpp b/Source/WebKit/win/WebURLAuthenticationChallenge.cpp index 1663376..e12d0fd 100644 --- a/Source/WebKit/win/WebURLAuthenticationChallenge.cpp +++ b/Source/WebKit/win/WebURLAuthenticationChallenge.cpp @@ -27,7 +27,6 @@ #include "WebKitDLL.h" #include "WebURLAuthenticationChallenge.h" -#include "COMPtr.h" #include "WebError.h" #include "WebKit.h" #include "WebURLAuthenticationChallengeSender.h" @@ -36,6 +35,7 @@ #include "WebURLResponse.h" #include "WebKit.h" #include <WebCore/BString.h> +#include <WebCore/COMPtr.h> #include <WebCore/ResourceHandle.h> using namespace WebCore; diff --git a/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp b/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp index 0a9154f..69c7ca3 100644 --- a/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp +++ b/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp @@ -28,11 +28,11 @@ #include <initguid.h> #include "WebURLAuthenticationChallengeSender.h" -#include "COMPtr.h" #include "WebKit.h" #include "WebURLAuthenticationChallenge.h" #include "WebURLCredential.h" #include <WebCore/AuthenticationClient.h> +#include <WebCore/COMPtr.h> using namespace WebCore; diff --git a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp index 3d329d1..8ae2c53 100644 --- a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp +++ b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp @@ -28,11 +28,11 @@ #include <initguid.h> #include "WebURLAuthenticationChallengeSender.h" -#include "COMPtr.h" #include "WebKit.h" #include "WebURLAuthenticationChallenge.h" #include "WebURLCredential.h" #include <WebCore/AuthenticationClient.h> +#include <WebCore/COMPtr.h> using namespace WebCore; diff --git a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp index 2f49f67..df07f34 100644 --- a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp +++ b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp @@ -28,11 +28,11 @@ #include <initguid.h> #include "WebURLAuthenticationChallengeSender.h" -#include "COMPtr.h" #include "NotImplemented.h" #include "WebKit.h" #include "WebURLAuthenticationChallenge.h" #include "WebURLCredential.h" +#include <WebCore/COMPtr.h> #include <WebCore/ResourceHandle.h> using namespace WebCore; diff --git a/Source/WebKit/win/WebURLResponse.cpp b/Source/WebKit/win/WebURLResponse.cpp index b6c94dd..f8afa9a 100644 --- a/Source/WebKit/win/WebURLResponse.cpp +++ b/Source/WebKit/win/WebURLResponse.cpp @@ -31,7 +31,6 @@ #include "COMPropertyBag.h" #include "MarshallingHelpers.h" -#include "WebLocalizableStrings.h" #if USE(CFNETWORK) #include <WebKitSystemInterface/WebKitSystemInterface.h> @@ -40,6 +39,7 @@ #include <wtf/platform.h> #include <WebCore/BString.h> #include <WebCore/KURL.h> +#include <WebCore/LocalizedStrings.h> #include <WebCore/ResourceHandle.h> #include <shlobj.h> #include <shlwapi.h> @@ -47,160 +47,160 @@ using namespace WebCore; -static LPCTSTR CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode(CFIndex statusCode) +static String CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode(CFIndex statusCode) { - LPCTSTR result = 0; + String result; if (statusCode < 100 || statusCode >= 600) - result = LPCTSTR_UI_STRING("server error", "HTTP result code string"); + result = WEB_UI_STRING("server error", "HTTP result code string"); else if (statusCode >= 100 && statusCode <= 199) { switch (statusCode) { case 100: - result = LPCTSTR_UI_STRING("continue", "HTTP result code string"); + result = WEB_UI_STRING("continue", "HTTP result code string"); break; case 101: - result = LPCTSTR_UI_STRING("switching protocols", "HTTP result code string"); + result = WEB_UI_STRING("switching protocols", "HTTP result code string"); break; default: - result = LPCTSTR_UI_STRING("informational", "HTTP result code string"); + result = WEB_UI_STRING("informational", "HTTP result code string"); break; } } else if (statusCode >= 200 && statusCode <= 299) { switch (statusCode) { case 200: - result = LPCTSTR_UI_STRING("no error", "HTTP result code string"); + result = WEB_UI_STRING("no error", "HTTP result code string"); break; case 201: - result = LPCTSTR_UI_STRING("created", "HTTP result code string"); + result = WEB_UI_STRING("created", "HTTP result code string"); break; case 202: - result = LPCTSTR_UI_STRING("accepted", "HTTP result code string"); + result = WEB_UI_STRING("accepted", "HTTP result code string"); break; case 203: - result = LPCTSTR_UI_STRING("non-authoritative information", "HTTP result code string"); + result = WEB_UI_STRING("non-authoritative information", "HTTP result code string"); break; case 204: - result = LPCTSTR_UI_STRING("no content", "HTTP result code string"); + result = WEB_UI_STRING("no content", "HTTP result code string"); break; case 205: - result = LPCTSTR_UI_STRING("reset content", "HTTP result code string"); + result = WEB_UI_STRING("reset content", "HTTP result code string"); break; case 206: - result = LPCTSTR_UI_STRING("partial content", "HTTP result code string"); + result = WEB_UI_STRING("partial content", "HTTP result code string"); break; default: - result = LPCTSTR_UI_STRING("success", "HTTP result code string"); + result = WEB_UI_STRING("success", "HTTP result code string"); break; } } else if (statusCode >= 300 && statusCode <= 399) { switch (statusCode) { case 300: - result = LPCTSTR_UI_STRING("multiple choices", "HTTP result code string"); + result = WEB_UI_STRING("multiple choices", "HTTP result code string"); break; case 301: - result = LPCTSTR_UI_STRING("moved permanently", "HTTP result code string"); + result = WEB_UI_STRING("moved permanently", "HTTP result code string"); break; case 302: - result = LPCTSTR_UI_STRING("found", "HTTP result code string"); + result = WEB_UI_STRING("found", "HTTP result code string"); break; case 303: - result = LPCTSTR_UI_STRING("see other", "HTTP result code string"); + result = WEB_UI_STRING("see other", "HTTP result code string"); break; case 304: - result = LPCTSTR_UI_STRING("not modified", "HTTP result code string"); + result = WEB_UI_STRING("not modified", "HTTP result code string"); break; case 305: - result = LPCTSTR_UI_STRING("needs proxy", "HTTP result code string"); + result = WEB_UI_STRING("needs proxy", "HTTP result code string"); break; case 307: - result = LPCTSTR_UI_STRING("temporarily redirected", "HTTP result code string"); + result = WEB_UI_STRING("temporarily redirected", "HTTP result code string"); break; case 306: // 306 status code unused in HTTP default: - result = LPCTSTR_UI_STRING("redirected", "HTTP result code string"); + result = WEB_UI_STRING("redirected", "HTTP result code string"); break; } } else if (statusCode >= 400 && statusCode <= 499) { switch (statusCode) { case 400: - result = LPCTSTR_UI_STRING("bad request", "HTTP result code string"); + result = WEB_UI_STRING("bad request", "HTTP result code string"); break; case 401: - result = LPCTSTR_UI_STRING("unauthorized", "HTTP result code string"); + result = WEB_UI_STRING("unauthorized", "HTTP result code string"); break; case 402: - result = LPCTSTR_UI_STRING("payment required", "HTTP result code string"); + result = WEB_UI_STRING("payment required", "HTTP result code string"); break; case 403: - result = LPCTSTR_UI_STRING("forbidden", "HTTP result code string"); + result = WEB_UI_STRING("forbidden", "HTTP result code string"); break; case 404: - result = LPCTSTR_UI_STRING("not found", "HTTP result code string"); + result = WEB_UI_STRING("not found", "HTTP result code string"); break; case 405: - result = LPCTSTR_UI_STRING("method not allowed", "HTTP result code string"); + result = WEB_UI_STRING("method not allowed", "HTTP result code string"); break; case 406: - result = LPCTSTR_UI_STRING("unacceptable", "HTTP result code string"); + result = WEB_UI_STRING("unacceptable", "HTTP result code string"); break; case 407: - result = LPCTSTR_UI_STRING("proxy authentication required", "HTTP result code string"); + result = WEB_UI_STRING("proxy authentication required", "HTTP result code string"); break; case 408: - result = LPCTSTR_UI_STRING("request timed out", "HTTP result code string"); + result = WEB_UI_STRING("request timed out", "HTTP result code string"); break; case 409: - result = LPCTSTR_UI_STRING("conflict", "HTTP result code string"); + result = WEB_UI_STRING("conflict", "HTTP result code string"); break; case 410: - result = LPCTSTR_UI_STRING("no longer exists", "HTTP result code string"); + result = WEB_UI_STRING("no longer exists", "HTTP result code string"); break; case 411: - result = LPCTSTR_UI_STRING("length required", "HTTP result code string"); + result = WEB_UI_STRING("length required", "HTTP result code string"); break; case 412: - result = LPCTSTR_UI_STRING("precondition failed", "HTTP result code string"); + result = WEB_UI_STRING("precondition failed", "HTTP result code string"); break; case 413: - result = LPCTSTR_UI_STRING("request too large", "HTTP result code string"); + result = WEB_UI_STRING("request too large", "HTTP result code string"); break; case 414: - result = LPCTSTR_UI_STRING("requested URL too long", "HTTP result code string"); + result = WEB_UI_STRING("requested URL too long", "HTTP result code string"); break; case 415: - result = LPCTSTR_UI_STRING("unsupported media type", "HTTP result code string"); + result = WEB_UI_STRING("unsupported media type", "HTTP result code string"); break; case 416: - result = LPCTSTR_UI_STRING("requested range not satisfiable", "HTTP result code string"); + result = WEB_UI_STRING("requested range not satisfiable", "HTTP result code string"); break; case 417: - result = LPCTSTR_UI_STRING("expectation failed", "HTTP result code string"); + result = WEB_UI_STRING("expectation failed", "HTTP result code string"); break; default: - result = LPCTSTR_UI_STRING("client error", "HTTP result code string"); + result = WEB_UI_STRING("client error", "HTTP result code string"); break; } } else if (statusCode >= 500 && statusCode <= 599) { switch (statusCode) { case 500: - result = LPCTSTR_UI_STRING("internal server error", "HTTP result code string"); + result = WEB_UI_STRING("internal server error", "HTTP result code string"); break; case 501: - result = LPCTSTR_UI_STRING("unimplemented", "HTTP result code string"); + result = WEB_UI_STRING("unimplemented", "HTTP result code string"); break; case 502: - result = LPCTSTR_UI_STRING("bad gateway", "HTTP result code string"); + result = WEB_UI_STRING("bad gateway", "HTTP result code string"); break; case 503: - result = LPCTSTR_UI_STRING("service unavailable", "HTTP result code string"); + result = WEB_UI_STRING("service unavailable", "HTTP result code string"); break; case 504: - result = LPCTSTR_UI_STRING("gateway timed out", "HTTP result code string"); + result = WEB_UI_STRING("gateway timed out", "HTTP result code string"); break; case 505: - result = LPCTSTR_UI_STRING("unsupported version", "HTTP result code string"); + result = WEB_UI_STRING("unsupported version", "HTTP result code string"); break; default: - result = LPCTSTR_UI_STRING("server error", "HTTP result code string"); + result = WEB_UI_STRING("server error", "HTTP result code string"); break; } } @@ -372,11 +372,11 @@ HRESULT STDMETHODCALLTYPE WebURLResponse::localizedStringForStatusCode( ASSERT(m_response.isHTTP()); if (statusString) *statusString = 0; - LPCTSTR statusText = CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode(statusCode); + String statusText = CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode(statusCode); if (!statusText) return E_FAIL; if (statusString) - *statusString = SysAllocString(statusText); + *statusString = BString(statusText).release(); return S_OK; } diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp index 69f83de..c9f086b 100644 --- a/Source/WebKit/win/WebView.cpp +++ b/Source/WebKit/win/WebView.cpp @@ -58,7 +58,6 @@ #include "WebPluginHalterClient.h" #include "WebPreferences.h" #include "WebScriptWorld.h" -#include "WindowsTouch.h" #include "resource.h" #include <JavaScriptCore/APICast.h> #include <JavaScriptCore/InitializeThreading.h> @@ -131,6 +130,7 @@ #include <WebCore/SystemInfo.h> #include <WebCore/TypingCommand.h> #include <WebCore/WindowMessageBroadcaster.h> +#include <WebCore/WindowsTouch.h> #include <wtf/Threading.h> #if ENABLE(CLIENT_BASED_GEOLOCATION) @@ -138,7 +138,7 @@ #include <WebCore/GeolocationError.h> #endif -#if PLATFORM(CG) +#if USE(CG) #include <CoreGraphics/CGContext.h> #endif @@ -1079,9 +1079,9 @@ void WebView::paint(HDC dc, LPARAM options) void WebView::paintIntoBackingStore(FrameView* frameView, HDC bitmapDC, const IntRect& dirtyRect, WindowsToPaint windowsToPaint) { -#if USE(ACCELERATED_COMPOSITING) - ASSERT(!isAcceleratedCompositing()); -#endif + // FIXME: This function should never be called in accelerated compositing mode, and we should + // assert as such. But currently it *is* sometimes called, so we can't assert yet. See + // <http://webkit.org/b/58539>. LOCAL_GDI_COUNTER(0, __FUNCTION__); @@ -1122,9 +1122,9 @@ void WebView::paintIntoBackingStore(FrameView* frameView, HDC bitmapDC, const In void WebView::paintIntoWindow(HDC bitmapDC, HDC windowDC, const IntRect& dirtyRect) { -#if USE(ACCELERATED_COMPOSITING) - ASSERT(!isAcceleratedCompositing()); -#endif + // FIXME: This function should never be called in accelerated compositing mode, and we should + // assert as such. But currently it *is* sometimes called, so we can't assert yet. See + // <http://webkit.org/b/58539>. LOCAL_GDI_COUNTER(0, __FUNCTION__); #if FLASH_WINDOW_REDRAW @@ -1935,8 +1935,6 @@ bool WebView::handleEditingKeyboardEvent(KeyboardEvent* evt) bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown) { Frame* frame = m_page->focusController()->focusedOrMainFrame(); - if (virtualKeyCode == VK_CAPITAL) - frame->eventHandler()->capsLockStateMayHaveChanged(); PlatformKeyboardEvent keyEvent(m_viewWindow, virtualKeyCode, keyData, PlatformKeyboardEvent::RawKeyDown, systemKeyDown); bool handled = frame->eventHandler()->keyEvent(keyEvent); @@ -1955,10 +1953,12 @@ bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown) return true; } - // We need to handle back/forward using either Backspace(+Shift) or Ctrl+Left/Right Arrow keys. - if ((virtualKeyCode == VK_BACK && keyEvent.shiftKey()) || (virtualKeyCode == VK_RIGHT && keyEvent.ctrlKey())) + // We need to handle back/forward using either Ctrl+Left/Right Arrow keys. + // FIXME: This logic should probably be in EventHandler::defaultArrowEventHandler(). + // FIXME: Should check that other modifiers aren't pressed. + if (virtualKeyCode == VK_RIGHT && keyEvent.ctrlKey()) return m_page->goForward(); - if (virtualKeyCode == VK_BACK || (virtualKeyCode == VK_LEFT && keyEvent.ctrlKey())) + if (virtualKeyCode == VK_LEFT && keyEvent.ctrlKey()) return m_page->goBack(); // Need to scroll the page if the arrow keys, pgup/dn, or home/end are hit. @@ -2015,6 +2015,15 @@ bool WebView::keyPress(WPARAM charCode, LPARAM keyData, bool systemKeyDown) return frame->eventHandler()->keyEvent(keyEvent); } +void WebView::setIsBeingDestroyed() +{ + m_isBeingDestroyed = true; + + // Remove our this pointer from the window so we won't try to handle any more window messages. + // See <http://webkit.org/b/55054>. + ::SetWindowLongPtrW(m_viewWindow, 0, 0); +} + bool WebView::registerWebViewWindowClass() { static bool haveRegisteredWindowClass = false; @@ -2061,9 +2070,13 @@ LRESULT CALLBACK WebView::WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LONG_PTR longPtr = GetWindowLongPtr(hWnd, 0); WebView* webView = reinterpret_cast<WebView*>(longPtr); WebFrame* mainFrameImpl = webView ? webView->topLevelFrame() : 0; - if (!mainFrameImpl || webView->isBeingDestroyed()) + if (!mainFrameImpl) return DefWindowProc(hWnd, message, wParam, lParam); + // We shouldn't be trying to handle any window messages after WM_DESTROY. + // See <http://webkit.org/b/55054>. + ASSERT(!webView->isBeingDestroyed()); + // hold a ref, since the WebView could go away in an event handler. COMPtr<WebView> protector(webView); ASSERT(webView); @@ -3182,7 +3195,7 @@ HRESULT STDMETHODCALLTYPE WebView::preferencesIdentifier( static void systemParameterChanged(WPARAM parameter) { -#if PLATFORM(CG) +#if USE(CG) if (parameter == SPI_SETFONTSMOOTHING || parameter == SPI_SETFONTSMOOTHINGTYPE || parameter == SPI_SETFONTSMOOTHINGCONTRAST || parameter == SPI_SETFONTSMOOTHINGORIENTATION) wkSystemFontSmoothingChanged(); #endif @@ -4778,6 +4791,11 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification) return hr; settings->setHyperlinkAuditingEnabled(enabled); + hr = prefsPrivate->loadsSiteIconsIgnoringImageLoadingPreference(&enabled); + if (FAILED(hr)) + return hr; + settings->setLoadsSiteIconsIgnoringImageLoadingSetting(!!enabled); + if (!m_closeWindowTimer) m_mainFrame->invalidate(); // FIXME diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h index 957f0a5..db3c2e7 100644 --- a/Source/WebKit/win/WebView.h +++ b/Source/WebKit/win/WebView.h @@ -26,10 +26,10 @@ #ifndef WebView_H #define WebView_H -#include "COMPtr.h" #include "WebKit.h" #include "WebFrame.h" #include "WebPreferences.h" +#include <WebCore/COMPtr.h> #include <WebCore/DragActions.h> #include <WebCore/IntRect.h> #include <WebCore/RefCountedGDIHandle.h> @@ -883,7 +883,7 @@ public: static WTF::String standardUserAgentWithApplicationName(const WTF::String&); - void setIsBeingDestroyed() { m_isBeingDestroyed = true; } + void setIsBeingDestroyed(); bool isBeingDestroyed() const { return m_isBeingDestroyed; } const char* interpretKeyEvent(const WebCore::KeyboardEvent*); diff --git a/Source/WebKit/win/WindowsTouch.h b/Source/WebKit/win/WindowsTouch.h deleted file mode 100644 index 9048103..0000000 --- a/Source/WebKit/win/WindowsTouch.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) 2009 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 COMPUTER, INC. ``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 COMPUTER, INC. OR - * 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. - */ - -#ifndef WindowsTouch_h -#define WindowsTouch_h - -/* - * The following constants are used to determine multitouch and gesture behavior - * for Windows 7. For more information, see: - * http://msdn.microsoft.com/en-us/library/dd562197(VS.85).aspx - */ - -// Value used in WebViewWndProc for Gestures -#define WM_GESTURE 0x0119 -#define WM_GESTURENOTIFY 0x011A - -// Gesture Information Flags -#define GF_BEGIN 0x00000001 -#define GF_INERTIA 0x00000002 -#define GF_END 0x00000004 - -// Gesture IDs -#define GID_BEGIN 1 -#define GID_END 2 -#define GID_ZOOM 3 -#define GID_PAN 4 -#define GID_ROTATE 5 -#define GID_TWOFINGERTAP 6 -#define GID_PRESSANDTAP 7 -#define GID_ROLLOVER GID_PRESSANDTAP - -// Zoom Gesture Confiration Flags -#define GC_ZOOM 0x00000001 - -// Pan Gesture Configuration Flags -#define GC_PAN 0x00000001 -#define GC_PAN_WITH_SINGLE_FINGER_VERTICALLY 0x00000002 -#define GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY 0x00000004 -#define GC_PAN_WITH_GUTTER 0x00000008 -#define GC_PAN_WITH_INERTIA 0x00000010 - -// Rotate Gesture Configuration Flags -#define GC_ROTATE 0x00000001 - -// Two finger tap configuration flags -#define GC_TWOFINGERTAP 0x00000001 - -// Press and tap Configuration Flags -#define GC_PRESSANDTAP 0x00000001 -#define GC_ROLLOVER GC_PRESSANDTAP - -// GESTUREINFO struct definition -typedef struct tagGESTUREINFO { - UINT cbSize; // size, in bytes, of this structure (including variable length Args field) - DWORD dwFlags; // see GF_* flags - DWORD dwID; // gesture ID, see GID_* defines - HWND hwndTarget; // handle to window targeted by this gesture - POINTS ptsLocation; // current location of this gesture - DWORD dwInstanceID; // internally used - DWORD dwSequenceID; // internally used - ULONGLONG ullArguments; // arguments for gestures whose arguments fit in 8 BYTES - UINT cbExtraArgs; // size, in bytes, of extra arguments, if any, that accompany this gesture -} GESTUREINFO, *PGESTUREINFO; -typedef GESTUREINFO const * PCGESTUREINFO; - -// GESTURECONFIG struct defintion -typedef struct tagGESTURECONFIG { - DWORD dwID; // gesture ID - DWORD dwWant; // settings related to gesture ID that are to be turned on - DWORD dwBlock; // settings related to gesture ID that are to be turned off -} GESTURECONFIG, *PGESTURECONFIG; - -/* - * Gesture notification structure - * - The WM_GESTURENOTIFY message lParam contains a pointer to this structure. - * - The WM_GESTURENOTIFY message notifies a window that gesture recognition is - * in progress and a gesture will be generated if one is recognized under the - * current gesture settings. - */ -typedef struct tagGESTURENOTIFYSTRUCT { - UINT cbSize; // size, in bytes, of this structure - DWORD dwFlags; // unused - HWND hwndTarget; // handle to window targeted by the gesture - POINTS ptsLocation; // starting location - DWORD dwInstanceID; // internally used -} GESTURENOTIFYSTRUCT, *PGESTURENOTIFYSTRUCT; - -DECLARE_HANDLE(HGESTUREINFO); - -#endif |