Commit b2127b75 authored by ap's avatar ap

2006-11-18 Don Gibson <dgibson77@gmail.com>

        Reviewed by Sam Weinig.

        http://bugs.webkit.org/show_bug.cgi?id=11634:
        Fix segfault on startup for Windows build.  Also fix segfault when
        typing in a URL.
        Clean up some of the style of the patch that landed in r17816.

WebCore:
        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * bridge/win/ChromeClientWin.h:
        (WebCore::ChromeClientWin::~ChromeClientWin):
        (WebCore::ChromeClientWin::ref):
        (WebCore::ChromeClientWin::deref):
        * bridge/win/ContextMenuClientWin.h:
        (WebCore::ContextMenuClientWin::~ContextMenuClientWin):
        (WebCore::ContextMenuClientWin::ref):
        (WebCore::ContextMenuClientWin::deref):
        * bridge/win/EditorClientWin.h:
        (WebCore::EditorClientWin::~EditorClientWin):
        (WebCore::EditorClientWin::ref):
        (WebCore::EditorClientWin::deref):
        * bridge/win/FrameWin.cpp:
        (WebCore::FrameWin::FrameWin):
        * bridge/win/FrameWin.h:
        (WebCore::Win):
        * loader/win/FrameLoaderClientWin.h: Added.
        (WebCore::FrameLoaderClientWin::~FrameLoaderClientWin):
        (WebCore::FrameLoaderClientWin::ref):
        (WebCore::FrameLoaderClientWin::deref):
        * platform/win/TemporaryLinkStubs.cpp:
        (WebCore::ChromeClientWin::createWindow):
        (WebCore::ChromeClientWin::createModalDialog):
        (WebCore::EditorClientWin::selectWordBeforeMenuEvent):
        (WebCore::EditorClientWin::isEditable):
        (WebCore::EditorClientWin::shouldBeginEditing):
        (WebCore::EditorClientWin::shouldEndEditing):
        (WebCore::EditorClientWin::shouldApplyStyle):
        (WebCore::EditorClientWin::didBeginEditing):
        (WebCore::EditorClientWin::respondToChangedContents):
        (WebCore::EditorClientWin::didEndEditing):
        (WebCore::EditorClientWin::registerCommandForUndo):
        (WebCore::EditorClientWin::registerCommandForRedo):
        (WebCore::EditorClientWin::clearUndoRedoOperations):
        (WebCore::EditorClientWin::canUndo):
        (WebCore::EditorClientWin::canRedo):
        (WebCore::EditorClientWin::undo):
        (WebCore::EditorClientWin::redo):
        (WebCore::FrameLoader::createFrame):
        (WebCore::FrameLoader::createPlugin):
        (WebCore::FrameLoaderClientWin::hasWebView):
        (WebCore::FrameLoaderClientWin::hasFrameView):
        (WebCore::FrameLoaderClientWin::hasBackForwardList):
        (WebCore::FrameLoaderClientWin::resetBackForwardList):
        (WebCore::FrameLoaderClientWin::provisionalItemIsTarget):
        (WebCore::FrameLoaderClientWin::loadProvisionalItemFromPageCache):
        (WebCore::FrameLoaderClientWin::invalidateCurrentItemPageCache):
        (WebCore::FrameLoaderClientWin::privateBrowsingEnabled):
        (WebCore::FrameLoaderClientWin::makeDocumentView):
        (WebCore::FrameLoaderClientWin::makeRepresentation):
        (WebCore::FrameLoaderClientWin::forceLayout):
        (WebCore::FrameLoaderClientWin::forceLayoutForNonHTML):
        (WebCore::FrameLoaderClientWin::updateHistoryForCommit):
        (WebCore::FrameLoaderClientWin::updateHistoryForBackForwardNavigation):
        (WebCore::FrameLoaderClientWin::updateHistoryForReload):
        (WebCore::FrameLoaderClientWin::updateHistoryForStandardLoad):
        (WebCore::FrameLoaderClientWin::updateHistoryForInternalLoad):
        (WebCore::FrameLoaderClientWin::updateHistoryAfterClientRedirect):
        (WebCore::FrameLoaderClientWin::setCopiesOnScroll):
        (WebCore::FrameLoaderClientWin::tokenForLoadErrorReset):
        (WebCore::FrameLoaderClientWin::resetAfterLoadError):
        (WebCore::FrameLoaderClientWin::doNotResetAfterLoadError):
        (WebCore::FrameLoaderClientWin::willCloseDocument):
        (WebCore::FrameLoaderClientWin::detachedFromParent1):
        (WebCore::FrameLoaderClientWin::detachedFromParent2):
        (WebCore::FrameLoaderClientWin::detachedFromParent3):
        (WebCore::FrameLoaderClientWin::detachedFromParent4):
        (WebCore::FrameLoaderClientWin::loadedFromPageCache):
        (WebCore::FrameLoaderClientWin::dispatchDidHandleOnloadEvents):
        (WebCore::FrameLoaderClientWin::dispatchDidReceiveServerRedirectForProvisionalLoad):
        (WebCore::FrameLoaderClientWin::dispatchDidCancelClientRedirect):
        (WebCore::FrameLoaderClientWin::dispatchWillPerformClientRedirect):
        (WebCore::FrameLoaderClientWin::dispatchDidChangeLocationWithinPage):
        (WebCore::FrameLoaderClientWin::dispatchWillClose):
        (WebCore::FrameLoaderClientWin::dispatchDidReceiveIcon):
        (WebCore::FrameLoaderClientWin::dispatchDidStartProvisionalLoad):
        (WebCore::FrameLoaderClientWin::dispatchDidReceiveTitle):
        (WebCore::FrameLoaderClientWin::dispatchDidCommitLoad):
        (WebCore::FrameLoaderClientWin::dispatchDidFinishLoad):
        (WebCore::FrameLoaderClientWin::dispatchDidFirstLayout):
        (WebCore::FrameLoaderClientWin::dispatchShow):
        (WebCore::FrameLoaderClientWin::cancelPolicyCheck):
        (WebCore::FrameLoaderClientWin::dispatchWillSubmitForm):
        (WebCore::FrameLoaderClientWin::dispatchDidLoadMainResource):
        (WebCore::FrameLoaderClientWin::clearLoadingFromPageCache):
        (WebCore::FrameLoaderClientWin::isLoadingFromPageCache):
        (WebCore::FrameLoaderClientWin::revertToProvisionalState):
        (WebCore::FrameLoaderClientWin::clearUnarchivingState):
        (WebCore::FrameLoaderClientWin::progressStarted):
        (WebCore::FrameLoaderClientWin::progressCompleted):
        (WebCore::FrameLoaderClientWin::setMainFrameDocumentReady):
        (WebCore::FrameLoaderClientWin::willChangeTitle):
        (WebCore::FrameLoaderClientWin::didChangeTitle):
        (WebCore::FrameLoaderClientWin::finishedLoading):
        (WebCore::FrameLoaderClientWin::finalSetupForReplace):
        (WebCore::FrameLoaderClientWin::setDefersLoading):
        (WebCore::FrameLoaderClientWin::isArchiveLoadPending):
        (WebCore::FrameLoaderClientWin::cancelPendingArchiveLoad):
        (WebCore::FrameLoaderClientWin::clearArchivedResources):
        (WebCore::FrameLoaderClientWin::canShowMIMEType):
        (WebCore::FrameLoaderClientWin::representationExistsForURLScheme):
        (WebCore::FrameLoaderClientWin::generatedMIMETypeForURLScheme):
        (WebCore::FrameLoaderClientWin::frameLoadCompleted):
        (WebCore::FrameLoaderClientWin::restoreScrollPositionAndViewState):
        (WebCore::FrameLoaderClientWin::provisionalLoadStarted):
        (WebCore::FrameLoaderClientWin::shouldTreatURLAsSameAsCurrent):
        (WebCore::FrameLoaderClientWin::addHistoryItemForFragmentScroll):
        (WebCore::FrameLoaderClientWin::didFinishLoad):
        (WebCore::FrameLoaderClientWin::prepareForDataSourceReplacement):
        (WebCore::FrameLoaderClientWin::setTitle):
        (WebCore::FrameLoaderClientWin::userAgent):

WebKit:
        * COM/WebFrame.cpp:
        (WebFrame::initWithName):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 88d5ca47
2006-11-18 Don Gibson <dgibson77@gmail.com>
Reviewed by Sam Weinig.
http://bugs.webkit.org/show_bug.cgi?id=11634:
Fix segfault on startup for Windows build. Also fix segfault when
typing in a URL.
Clean up some of the style of the patch that landed in r17816.
* WebCore.vcproj/WebCore/WebCore.vcproj:
* bridge/win/ChromeClientWin.h:
(WebCore::ChromeClientWin::~ChromeClientWin):
(WebCore::ChromeClientWin::ref):
(WebCore::ChromeClientWin::deref):
* bridge/win/ContextMenuClientWin.h:
(WebCore::ContextMenuClientWin::~ContextMenuClientWin):
(WebCore::ContextMenuClientWin::ref):
(WebCore::ContextMenuClientWin::deref):
* bridge/win/EditorClientWin.h:
(WebCore::EditorClientWin::~EditorClientWin):
(WebCore::EditorClientWin::ref):
(WebCore::EditorClientWin::deref):
* bridge/win/FrameWin.cpp:
(WebCore::FrameWin::FrameWin):
* bridge/win/FrameWin.h:
(WebCore::Win):
* loader/win/FrameLoaderClientWin.h: Added.
(WebCore::FrameLoaderClientWin::~FrameLoaderClientWin):
(WebCore::FrameLoaderClientWin::ref):
(WebCore::FrameLoaderClientWin::deref):
* platform/win/TemporaryLinkStubs.cpp:
(WebCore::ChromeClientWin::createWindow):
(WebCore::ChromeClientWin::createModalDialog):
(WebCore::EditorClientWin::selectWordBeforeMenuEvent):
(WebCore::EditorClientWin::isEditable):
(WebCore::EditorClientWin::shouldBeginEditing):
(WebCore::EditorClientWin::shouldEndEditing):
(WebCore::EditorClientWin::shouldApplyStyle):
(WebCore::EditorClientWin::didBeginEditing):
(WebCore::EditorClientWin::respondToChangedContents):
(WebCore::EditorClientWin::didEndEditing):
(WebCore::EditorClientWin::registerCommandForUndo):
(WebCore::EditorClientWin::registerCommandForRedo):
(WebCore::EditorClientWin::clearUndoRedoOperations):
(WebCore::EditorClientWin::canUndo):
(WebCore::EditorClientWin::canRedo):
(WebCore::EditorClientWin::undo):
(WebCore::EditorClientWin::redo):
(WebCore::FrameLoader::createFrame):
(WebCore::FrameLoader::createPlugin):
(WebCore::FrameLoaderClientWin::hasWebView):
(WebCore::FrameLoaderClientWin::hasFrameView):
(WebCore::FrameLoaderClientWin::hasBackForwardList):
(WebCore::FrameLoaderClientWin::resetBackForwardList):
(WebCore::FrameLoaderClientWin::provisionalItemIsTarget):
(WebCore::FrameLoaderClientWin::loadProvisionalItemFromPageCache):
(WebCore::FrameLoaderClientWin::invalidateCurrentItemPageCache):
(WebCore::FrameLoaderClientWin::privateBrowsingEnabled):
(WebCore::FrameLoaderClientWin::makeDocumentView):
(WebCore::FrameLoaderClientWin::makeRepresentation):
(WebCore::FrameLoaderClientWin::forceLayout):
(WebCore::FrameLoaderClientWin::forceLayoutForNonHTML):
(WebCore::FrameLoaderClientWin::updateHistoryForCommit):
(WebCore::FrameLoaderClientWin::updateHistoryForBackForwardNavigation):
(WebCore::FrameLoaderClientWin::updateHistoryForReload):
(WebCore::FrameLoaderClientWin::updateHistoryForStandardLoad):
(WebCore::FrameLoaderClientWin::updateHistoryForInternalLoad):
(WebCore::FrameLoaderClientWin::updateHistoryAfterClientRedirect):
(WebCore::FrameLoaderClientWin::setCopiesOnScroll):
(WebCore::FrameLoaderClientWin::tokenForLoadErrorReset):
(WebCore::FrameLoaderClientWin::resetAfterLoadError):
(WebCore::FrameLoaderClientWin::doNotResetAfterLoadError):
(WebCore::FrameLoaderClientWin::willCloseDocument):
(WebCore::FrameLoaderClientWin::detachedFromParent1):
(WebCore::FrameLoaderClientWin::detachedFromParent2):
(WebCore::FrameLoaderClientWin::detachedFromParent3):
(WebCore::FrameLoaderClientWin::detachedFromParent4):
(WebCore::FrameLoaderClientWin::loadedFromPageCache):
(WebCore::FrameLoaderClientWin::dispatchDidHandleOnloadEvents):
(WebCore::FrameLoaderClientWin::dispatchDidReceiveServerRedirectForProvisionalLoad):
(WebCore::FrameLoaderClientWin::dispatchDidCancelClientRedirect):
(WebCore::FrameLoaderClientWin::dispatchWillPerformClientRedirect):
(WebCore::FrameLoaderClientWin::dispatchDidChangeLocationWithinPage):
(WebCore::FrameLoaderClientWin::dispatchWillClose):
(WebCore::FrameLoaderClientWin::dispatchDidReceiveIcon):
(WebCore::FrameLoaderClientWin::dispatchDidStartProvisionalLoad):
(WebCore::FrameLoaderClientWin::dispatchDidReceiveTitle):
(WebCore::FrameLoaderClientWin::dispatchDidCommitLoad):
(WebCore::FrameLoaderClientWin::dispatchDidFinishLoad):
(WebCore::FrameLoaderClientWin::dispatchDidFirstLayout):
(WebCore::FrameLoaderClientWin::dispatchShow):
(WebCore::FrameLoaderClientWin::cancelPolicyCheck):
(WebCore::FrameLoaderClientWin::dispatchWillSubmitForm):
(WebCore::FrameLoaderClientWin::dispatchDidLoadMainResource):
(WebCore::FrameLoaderClientWin::clearLoadingFromPageCache):
(WebCore::FrameLoaderClientWin::isLoadingFromPageCache):
(WebCore::FrameLoaderClientWin::revertToProvisionalState):
(WebCore::FrameLoaderClientWin::clearUnarchivingState):
(WebCore::FrameLoaderClientWin::progressStarted):
(WebCore::FrameLoaderClientWin::progressCompleted):
(WebCore::FrameLoaderClientWin::setMainFrameDocumentReady):
(WebCore::FrameLoaderClientWin::willChangeTitle):
(WebCore::FrameLoaderClientWin::didChangeTitle):
(WebCore::FrameLoaderClientWin::finishedLoading):
(WebCore::FrameLoaderClientWin::finalSetupForReplace):
(WebCore::FrameLoaderClientWin::setDefersLoading):
(WebCore::FrameLoaderClientWin::isArchiveLoadPending):
(WebCore::FrameLoaderClientWin::cancelPendingArchiveLoad):
(WebCore::FrameLoaderClientWin::clearArchivedResources):
(WebCore::FrameLoaderClientWin::canShowMIMEType):
(WebCore::FrameLoaderClientWin::representationExistsForURLScheme):
(WebCore::FrameLoaderClientWin::generatedMIMETypeForURLScheme):
(WebCore::FrameLoaderClientWin::frameLoadCompleted):
(WebCore::FrameLoaderClientWin::restoreScrollPositionAndViewState):
(WebCore::FrameLoaderClientWin::provisionalLoadStarted):
(WebCore::FrameLoaderClientWin::shouldTreatURLAsSameAsCurrent):
(WebCore::FrameLoaderClientWin::addHistoryItemForFragmentScroll):
(WebCore::FrameLoaderClientWin::didFinishLoad):
(WebCore::FrameLoaderClientWin::prepareForDataSourceReplacement):
(WebCore::FrameLoaderClientWin::setTitle):
(WebCore::FrameLoaderClientWin::userAgent):
2006-11-18 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Rob (yay!).
......@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\ksvg2\misc&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\loader\icon&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\platform\network&quot;;&quot;$(ProjectDir)\..\..\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\ksvg2\misc&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\loader\icon&quot;;&quot;$(ProjectDir)\..\..\loader\win&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\platform\network&quot;;&quot;$(ProjectDir)\..\..\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;"
PreprocessorDefinitions="WIN32;XSLT_SUPPORT;XPATH_SUPPORT"
MinimalRebuild="true"
ExceptionHandling="0"
......@@ -108,7 +108,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\ksvg2\misc&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\loader\icon&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\platform\network&quot;;&quot;$(ProjectDir)\..\..\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\ksvg2\misc&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\loader\icon&quot;;&quot;$(ProjectDir)\..\..\loader\win&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\platform\graphics\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\platform\network&quot;;&quot;$(ProjectDir)\..\..\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;"
PreprocessorDefinitions="WIN32;XSLT_SUPPORT;XPATH_SUPPORT;NDEBUG"
ExceptionHandling="0"
RuntimeLibrary="2"
......@@ -1234,6 +1234,14 @@
>
</File>
</Filter>
<Filter
Name="win"
>
<File
RelativePath="..\..\loader\win\FrameLoaderClientWin.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="platform"
......
......@@ -32,44 +32,44 @@
namespace WebCore {
class ChromeClientWin : public ChromeClient, public Shared<ChromeClientWin> {
public:
virtual ~ChromeClientWin() { }
class ChromeClientWin : public ChromeClient, public Shared<ChromeClientWin> {
public:
virtual ~ChromeClientWin() { }
virtual void ref() { Shared<ChromeClientWin>::ref(); }
virtual void deref() { Shared<ChromeClientWin>::deref(); }
virtual void ref() { Shared<ChromeClientWin>::ref(); }
virtual void deref() { Shared<ChromeClientWin>::deref(); }
virtual void setWindowRect(const FloatRect&);
virtual FloatRect windowRect();
virtual void setWindowRect(const FloatRect&);
virtual FloatRect windowRect();
virtual FloatRect pageRect();
virtual FloatRect pageRect();
virtual float scaleFactor();
virtual float scaleFactor();
virtual void focus();
virtual void unfocus();
virtual void focus();
virtual void unfocus();
virtual Page* createWindow(const FrameLoadRequest&);
virtual Page* createModalDialog(const FrameLoadRequest&);
virtual void show();
virtual Page* createWindow(const FrameLoadRequest&);
virtual Page* createModalDialog(const FrameLoadRequest&);
virtual void show();
virtual bool canRunModal();
virtual void runModal();
virtual bool canRunModal();
virtual void runModal();
virtual void setToolbarsVisible(bool);
virtual bool toolbarsVisible();
virtual void setToolbarsVisible(bool);
virtual bool toolbarsVisible();
virtual void setStatusbarVisible(bool);
virtual bool statusbarVisible();
virtual void setStatusbarVisible(bool);
virtual bool statusbarVisible();
virtual void setScrollbarsVisible(bool);
virtual bool scrollbarsVisible();
virtual void setScrollbarsVisible(bool);
virtual bool scrollbarsVisible();
virtual void setMenubarVisible(bool);
virtual bool menubarVisible();
virtual void setMenubarVisible(bool);
virtual bool menubarVisible();
virtual void setResizable(bool);
};
virtual void setResizable(bool);
};
}
......
......@@ -32,15 +32,15 @@
namespace WebCore {
class ContextMenuClientWin : public ContextMenuClient, public Shared<ContextMenuClientWin> {
public:
virtual ~ContextMenuClientWin() { }
class ContextMenuClientWin : public ContextMenuClient, public Shared<ContextMenuClientWin> {
public:
virtual ~ContextMenuClientWin() { }
virtual void ref() { Shared<ContextMenuClientWin>::ref(); }
virtual void deref() { Shared<ContextMenuClientWin>::deref(); }
virtual void ref() { Shared<ContextMenuClientWin>::ref(); }
virtual void deref() { Shared<ContextMenuClientWin>::deref(); }
virtual void addCustomContextMenuItems(ContextMenu*);
};
virtual void addCustomContextMenuItems(ContextMenu*);
};
}
......
......@@ -32,17 +32,41 @@
namespace WebCore {
class EditorClientWin : public EditorClient {
public:
virtual ~EditorClientWin() { }
class EditorClientWin : public EditorClient, public Shared<EditorClientWin> {
public:
virtual ~EditorClientWin() { }
virtual bool shouldDeleteRange(Range*);
virtual bool shouldShowDeleteInterface(HTMLElement*);
virtual void ref() { Shared<EditorClientWin>::ref(); }
virtual void deref() { Shared<EditorClientWin>::deref(); }
virtual bool isContinuousSpellCheckingEnabled();
virtual bool isGrammarCheckingEnabled();
virtual int spellCheckerDocumentTag();
};
virtual bool shouldDeleteRange(Range*);
virtual bool shouldShowDeleteInterface(HTMLElement*);
virtual bool isContinuousSpellCheckingEnabled();
virtual bool isGrammarCheckingEnabled();
virtual int spellCheckerDocumentTag();
virtual bool selectWordBeforeMenuEvent();
virtual bool isEditable();
virtual bool shouldBeginEditing(Range*);
virtual bool shouldEndEditing(Range*);
virtual bool shouldApplyStyle(CSSStyleDeclaration*, Range*);
virtual void didBeginEditing();
virtual void respondToChangedContents();
virtual void didEndEditing();
virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
virtual void clearUndoRedoOperations();
virtual bool canUndo() const;
virtual bool canRedo() const;
virtual void undo();
virtual void redo();
};
}
......
......@@ -31,6 +31,7 @@
#include "Document.h"
#include "EditorClient.h"
#include "FrameLoader.h"
#include "FrameLoaderClientWin.h"
#include "FrameLoadRequest.h"
#include "FramePrivate.h"
#include "FrameView.h"
......@@ -57,6 +58,9 @@ FrameWin::FrameWin(Page* page, Element* ownerElement, PassRefPtr<EditorClient>
settings->setStdFontName("Times New Roman");
settings->setIsJavaScriptEnabled(true);
setSettings(settings);
// FIXME: rework once FrameLoaderClientWin is even close to working
loader()->setClient(new FrameLoaderClientWin());
}
FrameWin::~FrameWin()
......
......@@ -31,93 +31,93 @@
namespace WebCore {
class FormData;
class FrameLoadRequest;
class ResourceRequest;
struct WindowFeatures;
class FrameWinClient {
public:
virtual void createNewWindow(const ResourceRequest&, const WindowFeatures&, Frame*& newFrame) = 0;
virtual void openURL(const DeprecatedString&, bool lockHistory) = 0;
virtual void submitForm(const String& method, const KURL&, const FormData*) = 0;
virtual void setTitle(const String& title) = 0;
virtual void setStatusText(const String& statusText) = 0;
};
class FrameWin : public Frame {
public:
FrameWin(Page*, Element*, PassRefPtr<EditorClient>, FrameWinClient*);
virtual ~FrameWin();
virtual void createNewWindow(const FrameLoadRequest&, const WindowFeatures&, Frame*& part);
virtual void scheduleClose();
virtual void focusWindow();
virtual void unfocusWindow();
virtual void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID);
virtual void runJavaScriptAlert(const String& message);
virtual bool runJavaScriptConfirm(const String& message);
virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result);
virtual bool shouldInterruptJavaScript();
virtual bool locationbarVisible();
virtual bool menubarVisible();
virtual bool personalbarVisible();
virtual bool statusbarVisible();
virtual bool toolbarVisible();
virtual Range* markedTextRange() const;
virtual String mimeTypeForFileName(const String&) const;
virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
virtual void markMisspellings(const Selection&);
virtual bool lastEventIsMouseUp() const;
virtual bool passSubframeEventToSubframe(MouseEventWithHitTestResults &, Frame* subframePart = 0);
virtual bool passWheelEventToChildWidget(Node*);
virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
virtual KJS::Bindings::RootObject* bindingRootObject();
virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
virtual void clearUndoRedoOperations();
virtual void issueUndoCommand();
virtual void issueRedoCommand();
virtual void issueCutCommand();
virtual void issueCopyCommand();
virtual void issuePasteCommand();
virtual void issuePasteAndMatchStyleCommand();
virtual void issueTransposeCommand();
virtual void respondToChangedSelection(const Selection& oldSelection, bool closeTyping);
virtual void respondToChangedContents(const Selection& endingSelection);
virtual bool shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity affinity, bool stillSelecting) const;
virtual bool canPaste() const;
virtual bool canRedo() const;
virtual bool canUndo() const;
virtual void print();
virtual bool keyPress(const PlatformKeyboardEvent&);
protected:
virtual bool isLoadTypeReload();
private:
virtual bool passMouseDownEventToWidget(Widget*);
FrameWinClient* m_client;
};
inline FrameWin* Win(Frame* frame) { return static_cast<FrameWin*>(frame); }
inline const FrameWin* Win(const Frame* frame) { return static_cast<const FrameWin*>(frame); }
class FormData;
class FrameLoadRequest;
class ResourceRequest;
struct WindowFeatures;
class FrameWinClient {
public:
virtual void createNewWindow(const ResourceRequest&, const WindowFeatures&, Frame*& newFrame) = 0;
virtual void openURL(const DeprecatedString&, bool lockHistory) = 0;
virtual void submitForm(const String& method, const KURL&, const FormData*) = 0;
virtual void setTitle(const String& title) = 0;
virtual void setStatusText(const String& statusText) = 0;
};
class FrameWin : public Frame {
public:
FrameWin(Page*, Element*, PassRefPtr<EditorClient>, FrameWinClient*);
virtual ~FrameWin();
virtual void createNewWindow(const FrameLoadRequest&, const WindowFeatures&, Frame*& part);
virtual void scheduleClose();
virtual void focusWindow();
virtual void unfocusWindow();
virtual void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID);
virtual void runJavaScriptAlert(const String& message);
virtual bool runJavaScriptConfirm(const String& message);
virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result);
virtual bool shouldInterruptJavaScript();
virtual bool locationbarVisible();
virtual bool menubarVisible();
virtual bool personalbarVisible();
virtual bool statusbarVisible();
virtual bool toolbarVisible();
virtual Range* markedTextRange() const;
virtual String mimeTypeForFileName(const String&) const;
virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
virtual void markMisspellings(const Selection&);
virtual bool lastEventIsMouseUp() const;
virtual bool passSubframeEventToSubframe(MouseEventWithHitTestResults &, Frame* subframePart = 0);
virtual bool passWheelEventToChildWidget(Node*);
virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
virtual KJS::Bindings::RootObject* bindingRootObject();
virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
virtual void clearUndoRedoOperations();
virtual void issueUndoCommand();
virtual void issueRedoCommand();
virtual void issueCutCommand();
virtual void issueCopyCommand();
virtual void issuePasteCommand();
virtual void issuePasteAndMatchStyleCommand();
virtual void issueTransposeCommand();
virtual void respondToChangedSelection(const Selection& oldSelection, bool closeTyping);
virtual void respondToChangedContents(const Selection& endingSelection);
virtual bool shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity affinity, bool stillSelecting) const;
virtual bool canPaste() const;
virtual bool canRedo() const;
virtual bool canUndo() const;
virtual void print();
virtual bool keyPress(const PlatformKeyboardEvent&);
protected:
virtual bool isLoadTypeReload();
private:
virtual bool passMouseDownEventToWidget(Widget*);
FrameWinClient* m_client;
};
inline FrameWin* Win(Frame* frame) { return static_cast<FrameWin*>(frame); }
inline const FrameWin* Win(const Frame* frame) { return static_cast<const FrameWin*>(frame); }
} // namespace WebCore
......
/*
* Copyright (C) 2006 Don Gibson <dgibson77@gmail.com>
*
* 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 FrameLoaderClientWin_H
#define FrameLoaderClientWin_H
#include "FrameLoaderClient.h"
namespace WebCore {
class FrameLoaderClientWin : public FrameLoaderClient, public Shared<FrameLoaderClientWin> {
public:
virtual ~FrameLoaderClientWin() { }
virtual void ref() { Shared<FrameLoaderClientWin>::ref(); }
virtual void deref() { Shared<FrameLoaderClientWin>::deref(); }
virtual bool hasWebView() const;
virtual bool hasFrameView() const;
virtual bool hasBackForwardList() const;
virtual void resetBackForwardList();
virtual bool provisionalItemIsTarget() const;
virtual bool loadProvisionalItemFromPageCache();
virtual void invalidateCurrentItemPageCache();
virtual bool privateBrowsingEnabled() const;
virtual void makeDocumentView();
virtual void makeRepresentation(DocumentLoader*);
virtual void forceLayout();
virtual void forceLayoutForNonHTML();
virtual void updateHistoryForCommit();
virtual void updateHistoryForBackForwardNavigation();
virtual void updateHistoryForReload();
virtual void updateHistoryForStandardLoad();
virtual void updateHistoryForInternalLoad();
virtual void updateHistoryAfterClientRedirect();
virtual void setCopiesOnScroll();
virtual LoadErrorResetToken* tokenForLoadErrorReset();
virtual void resetAfterLoadError(LoadErrorResetToken*);
virtual void doNotResetAfterLoadError(LoadErrorResetToken*);
virtual void willCloseDocument();
virtual void detachedFromParent1();
virtual void detachedFromParent2();
virtual void detachedFromParent3();
virtual void detachedFromParent4();
virtual void loadedFromPageCache();
virtual void dispatchDidHandleOnloadEvents();
virtual void dispatchDidReceiveServerRedirectForProvisionalLoad();
virtual void dispatchDidCancelClientRedirect();
virtual void dispatchWillPerformClientRedirect(const KURL&, double, double);
virtual void dispatchDidChangeLocationWithinPage();
virtual void dispatchWillClose();
virtual void dispatchDidReceiveIcon();
virtual void dispatchDidStartProvisionalLoad();
virtual void dispatchDidReceiveTitle(const String&);
virtual void dispatchDidCommitLoad();
virtual void dispatchDidFinishLoad();
virtual void dispatchDidFirstLayout();
virtual void dispatchShow();
virtual void cancelPolicyCheck();
virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>);
virtual void dispatchDidLoadMainResource(DocumentLoader*);
virtual void clearLoadingFromPageCache(DocumentLoader*);
virtual bool isLoadingFromPageCache(DocumentLoader*);
virtual void revertToProvisionalState(DocumentLoader*);
virtual void clearUnarchivingState(DocumentLoader*);
virtual void progressStarted();
virtual void progressCompleted();
virtual void setMainFrameDocumentReady(bool);
virtual void willChangeTitle(DocumentLoader*);
virtual void didChangeTitle(DocumentLoader*);
virtual void finishedLoading(DocumentLoader*);
virtual void finalSetupForReplace(DocumentLoader*);
virtual void setDefersLoading(bool);
virtual bool isArchiveLoadPending(ResourceLoader*) const;
virtual void cancelPendingArchiveLoad(ResourceLoader*);
virtual void clearArchivedResources();
virtual bool canShowMIMEType(const String&) const;
virtual bool representationExistsForURLScheme(const String&) const;
virtual String generatedMIMETypeForURLScheme(const String&) const;
virtual void frameLoadCompleted();
virtual void restoreScrollPositionAndViewState();
virtual void provisionalLoadStarted();
virtual bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
virtual void addHistoryItemForFragmentScroll();
virtual void didFinishLoad();
virtual void prepareForDataSourceReplacement();
virtual void setTitle(const String& title, const KURL&);
virtual String userAgent();
};
}
#endif // FrameLoaderClientWin_H
This diff is collapsed.
......@@ -28,29 +28,29 @@
#include "WebKitDLL.h"
#include "IWebURLResponse.h"
#include "WebMutableURLRequest.h"
#include "WebFrame.h"
#include "WebView.h"
#include "WebDataSource.h"
#include "WebFrame.h"
#include "WebHistoryItem.h"
#include "WebMutableURLRequest.h"
#include "WebView.h"
#pragma warning( push, 0 )
#include "Cache.h"