diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/win | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/win')
24 files changed, 744 insertions, 183 deletions
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog index a24c061..5540ab3 100644 --- a/Source/WebKit/win/ChangeLog +++ b/Source/WebKit/win/ChangeLog @@ -1,3 +1,413 @@ +2011-03-07 Sam Weinig <sam@webkit.org> + + Reviewed by Anders Carlsson. + + Replace WebKit2's decidePolicyForMIMEType with decidePolicyForResponse + https://bugs.webkit.org/show_bug.cgi?id=55827 + + Renamed FrameLoaderClient::dispatchDecidePolicyForMIMEType to dispatchDecidePolicyForResponse + and pass the entire response, instead of just the MIMEType. + + * WebFrame.cpp: + (WebFrame::dispatchDecidePolicyForResponse): + * WebFrame.h: + +2011-03-04 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Darin Adler. + + Adopt VersionStamper tool for Windows WebKit DLLs + https://bugs.webkit.org/show_bug.cgi?id=55784 + + Calculate the WebKit version for the useragent via autoversion.h + instead of reading it back from the DLL. + + We now use a tool to stamp the version number onto the Apple WebKit DLLs + during the post-build step. + + * WebKit.vcproj/WebKit.rc: Removed. This file wasn't used. + * WebKit.vcproj/WebKitLibCommon.vsprops: Fetch version from a string resource. + * WebView.cpp: + (WebView::standardUserAgentWithApplicationName): Use __BUILD_NUMBER_SHORT__ for the version. + (osVersion): Removed + +2011-03-03 Anders Carlsson <andersca@apple.com> + + Reviewed by Sam Weinig. + + Get rid of Page::globalHistoryItem + https://bugs.webkit.org/show_bug.cgi?id=55738 + + * WebCoreSupport/WebFrameLoaderClient.cpp: + (WebFrameLoaderClient::updateGlobalHistoryItemForPage): + Get the current history item and update it using WebView::setGlobalHistoryItem. + + * WebCoreSupport/WebFrameLoaderClient.h: + * WebView.cpp: + (WebView::globalHistoryItem): + (WebView::setGlobalHistoryItem): + * WebView.h: + +2011-03-03 Brent Fulgham <bfulgham@webkit.org> + + Unreviewed build correction. + + * WebFrame.cpp: + (scaleFactor): Update after 77286 to replace right/bottom + with new maxX/maxY terminology. + +2011-03-03 Brady Eidson <beidson@apple.com> + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=55721 + Global IconDatabase should be returned by reference, not as a pointer + + * WebCoreStatistics.cpp: + (WebCoreStatistics::iconPageURLMappingCount): + (WebCoreStatistics::iconRetainedPageURLCount): + (WebCoreStatistics::iconRecordCount): + (WebCoreStatistics::iconsWithDataCount): + * WebIconDatabase.cpp: + (WebIconDatabase::init): + (WebIconDatabase::startUpIconDatabase): + (WebIconDatabase::iconForURL): + (WebIconDatabase::retainIconForURL): + (WebIconDatabase::releaseIconForURL): + (WebIconDatabase::removeAllIcons): + (WebIconDatabase::iconURLForURL): + (WebIconDatabase::isEnabled): + (WebIconDatabase::setEnabled): + (WebIconDatabase::hasIconForURL): + (WebIconDatabase::getOrCreateDefaultIconBitmap): + * WebKitDLL.cpp: + (shutDownWebKit): + +2011-03-03 Alexey Proskuryakov <ap@apple.com> + + Removing an include of WebCoreKeyboardUIMode.h that Ive just added. It's already included + via ChromeClient.h + + * WebCoreSupport/WebChromeClient.h: + +2011-03-02 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Darin Adler. + + REGRESSION (WebKit2): Tab keys no longer observe Full Keyboard Access + https://bugs.webkit.org/show_bug.cgi?id=55633 + <rdar://problem/8963023> + + * WebCoreSupport/WebChromeClient.cpp: (WebChromeClient::keyboardUIMode): + * WebCoreSupport/WebChromeClient.h: + Implement keyboardUIMode() instead of tabsToLinks(). No change in functionality, since + this platform doesn't observe or have full keyboard access state. + +2011-03-03 Peter Kasting <pkasting@google.com> + + Reviewed by James Robinson. + + Drop redundant "Windows; " from the Windows-specific User Agent string. + https://bugs.webkit.org/show_bug.cgi?id=54567 + + * WebView.cpp: + (WebView::standardUserAgentWithApplicationName): + +2011-03-01 Brian Weinstein <bweinstein@apple.com> + + Reviewed by Adam Roben. + + Part of WebKit2: Need a way to send notifications to client when cookies change + https://bugs.webkit.org/show_bug.cgi?id=55427 + <rdar://problem/9056027> + + Add stubs for CookiesStrategy on Windows WebKit1. + + * WebCoreSupport/WebPlatformStrategies.cpp: + (WebPlatformStrategies::createCookiesStrategy): + (WebPlatformStrategies::notifyCookiesChanged): + * WebCoreSupport/WebPlatformStrategies.h: + +2011-02-28 Chang Shu <cshu@webkit.org> + + Reviewed by Ryosuke Niwa. + + Remove the support of Frame::isContentEditable and its dependencies. + https://bugs.webkit.org/show_bug.cgi?id=54292 + + Remove the WebKit side implementation. + + * WebCoreSupport/WebEditorClient.cpp: + * WebCoreSupport/WebEditorClient.h: + +2011-02-28 Adam Roben <aroben@apple.com> + + Build TestWebKitAPIInjectedBundle on Windows + + Fixes <http://webkit.org/b/55420> run-api-tests doesn't run injected bundle tests on Windows + + Reviewed by Darin Adler. + + * WebKit.vcproj/WebKit.sln: Added TestWebKitAPIInjectedBundle. Let VS simplify the paths to + the project files. + +2011-02-28 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r78789. + http://trac.webkit.org/changeset/78789 + https://bugs.webkit.org/show_bug.cgi?id=55409 + + Incorrect canvas fallback implementation (Requested by + inferno-sec on #webkit). + + * AccessibleBase.cpp: + (MSAARole): + +2011-02-26 Vsevolod Vlasov <vsevik@chromium.org> + + Reviewed by Pavel Feldman. + + DumpRenderTree should reset frame opener between tests. + https://bugs.webkit.org/show_bug.cgi?id=54874 + + Added clearOpener method to IWebFramePrivate. + Touched WebKit.idl to trigger build scripts. + + * Interfaces/IWebFramePrivate.idl: + * Interfaces/WebKit.idl: + * WebFrame.cpp: + (WebFrame::clearOpener): + * WebFrame.h: + +2011-02-26 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r79764. + http://trac.webkit.org/changeset/79764 + https://bugs.webkit.org/show_bug.cgi?id=55295 + + "broke Chromium builds" (Requested by rniwa on #webkit). + + * Interfaces/IWebFramePrivate.idl: + * Interfaces/WebKit.idl: + * WebFrame.cpp: + * WebFrame.h: + +2011-02-26 Vsevolod Vlasov <vsevik@chromium.org> + + Reviewed by Pavel Feldman. + + DumpRenderTree should reset frame opener between tests. + https://bugs.webkit.org/show_bug.cgi?id=54874 + + Added clearOpener method to IWebFramePrivate. + Touched WebKit.idl to trigger build scripts. + + * Interfaces/IWebFramePrivate.idl: + * Interfaces/WebKit.idl: + * WebFrame.cpp: + (WebFrame::clearOpener): + * WebFrame.h: + +2011-02-24 Peter Kasting <pkasting@google.com> + + Reviewed by Eric Seidel. + + Drop the "U; " encryption level from the User Agent string. + https://bugs.webkit.org/show_bug.cgi?id=54566 + + * WebView.cpp: + (WebView::standardUserAgentWithApplicationName): + +2011-02-24 Andrew Wilson <atwilson@chromium.org> + + Unreviewed, rolling out r79570. + http://trac.webkit.org/changeset/79570 + https://bugs.webkit.org/show_bug.cgi?id=54874 + + Breaks chromium build because glue/mocks/mock_web_frame.h/cc + was not updated + + * Interfaces/IWebFramePrivate.idl: + * Interfaces/WebKit.idl: + * WebFrame.cpp: + * WebFrame.h: + +2011-02-24 Vsevolod Vlasov <vsevik@chromium.org> + + Reviewed by Alexey Proskuryakov. + + DumpRenderTree should reset frame opener between tests. + https://bugs.webkit.org/show_bug.cgi?id=54874 + + Added clearOpener method to IWebFramePrivate. + Touched WebKit.idl to trigger build scripts. + + * Interfaces/IWebFramePrivate.idl: + * Interfaces/WebKit.idl: + * WebFrame.cpp: + (WebFrame::clearOpener): + * WebFrame.h: + +2011-02-23 Patrick Gansterer <paroga@webkit.org> + + Reviewed by Darin Adler. + + Rename PLATFORM(CF) to USE(CF) + https://bugs.webkit.org/show_bug.cgi?id=53540 + + * WebView.cpp: + +2011-02-22 Laszlo Gombos <laszlo.1.gombos@nokia.com> + + Reviewed by Alexey Proskuryakov. + + Drop the language tag part from the User Agent string + https://bugs.webkit.org/show_bug.cgi?id=54560 + + * WebView.cpp: + (WebView::standardUserAgentWithApplicationName): + +2011-02-19 Charlie Reis <creis@chromium.org> + + Reviewed by Mihai Parparita. + + Ensure loading has stopped in HistoryController::goToItem + https://bugs.webkit.org/show_bug.cgi?id=54517 + + Add a FrameLoaderClient callback for whether to stop loading before goToItem. + + Test: http/tests/navigation/forward-to-fragment-fires-onload.html + + * WebCoreSupport/WebFrameLoaderClient.cpp: + (WebFrameLoaderClient::shouldStopLoadingForHistoryItem): Added. + * WebCoreSupport/WebFrameLoaderClient.h: + +2011-02-16 David Hyatt <hyatt@apple.com> + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=54244 + + Convert the line box tree to floating point and eliminate font rounding hacks. This patch removes all of the rounding + hacks from the Font code and makes sure all Font APIs involving width measurement and width offsets use floats. + + The line box tree's x, y and logicalWidth members have all been converted to floats and all of the line box APIs have + been changed as well. + + In terms of pixel adjustments, overflow is using an enclosing model (so it will be enclosingIntRect of a line box's x/y/width/height). + + Background and border painting is using a rounding model, so borders and backgrounds will round to the nearest pixel when painting. + + Replaced elements still snap to integer positions on lines, and they use a rounding model as well, although their underlying line boxes + still have a precise floating point position. + + Justification will now allow subpixel positioning to occur as well. Platforms that don't support subpixel positioning should already + be rounding justification spacing in their font code. + + Many layout test results change on Mac, since rounding hacks were used there and are now gone. + + * WebKitGraphics.cpp: + (CenterTruncateStringToWidth): + (RightTruncateStringToWidth): + +2011-02-10 Luiz Agostini <luiz.agostini@openbossa.org> + + Reviewed by Adam Roben. + + HTML5 <details> and <summary>: localized text + https://bugs.webkit.org/show_bug.cgi?id=54260 + + The method defaultDetailsSummaryText was added to LocalizationStrategy class. It is used to + provide the default label to be used by a <details> tag that has no <summary> child. + + * WebCoreSupport/WebPlatformStrategies.cpp: + (WebPlatformStrategies::defaultDetailsSummaryText): + * WebCoreSupport/WebPlatformStrategies.h: + +2011-02-16 Dominic Mazzoni <dmazzoni@google.com> + + Reviewed by Chris Fleizach. + + Add new role for canvas elements. + + https://bugs.webkit.org/show_bug.cgi?id=50126 + + Test: accessibility/canvas-fallback-content.html + + * AccessibleBase.cpp: + (MSAARole): + +2011-02-15 Kenneth Russell <kbr@google.com> + + Unreviewed. Remove whitespace-only change from + http://trac.webkit.org/changeset/78620 (https://bugs.webkit.org/show_bug.cgi?id=54312) + now that the patch has passed the Windows build bots. + + * Interfaces/WebKit.idl: + +2011-02-15 Kenneth Russell <kbr@google.com> + + Reviewed by Darin Fisher. + + Allow controlling minimum DOMTimer interval on a per-page basis + https://bugs.webkit.org/show_bug.cgi?id=54312 + + Added needed methods to implement LayoutTestController's new + setMinimumTimerInterval method. Includes whitespace-only change to + WebKit.idl to trigger proper rebuild on bots; will be removed in + subsequent checkin. + + * Interfaces/IWebViewPrivate.idl: + * Interfaces/WebKit.idl: + * WebView.cpp: + (WebView::initWithFrame): + (WebView::defaultMinimumTimerInterval): + (WebView::setMinimumTimerInterval): + * WebView.h: + +2011-01-26 MORITA Hajime <morrita@google.com> + + Reviewed by Ryosuke Niwa. + + Refactoring: Extract TextCheckerClient from EditorClient + https://bugs.webkit.org/show_bug.cgi?id=53213 + + * WebCoreSupport/WebEditorClient.h: + (WebEditorClient::textChecker): + +2011-02-07 Ryosuke Niwa <rniwa@webkit.org> + + Reviewed by Adam Barth. + + Add EditorClient callbacks to override isDOMPasteAllowed and javaScriptCanAccessClipboard + https://bugs.webkit.org/show_bug.cgi?id=52417 + + Added two callback functions, canCopyCut and canPaste to EditorClient. They are currently + not implemented. + + * WebCoreSupport/WebEditorClient.cpp: + (WebEditorClient::canCopyCut): Added. + (WebEditorClient::canPaste): Added. + * WebCoreSupport/WebEditorClient.h: + +2011-02-14 Brian Weinstein <bweinstein@apple.com> + + Reviewed by Brady Eidson. + + Need WebKit API to determine whether we have a site icon for a given URL + https://bugs.webkit.org/show_bug.cgi?id=54400 + + This patch implements IWebIconDatabase::hasIconForURL which tells us whether or not + we have a site icon for the given URL. + + * Interfaces/IWebIconDatabase.idl: Added new function. + * Interfaces/WebKit.idl: Touched to make sure Interfaces rebuilds. + * WebIconDatabase.cpp: + (WebIconDatabase::hasIconForURL): Call IconDatabase::iconForPageURL to make sure we + load the icon from disk, and call iconURLForPageURL to determine whether or not + we actually have an icon. + * WebIconDatabase.h: + 2011-02-11 Geoffrey Garen <ggaren@apple.com> Reviewed by Oliver Hunt. diff --git a/Source/WebKit/win/Interfaces/IWebFramePrivate.idl b/Source/WebKit/win/Interfaces/IWebFramePrivate.idl index 279cbbf..9a1c333 100755 --- a/Source/WebKit/win/Interfaces/IWebFramePrivate.idl +++ b/Source/WebKit/win/Interfaces/IWebFramePrivate.idl @@ -119,4 +119,6 @@ interface IWebFramePrivate : IUnknown HRESULT loadPlainTextString([in] BSTR string, [in] BSTR url); HRESULT hasSpellingMarker([in] UINT from, [in] UINT length, [out, retval] BOOL* result); + + HRESULT clearOpener(); } diff --git a/Source/WebKit/win/Interfaces/IWebIconDatabase.idl b/Source/WebKit/win/Interfaces/IWebIconDatabase.idl index 57d6683..4504a96 100644 --- a/Source/WebKit/win/Interfaces/IWebIconDatabase.idl +++ b/Source/WebKit/win/Interfaces/IWebIconDatabase.idl @@ -164,4 +164,11 @@ interface IWebIconDatabase : IUnknown - (void)setEnabled:(BOOL)flag; */ HRESULT setEnabled([in] BOOL flag); + + /*! + @method hasIconForURL: + @discussion Returns whether or not the icon database has an icon for this URL. + @parm url The URL to test for. + */ + HRESULT hasIconForURL([in] BSTR url, [out, retval] BOOL* result); } diff --git a/Source/WebKit/win/Interfaces/IWebViewPrivate.idl b/Source/WebKit/win/Interfaces/IWebViewPrivate.idl index 0377406..eaa91ca 100644 --- a/Source/WebKit/win/Interfaces/IWebViewPrivate.idl +++ b/Source/WebKit/win/Interfaces/IWebViewPrivate.idl @@ -239,4 +239,21 @@ interface IWebViewPrivate : IUnknown [local] HRESULT reportException([in] JSContextRef context, [in] JSValueRef exception); [local] HRESULT elementFromJS([in] JSContextRef context, [in] JSValueRef nodeObject, [out, retval] IDOMElement** element); + + + /*! + @method defaultMinimumTimerInterval + @discussion Returns the default minimum interval for DOMTimers on all pages, not + just the one associated with this receiver. + - (double)interval; + */ + HRESULT defaultMinimumTimerInterval([out, retval] double* interval); + + /*! + @method setMinimumTimerInterval + @discussion Sets the minimum interval for DOMTimers on the web page associated + with the receiver. + - (double)interval; + */ + HRESULT setMinimumTimerInterval([in] double interval); } diff --git a/Source/WebKit/win/WebCoreStatistics.cpp b/Source/WebKit/win/WebCoreStatistics.cpp index f5c399f..7a9b126 100644 --- a/Source/WebKit/win/WebCoreStatistics.cpp +++ b/Source/WebKit/win/WebCoreStatistics.cpp @@ -156,7 +156,7 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::iconPageURLMappingCount( { if (!count) return E_POINTER; - *count = (UINT) iconDatabase()->pageURLMappingCount(); + *count = (UINT) iconDatabase().pageURLMappingCount(); return S_OK; } @@ -165,7 +165,7 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::iconRetainedPageURLCount( { if (!count) return E_POINTER; - *count = (UINT) iconDatabase()->retainedPageURLCount(); + *count = (UINT) iconDatabase().retainedPageURLCount(); return S_OK; } @@ -174,7 +174,7 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::iconRecordCount( { if (!count) return E_POINTER; - *count = (UINT) iconDatabase()->iconRecordCount(); + *count = (UINT) iconDatabase().iconRecordCount(); return S_OK; } @@ -183,7 +183,7 @@ HRESULT STDMETHODCALLTYPE WebCoreStatistics::iconsWithDataCount( { if (!count) return E_POINTER; - *count = (UINT) iconDatabase()->iconRecordCountWithData(); + *count = (UINT) iconDatabase().iconRecordCountWithData(); return S_OK; } diff --git a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp index 47ca713..65537f4 100644 --- a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp @@ -448,14 +448,14 @@ bool WebChromeClient::shouldInterruptJavaScript() return false; } -bool WebChromeClient::tabsToLinks() const +KeyboardUIMode WebChromeClient::keyboardUIMode() { BOOL enabled = FALSE; IWebPreferences* preferences; if (SUCCEEDED(m_webView->preferences(&preferences))) preferences->tabsToLinks(&enabled); - return !!enabled; + return enabled ? KeyboardAccessTabsToLinks : KeyboardAccessDefault; } IntRect WebChromeClient::windowResizerRect() const diff --git a/Source/WebKit/win/WebCoreSupport/WebChromeClient.h b/Source/WebKit/win/WebCoreSupport/WebChromeClient.h index 9298f1c..adfc869 100644 --- a/Source/WebKit/win/WebCoreSupport/WebChromeClient.h +++ b/Source/WebKit/win/WebCoreSupport/WebChromeClient.h @@ -92,7 +92,7 @@ public: virtual void setStatusbarText(const WTF::String&); virtual bool shouldInterruptJavaScript(); - virtual bool tabsToLinks() const; + virtual WebCore::KeyboardUIMode keyboardUIMode(); virtual WebCore::IntRect windowResizerRect() const; virtual void invalidateWindow(const WebCore::IntRect&, bool); diff --git a/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp index 539259b..9f08087 100644 --- a/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp @@ -569,6 +569,16 @@ void WebEditorClient::clearUndoRedoOperations() } } +bool WebEditorClient::canCopyCut(bool defaultValue) const +{ + return defaultValue; +} + +bool WebEditorClient::canPaste(bool defaultValue) const +{ + return defaultValue; +} + bool WebEditorClient::canUndo() const { BOOL result = FALSE; @@ -619,11 +629,6 @@ void WebEditorClient::handleInputMethodKeydown(KeyboardEvent* ) { } -bool WebEditorClient::isEditable() -{ - return false; -} - void WebEditorClient::ignoreWordInSpellDocument(const String& word) { COMPtr<IWebEditingDelegate> ed; diff --git a/Source/WebKit/win/WebCoreSupport/WebEditorClient.h b/Source/WebKit/win/WebCoreSupport/WebEditorClient.h index 358a365..18be400 100644 --- a/Source/WebKit/win/WebCoreSupport/WebEditorClient.h +++ b/Source/WebKit/win/WebCoreSupport/WebEditorClient.h @@ -29,6 +29,7 @@ #include "WebKit.h" #pragma warning(push, 0) #include <WebCore/EditorClient.h> +#include <WebCore/TextCheckerClient.h> #include <wtf/OwnPtr.h> #pragma warning(pop) @@ -36,7 +37,7 @@ class WebView; class WebNotification; class WebEditorUndoTarget; -class WebEditorClient : public WebCore::EditorClient { +class WebEditorClient : public WebCore::EditorClient, public WebCore::TextCheckerClient { public: WebEditorClient(WebView*); ~WebEditorClient(); @@ -49,8 +50,6 @@ public: virtual void toggleContinuousSpellChecking(); virtual int spellCheckerDocumentTag(); - virtual bool isEditable(); - virtual bool shouldBeginEditing(WebCore::Range*); virtual bool shouldEndEditing(WebCore::Range*); virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction); @@ -81,6 +80,8 @@ public: void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>); void clearUndoRedoOperations(); + bool canCopyCut(bool defaultValue) const; + bool canPaste(bool defaultValue) const; bool canUndo() const; bool canRedo() const; @@ -112,6 +113,7 @@ public: virtual void willSetInputMethodState(); virtual void setInputMethodState(bool); virtual void requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&) {} + virtual WebCore::TextCheckerClient* textChecker() { return this; } private: WebView* m_webView; diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp index 710fec2..03041a6 100644 --- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp @@ -50,6 +50,7 @@ #include "WebURLResponse.h" #include "WebView.h" #pragma warning(push, 0) +#include <WebCore/BackForwardController.h> #include <WebCore/CachedFrame.h> #include <WebCore/DocumentLoader.h> #include <WebCore/FrameLoader.h> @@ -67,6 +68,7 @@ #include <WebCore/PluginView.h> #include <WebCore/RenderPart.h> #include <WebCore/ResourceHandle.h> +#include <WebCore/Settings.h> #pragma warning(pop) using namespace WebCore; @@ -602,6 +604,11 @@ bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const return true; } +bool WebFrameLoaderClient::shouldStopLoadingForHistoryItem(HistoryItem*) const +{ + return true; +} + void WebFrameLoaderClient::dispatchDidAddBackForwardItem(HistoryItem*) const { } @@ -614,6 +621,19 @@ void WebFrameLoaderClient::dispatchDidChangeBackForwardIndex() const { } +void WebFrameLoaderClient::updateGlobalHistoryItemForPage() +{ + HistoryItem* historyItem = 0; + WebView* webView = m_webFrame->webView(); + + if (Page* page = webView->page()) { + if (!page->settings()->privateBrowsingEnabled()) + historyItem = page->backForward()->currentItem(); + } + + webView->setGlobalHistoryItem(historyItem); +} + void WebFrameLoaderClient::didDisplayInsecureContent() { WebView* webView = m_webFrame->webView(); diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h index 5fada31..57de2ad 100644 --- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h +++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h @@ -94,9 +94,11 @@ public: virtual void updateGlobalHistory(); virtual void updateGlobalHistoryRedirectLinks(); virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const; + virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const; virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const; virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const; virtual void dispatchDidChangeBackForwardIndex() const; + virtual void updateGlobalHistoryItemForPage(); virtual void didDisplayInsecureContent(); virtual void didRunInsecureContent(WebCore::SecurityOrigin*, const WebCore::KURL&); diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp index fe35877..9f5b20e 100644 --- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp +++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp @@ -46,7 +46,10 @@ WebPlatformStrategies::WebPlatformStrategies() setPlatformStrategies(this); } -// PluginStrategy +CookiesStrategy* WebPlatformStrategies::createCookiesStrategy() +{ + return this; +} PluginStrategy* WebPlatformStrategies::createPluginStrategy() { @@ -63,6 +66,10 @@ VisitedLinkStrategy* WebPlatformStrategies::createVisitedLinkStrategy() return this; } +void WebPlatformStrategies::notifyCookiesChanged() +{ +} + void WebPlatformStrategies::refreshPlugins() { PluginDatabase::installedPlugins()->refresh(); @@ -133,6 +140,11 @@ 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"); diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h index 48c2b46..4e5bb18 100644 --- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h +++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h @@ -26,12 +26,13 @@ #ifndef WebPlatformStrategies_h #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::PluginStrategy, private WebCore::LocalizationStrategy, private WebCore::VisitedLinkStrategy { +class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy, private WebCore::LocalizationStrategy, private WebCore::VisitedLinkStrategy { public: static void initialize(); @@ -39,10 +40,14 @@ private: WebPlatformStrategies(); // WebCore::PlatformStrategies + virtual WebCore::CookiesStrategy* createCookiesStrategy(); virtual WebCore::PluginStrategy* createPluginStrategy(); virtual WebCore::LocalizationStrategy* createLocalizationStrategy(); virtual WebCore::VisitedLinkStrategy* createVisitedLinkStrategy(); + // WebCore::CookiesStrategy + virtual void notifyCookiesChanged(); + // WebCore::PluginStrategy virtual void refreshPlugins(); virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&); @@ -54,6 +59,7 @@ private: 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(); diff --git a/Source/WebKit/win/WebFrame.cpp b/Source/WebKit/win/WebFrame.cpp index 80b91cd..e412543 100644 --- a/Source/WebKit/win/WebFrame.cpp +++ b/Source/WebKit/win/WebFrame.cpp @@ -1033,6 +1033,15 @@ HRESULT STDMETHODCALLTYPE WebFrame::hasSpellingMarker( return S_OK; } +HRESULT STDMETHODCALLTYPE WebFrame::clearOpener() +{ + HRESULT hr = S_OK; + if (Frame* coreFrame = core(this)) + coreFrame->loader()->setOpener(0); + + return hr; +} + // IWebDocumentText ----------------------------------------------------------- HRESULT STDMETHODCALLTYPE WebFrame::supportsTextEncoding( @@ -1755,7 +1764,7 @@ void WebFrame::receivedPolicyDecision(PolicyAction action) (coreFrame->loader()->policyChecker()->*function)(action); } -void WebFrame::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const String& mimeType, const ResourceRequest& request) +void WebFrame::dispatchDecidePolicyForResponse(FramePolicyFunction function, const ResourceResponse& response, const ResourceRequest& request) { Frame* coreFrame = core(this); ASSERT(coreFrame); @@ -1766,7 +1775,7 @@ void WebFrame::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, con COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(request)); - if (SUCCEEDED(policyDelegate->decidePolicyForMIMEType(d->webView, BString(mimeType), urlRequest.get(), this, setUpPolicyListener(function).get()))) + if (SUCCEEDED(policyDelegate->decidePolicyForMIMEType(d->webView, BString(response.mimeType()), urlRequest.get(), this, setUpPolicyListener(function).get()))) return; (coreFrame->loader()->policyChecker()->*function)(PolicyUse); @@ -2167,8 +2176,8 @@ static float scaleFactor(HDC printDC, const IntRect& marginRect, const IntRect& IntRect adjustedRect = IntRect( printRect.x() + marginRect.x(), printRect.y() + marginRect.y(), - printRect.width() - marginRect.x() - marginRect.right(), - printRect.height() - marginRect.y() - marginRect.bottom()); + printRect.width() - marginRect.x() - marginRect.maxX(), + printRect.height() - marginRect.y() - marginRect.maxY()); float scale = static_cast<float>(adjustedRect.width()) / static_cast<float>(pageRect.width()); if (!scale) diff --git a/Source/WebKit/win/WebFrame.h b/Source/WebKit/win/WebFrame.h index 0095590..59c0aec 100644 --- a/Source/WebKit/win/WebFrame.h +++ b/Source/WebKit/win/WebFrame.h @@ -278,6 +278,8 @@ public: /* [in] */ UINT length, /* [retval][out] */ BOOL *result); + virtual HRESULT STDMETHODCALLTYPE clearOpener(); + // IWebDocumentText virtual HRESULT STDMETHODCALLTYPE supportsTextEncoding( /* [retval][out] */ BOOL* result); @@ -326,7 +328,7 @@ public: virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&); virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&); virtual bool shouldFallBack(const WebCore::ResourceError&); - virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WTF::String& MIMEType, const WebCore::ResourceRequest&); + virtual void dispatchDecidePolicyForResponse(WebCore::FramePolicyFunction, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&); virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName); virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>); virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&); diff --git a/Source/WebKit/win/WebIconDatabase.cpp b/Source/WebKit/win/WebIconDatabase.cpp index 9b87c2b..5ccf0b7 100644 --- a/Source/WebKit/win/WebIconDatabase.cpp +++ b/Source/WebKit/win/WebIconDatabase.cpp @@ -71,7 +71,7 @@ void WebIconDatabase::init() enabled = FALSE; LOG_ERROR("Unable to get icon database enabled preference"); } - iconDatabase()->setEnabled(!!enabled); + iconDatabase().setEnabled(!!enabled); if (!(!!enabled)) return; @@ -82,7 +82,7 @@ void WebIconDatabase::startUpIconDatabase() { WebPreferences* standardPrefs = WebPreferences::sharedStandardPreferences(); - iconDatabase()->setClient(this); + iconDatabase().setClient(this); BSTR prefDatabasePath = 0; if (FAILED(standardPrefs->iconDatabaseLocation(&prefDatabasePath))) @@ -97,7 +97,7 @@ void WebIconDatabase::startUpIconDatabase() LOG_ERROR("Failed to construct default icon database path"); } - if (!iconDatabase()->open(databasePath)) + if (!iconDatabase().open(databasePath)) LOG_ERROR("Failed to open icon database path"); } @@ -172,7 +172,7 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::iconForURL( Image* icon = 0; if (url) - icon = iconDatabase()->iconForPageURL(String(url, SysStringLen(url)), intSize); + icon = iconDatabase().iconForPageURL(String(url, SysStringLen(url)), intSize); // Make sure we check for the case of an "empty image" if (icon && icon->width()) { @@ -199,20 +199,20 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::defaultIconWithSize( HRESULT STDMETHODCALLTYPE WebIconDatabase::retainIconForURL( /* [in] */ BSTR url) { - iconDatabase()->retainIconForPageURL(String(url, SysStringLen(url))); + iconDatabase().retainIconForPageURL(String(url, SysStringLen(url))); return S_OK; } HRESULT STDMETHODCALLTYPE WebIconDatabase::releaseIconForURL( /* [in] */ BSTR url) { - iconDatabase()->releaseIconForPageURL(String(url, SysStringLen(url))); + iconDatabase().releaseIconForPageURL(String(url, SysStringLen(url))); return S_OK; } HRESULT STDMETHODCALLTYPE WebIconDatabase::removeAllIcons(void) { - iconDatabase()->removeAllIcons(); + iconDatabase().removeAllIcons(); return S_OK; } @@ -234,7 +234,7 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::iconURLForURL( { if (!url || !iconURL) return E_POINTER; - BString iconURLBSTR(iconDatabase()->iconURLForPageURL(String(url, SysStringLen(url)))); + BString iconURLBSTR(iconDatabase().iconURLForPageURL(String(url, SysStringLen(url)))); *iconURL = iconURLBSTR.release(); return S_OK; } @@ -242,7 +242,7 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::iconURLForURL( HRESULT STDMETHODCALLTYPE WebIconDatabase::isEnabled( /* [retval][out] */ BOOL *result) { - *result = iconDatabase()->isEnabled(); + *result = iconDatabase().isEnabled(); return S_OK; } @@ -252,15 +252,35 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::setEnabled( BOOL currentlyEnabled; isEnabled(¤tlyEnabled); if (currentlyEnabled && !flag) { - iconDatabase()->setEnabled(false); + iconDatabase().setEnabled(false); shutDownIconDatabase(); } else if (!currentlyEnabled && flag) { - iconDatabase()->setEnabled(true); + iconDatabase().setEnabled(true); startUpIconDatabase(); } return S_OK; } +HRESULT STDMETHODCALLTYPE WebIconDatabase::hasIconForURL( + /* [in] */ BSTR url, + /* [out][retval] */ BOOL* result) +{ + if (!url || !result) + return E_POINTER; + + String urlString(url, SysStringLen(url)); + + // Passing a size parameter of 0, 0 means we don't care about the result of the image, we just + // want to make sure the read from disk to load the icon is kicked off. + iconDatabase().iconForPageURL(urlString, IntSize(0, 0)); + + // Check to see if we have a non-empty icon URL for the page, and if we do, we have an icon for + // the page. + *result = !(iconDatabase().iconURLForPageURL(urlString).isEmpty()); + + return S_OK; +} + HBITMAP createDIB(LPSIZE size) { BitmapInfo bmInfo = BitmapInfo::create(IntSize(*size)); @@ -291,7 +311,7 @@ HBITMAP WebIconDatabase::getOrCreateDefaultIconBitmap(LPSIZE size) result = createDIB(size); m_defaultIconMap.set(*size, result); - if (!iconDatabase()->defaultIcon(*size)->getHBITMAPOfSize(result, size)) { + if (!iconDatabase().defaultIcon(*size)->getHBITMAPOfSize(result, size)) { LOG_ERROR("Failed to draw Image to HBITMAP"); return 0; } diff --git a/Source/WebKit/win/WebIconDatabase.h b/Source/WebKit/win/WebIconDatabase.h index c6351a7..178fff8 100644 --- a/Source/WebKit/win/WebIconDatabase.h +++ b/Source/WebKit/win/WebIconDatabase.h @@ -102,6 +102,10 @@ public: virtual HRESULT STDMETHODCALLTYPE setEnabled( /* [in] */ BOOL /*flag*/); + virtual HRESULT STDMETHODCALLTYPE hasIconForURL( + /* [in] */ BSTR url, + /* [retval][out] */ BOOL* result); + // IconDatabaseClient virtual void dispatchDidRemoveAllIcons(); virtual void dispatchDidAddIconForPageURL(const WTF::String&); diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.rc b/Source/WebKit/win/WebKit.vcproj/WebKit.rc deleted file mode 100644 index 92d1e6c..0000000 --- a/Source/WebKit/win/WebKit.vcproj/WebKit.rc +++ /dev/null @@ -1,89 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" -#include "autoversion.h" -#include "winresrc.h" - -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// TYPELIB -// - -IDR_WEBKIT TYPELIB "WebKit.tlb" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__ - PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__ - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "WebKit Dynamic Link Library" - VALUE "FileVersion", __VERSION_TEXT__ - VALUE "CompanyName", "Apple Inc." - VALUE "InternalName", "WebKit" - VALUE "LegalCopyright", "Copyright Apple Inc. 2003-" __COPYRIGHT_YEAR_END_TEXT__ - VALUE "OriginalFilename", "WebKit.dll" - VALUE "ProductName", "WebKit" - VALUE "ProductVersion", __BUILD_NUMBER_SHORT__ - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// PNG -// - -IDR_RESIZE_CORNER PNG "textAreaResizeCorner.png" -IDR_MISSING_IMAGE PNG "missingImage.png" -IDR_NULL_PLUGIN PNG "nullplugin.png" -IDR_DELETE_BUTTON PNG "deleteButton.png" -IDR_DELETE_BUTTON_PRESSED PNG "deleteButtonPressed.png" -IDR_ZOOM_IN_CURSOR PNG "zoomInCursor.png" -IDR_ZOOM_OUT_CURSOR PNG "zoomOutCursor.png" -IDR_VERTICAL_TEXT_CURSOR PNG "verticalTextCursor.png" -IDR_PAN_SCROLL_ICON PNG "panIcon.png" -IDR_PAN_SOUTH_CURSOR PNG "panSouthCursor.png" -IDR_PAN_NORTH_CURSOR PNG "panNorthCursor.png" -IDR_PAN_EAST_CURSOR PNG "panEastCursor.png" -IDR_PAN_WEST_CURSOR PNG "panWestCursor.png" -IDR_PAN_SOUTH_EAST_CURSOR PNG "panSouthEastCursor.png" -IDR_PAN_SOUTH_WEST_CURSOR PNG "panSouthWestCursor.png" -IDR_PAN_NORTH_EAST_CURSOR PNG "panNorthEastCursor.png" -IDR_PAN_NORTH_WEST_CURSOR PNG "panNorthWestCursor.png" -IDR_SEARCH_CANCEL PNG "searchCancel.png" -IDR_SEARCH_CANCEL_PRESSED PNG "searchCancelPressed.png" -IDR_SEARCH_MAGNIFIER PNG "searchMagnifier.png" -IDR_SEARCH_MAGNIFIER_RESULTS PNG "searchMagnifierResults.png" -IDR_FS_VIDEO_AUDIO_VOLUME_HIGH PNG "fsVideoAudioVolumeHigh.png" -IDR_FS_VIDEO_AUDIO_VOLUME_LOW PNG "fsVideoAudioVolumeLow.png" -IDR_FS_VIDEO_EXIT_FULLSCREEN PNG "fsVideoExitFullscreen.png" -IDR_FS_VIDEO_PAUSE PNG "fsVideoPause.png" -IDR_FS_VIDEO_PLAY PNG "fsVideoPlay.png" - diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.sln b/Source/WebKit/win/WebKit.vcproj/WebKit.sln index 10ac3a3..3b578c5 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKit.sln +++ b/Source/WebKit/win/WebKit.vcproj/WebKit.sln @@ -1,60 +1,60 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}" ProjectSection(ProjectDependencies) = postProject {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\..\..\Source\WebCore\WebCore.vcproj\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\..\WebCore\WebCore.vcproj\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}" ProjectSection(ProjectDependencies) = postProject {E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {E498CA9D-3BD2-4D52-8E37-C8DC76526325} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" ProjectSection(ProjectDependencies) = postProject {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" ProjectSection(ProjectDependencies) = postProject {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2} = {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavaScriptCore Folder", "JavaScriptCore Folder", "{557FA164-0E39-4DEC-B66C-8795C8E52399}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebCore Folder", "WebCore Folder", "{63FB6F8A-C601-43E3-BD16-A00A465C2CB6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "..\..\..\..\Source\WebCore\WebCore.vcproj\WebCoreGenerated.vcproj", "{0A324352-B3B6-496C-9E5B-4C7E923E628B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "..\..\..\WebCore\WebCore.vcproj\WebCoreGenerated.vcproj", "{0A324352-B3B6-496C-9E5B-4C7E923E628B}" ProjectSection(ProjectDependencies) = postProject {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\..\..\Source\WebCore\WebCore.vcproj\QTMovieWin.vcproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\..\WebCore\WebCore.vcproj\QTMovieWin.vcproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}" ProjectSection(ProjectDependencies) = postProject {0A324352-B3B6-496C-9E5B-4C7E923E628B} = {0A324352-B3B6-496C-9E5B-4C7E923E628B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "..\..\..\..\Source\JavaScriptCore\JavaScriptCore.vcproj\testapi\testapi.vcproj", "{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "..\..\..\JavaScriptCore\JavaScriptCore.vcproj\testapi\testapi.vcproj", "{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}" ProjectSection(ProjectDependencies) = postProject {DA31DA52-6675-48D4-89E0-333A7144397C} = {DA31DA52-6675-48D4-89E0-333A7144397C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\..\..\..\Source\WebKit2\win\WebKit2.vcproj", "{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\..\..\WebKit2\win\WebKit2.vcproj", "{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}" ProjectSection(ProjectDependencies) = postProject {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit2 Folder", "WebKit2 Folder", "{9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2Generated", "..\..\..\..\Source\WebKit2\win\WebKit2Generated.vcproj", "{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2Generated", "..\..\..\WebKit2\win\WebKit2Generated.vcproj", "{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}" ProjectSection(ProjectDependencies) = postProject {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2WebProcess", "..\..\..\..\Source\WebKit2\win\WebKit2WebProcess.vcproj", "{AAE88FEF-509E-4D49-870B-7357922C276F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2WebProcess", "..\..\..\WebKit2\win\WebKit2WebProcess.vcproj", "{AAE88FEF-509E-4D49-870B-7357922C276F}" ProjectSection(ProjectDependencies) = postProject {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD} = {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD} EndProjectSection @@ -135,7 +135,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunner", "..\..\. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowser", "..\..\..\..\Tools\MiniBrowser\MiniBrowser.vcproj", "{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}" ProjectSection(ProjectDependencies) = postProject - {3E48AB23-D249-488F-A1C4-43CDF52FBD28} = {3E48AB23-D249-488F-A1C4-43CDF52FBD28} + {B0101604-B483-4F8C-9C51-90B46A2B1CD3} = {B0101604-B483-4F8C-9C51-90B46A2B1CD3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "..\..\..\..\Tools\TestWebKitAPI\win\TestWebKitAPI.vcproj", "{3E48AB23-D249-488F-A1C4-43CDF52FBD28}" @@ -148,236 +148,367 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIGenerated", ". {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIInjectedBundle", "..\..\..\..\Tools\TestWebKitAPI\win\TestWebKitAPIInjectedBundle.vcproj", "{B0101604-B483-4F8C-9C51-90B46A2B1CD3}" + ProjectSection(ProjectDependencies) = postProject + {3E48AB23-D249-488F-A1C4-43CDF52FBD28} = {3E48AB23-D249-488F-A1C4-43CDF52FBD28} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_All|Win32 = Debug_All|Win32 Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32 Debug|Win32 = Debug|Win32 Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32 + Release_LTCG|Win32 = Release_LTCG|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32 + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.Build.0 = Debug_All|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.Build.0 = Debug|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32 + {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.Build.0 = Debug_All|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = Debug|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = Debug|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = Release|Win32 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = Release|Win32 + {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.Build.0 = Debug_All|Win32 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 + {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32 + {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_All|Win32.Build.0 = Debug_All|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug|Win32.ActiveCfg = Debug|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug|Win32.Build.0 = Debug|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.ActiveCfg = Release|Win32 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.Build.0 = Release|Win32 + {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.Build.0 = Debug_All|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug|Win32.ActiveCfg = Debug|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug|Win32.Build.0 = Debug|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.ActiveCfg = Release|Win32 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.Build.0 = Release|Win32 + {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.Build.0 = Debug_All|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.ActiveCfg = Debug|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = Debug|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = Release|Win32 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = Release|Win32 + {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.Build.0 = Debug_All|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.ActiveCfg = Debug|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.Build.0 = Debug|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {AAE88FEF-509E-4D49-870B-7357922C276F}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {AAE88FEF-509E-4D49-870B-7357922C276F}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.ActiveCfg = Release|Win32 {AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.Build.0 = Release|Win32 + {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.Build.0 = Debug_All|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.ActiveCfg = Debug|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.Build.0 = Debug|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.ActiveCfg = Release|Win32 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.Build.0 = Release|Win32 + {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.Build.0 = Debug_All|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32 + {B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.Build.0 = Debug_All|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.ActiveCfg = Debug|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.Build.0 = Debug|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {B8437A41-67BC-4769-9452-45203827F821}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {B8437A41-67BC-4769-9452-45203827F821}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.ActiveCfg = Release|Win32 {B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.Build.0 = Release|Win32 + {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.Build.0 = Debug_All|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.ActiveCfg = Debug|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.Build.0 = Debug|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32 + {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug_All|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32 {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32 + {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_All|Win32.Build.0 = Debug_All|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.ActiveCfg = Debug|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.Build.0 = Debug|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.ActiveCfg = Release|Win32 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.Build.0 = Release|Win32 + {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug_All|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32 + {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.Build.0 = Debug_All|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug|Win32.ActiveCfg = Debug|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug|Win32.Build.0 = Debug|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {626089A3-25D3-4883-A96C-B8C66E036397}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {626089A3-25D3-4883-A96C-B8C66E036397}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Release|Win32 {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Release|Win32 + {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.Build.0 = Debug_All|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.ActiveCfg = Debug|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.Build.0 = Debug|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.ActiveCfg = Release|Win32 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.Build.0 = Release|Win32 + {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.Build.0 = Debug_All|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.ActiveCfg = Debug|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32 {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32 + {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.Build.0 = Debug_All|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.ActiveCfg = Debug|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.Build.0 = Debug|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32 {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.Build.0 = Release|Win32 + {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.Build.0 = Debug_All|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.ActiveCfg = Debug|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = Debug|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = Release|Win32 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = Release|Win32 + {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.Build.0 = Debug_All|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.ActiveCfg = Debug|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.Build.0 = Debug|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {3B99669B-1817-443B-BCBE-835580146668}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {3B99669B-1817-443B-BCBE-835580146668}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.ActiveCfg = Release|Win32 {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.Build.0 = Release|Win32 + {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_All|Win32.Build.0 = Debug_All|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug|Win32.ActiveCfg = Debug|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug|Win32.Build.0 = Debug|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release|Win32.ActiveCfg = Release|Win32 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release|Win32.Build.0 = Release|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.Build.0 = Debug_All|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.ActiveCfg = Debug|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.Build.0 = Debug|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.Build.0 = Debug_All|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = Debug|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = Debug|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug|Win32.ActiveCfg = Debug|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug|Win32.Build.0 = Debug|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release|Win32.ActiveCfg = Release|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -411,5 +542,6 @@ Global {1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} {3E48AB23-D249-488F-A1C4-43CDF52FBD28} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} {45C45411-7F0E-404D-919A-4EE9BB60BE86} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} + {B0101604-B483-4F8C-9C51-90B46A2B1CD3} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} EndGlobalSection EndGlobal diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops index 0797866..32c5b20 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops @@ -15,8 +15,4 @@ DisableSpecificWarnings="4819" ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h" /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="$(ConfigurationBuildDir)\obj\WebKit\" - /> </VisualStudioPropertySheet> diff --git a/Source/WebKit/win/WebKitDLL.cpp b/Source/WebKit/win/WebKitDLL.cpp index bc7aa60..d6a5120 100644 --- a/Source/WebKit/win/WebKitDLL.cpp +++ b/Source/WebKit/win/WebKitDLL.cpp @@ -133,7 +133,7 @@ STDAPI LocalServerDidDie() void shutDownWebKit() { - WebCore::iconDatabase()->close(); + WebCore::iconDatabase().close(); WebCore::PageGroup::closeLocalStorage(); } diff --git a/Source/WebKit/win/WebKitGraphics.cpp b/Source/WebKit/win/WebKitGraphics.cpp index 1907050..b130002 100644 --- a/Source/WebKit/win/WebKitGraphics.cpp +++ b/Source/WebKit/win/WebKitGraphics.cpp @@ -149,7 +149,7 @@ unsigned CenterTruncateStringToWidth(LPCTSTR text, int length, const WebFontDesc { ASSERT(buffer); - String result = StringTruncator::centerTruncate(String(text, length), width, makeFont(description), false); + String result = StringTruncator::centerTruncate(String(text, length), width, makeFont(description)); memcpy(buffer, result.characters(), result.length() * sizeof(UChar)); buffer[result.length()] = '\0'; return result.length(); @@ -159,7 +159,7 @@ unsigned RightTruncateStringToWidth(LPCTSTR text, int length, const WebFontDescr { ASSERT(buffer); - String result = StringTruncator::rightTruncate(String(text, length), width, makeFont(description), false); + String result = StringTruncator::rightTruncate(String(text, length), width, makeFont(description)); memcpy(buffer, result.characters(), result.length() * sizeof(UChar)); buffer[result.length()] = '\0'; return result.length(); diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp index a85b23d..0fb8047 100644 --- a/Source/WebKit/win/WebView.cpp +++ b/Source/WebKit/win/WebView.cpp @@ -59,6 +59,7 @@ #include "WebPreferences.h" #include "WebScriptWorld.h" #include "WindowsTouch.h" +#include "resource.h" #include <JavaScriptCore/APICast.h> #include <JavaScriptCore/InitializeThreading.h> #include <JavaScriptCore/JSLock.h> @@ -98,7 +99,6 @@ #include <WebCore/IntRect.h> #include <WebCore/JSElement.h> #include <WebCore/KeyboardEvent.h> -#include <WebCore/Language.h> #include <WebCore/Logging.h> #include <WebCore/MIMETypeRegistry.h> #include <WebCore/Page.h> @@ -141,7 +141,7 @@ #include <CoreGraphics/CGContext.h> #endif -#if PLATFORM(CF) +#if USE(CF) #include <CoreFoundation/CoreFoundation.h> #endif @@ -1245,8 +1245,8 @@ bool WebView::canHandleRequest(const WebCore::ResourceRequest& request) String WebView::standardUserAgentWithApplicationName(const String& applicationName) { if (applicationName.isEmpty()) - return makeString("Mozilla/5.0 (Windows; U; ", osVersion(), "; ", defaultLanguage(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)"); - return makeString("Mozilla/5.0 (Windows; U; ", osVersion(), "; ", defaultLanguage(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName); + return makeString("Mozilla/5.0 (", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)"); + return makeString("Mozilla/5.0 (", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName); } Page* WebView::page() @@ -2362,40 +2362,11 @@ static String osVersion() static String webKitVersion() { - String versionStr = "420+"; - void* data = 0; - - struct LANGANDCODEPAGE { - WORD wLanguage; - WORD wCodePage; - } *lpTranslate; - - TCHAR path[MAX_PATH]; - GetModuleFileName(gInstance, path, WTF_ARRAY_LENGTH(path)); - DWORD handle; - DWORD versionSize = GetFileVersionInfoSize(path, &handle); - if (!versionSize) - goto exit; - data = malloc(versionSize); - if (!data) - goto exit; - if (!GetFileVersionInfo(path, 0, versionSize, data)) - goto exit; - UINT cbTranslate; - if (!VerQueryValue(data, TEXT("\\VarFileInfo\\Translation"), (LPVOID*)&lpTranslate, &cbTranslate)) - goto exit; - TCHAR key[256]; - _stprintf_s(key, WTF_ARRAY_LENGTH(key), TEXT("\\StringFileInfo\\%04x%04x\\ProductVersion"), lpTranslate[0].wLanguage, lpTranslate[0].wCodePage); - LPCTSTR productVersion; - UINT productVersionLength; - if (!VerQueryValue(data, (LPTSTR)(LPCTSTR)key, (void**)&productVersion, &productVersionLength)) - goto exit; - versionStr = String(productVersion, productVersionLength - 1); - -exit: - if (data) - free(data); - return versionStr; + LPWSTR buildNumberStringPtr; + if (!::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) || !buildNumberStringPtr) + return "534+"; + + return buildNumberStringPtr; } const String& WebView::userAgentForKURL(const KURL&) @@ -2611,7 +2582,7 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame( #endif WebKitSetApplicationCachePathIfNecessary(); WebPlatformStrategies::initialize(); - Settings::setMinDOMTimerInterval(0.004); + Settings::setDefaultMinDOMTimerInterval(0.004); didOneTimeInitialization = true; } @@ -5893,12 +5864,12 @@ HRESULT STDMETHODCALLTYPE WebView::globalHistoryItem(IWebHistoryItem** item) if (!m_page) return E_FAIL; - if (!m_page->globalHistoryItem()) { + if (!m_globalHistoryItem) { *item = 0; return S_OK; } - *item = WebHistoryItem::createInstance(m_page->globalHistoryItem()); + *item = WebHistoryItem::createInstance(m_globalHistoryItem); return S_OK; } @@ -6620,3 +6591,22 @@ Page* core(IWebView* iWebView) return page; } + +HRESULT WebView::defaultMinimumTimerInterval(double* interval) +{ + if (!interval) + return E_POINTER; + *interval = Settings::defaultMinDOMTimerInterval(); + return S_OK; +} + +HRESULT WebView::setMinimumTimerInterval(double interval) +{ + page()->settings()->setMinDOMTimerInterval(interval); + return S_OK; +} + +void WebView::setGlobalHistoryItem(HistoryItem* historyItem) +{ + m_globalHistoryItem = historyItem; +} diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h index ddfb6db..957f0a5 100644 --- a/Source/WebKit/win/WebView.h +++ b/Source/WebKit/win/WebView.h @@ -48,6 +48,10 @@ namespace WebCore { } #endif +namespace WebCore { + class HistoryItem; +} + class FullscreenVideoController; class WebBackForwardList; class WebFrame; @@ -813,6 +817,12 @@ public: virtual HRESULT STDMETHODCALLTYPE nextDisplayIsSynchronous(); + virtual HRESULT STDMETHODCALLTYPE defaultMinimumTimerInterval( + /* [retval][out] */ double *interval); + + virtual HRESULT STDMETHODCALLTYPE setMinimumTimerInterval( + /* [in] */ double); + // WebView bool shouldUseEmbeddedView(const WTF::String& mimeType) const; @@ -918,6 +928,8 @@ public: void setLastCursor(HCURSOR cursor) { m_lastSetCursor = cursor; } + void setGlobalHistoryItem(WebCore::HistoryItem*); + private: void setZoomMultiplier(float multiplier, bool isTextOnly); float zoomMultiplier(bool isTextOnly); @@ -1067,6 +1079,8 @@ protected: bool m_nextDisplayIsSynchronous; HCURSOR m_lastSetCursor; + + RefPtr<WebCore::HistoryItem> m_globalHistoryItem; }; #endif |