2006-11-16 Don Gibson <dgibson77@gmail.com>
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Nov 2006 20:32:21 +0000 (20:32 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Nov 2006 20:32:21 +0000 (20:32 +0000)
        Reviewed and landed by ap.

        http://bugs.webkit.org/show_bug.cgi?id=11509:
        Windows build bustage.

        Also reorganizes WebCore.vcproj to add files whose absence wasn't
        causing compile errors, but which should have been there, and to
        make the include directory ordering (and contents) sane.
        Also reorganizes TemporaryLinkStubs.cpp to put headers and
        function groups in alphabetical order, and ensure that all functions
        in the file call notImplemented().

WebCore:
        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * bridge/win/ChromeClientWin.h:
        (WebCore::ChromeClientWin::ref):
        (WebCore::ChromeClientWin::deref):
        * bridge/win/ContextMenuClientWin.h: Added.
        (WebCore::ContextMenuClientWin::~ContextMenuClientWin):
        (WebCore::ContextMenuClientWin::ref):
        (WebCore::ContextMenuClientWin::deref):
        * bridge/win/EditorClientWin.h:
        * bridge/win/FrameWin.cpp:
        (WebCore::FrameWin::~FrameWin):
        (WebCore::FrameWin::keyPress):
        * bridge/win/FrameWin.h:
        * bridge/win/PageWin.cpp: Removed.
        * editing/EditCommand.h:
        * loader/FormState.h:
        * loader/FrameLoader.h:
        * page/EventHandler.cpp:
        * platform/MimeTypeRegistry.cpp:
        (WebCore::initialiseSupportedImageMIMETypes):
        * platform/graphics/win/ImageWin.cpp:
        * platform/network/ResourceError.cpp:
        * platform/network/ResourceHandleInternal.h:
        * platform/network/win/ResourceHandleWin.cpp:
        (WebCore::ResourceHandle::onHandleCreated):
        (WebCore::ResourceHandle::onRequestRedirected):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::cancel):
        * platform/win/ScreenWin.cpp:
        (WebCore::monitorInfo):
        (WebCore::screenRect):
        (WebCore::screenAvailableRect):
        (WebCore::screenDepth):
        * platform/win/SoundWin.cpp: Added.
        (WebCore::systemBeep):
        * platform/win/TemporaryLinkStubs.cpp:
        (WebCore::CacheObjectExpiresTime):
        (WebCore::CheckCacheObjectStatus):
        (WebCore::CheckIfReloading):
        (WebCore::defaultLanguage):
        (WebCore::fileButtonChooseFileLabel):
        (WebCore::fileButtonNoFileSelectedLabel):
        (WebCore::findNextSentenceFromIndex):
        (WebCore::findNextWordFromIndex):
        (WebCore::findSentenceBoundary):
        (WebCore::findWordBoundary):
        (WebCore::focusRingColor):
        (WebCore::historyContains):
        (WebCore::inputElementAltText):
        (WebCore::IsResponseURLEqualToURL):
        (WebCore::cellCursor):
        (WebCore::contextMenuCursor):
        (WebCore::moveCursor):
        (WebCore::verticalTextCursor):
        (WebCore::refreshPlugins):
        (WebCore::resetButtonDefaultLabel):
        (WebCore::ResponseIsMultipart):
        (WebCore::ResponseMIMEType):
        (WebCore::ResponseURL):
        (WebCore::screenDepthPerComponent):
        (WebCore::screenIsMonochrome):
        (WebCore::searchableIndexIntroduction):
        (WebCore::ServeSynchronousRequest):
        (WebCore::setFocusRingColorChangeFunction):
        (WebCore::submitButtonDefaultLabel):
        (WebCore::CachedResource::setPlatformResponse):
        (WebCore::CachedResource::setAllData):
        (WebCore::ChromeClientWin::setWindowRect):
        (WebCore::ChromeClientWin::windowRect):
        (WebCore::ChromeClientWin::pageRect):
        (WebCore::ChromeClientWin::scaleFactor):
        (WebCore::ChromeClientWin::focus):
        (WebCore::ChromeClientWin::unfocus):
        (WebCore::ChromeClientWin::createWindow):
        (WebCore::ChromeClientWin::createModalDialog):
        (WebCore::ChromeClientWin::show):
        (WebCore::ChromeClientWin::canRunModal):
        (WebCore::ChromeClientWin::runModal):
        (WebCore::ChromeClientWin::setToolbarsVisible):
        (WebCore::ChromeClientWin::toolbarsVisible):
        (WebCore::ChromeClientWin::setStatusbarVisible):
        (WebCore::ChromeClientWin::statusbarVisible):
        (WebCore::ChromeClientWin::setScrollbarsVisible):
        (WebCore::ChromeClientWin::scrollbarsVisible):
        (WebCore::ChromeClientWin::setMenubarVisible):
        (WebCore::ChromeClientWin::menubarVisible):
        (WebCore::ChromeClientWin::setResizable):
        (WebCore::ContextMenu::appendItem):
        (WebCore::ContextMenuClientWin::addCustomContextMenuItems):
        (WebCore::DocumentLoader::setFrame):
        (WebCore::DocumentLoader::frameLoader):
        (WebCore::DocumentLoader::URL):
        (WebCore::DocumentLoader::isStopping):
        (WebCore::DocumentLoader::stopLoading):
        (WebCore::DocumentLoader::setLoading):
        (WebCore::DocumentLoader::updateLoading):
        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
        (WebCore::DocumentLoader::isLoadingInAPISense):
        (WebCore::DocumentLoader::stopRecordingResponses):
        (WebCore::EditorClientWin::shouldDeleteRange):
        (WebCore::EditorClientWin::shouldShowDeleteInterface):
        (WebCore::EditorClientWin::isContinuousSpellCheckingEnabled):
        (WebCore::EditorClientWin::isGrammarCheckingEnabled):
        (WebCore::EditorClientWin::spellCheckerDocumentTag):
        (WebCore::EventHandler::focusDocumentView):
        (WebCore::EventHandler::handleDrag):
        (WebCore::EventHandler::handleMouseUp):
        (WebCore::EventHandler::lastEventIsMouseUp):
        (WebCore::EventHandler::passMousePressEventToSubframe):
        (WebCore::EventHandler::passMouseMoveEventToSubframe):
        (WebCore::EventHandler::passMouseReleaseEventToSubframe):
        (WebCore::EventHandler::passWheelEventToSubframe):
        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
        (WebCore::EventHandler::passMousePressEventToScrollbar):
        (WebCore::EventHandler::shouldDragAutoNode):
        (WebCore::EventHandler::tabsToAllControls):
        (WebCore::EventHandler::tabsToLinks):
        (WebCore::Frame::setNeedsReapplyStyles):
        (WebCore::FrameLoader::didFirstLayout):
        (WebCore::FrameLoader::overrideMediaType):
        (WebCore::FrameLoader::createJavaAppletWidget):
        (WebCore::FrameLoader::redirectDataToPlugin):
        (WebCore::FrameLoader::getHistoryLength):
        (WebCore::FrameLoader::setTitle):
        (WebCore::FrameLoader::referrer):
        (WebCore::FrameLoader::saveDocumentState):
        (WebCore::FrameLoader::restoreDocumentState):
        (WebCore::FrameLoader::goBackOrForward):
        (WebCore::FrameLoader::historyURL):
        (WebCore::FrameLoader::urlSelected):
        (WebCore::FrameLoader::createFrame):
        (WebCore::FrameLoader::submitForm):
        (WebCore::FrameLoader::partClearedInBegin):
        (WebCore::FrameLoader::originalRequestURL):
        (WebCore::FrameLoader::canGoBackOrForward):
        (WebCore::FrameLoader::objectContentType):
        (WebCore::FrameLoader::createPlugin):
        (WebCore::FrameLoader::detachFromParent):
        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
        (WebCore::FrameView::updateBorder):
        (WebCore::FrameWin::bindingRootObject):
        (WebCore::FrameWin::canPaste):
        (WebCore::FrameWin::issuePasteAndMatchStyleCommand):
        (WebCore::FrameWin::markedTextRange):
        (WebCore::FrameWin::passSubframeEventToSubframe):
        (WebCore::FrameWin::lastEventIsMouseUp):
        (WebCore::FrameWin::addMessageToConsole):
        (WebCore::FrameWin::shouldChangeSelection):
        (WebCore::FrameWin::respondToChangedSelection):
        (WebCore::FrameWin::clearUndoRedoOperations):
        (WebCore::FrameWin::markMisspellingsInAdjacentWords):
        (WebCore::FrameWin::respondToChangedContents):
        (WebCore::GraphicsContext::addRoundedRectClip):
        (WebCore::GraphicsContext::setShadow):
        (WebCore::GraphicsContext::clearShadow):
        (WebCore::GraphicsContext::beginTransparencyLayer):
        (WebCore::GraphicsContext::endTransparencyLayer):
        (WebCore::GraphicsContext::clearRect):
        (WebCore::GraphicsContext::strokeRect):
        (WebCore::GraphicsContext::setLineWidth):
        (WebCore::GraphicsContext::setLineCap):
        (WebCore::GraphicsContext::setLineJoin):
        (WebCore::GraphicsContext::setMiterLimit):
        (WebCore::GraphicsContext::setAlpha):
        (WebCore::GraphicsContext::setCompositeOperation):
        (WebCore::GraphicsContext::clip):
        (WebCore::GraphicsContext::rotate):
        (WebCore::GraphicsContext::scale):
        (WebCore::Icon::Icon):
        (WebCore::Icon::~Icon):
        (WebCore::Icon::newIconForFile):
        (WebCore::Icon::paint):
        (WebCore::IconDatabase::isIconExpiredForIconURL):
        (WebCore::IconDatabase::hasEntryForIconURL):
        (WebCore::IconDatabase::sharedIconDatabase):
        (WebCore::IconDatabase::setIconURLForPageURL):
        (WebCore::IconDatabase::setIconDataForIconURL):
        (WebCore::Image::drawTiled):
        (WebCore::Image::getHBITMAP):
        (WebCore::Path::Path):
        (WebCore::Path::~Path):
        (WebCore::Path::contains):
        (WebCore::Path::translate):
        (WebCore::Path::boundingRect):
        (WebCore::Path::operator=):
        (WebCore::Path::clear):
        (WebCore::Path::moveTo):
        (WebCore::Path::addLineTo):
        (WebCore::Path::addQuadCurveTo):
        (WebCore::Path::addBezierCurveTo):
        (WebCore::Path::addArcTo):
        (WebCore::Path::closeSubpath):
        (WebCore::Path::addArc):
        (WebCore::Path::addRect):
        (WebCore::Path::addEllipse):
        (WebCore::Path::transform):
        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
        (WebCore::PlatformScrollbar::PlatformScrollbar):
        (WebCore::PlatformScrollbar::~PlatformScrollbar):
        (WebCore::PlatformScrollbar::width):
        (WebCore::PlatformScrollbar::height):
        (WebCore::PlatformScrollbar::setEnabled):
        (WebCore::PlatformScrollbar::paint):
        (WebCore::PlatformScrollbar::updateThumbPosition):
        (WebCore::PlatformScrollbar::updateThumbProportion):
        (WebCore::PlatformScrollbar::setRect):
        (WebCore::PlugInInfoStore::createPluginInfoForPluginAtIndex):
        (WebCore::PlugInInfoStore::pluginCount):
        (WebCore::PlugInInfoStore::supportsMIMEType):
        (WebCore::PolicyCheck::PolicyCheck):
        (WebCore::PolicyCheck::clear):
        (WebCore::PolicyCheck::clearRequest):
        (WebCore::PolicyCheck::call):
        (WebCore::RenderThemeWin::systemFont):
        (WebCore::RenderThemeWin::paintMenuList):
        (WebCore::RenderThemeWin::adjustMenuListStyle):
        (WebCore::ResourceLoader::cancel):
        (WebCore::ScrollView::addChild):
        (WebCore::ScrollView::removeChild):
        (WebCore::ScrollView::scrollPointRecursively):
        (WebCore::ScrollView::inWindow):
        (WebCore::ScrollView::paint):
        (WebCore::ScrollView::wheelEvent):
        (WebCore::ScrollView::themeChanged):
        (WebCore::ScrollView::convertChildToSelf):
        (WebCore::ScrollView::convertSelfToChild):
        (WebCore::ScrollView::geometryChanged):
        (WebCore::ScrollView::scrollbarUnderMouse):
        (WebCore::ScrollView::setFrameGeometry):
        (WebCore::ScrollView::windowResizerRect):
        (WebCore::ScrollView::resizerOverlapsContent):
        (WebCore::TextField::selectAll):
        (WebCore::TextField::addSearchResult):
        (WebCore::TextField::selectionStart):
        (WebCore::TextField::hasSelectedText):
        (WebCore::TextField::selectedText):
        (WebCore::TextField::setAutoSaveName):
        (WebCore::TextField::checksDescendantsForFocus):
        (WebCore::TextField::setSelection):
        (WebCore::TextField::setMaxResults):
        (WebCore::TextField::edited):
        (WebCore::TextField::focusPolicy):
        (WebCore::TextField::TextField):
        (WebCore::TextField::~TextField):
        (WebCore::TextField::setFont):
        (WebCore::TextField::setAlignment):
        (WebCore::TextField::setWritingDirection):
        (WebCore::TextField::maxLength):
        (WebCore::TextField::setMaxLength):
        (WebCore::TextField::text):
        (WebCore::TextField::setText):
        (WebCore::TextField::cursorPosition):
        (WebCore::TextField::setCursorPosition):
        (WebCore::TextField::setEdited):
        (WebCore::TextField::setReadOnly):
        (WebCore::TextField::setPlaceholderString):
        (WebCore::TextField::setColors):
        (WebCore::TextField::sizeForCharacterWidth):
        (WebCore::TextField::baselinePosition):
        (WebCore::TextField::setLiveSearch):
        (WebCore::Widget::enableFlushDrawing):
        (WebCore::Widget::isEnabled):
        (WebCore::Widget::focusPolicy):
        (WebCore::Widget::disableFlushDrawing):
        (WebCore::Widget::removeFromParent):
        (WebCore::Widget::lockDrawingFocus):
        (WebCore::Widget::unlockDrawingFocus):
        (WebCore::Widget::capturingMouse):
        (WebCore::Widget::setCapturingMouse):
        (WebCore::Widget::capturingTarget):
        (WebCore::Widget::capturingChild):
        (WebCore::Widget::setCapturingChild):
        (WebCore::Widget::convertChildToSelf):
        (WebCore::Widget::convertSelfToChild):
        (WebCore::Widget::setParent):
        (WebCore::Widget::parent):
        (WebCore::Widget::setEnabled):
        (WebCore::Widget::paint):
        (WebCore::Widget::setIsSelected):
        (WebCore::Widget::invalidate):
        (WebCore::Widget::invalidateRect):
        * platform/win/WidgetWin.cpp:
        (WebCore::Widget::clearFocus):

WebKit:
        * COM/WebFrame.cpp:
        (WebFrame::initWithName):
        (WebFrame::loadHTMLString):
        (WebFrame::stopLoading):
        (WebFrame::reload):
        (WebFrame::loadDataSource):
        (WebFrame::didReceiveData):
        (WebFrame::receivedResponse):
        (WebFrame::receivedAllData):
        * COM/WebFrame.h:
        * COM/WebView.cpp:
        (WebView::mouseMoved):
        (WebView::mouseDown):
        (WebView::mouseUp):
        (WebView::mouseDoubleClick):
        * WebKit.vcproj/WebKit.vcproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17816 268f45cc-cd09-0410-ab3c-d52691b4dbfc

25 files changed:
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/bridge/win/ChromeClientWin.h
WebCore/bridge/win/ContextMenuClientWin.h [new file with mode: 0644]
WebCore/bridge/win/EditorClientWin.h
WebCore/bridge/win/FrameWin.cpp
WebCore/bridge/win/FrameWin.h
WebCore/editing/EditCommand.h
WebCore/loader/FormState.h
WebCore/loader/FrameLoader.h
WebCore/page/EventHandler.cpp
WebCore/platform/MimeTypeRegistry.cpp
WebCore/platform/graphics/win/ImageWin.cpp
WebCore/platform/network/ResourceError.cpp
WebCore/platform/network/ResourceHandleInternal.h
WebCore/platform/network/win/ResourceHandleWin.cpp
WebCore/platform/win/ScreenWin.cpp
WebCore/platform/win/SoundWin.cpp [moved from WebCore/bridge/win/PageWin.cpp with 61% similarity]
WebCore/platform/win/TemporaryLinkStubs.cpp
WebCore/platform/win/WidgetWin.cpp
WebKit/COM/WebFrame.cpp
WebKit/COM/WebFrame.h
WebKit/COM/WebView.cpp
WebKit/ChangeLog
WebKit/WebKit.vcproj/WebKit.vcproj

index bfbf00067bc7cb3e129d68245cc3de80cc4c3d17..9b297bd40af2affd0f48222c597911b83a5aa879 100644 (file)
@@ -1,3 +1,301 @@
+2006-11-16  Don Gibson  <dgibson77@gmail.com>
+
+        Reviewed and landed by ap.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11509:
+        Windows build bustage.
+
+        Also reorganizes WebCore.vcproj to add files whose absence wasn't
+        causing compile errors, but which should have been there, and to
+        make the include directory ordering (and contents) sane.
+        Also reorganizes TemporaryLinkStubs.cpp to put headers and
+        function groups in alphabetical order, and ensure that all functions
+        in the file call notImplemented().
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * bridge/win/ChromeClientWin.h:
+        (WebCore::ChromeClientWin::ref):
+        (WebCore::ChromeClientWin::deref):
+        * bridge/win/ContextMenuClientWin.h: Added.
+        (WebCore::ContextMenuClientWin::~ContextMenuClientWin):
+        (WebCore::ContextMenuClientWin::ref):
+        (WebCore::ContextMenuClientWin::deref):
+        * bridge/win/EditorClientWin.h:
+        * bridge/win/FrameWin.cpp:
+        (WebCore::FrameWin::~FrameWin):
+        (WebCore::FrameWin::keyPress):
+        * bridge/win/FrameWin.h:
+        * bridge/win/PageWin.cpp: Removed.
+        * editing/EditCommand.h:
+        * loader/FormState.h:
+        * loader/FrameLoader.h:
+        * page/EventHandler.cpp:
+        * platform/MimeTypeRegistry.cpp:
+        (WebCore::initialiseSupportedImageMIMETypes):
+        * platform/graphics/win/ImageWin.cpp:
+        * platform/network/ResourceError.cpp:
+        * platform/network/ResourceHandleInternal.h:
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::onHandleCreated):
+        (WebCore::ResourceHandle::onRequestRedirected):
+        (WebCore::ResourceHandle::start):
+        (WebCore::ResourceHandle::cancel):
+        * platform/win/ScreenWin.cpp:
+        (WebCore::monitorInfo):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        (WebCore::screenDepth):
+        * platform/win/SoundWin.cpp: Added.
+        (WebCore::systemBeep):
+        * platform/win/TemporaryLinkStubs.cpp:
+        (WebCore::CacheObjectExpiresTime):
+        (WebCore::CheckCacheObjectStatus):
+        (WebCore::CheckIfReloading):
+        (WebCore::defaultLanguage):
+        (WebCore::fileButtonChooseFileLabel):
+        (WebCore::fileButtonNoFileSelectedLabel):
+        (WebCore::findNextSentenceFromIndex):
+        (WebCore::findNextWordFromIndex):
+        (WebCore::findSentenceBoundary):
+        (WebCore::findWordBoundary):
+        (WebCore::focusRingColor):
+        (WebCore::historyContains):
+        (WebCore::inputElementAltText):
+        (WebCore::IsResponseURLEqualToURL):
+        (WebCore::cellCursor):
+        (WebCore::contextMenuCursor):
+        (WebCore::moveCursor):
+        (WebCore::verticalTextCursor):
+        (WebCore::refreshPlugins):
+        (WebCore::resetButtonDefaultLabel):
+        (WebCore::ResponseIsMultipart):
+        (WebCore::ResponseMIMEType):
+        (WebCore::ResponseURL):
+        (WebCore::screenDepthPerComponent):
+        (WebCore::screenIsMonochrome):
+        (WebCore::searchableIndexIntroduction):
+        (WebCore::ServeSynchronousRequest):
+        (WebCore::setFocusRingColorChangeFunction):
+        (WebCore::submitButtonDefaultLabel):
+        (WebCore::CachedResource::setPlatformResponse):
+        (WebCore::CachedResource::setAllData):
+        (WebCore::ChromeClientWin::setWindowRect):
+        (WebCore::ChromeClientWin::windowRect):
+        (WebCore::ChromeClientWin::pageRect):
+        (WebCore::ChromeClientWin::scaleFactor):
+        (WebCore::ChromeClientWin::focus):
+        (WebCore::ChromeClientWin::unfocus):
+        (WebCore::ChromeClientWin::createWindow):
+        (WebCore::ChromeClientWin::createModalDialog):
+        (WebCore::ChromeClientWin::show):
+        (WebCore::ChromeClientWin::canRunModal):
+        (WebCore::ChromeClientWin::runModal):
+        (WebCore::ChromeClientWin::setToolbarsVisible):
+        (WebCore::ChromeClientWin::toolbarsVisible):
+        (WebCore::ChromeClientWin::setStatusbarVisible):
+        (WebCore::ChromeClientWin::statusbarVisible):
+        (WebCore::ChromeClientWin::setScrollbarsVisible):
+        (WebCore::ChromeClientWin::scrollbarsVisible):
+        (WebCore::ChromeClientWin::setMenubarVisible):
+        (WebCore::ChromeClientWin::menubarVisible):
+        (WebCore::ChromeClientWin::setResizable):
+        (WebCore::ContextMenu::appendItem):
+        (WebCore::ContextMenuClientWin::addCustomContextMenuItems):
+        (WebCore::DocumentLoader::setFrame):
+        (WebCore::DocumentLoader::frameLoader):
+        (WebCore::DocumentLoader::URL):
+        (WebCore::DocumentLoader::isStopping):
+        (WebCore::DocumentLoader::stopLoading):
+        (WebCore::DocumentLoader::setLoading):
+        (WebCore::DocumentLoader::updateLoading):
+        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
+        (WebCore::DocumentLoader::isLoadingInAPISense):
+        (WebCore::DocumentLoader::stopRecordingResponses):
+        (WebCore::EditorClientWin::shouldDeleteRange):
+        (WebCore::EditorClientWin::shouldShowDeleteInterface):
+        (WebCore::EditorClientWin::isContinuousSpellCheckingEnabled):
+        (WebCore::EditorClientWin::isGrammarCheckingEnabled):
+        (WebCore::EditorClientWin::spellCheckerDocumentTag):
+        (WebCore::EventHandler::focusDocumentView):
+        (WebCore::EventHandler::handleDrag):
+        (WebCore::EventHandler::handleMouseUp):
+        (WebCore::EventHandler::lastEventIsMouseUp):
+        (WebCore::EventHandler::passMousePressEventToSubframe):
+        (WebCore::EventHandler::passMouseMoveEventToSubframe):
+        (WebCore::EventHandler::passMouseReleaseEventToSubframe):
+        (WebCore::EventHandler::passWheelEventToSubframe):
+        (WebCore::EventHandler::passWidgetMouseDownEventToWidget):
+        (WebCore::EventHandler::passMousePressEventToScrollbar):
+        (WebCore::EventHandler::shouldDragAutoNode):
+        (WebCore::EventHandler::tabsToAllControls):
+        (WebCore::EventHandler::tabsToLinks):
+        (WebCore::Frame::setNeedsReapplyStyles):
+        (WebCore::FrameLoader::didFirstLayout):
+        (WebCore::FrameLoader::overrideMediaType):
+        (WebCore::FrameLoader::createJavaAppletWidget):
+        (WebCore::FrameLoader::redirectDataToPlugin):
+        (WebCore::FrameLoader::getHistoryLength):
+        (WebCore::FrameLoader::setTitle):
+        (WebCore::FrameLoader::referrer):
+        (WebCore::FrameLoader::saveDocumentState):
+        (WebCore::FrameLoader::restoreDocumentState):
+        (WebCore::FrameLoader::goBackOrForward):
+        (WebCore::FrameLoader::historyURL):
+        (WebCore::FrameLoader::urlSelected):
+        (WebCore::FrameLoader::createFrame):
+        (WebCore::FrameLoader::submitForm):
+        (WebCore::FrameLoader::partClearedInBegin):
+        (WebCore::FrameLoader::originalRequestURL):
+        (WebCore::FrameLoader::canGoBackOrForward):
+        (WebCore::FrameLoader::objectContentType):
+        (WebCore::FrameLoader::createPlugin):
+        (WebCore::FrameLoader::detachFromParent):
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        (WebCore::FrameView::updateBorder):
+        (WebCore::FrameWin::bindingRootObject):
+        (WebCore::FrameWin::canPaste):
+        (WebCore::FrameWin::issuePasteAndMatchStyleCommand):
+        (WebCore::FrameWin::markedTextRange):
+        (WebCore::FrameWin::passSubframeEventToSubframe):
+        (WebCore::FrameWin::lastEventIsMouseUp):
+        (WebCore::FrameWin::addMessageToConsole):
+        (WebCore::FrameWin::shouldChangeSelection):
+        (WebCore::FrameWin::respondToChangedSelection):
+        (WebCore::FrameWin::clearUndoRedoOperations):
+        (WebCore::FrameWin::markMisspellingsInAdjacentWords):
+        (WebCore::FrameWin::respondToChangedContents):
+        (WebCore::GraphicsContext::addRoundedRectClip):
+        (WebCore::GraphicsContext::setShadow):
+        (WebCore::GraphicsContext::clearShadow):
+        (WebCore::GraphicsContext::beginTransparencyLayer):
+        (WebCore::GraphicsContext::endTransparencyLayer):
+        (WebCore::GraphicsContext::clearRect):
+        (WebCore::GraphicsContext::strokeRect):
+        (WebCore::GraphicsContext::setLineWidth):
+        (WebCore::GraphicsContext::setLineCap):
+        (WebCore::GraphicsContext::setLineJoin):
+        (WebCore::GraphicsContext::setMiterLimit):
+        (WebCore::GraphicsContext::setAlpha):
+        (WebCore::GraphicsContext::setCompositeOperation):
+        (WebCore::GraphicsContext::clip):
+        (WebCore::GraphicsContext::rotate):
+        (WebCore::GraphicsContext::scale):
+        (WebCore::Icon::Icon):
+        (WebCore::Icon::~Icon):
+        (WebCore::Icon::newIconForFile):
+        (WebCore::Icon::paint):
+        (WebCore::IconDatabase::isIconExpiredForIconURL):
+        (WebCore::IconDatabase::hasEntryForIconURL):
+        (WebCore::IconDatabase::sharedIconDatabase):
+        (WebCore::IconDatabase::setIconURLForPageURL):
+        (WebCore::IconDatabase::setIconDataForIconURL):
+        (WebCore::Image::drawTiled):
+        (WebCore::Image::getHBITMAP):
+        (WebCore::Path::Path):
+        (WebCore::Path::~Path):
+        (WebCore::Path::contains):
+        (WebCore::Path::translate):
+        (WebCore::Path::boundingRect):
+        (WebCore::Path::operator=):
+        (WebCore::Path::clear):
+        (WebCore::Path::moveTo):
+        (WebCore::Path::addLineTo):
+        (WebCore::Path::addQuadCurveTo):
+        (WebCore::Path::addBezierCurveTo):
+        (WebCore::Path::addArcTo):
+        (WebCore::Path::closeSubpath):
+        (WebCore::Path::addArc):
+        (WebCore::Path::addRect):
+        (WebCore::Path::addEllipse):
+        (WebCore::Path::transform):
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        (WebCore::PlatformScrollbar::PlatformScrollbar):
+        (WebCore::PlatformScrollbar::~PlatformScrollbar):
+        (WebCore::PlatformScrollbar::width):
+        (WebCore::PlatformScrollbar::height):
+        (WebCore::PlatformScrollbar::setEnabled):
+        (WebCore::PlatformScrollbar::paint):
+        (WebCore::PlatformScrollbar::updateThumbPosition):
+        (WebCore::PlatformScrollbar::updateThumbProportion):
+        (WebCore::PlatformScrollbar::setRect):
+        (WebCore::PlugInInfoStore::createPluginInfoForPluginAtIndex):
+        (WebCore::PlugInInfoStore::pluginCount):
+        (WebCore::PlugInInfoStore::supportsMIMEType):
+        (WebCore::PolicyCheck::PolicyCheck):
+        (WebCore::PolicyCheck::clear):
+        (WebCore::PolicyCheck::clearRequest):
+        (WebCore::PolicyCheck::call):
+        (WebCore::RenderThemeWin::systemFont):
+        (WebCore::RenderThemeWin::paintMenuList):
+        (WebCore::RenderThemeWin::adjustMenuListStyle):
+        (WebCore::ResourceLoader::cancel):
+        (WebCore::ScrollView::addChild):
+        (WebCore::ScrollView::removeChild):
+        (WebCore::ScrollView::scrollPointRecursively):
+        (WebCore::ScrollView::inWindow):
+        (WebCore::ScrollView::paint):
+        (WebCore::ScrollView::wheelEvent):
+        (WebCore::ScrollView::themeChanged):
+        (WebCore::ScrollView::convertChildToSelf):
+        (WebCore::ScrollView::convertSelfToChild):
+        (WebCore::ScrollView::geometryChanged):
+        (WebCore::ScrollView::scrollbarUnderMouse):
+        (WebCore::ScrollView::setFrameGeometry):
+        (WebCore::ScrollView::windowResizerRect):
+        (WebCore::ScrollView::resizerOverlapsContent):
+        (WebCore::TextField::selectAll):
+        (WebCore::TextField::addSearchResult):
+        (WebCore::TextField::selectionStart):
+        (WebCore::TextField::hasSelectedText):
+        (WebCore::TextField::selectedText):
+        (WebCore::TextField::setAutoSaveName):
+        (WebCore::TextField::checksDescendantsForFocus):
+        (WebCore::TextField::setSelection):
+        (WebCore::TextField::setMaxResults):
+        (WebCore::TextField::edited):
+        (WebCore::TextField::focusPolicy):
+        (WebCore::TextField::TextField):
+        (WebCore::TextField::~TextField):
+        (WebCore::TextField::setFont):
+        (WebCore::TextField::setAlignment):
+        (WebCore::TextField::setWritingDirection):
+        (WebCore::TextField::maxLength):
+        (WebCore::TextField::setMaxLength):
+        (WebCore::TextField::text):
+        (WebCore::TextField::setText):
+        (WebCore::TextField::cursorPosition):
+        (WebCore::TextField::setCursorPosition):
+        (WebCore::TextField::setEdited):
+        (WebCore::TextField::setReadOnly):
+        (WebCore::TextField::setPlaceholderString):
+        (WebCore::TextField::setColors):
+        (WebCore::TextField::sizeForCharacterWidth):
+        (WebCore::TextField::baselinePosition):
+        (WebCore::TextField::setLiveSearch):
+        (WebCore::Widget::enableFlushDrawing):
+        (WebCore::Widget::isEnabled):
+        (WebCore::Widget::focusPolicy):
+        (WebCore::Widget::disableFlushDrawing):
+        (WebCore::Widget::removeFromParent):
+        (WebCore::Widget::lockDrawingFocus):
+        (WebCore::Widget::unlockDrawingFocus):
+        (WebCore::Widget::capturingMouse):
+        (WebCore::Widget::setCapturingMouse):
+        (WebCore::Widget::capturingTarget):
+        (WebCore::Widget::capturingChild):
+        (WebCore::Widget::setCapturingChild):
+        (WebCore::Widget::convertChildToSelf):
+        (WebCore::Widget::convertSelfToChild):
+        (WebCore::Widget::setParent):
+        (WebCore::Widget::parent):
+        (WebCore::Widget::setEnabled):
+        (WebCore::Widget::paint):
+        (WebCore::Widget::setIsSelected):
+        (WebCore::Widget::invalidate):
+        (WebCore::Widget::invalidateRect):
+        * platform/win/WidgetWin.cpp:
+        (WebCore::Widget::clearFocus):
+
 2006-11-16  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam.
index 59ad041e63437205b2b72e4d15f1203b959aa4bf..0b1478d859eddd576e00fcde4e167e463795dbaf 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="8.00"
        Name="WebCore"
        ProjectGUID="{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
        RootNamespace="WebCore"
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo&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)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\loader\icon&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)\..\..\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"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo&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)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\loader\icon&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)\..\..\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"
                                RelativePath="..\..\DerivedSources\WebCore\JSDOMImplementation.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSDOMParser.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSDOMParser.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\DerivedSources\WebCore\JSDOMWindow.cpp"
                                >
                                RelativePath="..\..\DerivedSources\WebCore\JSNodeFilter.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSNodeIterator.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSNodeIterator.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\DerivedSources\WebCore\JSNotation.cpp"
                                >
                                RelativePath="..\..\DerivedSources\WebCore\JSText.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSTreeWalker.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSTreeWalker.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\DerivedSources\WebCore\JSUIEvent.cpp"
                                >
                                >
                        </File>
                        <File
-                               RelativePath="..\..\DerivedSources\WebCore\JSXMLSerializer.lut.h"
+                               RelativePath="..\..\DerivedSources\WebCore\JSXMLSerializer.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\JSXMLSerializer.h"
                                >
                        </File>
                        <File
                                RelativePath="..\..\DerivedSources\WebCore\kjs_window.lut.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\ksvgcssproperties.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\ksvgcssvalues.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\SVGElementFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\SVGNames.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\DerivedSources\WebCore\UserAgentStyleSheets.h"
                                >
                                RelativePath="..\..\DerivedSources\WebCore\XLinkNames.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\DerivedSources\WebCore\XMLNames.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\DerivedSources\WebCore\XPathGrammar.cpp"
                                >
                                RelativePath="..\..\page\Chrome.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\page\ContextMenuClient.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\page\ContextMenuController.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\page\ContextMenuController.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\page\ChromeClient.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\page\DOMWindow.cpp"
                                >
                                RelativePath="..\..\page\DOMWindow.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\page\EventHandler.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\page\EventHandler.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\page\Frame.cpp"
                                >
                                >
                        </File>
                        <File
-                               RelativePath="..\..\page\Plugin.h"
+                               RelativePath="..\..\page\PageState.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\page\PageState.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\page\ResourceRequest.h"
+                               RelativePath="..\..\page\Plugin.h"
                                >
                        </File>
                        <File
                                RelativePath="..\..\loader\CachedXSLStyleSheet.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\loader\CachePolicy.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\loader\DocLoader.cpp"
                                >
                                >
                        </File>
                        <File
-                               RelativePath="..\..\loader\FormData.cpp"
+                               RelativePath="..\..\loader\DocumentLoader.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\DocumentLoader.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\FormState.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\loader\FormData.h"
+                               RelativePath="..\..\loader\FormState.h"
                                >
                        </File>
                        <File
                                RelativePath="..\..\loader\Request.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\loader\ResourceLoader.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\loader\ResourceLoader.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\loader\TextDocument.cpp"
                                >
                                RelativePath="..\..\loader\TextResourceDecoder.h"
                                >
                        </File>
+                       <Filter
+                               Name="icon"
+                               >
+                               <File
+                                       RelativePath="..\..\loader\icon\IconLoader.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\loader\icon\IconLoader.h"
+                                       >
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="platform"
                        >
                        <File
-                               RelativePath="..\..\platform\AffineTransform.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\AffineTransform.h"
+                               RelativePath="..\..\platform\AbstractShared.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\Color.cpp"
+                               RelativePath="..\..\platform\CharsetData.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\platform\ContextMenu.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\Color.h"
+                               RelativePath="..\..\platform\ContextMenu.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\FileButton.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\FloatPoint.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\FloatPoint.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\FloatRect.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\FloatRect.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\FloatSize.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\FloatSize.h"
+                               RelativePath="..\..\platform\FileChooser.h"
                                >
                        </File>
                        <File
                                RelativePath="..\..\platform\GlyphWidthMap.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\platform\Image.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\Image.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\platform\ImageAnimationObserver.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\platform\ImageSource.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\IntPoint.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\IntRect.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\IntRect.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\IntSize.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\platform\KURL.cpp"
                                >
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\Path.h"
+                               RelativePath="..\..\platform\MimeTypeRegistry.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\Pen.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\platform\Pen.h"
+                               RelativePath="..\..\platform\MimeTypeRegistry.h"
                                >
                        </File>
                        <File
                                RelativePath="..\..\platform\Screen.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\platform\ScrollBar.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\platform\ScrollBar.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\ScrollBarMode.h"
+                               RelativePath="..\..\platform\ScrollTypes.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath="..\..\platform\Slider.h"
+                               RelativePath="..\..\platform\Sound.h"
                                >
                        </File>
                        <File
                                RelativePath="..\..\platform\String.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\platform\StringHash.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\platform\StringImpl.cpp"
                                >
                                RelativePath="..\..\platform\TextDecoder.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\platform\TextDirection.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\platform\TextEncoding.cpp"
                                >
                                RelativePath="..\..\platform\TextStream.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\platform\TextStyle.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\platform\Timer.cpp"
                                >
                                RelativePath="..\..\platform\Timer.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\platform\UChar.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\platform\Widget.cpp"
                                >
                                >
                        </File>
                        <Filter
-                               Name="win"
+                               Name="graphics"
                                >
                                <File
-                                       RelativePath="..\..\platform\win\CookieJarWin.cpp"
+                                       RelativePath="..\..\platform\graphics\AffineTransform.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\CursorWin.cpp"
+                                       RelativePath="..\..\platform\graphics\AffineTransform.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\FontCacheWin.cpp"
+                                       RelativePath="..\..\platform\graphics\Color.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\FontDataWin.cpp"
+                                       RelativePath="..\..\platform\graphics\Color.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\FontPlatformData.h"
+                                       RelativePath="..\..\platform\graphics\FloatPoint.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\FontPlatformDataWin.cpp"
+                                       RelativePath="..\..\platform\graphics\FloatPoint.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\FontWin.cpp"
+                                       RelativePath="..\..\platform\graphics\FloatRect.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\GlyphMapWin.cpp"
+                                       RelativePath="..\..\platform\graphics\FloatRect.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\GraphicsContextWin.cpp"
+                                       RelativePath="..\..\platform\graphics\FloatSize.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\ImageWin.cpp"
+                                       RelativePath="..\..\platform\graphics\FloatSize.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\IntPointWin.cpp"
+                                       RelativePath="..\..\platform\graphics\GraphicsContext.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\IntRectWin.cpp"
+                                       RelativePath="..\..\platform\graphics\GraphicsContext.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\IntSizeWin.cpp"
+                                       RelativePath="..\..\platform\graphics\GraphicsTypes.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\KeyEventWin.cpp"
+                                       RelativePath="..\..\platform\graphics\GraphicsTypes.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\MouseEventWin.cpp"
+                                       RelativePath="..\..\platform\graphics\Icon.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\PlatformScrollBar.h"
+                                       RelativePath="..\..\platform\graphics\Image.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\ScreenWin.cpp"
+                                       RelativePath="..\..\platform\graphics\Image.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\ScrollViewWin.cpp"
+                                       RelativePath="..\..\platform\graphics\ImageSource.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\SharedTimerWin.cpp"
+                                       RelativePath="..\..\platform\graphics\IntPoint.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\SystemTimeWin.cpp"
+                                       RelativePath="..\..\platform\graphics\IntRect.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\TemporaryLinkStubs.cpp"
+                                       RelativePath="..\..\platform\graphics\IntRect.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\win\WidgetWin.cpp"
+                                       RelativePath="..\..\platform\graphics\IntSize.h"
                                        >
                                </File>
-                       </Filter>
-                       <Filter
-                               Name="image-decoders"
-                               >
                                <File
-                                       RelativePath="..\..\platform\image-decoders\ImageDecoder.h"
+                                       RelativePath="..\..\platform\graphics\IntSizeHash.h"
                                        >
                                </File>
-                               <Filter
-                                       Name="gif"
+                               <File
+                                       RelativePath="..\..\platform\graphics\Path.cpp"
                                        >
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageDecoder.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageDecoder.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageReader.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageReader.h"
-                                               >
-                                       </File>
-                               </Filter>
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\graphics\Path.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\graphics\Pen.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\graphics\Pen.h"
+                                       >
+                               </File>
                                <Filter
-                                       Name="png"
+                                       Name="cairo"
                                        >
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\png\mozpngconf.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\png.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\png.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngasmrd.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngconf.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngerror.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pnggccrd.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngget.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\PNGImageDecoder.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\PNGImageDecoder.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngmem.c"
+                                               RelativePath="..\..\platform\graphics\cairo\AffineTransformCairo.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngpread.c"
+                                               RelativePath="..\..\platform\graphics\cairo\GraphicsContextCairo.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngread.c"
+                                               RelativePath="..\..\platform\graphics\cairo\ImageCairo.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngrio.c"
+                                               RelativePath="..\..\platform\graphics\cairo\ImageSourceCairo.cpp"
                                                >
                                        </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngrtran.c"
+                                       <Filter
+                                               Name="cairo"
                                                >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngrutil.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngset.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngtrans.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngvcrd.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngwio.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngwrite.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngwtran.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\png\pngwutil.c"
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-arc-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-arc.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-array.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-cache-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-cache.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-clip-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-clip.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-color.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-debug.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-debug.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-features.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-fixed.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-font-options.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-font.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-gstate-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-gstate.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-hash-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-hash.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-hull.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-image-surface.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-matrix.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-meta-surface-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-meta-surface.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-output-stream.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-paginated-surface-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-paginated-surface.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path-bounds.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path-data-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path-data.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path-fill.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path-fixed-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path-stroke.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-path.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-pattern.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-pen.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-platform.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-polygon.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-region.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-scaled-font.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-slope.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-spline.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-stroke-style.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-surface-fallback-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-surface-fallback.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-surface.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-traps.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-unicode.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-wideint.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-wideint.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-win32-font.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-win32-private.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-win32-surface.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo-win32.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairo.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\cairo\src\cairoint.h"
+                                                       >
+                                               </File>
+                                       </Filter>
+                                       <Filter
+                                               Name="pixman"
                                                >
-                                       </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\fbcompose.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\fbedge.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\fbedgeimp.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\fbpict.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\fbpict.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\fbtrap.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icblt.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icbltone.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\iccolor.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icformat.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icimage.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icimage.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icint.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icpixels.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icrect.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icrop.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icstipple.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\ictransform.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\ictrap.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\ictri.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\icutil.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\pixman-remap.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\pixman.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\pixregion.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\pixregionint.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\renderedge.c"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\renderedge.h"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\..\platform\graphics\cairo\pixman\src\slim_internal.h"
+                                                       >
+                                               </File>
+                                       </Filter>
                                </Filter>
                                <Filter
-                                       Name="zlib"
+                                       Name="win"
                                        >
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\adler32.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\compress.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\crc32.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\crc32.h"
+                                               RelativePath="..\..\platform\graphics\win\ImageWin.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\deflate.c"
+                                               RelativePath="..\..\platform\graphics\win\IntPointWin.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\deflate.h"
+                                               RelativePath="..\..\platform\graphics\win\IntRectWin.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\gzio.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\infback.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inffast.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inffast.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inffixed.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inflate.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inflate.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inftrees.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\inftrees.h"
+                                               RelativePath="..\..\platform\graphics\win\IntSizeWin.cpp"
                                                >
                                        </File>
+                               </Filter>
+                       </Filter>
+                       <Filter
+                               Name="image-decoders"
+                               >
+                               <File
+                                       RelativePath="..\..\platform\image-decoders\ImageDecoder.h"
+                                       >
+                               </File>
+                               <Filter
+                                       Name="bmp"
+                                       >
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\mozzconf.h"
+                                               RelativePath="..\..\platform\image-decoders\bmp\BMPImageDecoder.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\trees.c"
+                                               RelativePath="..\..\platform\image-decoders\bmp\BMPImageDecoder.h"
                                                >
                                        </File>
+                               </Filter>
+                               <Filter
+                                       Name="gif"
+                                       >
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\trees.h"
+                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageDecoder.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\uncompr.c"
+                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageDecoder.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\zconf.h"
+                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageReader.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\zlib.h"
+                                               RelativePath="..\..\platform\image-decoders\gif\GIFImageReader.h"
                                                >
                                        </File>
+                               </Filter>
+                               <Filter
+                                       Name="ico"
+                                       >
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\zutil.c"
+                                               RelativePath="..\..\platform\image-decoders\ico\ICOImageDecoder.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\zlib\zutil.h"
+                                               RelativePath="..\..\platform\image-decoders\ico\ICOImageDecoder.h"
                                                >
                                        </File>
                                </Filter>
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdhuff.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdhuff.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdinput.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmainct.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmarker.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmaster.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmerge.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdphuff.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdpostct.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jdsample.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jerror.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jerror.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jfdctflt.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jfdctfst.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jfdctint.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jidctflt.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jidctfst.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jidctint.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jinclude.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jmemmgr.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jmemnobs.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jmemsys.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jmorecfg.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\JPEGImageDecoder.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\JPEGImageDecoder.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jpegint.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jpeglib.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jquant1.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jquant2.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jutils.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jversion.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\jpeg\jwinfig.h"
-                                               >
-                                       </File>
-                               </Filter>
-                               <Filter
-                                       Name="bmp"
-                                       >
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\bmp\BMPImageDecoder.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\bmp\BMPImageDecoder.h"
-                                               >
-                                       </File>
-                               </Filter>
-                               <Filter
-                                       Name="ico"
-                                       >
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\ico\ICOImageDecoder.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\ico\ICOImageDecoder.h"
-                                               >
-                                       </File>
-                               </Filter>
-                               <Filter
-                                       Name="xbm"
-                                       >
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\xbm\XBMImageDecoder.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\image-decoders\xbm\XBMImageDecoder.h"
-                                               >
-                                       </File>
-                               </Filter>
-                       </Filter>
-                       <Filter
-                               Name="cairo"
-                               >
-                               <File
-                                       RelativePath="..\..\platform\cairo\AffineTransformCairo.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\platform\cairo\GraphicsContextCairo.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\platform\cairo\ImageCairo.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\platform\cairo\ImageSourceCairo.cpp"
-                                       >
-                               </File>
-                               <Filter
-                                       Name="pixman"
-                                       >
-                                       <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\fbcompose.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\fbedge.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\fbedgeimp.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\fbpict.c"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\fbpict.h"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\fbtrap.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdhuff.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icblt.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdhuff.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icbltone.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdinput.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\iccolor.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmainct.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icformat.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmarker.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icimage.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmaster.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icimage.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdmerge.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icint.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdphuff.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icpixels.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdpostct.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icrect.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jdsample.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icrop.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jerror.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icstipple.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jerror.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\ictransform.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jfdctflt.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\ictrap.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jfdctfst.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\ictri.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jfdctint.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\icutil.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jidctflt.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\pixman-remap.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jidctfst.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\pixman.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jidctint.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\pixregion.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jinclude.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\pixregionint.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jmemmgr.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\renderedge.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jmemnobs.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\renderedge.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jmemsys.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\pixman\src\slim_internal.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jmorecfg.h"
                                                >
                                        </File>
-                               </Filter>
-                               <Filter
-                                       Name="cairo"
-                                       >
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-arc-private.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\JPEGImageDecoder.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-arc.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\JPEGImageDecoder.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-array.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jpegint.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-cache-private.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jpeglib.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-cache.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jquant1.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-clip-private.h"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jquant2.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-clip.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jutils.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-color.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jversion.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-debug.c"
+                                               RelativePath="..\..\platform\image-decoders\jpeg\jwinfig.h"
                                                >
                                        </File>
+                               </Filter>
+                               <Filter
+                                       Name="png"
+                                       >
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-debug.h"
+                                               RelativePath="..\..\platform\image-decoders\png\mozpngconf.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-features.h"
+                                               RelativePath="..\..\platform\image-decoders\png\png.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-fixed.c"
+                                               RelativePath="..\..\platform\image-decoders\png\png.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-font-options.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngasmrd.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-font.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngconf.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-gstate-private.h"
+                                               RelativePath="..\..\platform\image-decoders\png\pngerror.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-gstate.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pnggccrd.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-hash-private.h"
+                                               RelativePath="..\..\platform\image-decoders\png\pngget.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-hash.c"
+                                               RelativePath="..\..\platform\image-decoders\png\PNGImageDecoder.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-hull.c"
+                                               RelativePath="..\..\platform\image-decoders\png\PNGImageDecoder.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-image-surface.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngmem.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-matrix.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngpread.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-meta-surface-private.h"
+                                               RelativePath="..\..\platform\image-decoders\png\pngread.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-meta-surface.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngrio.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-output-stream.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngrtran.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-paginated-surface-private.h"
+                                               RelativePath="..\..\platform\image-decoders\png\pngrutil.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-paginated-surface.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngset.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path-bounds.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngtrans.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path-data-private.h"
+                                               RelativePath="..\..\platform\image-decoders\png\pngvcrd.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path-data.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngwio.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path-fill.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngwrite.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path-fixed-private.h"
+                                               RelativePath="..\..\platform\image-decoders\png\pngwtran.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path-stroke.c"
+                                               RelativePath="..\..\platform\image-decoders\png\pngwutil.c"
                                                >
                                        </File>
+                               </Filter>
+                               <Filter
+                                       Name="xbm"
+                                       >
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-path.c"
+                                               RelativePath="..\..\platform\image-decoders\xbm\XBMImageDecoder.cpp"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-pattern.c"
+                                               RelativePath="..\..\platform\image-decoders\xbm\XBMImageDecoder.h"
                                                >
                                        </File>
+                               </Filter>
+                               <Filter
+                                       Name="zlib"
+                                       >
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-pen.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\adler32.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-platform.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\compress.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-polygon.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\crc32.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-private.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\crc32.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-region.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\deflate.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-scaled-font.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\deflate.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-slope.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\gzio.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-spline.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\infback.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-stroke-style.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inffast.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-surface-fallback-private.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inffast.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-surface-fallback.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inffixed.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-surface.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inflate.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-traps.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inflate.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-unicode.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inftrees.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-wideint.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\inftrees.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-wideint.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\mozzconf.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-win32-font.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\trees.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-win32-private.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\trees.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-win32-surface.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\uncompr.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo-win32.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\zconf.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo.c"
+                                               RelativePath="..\..\platform\image-decoders\zlib\zlib.h"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairo.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\zutil.c"
                                                >
                                        </File>
                                        <File
-                                               RelativePath="..\..\platform\cairo\cairo\src\cairoint.h"
+                                               RelativePath="..\..\platform\image-decoders\zlib\zutil.h"
                                                >
                                        </File>
                                </Filter>
                        </Filter>
                        <Filter
-                               Name="graphics"
+                               Name="network"
                                >
                                <File
-                                       RelativePath="..\..\platform\graphics\GraphicsContext.cpp"
+                                       RelativePath="..\..\platform\network\FormData.cpp"
                                        >
-                                       <FileConfiguration
-                                               Name="Debug|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Release|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                               />
-                                       </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\platform\graphics\GraphicsContext.h"
+                                       RelativePath="..\..\platform\network\FormData.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\platform\graphics\GraphicsTypes.cpp"
+                                       RelativePath="..\..\platform\network\HTTPHeaderMap.h"
                                        >
-                                       <FileConfiguration
-                                               Name="Debug|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Release|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                               />
-                                       </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\platform\graphics\GraphicsTypes.h"
+                                       RelativePath="..\..\platform\network\ResourceError.cpp"
                                        >
                                </File>
-                       </Filter>
-                       <Filter
-                               Name="network"
-                               >
                                <File
-                                       RelativePath="..\..\platform\network\HTTPHeaderMap.h"
+                                       RelativePath="..\..\platform\network\ResourceError.h"
                                        >
                                </File>
                                <File
                                        RelativePath="..\..\platform\network\ResourceHandle.cpp"
                                        >
-                                       <FileConfiguration
-                                               Name="Debug|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Release|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                               />
-                                       </FileConfiguration>
                                </File>
                                <File
                                        RelativePath="..\..\platform\network\ResourceHandle.h"
                                        <File
                                                RelativePath="..\..\platform\network\win\ResourceHandleWin.cpp"
                                                >
-                                               <FileConfiguration
-                                                       Name="Debug|Win32"
-                                                       >
-                                                       <Tool
-                                                               Name="VCCLCompilerTool"
-                                                               ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                                       />
-                                               </FileConfiguration>
-                                               <FileConfiguration
-                                                       Name="Release|Win32"
-                                                       >
-                                                       <Tool
-                                                               Name="VCCLCompilerTool"
-                                                               ObjectFile="$(IntDir)\$(InputName)1.obj"
-                                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-                                                       />
-                                               </FileConfiguration>
                                        </File>
                                        <File
                                                RelativePath="..\..\platform\network\win\ResourceHandleWin.h"
                                        </File>
                                </Filter>
                        </Filter>
+                       <Filter
+                               Name="win"
+                               >
+                               <File
+                                       RelativePath="..\..\platform\win\CookieJarWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\CursorWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\FontCacheWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\FontDataWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\FontPlatformData.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\FontPlatformDataWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\FontWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\GlyphMapWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\GraphicsContextWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\KeyEventWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\MouseEventWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\PlatformScrollBar.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\ScreenWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\ScrollViewWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\SharedTimerWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\SoundWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\SystemTimeWin.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\TemporaryLinkStubs.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\platform\win\WidgetWin.cpp"
+                                       >
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="css"
                                RelativePath="..\..\css\CSSStyleRule.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\css\CSSStyleRule.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\css\cssstyleselector.cpp"
                                >
                                RelativePath="..\..\css\StyleSheetList.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\css\svg.css"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\css\tokenizer.flex"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\css\view-source.css"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="rendering"
                                RelativePath="..\..\rendering\DataRef.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\rendering\DeprecatedSlider.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\rendering\DeprecatedSlider.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\rendering\EllipsisBox.cpp"
                                >
                                RelativePath="..\..\rendering\RenderReplaced.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\rendering\RenderSlider.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\rendering\RenderSlider.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\rendering\RenderStyle.cpp"
                                >
                                RelativePath="..\..\dom\DocumentFragment.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\dom\DocumentMarker.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\dom\DocumentType.cpp"
                                >
                                RelativePath="..\..\dom\Range.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\dom\RangeException.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\dom\RegisteredEventListener.cpp"
                                >
                                RelativePath="..\..\bridge\History.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\bridge\JavaAppletWidget.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\bridge\WindowFeatures.h"
                                >
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\bridge\win\EditorClientWin.h"
+                                       RelativePath="..\..\bridge\win\ContextMenuClientWin.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\bridge\win\FrameWin.cpp"
+                                       RelativePath="..\..\bridge\win\EditorClientWin.h"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\bridge\win\FrameWin.h"
+                                       RelativePath="..\..\bridge\win\FrameWin.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\bridge\win\PageWin.cpp"
+                                       RelativePath="..\..\bridge\win\FrameWin.h"
                                        >
                                </File>
                        </Filter>
                                        RelativePath="..\..\bindings\js\JSCanvasRenderingContext2DCustom.cpp"
                                        >
                                </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSDOMParser.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSDOMParser.h"
-                                       >
-                               </File>
                                <File
                                        RelativePath="..\..\bindings\js\JSHTMLElementWrapperFactory.cpp"
                                        >
                                        RelativePath="..\..\bindings\js\JSHTMLOptionsCollectionCustom.cpp"
                                        >
                                </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSNodeIterator.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSNodeIterator.h"
-                                       >
-                               </File>
                                <File
                                        RelativePath="..\..\bindings\js\JSNodeIteratorCustom.cpp"
                                        >
                                </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSTreeWalker.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSTreeWalker.h"
-                                       >
-                               </File>
                                <File
                                        RelativePath="..\..\bindings\js\JSTreeWalkerCustom.cpp"
                                        >
                                        RelativePath="..\..\bindings\js\JSXMLHttpRequest.h"
                                        >
                                </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSXMLSerializer.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\DerivedSources\WebCore\JSXMLSerializer.h"
-                                       >
-                               </File>
                                <File
                                        RelativePath="..\..\bindings\js\JSXSLTProcessor.cpp"
                                        >
index b580a327154577200a8fd3d3df5925e1f241e26f..49ecf89a65d4afe0f9b7679001cdc75a75c4b92a 100644 (file)
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2006 Don Gibson <dgibson77@gmail.com>
- * Copyright (C) 2006 Apple Computer, Inc.
  *
  * All rights reserved.
  *
 
 namespace WebCore {
 
-class ChromeClientWin : public ChromeClient {
+class ChromeClientWin : public ChromeClient, public Shared<ChromeClientWin> {
 public:
     virtual ~ChromeClientWin() { }
-        
+
+    virtual void ref() { Shared<ChromeClientWin>::ref(); }
+    virtual void deref() { Shared<ChromeClientWin>::deref(); }
+
+    virtual void setWindowRect(const FloatRect&);
+    virtual FloatRect windowRect();
+
+    virtual FloatRect pageRect();
+
+    virtual float scaleFactor();
+
+    virtual void focus();
+    virtual void unfocus();
+
+    virtual Page* createWindow(const FrameLoadRequest&);
+    virtual Page* createModalDialog(const FrameLoadRequest&);
+    virtual void show();
+
     virtual bool canRunModal();
     virtual void runModal();
+
+    virtual void setToolbarsVisible(bool);
+    virtual bool toolbarsVisible();
+
+    virtual void setStatusbarVisible(bool);
+    virtual bool statusbarVisible();
+
+    virtual void setScrollbarsVisible(bool);
+    virtual bool scrollbarsVisible();
+
+    virtual void setMenubarVisible(bool);
+    virtual bool menubarVisible();
+
+    virtual void setResizable(bool);
 };
 
 }
diff --git a/WebCore/bridge/win/ContextMenuClientWin.h b/WebCore/bridge/win/ContextMenuClientWin.h
new file mode 100644 (file)
index 0000000..da35932
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * 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 ContextMenuClientWin_H
+#define ContextMenuClientWin_H
+
+#include "ContextMenuClient.h"
+
+namespace WebCore {
+
+class ContextMenuClientWin : public ContextMenuClient, public Shared<ContextMenuClientWin> {
+public:
+    virtual ~ContextMenuClientWin() { }
+
+    virtual void ref() { Shared<ContextMenuClientWin>::ref(); }
+    virtual void deref() { Shared<ContextMenuClientWin>::deref(); }
+
+    virtual void addCustomContextMenuItems(ContextMenu*);
+};
+
+}
+
+#endif // ContextMenuClientWin_H
index 64c96af1b007e4907d6902e503f38fab03c071cc..655775715f41d99b6bf853e2f2e07124b8096eb6 100644 (file)
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2006 Don Gibson <dgibson77@gmail.com>
- * Copyright (C) 2006 Apple Computer, Inc.
  *
  * All rights reserved.
  *
index 38a886515eb025fd927e45ee505bec8748637e3f..fabf4ad517c6862827c2542fa6d1a7f8e4577fc5 100644 (file)
 
 #include "TextResourceDecoder.h"
 #include "Document.h"
+#include "EditorClient.h"
+#include "FrameLoader.h"
 #include "FrameLoadRequest.h"
 #include "FramePrivate.h"
+#include "FrameView.h"
 #include "Settings.h"
 #include "PlatformKeyboardEvent.h"
 #include "Plugin.h"
@@ -59,32 +62,7 @@ FrameWin::FrameWin(Page* page, Element* ownerElement,  PassRefPtr<EditorClient>
 FrameWin::~FrameWin()
 {
     setView(0);
-    clearRecordedFormValues();    
-}
-
-void FrameWin::urlSelected(const FrameLoadRequest& request, Event* /*triggeringEvent*/)
-{
-    if (m_client)
-        m_client->openURL(request.resourceRequest().url().url(), request.lockHistory());
-}
-
-void FrameWin::submitForm(const FrameLoadRequest& request, Event*)
-{
-    // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
-    const ResourceRequest& resourceRequest = request.resourceRequest();
-    if (d->m_submittedFormURL == resourceRequest.url())
-        return;
-    d->m_submittedFormURL = resourceRequest.url();
-
-    if (m_client)
-        m_client->submitForm(resourceRequest.httpMethod(), resourceRequest.url(), &resourceRequest.httpBody());
-
-    clearRecordedFormValues();
-}
-
-String FrameWin::userAgent() const
-{
-    return "Mozilla/5.0 (PC; U; Intel; Windows; en) AppleWebKit/420+ (KHTML, like Gecko)";
+    loader()->clearRecordedFormValues();    
 }
 
 void FrameWin::runJavaScriptAlert(String const& message)
@@ -125,7 +103,7 @@ bool FrameWin::keyPress(const PlatformKeyboardEvent& keyEvent)
     }
     
     if (!keyEvent.isKeyUp())
-        prepareForUserAction();
+        loader()->resetMultipleFormSubmissionProtection();
 
     result = !EventTargetNodeCast(node)->dispatchKeyEvent(keyEvent);
 
@@ -134,22 +112,6 @@ bool FrameWin::keyPress(const PlatformKeyboardEvent& keyEvent)
     return result;
 }
 
-void FrameWin::setTitle(const String &title)
-{
-    String text = title;
-    text.replace('\\', backslashAsCurrencySymbol());
-
-    m_client->setTitle(text);
-}
-
-void FrameWin::setStatusBarText(const String& status)
-{
-    String text = status;
-    text.replace('\\', backslashAsCurrencySymbol());
-
-    m_client->setStatusText(text);
-}
-
 void FrameWin::createNewWindow(const FrameLoadRequest& request, const WindowFeatures& features, Frame*& newFrame)
 {
     m_client->createNewWindow(request.resourceRequest(), features, newFrame);
index 39856ec483985262c39b44504a42c36df812956a..2278e6775fba35922ecd6b3c06e13da2bbef634e 100644 (file)
@@ -31,7 +31,9 @@
 
 namespace WebCore {
 
+class FormData;
 class FrameLoadRequest;
+class ResourceRequest;
 struct WindowFeatures;
 
 class FrameWinClient {
@@ -45,48 +47,31 @@ public:
 
 class FrameWin : public Frame {
 public:
-    FrameWin(Page*, Element*,  PassRefPtr<EditorClient>, FrameWinClient*);
-    ~FrameWin();
+    FrameWin(Page*, Element*, PassRefPtr<EditorClient>, FrameWinClient*);
+    virtual ~FrameWin();
 
     virtual void createNewWindow(const FrameLoadRequest&, const WindowFeatures&, Frame*& part);
-    virtual void submitForm(const FrameLoadRequest&, Event*);
-    virtual void urlSelected(const FrameLoadRequest&, Event*);
-
-    virtual void setTitle(const String&);
-    virtual void setStatusBarText(const String&);
-
-    virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
-    virtual Plugin* createPlugin(Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType);
-    virtual Frame* createFrame(const KURL&, const String& name, Element* ownerElement, const String& referrer);
-    virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>& args);
 
     virtual void scheduleClose();
 
     virtual void focusWindow();
     virtual void unfocusWindow();
-    
-    virtual void saveDocumentState();
-    virtual void restoreDocumentState();
-    
+
     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 void createEmptyDocument();
     virtual Range* markedTextRange() const;
 
-    virtual String incomingReferrer() const;
-    virtual String userAgent() const;
-
     virtual String mimeTypeForFileName(const String&) const;
 
     virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
@@ -96,14 +81,12 @@ public:
 
     virtual bool passSubframeEventToSubframe(MouseEventWithHitTestResults &, Frame* subframePart = 0);
     virtual bool passWheelEventToChildWidget(Node*);
-    
-    virtual String overrideMediaType() const;
 
     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();
@@ -115,25 +98,16 @@ public:
     virtual void issuePasteAndMatchStyleCommand();
     virtual void issueTransposeCommand();
     virtual void respondToChangedSelection(const Selection& oldSelection, bool closeTyping);
-    void FrameWin::respondToChangedContents(const Selection& endingSelection);
+    virtual void respondToChangedContents(const Selection& endingSelection);
     virtual bool shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity affinity, bool stillSelecting) const;
-    virtual void partClearedInBegin();
-
-    virtual bool canGoBackOrForward(int distance) const;
-    virtual void goBackOrForward(int distance);
-    virtual int getHistoryLength();
-    virtual KURL historyURL(int distance);
-    virtual void handledOnloadEvents();
 
     virtual bool canPaste() const;
     virtual bool canRedo() const;
     virtual bool canUndo() const;
     virtual void print();
 
-    bool keyPress(const PlatformKeyboardEvent&);
-    virtual KURL originalRequestURL() const;
-    virtual IntRect windowResizerRect() const;
-    
+    virtual bool keyPress(const PlatformKeyboardEvent&);
+
 protected:
     virtual bool isLoadTypeReload();
 
index f919237b14e6b1bf8d7cfbb631efc05245c7a660..38c0fd5139b7c2a445f5b22e7228758dbeb5f193 100644 (file)
@@ -27,6 +27,7 @@
 #define EditCommand_h
 
 #include "EditAction.h"
+#include "Element.h"
 #include "Selection.h"
 
 namespace WebCore {
index 2b35e92f24bafd7ec4e3e28975754b02a1ae9cfb..5effc8d011ce2a5c74828f977f25fd8314b88235 100644 (file)
@@ -26,6 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef FormState_h
+#define FormState_h
+
 #include "Shared.h"
 #include "StringHash.h"
 #include <wtf/HashMap.h>
@@ -52,3 +55,5 @@ namespace WebCore {
     };
 
 }
+
+#endif // FormState_h
index 9f882e3dd3e18ec5de9ce0f4a7b5350b341abefc..20c3b5ecf0d8380881858f3d0695a07fd0e678a4 100644 (file)
@@ -29,6 +29,7 @@
 #define FrameLoader_h
 
 #include "CachePolicy.h"
+#include "FormState.h"
 #include "FrameLoaderTypes.h"
 #include "KURL.h"
 #include "StringHash.h"
@@ -81,7 +82,6 @@ namespace WebCore {
     class Element;
     class Event;
     class FormData;
-    class FormState;
     class Frame;
     class FrameLoaderClient;
     class HTMLFormElement;
index fe986c2bc5de782a49085eee4b7ef735512e0c45..47bcab16b383ecf8c752c17f399e729831991b5b 100644 (file)
@@ -40,6 +40,7 @@
 #include "HTMLFrameElementBase.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
+#include "Image.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "MouseEventWithHitTestResults.h"
index ce401efbe1954d25dd402e27679790ec6495ae7c..4c19212203e98a3021ab0db9d98c6467abd0c6c0 100644 (file)
@@ -76,7 +76,6 @@ static void initialiseSupportedImageMIMETypes()
 #else
     //assume that all implementations at least support
     supportedImageMIMETypes->add("image/jpeg");
-    supportedImageMIMETypes->add("image/jpeg");
     supportedImageMIMETypes->add("image/png");
     supportedImageMIMETypes->add("image/gif");
     supportedImageMIMETypes->add("image/bmp");
index 51c4f120041821f0d57e9fa3f28f21e72461a578..dc897c5b1b9225a67c1d761fa363590adfe72e57 100644 (file)
@@ -59,10 +59,4 @@ Image* Image::loadPlatformResource(const char *name)
     return img;
 }
 
-bool Image::supportsType(const String& type)
-{
-    // FIXME: Implement.
-    return false;
-}
-
 }
index 13be3f2aa1a08ae8e549eaebfd8ccdcabb32889b..fd0674ca88734fc233654c1cd70c22ab05b9b141 100644 (file)
@@ -24,6 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#import "config.h"
-#import "ResourceError.h"
+#include "config.h"
+#include "ResourceError.h"
 
index 868fd8f7f760317922c98cadccd9f2d23f617289..d69bbb21baf35d61987acefd92c27d97c7123a84 100644 (file)
@@ -36,6 +36,7 @@
 #if USE(WININET)
 #include <winsock2.h>
 #include <windows.h>
+#include "Timer.h"
 #endif
 
 #if USE(CURL)
index 0456413e4afc53438af596f2994f5a972b5ad3fe..d2f9c0119624aa2eb3d9faaf230b0a0a58323400 100644 (file)
@@ -32,7 +32,9 @@
 #include "DocLoader.h"
 #include "Document.h"
 #include "Frame.h"
+#include "FrameLoader.h"
 #include "Page.h"
+#include "ResourceError.h"
 #include "Timer.h"
 #include <windows.h>
 #include <wininet.h>
@@ -172,7 +174,7 @@ void ResourceHandle::onHandleCreated(LPARAM lParam)
         headers += d->m_postReferrer;
         headers += "\n";
         const CString& headersLatin1 = headers.latin1();
-        String formData = postData().flattenToString();
+        String formData = postData()->flattenToString();
         INTERNET_BUFFERSA buffers;
         memset(&buffers, 0, sizeof(buffers));
         buffers.dwStructSize = sizeof(INTERNET_BUFFERSA);
@@ -196,8 +198,9 @@ void ResourceHandle::onRequestRedirected(LPARAM lParam)
     if (d->status != 0)
         return;
 
-    KURL url(String((StringImpl*) lParam).deprecatedString());
-    client()->receivedRedirect(this, url);
+    ResourceRequest request((StringImpl*) lParam);
+    ResourceResponse redirectResponse;
+    client()->willSendRequest(this, request, redirectResponse);
 }
 
 void ResourceHandle::onRequestComplete(LPARAM lParam)
@@ -342,7 +345,7 @@ bool ResourceHandle::start(DocLoader* docLoader)
     } else {
         static HINTERNET internetHandle = 0;
         if (!internetHandle) {
-            String userAgentStr = docLoader->frame()->userAgent() + String("", 1);
+            String userAgentStr = docLoader->frame()->loader()->userAgent() + String("", 1);
             LPCWSTR userAgent = reinterpret_cast<const WCHAR*>(userAgentStr.characters());
             // leak the Internet for now
             internetHandle = InternetOpen(userAgent, INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, INTERNET_FLAG_ASYNC);
@@ -365,13 +368,13 @@ bool ResourceHandle::start(DocLoader* docLoader)
         // For form posting, we can't use InternetOpenURL.  We have to use
         // InternetConnect followed by HttpSendRequest.
         HINTERNET urlHandle;
-        String referrer = docLoader->frame()->referrer();
+        String referrer = docLoader->frame()->loader()->referrer();
         if (method() == "POST") {
             d->m_postReferrer = referrer;
             DeprecatedString host = url().host();
             host += "\0";
             urlHandle = InternetConnectA(internetHandle, host.ascii(),
-                                         d->URL.port(),
+                                         url().port(),
                                          NULL, // no username
                                          NULL, // no password
                                          INTERNET_SERVICE_HTTP,
@@ -447,7 +450,8 @@ void ResourceHandle::cancel()
 
     if (!d->m_resourceHandle)
         // Async load canceled before we have a handle -- mark ourselves as in error, to be deleted later.
-        setError(1);
+        // FIXME: need real cancel error
+        client()->didFailWithError(this, ResourceError());
 }
 
 void ResourceHandle::setHasReceivedResponse(bool b)
index cd959f584d93ff63626e397d08cb919d2e15cbd8..18c7a657bfc6616f1c61288f70b8b8e2bc22adb5 100644 (file)
@@ -44,22 +44,28 @@ FloatRect scalePageRectToScreenCoordinates(const FloatRect& rect, const Page*)
 {
     return rect;
 }
-    
-static MONITORINFOEX monitorInfo(const Page* page)
+
+static MONITORINFOEX monitorInfo(Widget* widget)
 {
-    HMONITOR monitor = MonitorFromWindow(page->mainFrame()->view()->containingWindow(), MONITOR_DEFAULTTOPRIMARY);
+    HMONITOR monitor = MonitorFromWindow(widget->containingWindow(), MONITOR_DEFAULTTOPRIMARY);
     MONITORINFOEX info;
     info.cbSize = sizeof(MONITORINFOEX);
     GetMonitorInfo(monitor, &info);
     return info;
 }
 
-FloatRect screenRect(const Page* page)
+FloatRect screenRect(Widget* widget)
 {
-    return monitorInfo(page).rcMonitor;
+    return monitorInfo(widget).rcMonitor;
 }
 
-int screenDepth(const Page*)
+FloatRect screenAvailableRect(Widget* widget)
+{
+    // FIXME: I have no idea if this is correct
+    return monitorInfo(widget).rcWork;
+}
+
+int screenDepth(Widget*)
 {
     DEVMODE deviceInfo;
     deviceInfo.dmSize = sizeof(DEVMODE);
@@ -68,14 +74,4 @@ int screenDepth(const Page*)
     return deviceInfo.dmBitsPerPel;
 }
 
-FloatRect usableScreenRect(const Page* page)
-{
-    return monitorInfo(page).rcWork;
-}
-
-float scaleFactor(const Page* page)
-{
-    return 1.0f;
-}
-
 } // namespace WebCore
similarity index 61%
rename from WebCore/bridge/win/PageWin.cpp
rename to WebCore/platform/win/SoundWin.cpp
index 3bbfd10ca2598d30a5050f9d2e80d2b80ef5d4c5..b00756141b5593ac38e567213830cf61aabc2b95 100644 (file)
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * 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
  * 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. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "Page.h"
 
-#include "Frame.h"
-#include "FloatRect.h"
+#include "Sound.h"
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 namespace WebCore {
 
-static HWND rootWindowForFrame(const Frame* frame)
-{
-    if (!frame)
-        return 0;
-    FrameView* frameView = frame->view();
-    if (!frameView)
-        return 0;
-    HWND frameWnd = frameView->containingWindow();
-    if (!frameWnd)
-        return 0;
-    return GetAncestor(frameWnd, GA_ROOT);
-}
-
-FloatRect Page::windowRect() const
-{
-    HWND windowHandle = rootWindowForFrame(mainFrame());
-    if (!windowHandle)
-        return IntRect();
-    RECT rect;
-    GetWindowRect(windowHandle, &rect);
-    return rect;
-}
-
-void Page::setWindowRect(const FloatRect& r)
+void systemBeep()
 {
-    HWND windowHandle = rootWindowForFrame(mainFrame());
-    if (!windowHandle)
-        return;
-    MoveWindow(windowHandle, r.x(), r.y(), r.width(), r.height(), true);
+    MessageBeep(-1);
 }
 
 }
index bc154f1603212fb8dd0a636d520c598bf8ede741..6e76bfb4c6cd1ae2ba8e747597cbf0710b2f250d 100644 (file)
 
 #define WIN32_COMPILE_HACK
 
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <windows.h>
+#include "AXObjectCache.h"
+#include "CachedResource.h"
+#include "ChromeClientWin.h"
+#include "ContextMenu.h"
+#include "ContextMenuClientWin.h"
+#include "CookieJar.h"
 #include "CString.h"
-#include "Node.h"
-#include "TextField.h"
+#include "Cursor.h"
+#include "DocumentLoader.h"
+#include "EditCommand.h"
+#include "EditorClientWin.h"
+#include "EventHandler.h"
 #include "FileChooser.h"
 #include "Font.h"
-#include "IntPoint.h"
-#include "Widget.h"
-#include "GraphicsContext.h"
-#include "Cursor.h"
-#include "loader.h"
-#include "FrameView.h"
+#include "FrameLoader.h"
 #include "FrameLoadRequest.h"
+#include "FrameView.h"
+#include "FrameWin.h"
+#include "GraphicsContext.h"
+#include "History.h"
+#include "Icon.h"
+#include "IconLoader.h"
+#include "IconDatabase.h"
+#include "IntPoint.h"
 #include "KURL.h"
-#include "PlatformScrollBar.h"
-#include "ScrollBar.h"
+#include "Language.h"
+#include "loader.h"
+#include "LocalizedStrings.h"
+#include "Node.h"
 #include "Page.h"
 #include "Path.h"
 #include "PlatformMouseEvent.h"
-#include "CookieJar.h"
-#include "Screen.h"
-#include "History.h"
-#include "Language.h"
-#include "LocalizedStrings.h"
+#include "PlatformScrollBar.h"
 #include "PlugInInfoStore.h"
+#include "PopupMenu.h"
 #include "RenderTheme.h"
-#include "FrameWin.h"
-#include "ResourceHandle.h"
-#include "ResourceHandleClient.h"
 #include "ResourceLoader.h"
 #include "RenderThemeWin.h"
+#include "Screen.h"
+#include "ScrollBar.h"
 #include "TextBoundaries.h"
-#include "AXObjectCache.h"
-#include "PopupMenu.h"
-#include "ChromeClientWin.h"
-#include "EditCommand.h"
-#include "EditorClientWin.h"
-#include "Icon.h"
-#include "IconLoader.h"
-#include "IconDatabase.h"
-#include "CachedResource.h"
+#include "TextField.h"
+#include "Widget.h"
 
 #define notImplemented() do { \
     char buf[256] = {0}; \
 
 namespace WebCore {
 
-void FrameView::updateBorder() { notImplemented(); }
-bool FrameView::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { return true; }
-bool FrameView::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { return true; }
-bool FrameView::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { return true; }
-bool FrameView::passWheelEventToSubframe(PlatformWheelEvent& e, Frame* subframe) { return false; }
-bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar*) { return false; }
+static int frameNumber = 0;
+static Cursor localCursor;
 
-void Widget::enableFlushDrawing() { notImplemented(); }
-bool Widget::isEnabled() const { notImplemented(); return 0; }
-Widget::FocusPolicy Widget::focusPolicy() const { notImplemented(); return NoFocus; }
-void Widget::disableFlushDrawing() { notImplemented(); }
-void Widget::removeFromParent() { notImplemented(); }
-GraphicsContext* Widget::lockDrawingFocus() { notImplemented(); return 0; }
-void Widget::unlockDrawingFocus(GraphicsContext*) { notImplemented(); }
-bool Widget::capturingMouse() const { return false; }
-void Widget::setCapturingMouse(bool capturingMouse) { }
-Widget* Widget::capturingTarget() { return this; }
-Widget* Widget::capturingChild() { return 0; }
-void Widget::setCapturingChild(Widget* w) {}
-IntPoint Widget::convertChildToSelf(const Widget*, const IntPoint& p) const { return p; }
-IntPoint Widget::convertSelfToChild(const Widget*, const IntPoint& p) const { return p; }
-void Widget::setParent(ScrollView*) {}
-ScrollView* Widget::parent() const { return 0; }
+time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) { notImplemented(); return 0; }
+void CheckCacheObjectStatus(DocLoader*, CachedResource*) { notImplemented(); }
+bool CheckIfReloading(DocLoader*) { notImplemented(); return false; }
+String defaultLanguage() { notImplemented(); return "en"; }
+String fileButtonChooseFileLabel() { notImplemented(); return "Browse..."; }
+String fileButtonNoFileSelectedLabel() { notImplemented(); return String(); }
+int findNextSentenceFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
+int findNextWordFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
+void findSentenceBoundary(UChar const*, int, int, int*, int*) { notImplemented(); }
+void findWordBoundary(UChar const* str, int len, int position, int* start, int* end) { notImplemented(); *start = position; *end = position; }
+Color focusRingColor() { notImplemented(); return 0xFF0000FF; }
+bool historyContains(DeprecatedString const&) { notImplemented(); return false; }
+String inputElementAltText() { notImplemented(); return DeprecatedString(); }
+bool IsResponseURLEqualToURL(PlatformResponse , const String&) { notImplemented(); return false; }
+const Cursor& cellCursor() { notImplemented(); return localCursor; }
+const Cursor& contextMenuCursor() { notImplemented(); return localCursor; }
+const Cursor& moveCursor() { notImplemented(); return localCursor; }
+const Cursor& verticalTextCursor() { notImplemented(); return localCursor; }
+void refreshPlugins(bool) { notImplemented(); }
+String resetButtonDefaultLabel() { notImplemented(); return "Reset"; }
+bool ResponseIsMultipart(PlatformResponse) { notImplemented(); return false; }
+DeprecatedString ResponseMIMEType(PlatformResponse) { notImplemented(); return DeprecatedString(); }
+DeprecatedString ResponseURL(PlatformResponse) { notImplemented(); return DeprecatedString(); }
+int screenDepthPerComponent(Widget*) { notImplemented(); return 8; }
+bool screenIsMonochrome(Widget*) { notImplemented(); return false; }
+String searchableIndexIntroduction() { notImplemented(); return String(); }
+Vector<char> ServeSynchronousRequest(Loader*, DocLoader*, const ResourceRequest&, ResourceResponse&) { notImplemented(); return Vector<char>(); }
+void setFocusRingColorChangeFunction(void (*)()) { notImplemented(); }
+String submitButtonDefaultLabel() { notImplemented(); return "Submit"; }
 
-void TextField::selectAll() { notImplemented(); }
-void TextField::addSearchResult() { notImplemented(); }
-int TextField::selectionStart() const { notImplemented(); return 0; }
-bool TextField::hasSelectedText() const { notImplemented(); return 0; }
-String TextField::selectedText() const { notImplemented(); return String(); }
-void TextField::setAutoSaveName(String const&) { notImplemented(); }
-bool TextField::checksDescendantsForFocus() const { notImplemented(); return false; }
-void TextField::setSelection(int,int) { notImplemented(); }
-void TextField::setMaxResults(int) { notImplemented(); }
-bool TextField::edited() const { notImplemented(); return 0; }
+bool AXObjectCache::gAccessibilityEnabled = false;
+
+void CachedResource::setPlatformResponse(PlatformResponse) { notImplemented(); }
+void CachedResource::setAllData(PlatformData) { notImplemented(); }
+
+void ChromeClientWin::setWindowRect(const FloatRect&) { notImplemented(); }
+FloatRect ChromeClientWin::windowRect() { notImplemented(); return FloatRect(); }
+FloatRect ChromeClientWin::pageRect() { notImplemented(); return FloatRect(); }
+float ChromeClientWin::scaleFactor() { notImplemented(); return 0.0; }
+void ChromeClientWin::focus() { notImplemented(); }
+void ChromeClientWin::unfocus() { notImplemented(); }
+Page* ChromeClientWin::createWindow(const FrameLoadRequest&) { notImplemented(); return NULL; }
+Page* ChromeClientWin::createModalDialog(const FrameLoadRequest&) { notImplemented(); return NULL; }
+void ChromeClientWin::show() { notImplemented(); }
+bool ChromeClientWin::canRunModal() { notImplemented(); return false; }
+void ChromeClientWin::runModal() { notImplemented(); }
+void ChromeClientWin::setToolbarsVisible(bool) { notImplemented(); }
+bool ChromeClientWin::toolbarsVisible() { notImplemented(); return false; }
+void ChromeClientWin::setStatusbarVisible(bool) { notImplemented(); }
+bool ChromeClientWin::statusbarVisible() { notImplemented(); return false; }
+void ChromeClientWin::setScrollbarsVisible(bool) { notImplemented(); }
+bool ChromeClientWin::scrollbarsVisible() { notImplemented(); return false; }
+void ChromeClientWin::setMenubarVisible(bool) { notImplemented(); }
+bool ChromeClientWin::menubarVisible() { notImplemented(); return false; }
+void ChromeClientWin::setResizable(bool) { notImplemented(); }
+
+void ContextMenu::appendItem(ContextMenuItem item) { notImplemented(); }
+
+void ContextMenuClientWin::addCustomContextMenuItems(ContextMenu*) { notImplemented(); }
+
+void DocumentLoader::setFrame(Frame*) { notImplemented(); }
+FrameLoader* DocumentLoader::frameLoader() const { notImplemented(); return m_frame->loader(); }
+KURL DocumentLoader::URL() const { notImplemented(); return KURL(); }
+bool DocumentLoader::isStopping() const { notImplemented(); return false; }
+void DocumentLoader::stopLoading() { notImplemented(); }
+void DocumentLoader::setLoading(bool) { notImplemented(); }
+void DocumentLoader::updateLoading() { notImplemented(); }
+void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType) { notImplemented(); }
+bool DocumentLoader::isLoadingInAPISense() const { notImplemented(); return false; }
+void DocumentLoader::stopRecordingResponses() { notImplemented(); }
+
+bool EditorClientWin::shouldDeleteRange(Range*) { notImplemented(); return false; }
+bool EditorClientWin::shouldShowDeleteInterface(HTMLElement*) { notImplemented(); return false; }
+bool EditorClientWin::isContinuousSpellCheckingEnabled() { notImplemented(); return false; }
+bool EditorClientWin::isGrammarCheckingEnabled() { notImplemented(); return false; }
+int EditorClientWin::spellCheckerDocumentTag() { notImplemented(); return 0; }
+
+
+void EventHandler::focusDocumentView() { notImplemented(); }
+bool EventHandler::handleDrag(const MouseEventWithHitTestResults&) { notImplemented(); return false; }
+bool EventHandler::handleMouseUp(const MouseEventWithHitTestResults&) { notImplemented(); return false; }
+bool EventHandler::lastEventIsMouseUp() const { notImplemented(); return false; }
+bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { notImplemented(); return true; }
+bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { notImplemented(); return true; }
+bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { notImplemented(); return true; }
+bool EventHandler::passWheelEventToSubframe(PlatformWheelEvent& e, Frame* subframe) { notImplemented(); return false; }
+bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults&) { notImplemented(); return false; }
+bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar*) { notImplemented(); return false; }
+bool EventHandler::shouldDragAutoNode(Node*, const IntPoint&) const { notImplemented(); return false; }
+bool EventHandler::tabsToAllControls(KeyboardEvent*) const { notImplemented(); return false; }
+bool EventHandler::tabsToLinks(KeyboardEvent*) const { notImplemented(); return false; }
 
 FileChooser::FileChooser(Document*, RenderFileUploadControl*) { notImplemented(); }
 FileChooser::~FileChooser() { notImplemented(); }
@@ -123,14 +186,31 @@ String FileChooser::basenameForWidth(int width) const { notImplemented(); return
 void FileChooser::disconnectUploadControl() { notImplemented(); }
 void FileChooser::chooseFile(const String& filename) { notImplemented(); }
 
-Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
+void Frame::setNeedsReapplyStyles() { notImplemented(); }
+
+void FrameLoader::didFirstLayout() { notImplemented(); }
+String FrameLoader::overrideMediaType() const { notImplemented(); return String(); }
+Widget* FrameLoader::createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>&) { notImplemented(); return 0; }
+void FrameLoader::redirectDataToPlugin(Widget* pluginWidget) { notImplemented(); }
+int FrameLoader::getHistoryLength() { notImplemented(); return 0; }
+void FrameLoader::setTitle(const String& title) { notImplemented(); }
+String FrameLoader::referrer() const { notImplemented(); return String(); }
+void FrameLoader::saveDocumentState() { notImplemented(); }
+void FrameLoader::restoreDocumentState() { notImplemented(); }
+void FrameLoader::goBackOrForward(int distance) { notImplemented(); }
+KURL FrameLoader::historyURL(int distance) { notImplemented(); return KURL();}
+void FrameLoader::urlSelected(const FrameLoadRequest&, Event*) { notImplemented(); }
+Frame* FrameLoader::createFrame(KURL const&, String const&, Element*, String const&) { notImplemented(); return NULL; }
+void FrameLoader::submitForm(const FrameLoadRequest&, Event*) { notImplemented(); }
+void FrameLoader::partClearedInBegin() { notImplemented(); }
+KURL FrameLoader::originalRequestURL() const { notImplemented(); return KURL(); }
+bool FrameLoader::canGoBackOrForward(int) const { notImplemented(); return false; }
+ObjectContentType FrameLoader::objectContentType(const KURL&, const String&) { notImplemented(); return ObjectContentNone; }
+Widget* FrameLoader::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { notImplemented(); return NULL; }
+void FrameLoader::detachFromParent() { notImplemented(); }
+void FrameLoader::checkLoadCompleteForThisFrame() { notImplemented(); }
 
-PlatformMouseEvent::PlatformMouseEvent(const CurrentEventTag&) { notImplemented(); }
-String searchableIndexIntroduction() { notImplemented(); return String(); }
-
-int findNextSentenceFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
-void findSentenceBoundary(UChar const*, int, int, int*, int*) { notImplemented(); }
-int findNextWordFromIndex(UChar const*, int, int, bool) { notImplemented(); return 0; }
+void FrameView::updateBorder() { notImplemented(); }
 
 void FrameWin::focusWindow() { notImplemented(); }
 void FrameWin::unfocusWindow() { notImplemented(); }
@@ -139,7 +219,6 @@ void FrameWin::issueRedoCommand(void) { notImplemented(); }
 KJS::Bindings::Instance* FrameWin::getObjectInstanceForWidget(Widget*) { notImplemented(); return 0; }
 KJS::Bindings::Instance* FrameWin::getEmbedInstanceForWidget(Widget*) { notImplemented(); return 0; }
 KJS::Bindings::RootObject* FrameWin::bindingRootObject() { notImplemented(); return 0; }
-Widget* FrameWin::createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>&) { notImplemented(); return 0; }
 bool FrameWin::canRedo() const { notImplemented(); return 0; }
 bool FrameWin::canUndo() const { notImplemented(); return 0; }
 void FrameWin::registerCommandForUndo(PassRefPtr<WebCore::EditCommand>) { notImplemented(); }
@@ -163,186 +242,92 @@ bool FrameWin::statusbarVisible() { notImplemented(); return 0; }
 bool FrameWin::toolbarVisible() { notImplemented(); return 0; }
 void FrameWin::issueTransposeCommand() { notImplemented(); }
 bool FrameWin::canPaste() const { notImplemented(); return 0; }
-bool FrameWin::canGoBackOrForward(int) const { notImplemented(); return 0; }
-void FrameWin::goBackOrForward(int distance) { notImplemented(); }
-int FrameWin::getHistoryLength() { notImplemented(); return 0;}
-KURL FrameWin::historyURL(int distance) { notImplemented(); return KURL();}
 void FrameWin::issuePasteAndMatchStyleCommand() { notImplemented(); }
-KURL FrameWin::originalRequestURL() const { return KURL(); }
 bool FrameWin::isLoadTypeReload() { notImplemented(); return false; }
-IntRect FrameWin::windowResizerRect() const { return IntRect(); }
-void FrameWin::restoreDocumentState() { }
-void FrameWin::partClearedInBegin() { }
-void FrameWin::createEmptyDocument() { }
-String FrameWin::overrideMediaType() const { return String(); }
-Range* FrameWin::markedTextRange() const { return 0; }
-bool FrameWin::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame*) { return false; }
-bool FrameWin::lastEventIsMouseUp() const { return false; }
-void FrameWin::addMessageToConsole(String const&, unsigned int ,String const&) { }
-bool FrameWin::shouldChangeSelection(const Selection&, const Selection&, EAffinity, bool) const { return true; }
-void FrameWin::respondToChangedSelection(const Selection&, bool) { }
-static int frameNumber = 0;
-Frame* FrameWin::createFrame(KURL const&, String const&, Element*, String const&) { return 0; }
-void FrameWin::saveDocumentState() { }
-void FrameWin::clearUndoRedoOperations(void) { }
-String FrameWin::incomingReferrer() const { return String(); }
-void FrameWin::markMisspellingsInAdjacentWords(VisiblePosition const&) { }
-void FrameWin::respondToChangedContents(const Selection&) { }
-void FrameWin::handledOnloadEvents() { }
-Plugin* FrameWin::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { return 0; }
-ObjectContentType FrameWin::objectContentType(const KURL&, const String&) { return ObjectContentNone; }
-
-void GraphicsContext::addRoundedRectClip(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight,
-    const IntSize& bottomLeft, const IntSize& bottomRight) { notImplemented(); }
+Range* FrameWin::markedTextRange() const { notImplemented(); return 0; }
+bool FrameWin::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame*) { notImplemented(); return false; }
+bool FrameWin::lastEventIsMouseUp() const { notImplemented(); return false; }
+void FrameWin::addMessageToConsole(String const&, unsigned int, String const&) { notImplemented(); }
+bool FrameWin::shouldChangeSelection(const Selection&, const Selection&, EAffinity, bool) const { notImplemented(); return true; }
+void FrameWin::respondToChangedSelection(const Selection&, bool) { notImplemented(); }
+void FrameWin::clearUndoRedoOperations(void) { notImplemented(); }
+void FrameWin::markMisspellingsInAdjacentWords(VisiblePosition const&) { notImplemented(); }
+void FrameWin::respondToChangedContents(const Selection&) { notImplemented(); }
+
+void GraphicsContext::addRoundedRectClip(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight) { notImplemented(); }
 void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness) { notImplemented(); }
+void GraphicsContext::setShadow(IntSize const&,int,Color const&) { notImplemented(); }
+void GraphicsContext::clearShadow() { notImplemented(); }
+void GraphicsContext::beginTransparencyLayer(float) { notImplemented(); }
+void GraphicsContext::endTransparencyLayer() { notImplemented(); }
+void GraphicsContext::clearRect(const FloatRect&) { notImplemented(); }
+void GraphicsContext::strokeRect(const FloatRect&, float) { notImplemented(); }
+void GraphicsContext::setLineWidth(float) { notImplemented(); }
+void GraphicsContext::setLineCap(LineCap) { notImplemented(); }
+void GraphicsContext::setLineJoin(LineJoin) { notImplemented(); }
+void GraphicsContext::setMiterLimit(float) { notImplemented(); }
+void GraphicsContext::setAlpha(float) { notImplemented(); }
+void GraphicsContext::setCompositeOperation(CompositeOperator) { notImplemented(); }
+void GraphicsContext::clip(const Path&) { notImplemented(); }
+void GraphicsContext::rotate(float) { notImplemented(); }
+void GraphicsContext::scale(const FloatSize&) { notImplemented(); }
 
-int screenDepthPerComponent(const Page*) { notImplemented(); return 8; }
-bool screenIsMonochrome(const Page*) { notImplemented(); return false; }
-
-/********************************************************/
-/* Completely empty stubs (mostly to allow DRT to run): */
-/********************************************************/
-static Cursor localCursor;
-const Cursor& WebCore::moveCursor() { return localCursor; }
-
-bool AXObjectCache::gAccessibilityEnabled = false;
-
-bool historyContains(DeprecatedString const&) { return false; }
-String submitButtonDefaultLabel() { return "Submit"; }
-String inputElementAltText() { return DeprecatedString(); }
-String resetButtonDefaultLabel() { return "Reset"; }
-String fileButtonChooseFileLabel() { return "Browse..."; }
-String fileButtonNoFileSelectedLabel() { return String(); }
-
-String defaultLanguage() { return "en"; }
-
-void findWordBoundary(UChar const* str, int len, int position, int* start, int* end) {*start = position; *end = position; }
-
-PluginInfo* PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned) { return 0;}
-unsigned PlugInInfoStore::pluginCount() const { return 0; }
-bool PlugInInfoStore::supportsMIMEType(const String&) { return false; }
-void refreshPlugins(bool) { }
+Icon::Icon() { notImplemented(); }
+Icon::~Icon() { notImplemented(); }
+PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
+void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
 
-Vector<char> ServeSynchronousRequest(Loader*, DocLoader*, const ResourceRequest&, ResourceResponse&){ notImplemented(); return Vector<char>(); }
+bool IconDatabase::isIconExpiredForIconURL(const String& url) { notImplemented(); return false; }
+bool IconDatabase::hasEntryForIconURL(const String& url) { notImplemented(); return false; }
+IconDatabase* IconDatabase::sharedIconDatabase() { notImplemented(); return 0; }
+bool IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) { notImplemented(); return false; }
+void IconDatabase::setIconDataForIconURL(const void* data, int size, const String&) { notImplemented(); }
 
-void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
-bool CheckIfReloading(DocLoader*) { return false; }
-bool IsResponseURLEqualToURL(PlatformResponse , const String&) { return false; }
-DeprecatedString ResponseURL(PlatformResponse) { return DeprecatedString(); }
-DeprecatedString ResponseMIMEType(PlatformResponse) { return DeprecatedString(); }
-bool ResponseIsMultipart(PlatformResponse) { return false; }
-time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) { return 0; }
-
-void CachedResource::setResponse(PlatformResponse) { notImplemented(); }
-void CachedResource::setAllData(PlatformData) { notImplemented(); }
+void Image::drawTiled(GraphicsContext*, const FloatRect&, const FloatRect&, TileRule, TileRule, CompositeOperator) { notImplemented(); }
+bool Image::getHBITMAP(HBITMAP) { notImplemented(); return false; }
 
 HINSTANCE Page::s_instanceHandle = 0;
-bool ChromeClientWin::canRunModal() { notImplemented(); return false; }
-void ChromeClientWin::runModal() { }
 
-bool EditorClientWin::shouldDeleteRange(Range*) { notImplemented(); return false; }
-bool EditorClientWin::shouldShowDeleteInterface(HTMLElement*) { return false; }
-bool EditorClientWin::isContinuousSpellCheckingEnabled() { notImplemented(); return false; }
-bool EditorClientWin::isGrammarCheckingEnabled() { notImplemented(); return false; }
-int EditorClientWin::spellCheckerDocumentTag() { notImplemented(); return 0; }
+Path::Path() { notImplemented(); }
+Path::~Path() { notImplemented(); }
+Path::Path(const Path&) { notImplemented(); }
+bool Path::contains(const FloatPoint&, WindRule rule) const { notImplemented(); return false; }
+void Path::translate(const FloatSize&) { notImplemented(); }
+FloatRect Path::boundingRect() const { notImplemented(); return FloatRect(); }
+Path& Path::operator=(const Path&) { notImplemented(); return*this; }
+void Path::clear() { notImplemented(); }
+void Path::moveTo(const FloatPoint&) { notImplemented(); }
+void Path::addLineTo(const FloatPoint&) { notImplemented(); }
+void Path::addQuadCurveTo(const FloatPoint&, const FloatPoint&) { notImplemented(); }
+void Path::addBezierCurveTo(const FloatPoint&, const FloatPoint&, const FloatPoint&) { notImplemented(); }
+void Path::addArcTo(const FloatPoint&, const FloatPoint&, float) { notImplemented(); }
+void Path::closeSubpath() { notImplemented(); }
+void Path::addArc(const FloatPoint&, float, float, float, bool) { notImplemented(); }
+void Path::addRect(const FloatRect&) { notImplemented(); }
+void Path::addEllipse(const FloatRect&) { notImplemented(); }
+void Path::transform(const AffineTransform&) { notImplemented(); }
 
-void Widget::setEnabled(bool) { }
-void Widget::paint(GraphicsContext*,IntRect const&) { }
-void Widget::setIsSelected(bool) { }
-void Widget::invalidate() { }
-void Widget::invalidateRect(const IntRect& r) { }
-void ScrollView::addChild(Widget*) { }
-void ScrollView::removeChild(Widget*) { }
-void ScrollView::scrollPointRecursively(int x, int y) { }
-bool ScrollView::inWindow() const { return true; }
-void ScrollView::paint(GraphicsContext*, const IntRect&) { }
-void ScrollView::wheelEvent(PlatformWheelEvent&) { }
-void ScrollView::themeChanged() { }
-IntPoint ScrollView::convertChildToSelf(const Widget*, const IntPoint& p) const { return p; }
-IntPoint ScrollView::convertSelfToChild(const Widget*, const IntPoint& p) const { return p; }
-void ScrollView::geometryChanged() const {};
-PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent) { return 0; }
-void ScrollView::setFrameGeometry(const IntRect& r) { Widget::setFrameGeometry(r); }
-IntRect ScrollView::windowResizerRect() { return IntRect(); }
-bool ScrollView::resizerOverlapsContent() const { return false; }
-
-void GraphicsContext::setShadow(IntSize const&,int,Color const&) { }
-void GraphicsContext::clearShadow() { }
-void GraphicsContext::beginTransparencyLayer(float) { }
-void GraphicsContext::endTransparencyLayer() { }
-void GraphicsContext::clearRect(const FloatRect&) { }
-void GraphicsContext::strokeRect(const FloatRect&, float) { }
-void GraphicsContext::setLineWidth(float) { }
-void GraphicsContext::setLineCap(LineCap) { }
-void GraphicsContext::setLineJoin(LineJoin) { }
-void GraphicsContext::setMiterLimit(float) { }
-void GraphicsContext::setAlpha(float) { }
-void GraphicsContext::setCompositeOperation(CompositeOperator) { }
-void GraphicsContext::clip(const Path&) { }
-void GraphicsContext::rotate(float) { }
-void GraphicsContext::scale(const FloatSize&) { }
-
-Path::Path(){ }
-Path::~Path(){ }
-Path::Path(const Path&){ }
-bool Path::contains(const FloatPoint&, WindRule rule) const { return false; }
-void Path::translate(const FloatSize&){ }
-FloatRect Path::boundingRect() const { return FloatRect(); }
-Path& Path::operator=(const Path&){ return*this; }
-void Path::clear() { }
-void Path::moveTo(const FloatPoint&) { }
-void Path::addLineTo(const FloatPoint&) { }
-void Path::addQuadCurveTo(const FloatPoint&, const FloatPoint&) { }
-void Path::addBezierCurveTo(const FloatPoint&, const FloatPoint&, const FloatPoint&) { }
-void Path::addArcTo(const FloatPoint&, const FloatPoint&, float) { }
-void Path::closeSubpath() { }
-void Path::addArc(const FloatPoint&, float, float, float, bool) { }
-void Path::addRect(const FloatRect&) { }
-void Path::addEllipse(const FloatRect&) { }
-void Path::transform(const AffineTransform&) { }
-
-TextField::TextField(TextField::Type type) { m_type = type; }
-TextField::~TextField() { }
-void TextField::setFont(WebCore::Font const&) { }
-void TextField::setAlignment(HorizontalAlignment) { }
-void TextField::setWritingDirection(TextDirection) { }
-int TextField::maxLength() const { return 0; }
-void TextField::setMaxLength(int) { }
-String TextField::text() const { return String(); }
-void TextField::setText(String const&) { }
-int TextField::cursorPosition() const { return 0; }
-void TextField::setCursorPosition(int) { }
-void TextField::setEdited(bool) { }
-void TextField::setReadOnly(bool) { }
-void TextField::setPlaceholderString(String const&) { }
-void TextField::setColors(Color const&,Color const&) { }
-IntSize TextField::sizeForCharacterWidth(int) const { return IntSize(); }
-int TextField::baselinePosition(int) const { return 0; }
-void TextField::setLiveSearch(bool) { }
-
-PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize) : Scrollbar(client, orientation, controlSize) { }
-PlatformScrollbar::~PlatformScrollbar() { }
-int PlatformScrollbar::width() const { return 0; }
-int PlatformScrollbar::height() const { return 0; }
-void PlatformScrollbar::setEnabled(bool) { }
-void PlatformScrollbar::paint(GraphicsContext*, const IntRect& damageRect) { }
-void PlatformScrollbar::updateThumbPosition() { }
-void PlatformScrollbar::updateThumbProportion() { }
-void PlatformScrollbar::setRect(const IntRect&) { }
-
-Scrollbar::Scrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize) { }
-void Scrollbar::setSteps(int, int) { }
-bool Scrollbar::scroll(ScrollDirection, ScrollGranularity, float) { return false; }
-bool Scrollbar::setValue(int) { return false; }
-void Scrollbar::setProportion(int, int) { }
-
-Color focusRingColor() { return 0xFF0000FF; }
-void setFocusRingColorChangeFunction(void (*)()) { }
-
-void Frame::setNeedsReapplyStyles() { }
-
-void Image::drawTiled(GraphicsContext*, const FloatRect&, const FloatRect&, TileRule, TileRule, CompositeOperator) { }
-bool Image::getHBITMAP(HBITMAP) { return false; }
+PlatformMouseEvent::PlatformMouseEvent(const CurrentEventTag&) { notImplemented(); }
+
+PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize) : Scrollbar(client, orientation, controlSize) { notImplemented(); }
+PlatformScrollbar::~PlatformScrollbar() { notImplemented(); }
+int PlatformScrollbar::width() const { notImplemented(); return 0; }
+int PlatformScrollbar::height() const { notImplemented(); return 0; }
+void PlatformScrollbar::setEnabled(bool) { notImplemented(); }
+void PlatformScrollbar::paint(GraphicsContext*, const IntRect& damageRect) { notImplemented(); }
+void PlatformScrollbar::updateThumbPosition() { notImplemented(); }
+void PlatformScrollbar::updateThumbProportion() { notImplemented(); }
+void PlatformScrollbar::setRect(const IntRect&) { notImplemented(); }
+
+PluginInfo* PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned) { notImplemented(); return 0;}
+unsigned PlugInInfoStore::pluginCount() const { notImplemented(); return 0; }
+bool PlugInInfoStore::supportsMIMEType(const String&) { notImplemented(); return false; }
+
+PolicyCheck::PolicyCheck() { notImplemented(); }
+void PolicyCheck::clear() { notImplemented(); }
+void PolicyCheck::clearRequest() { notImplemented(); }
+void PolicyCheck::call() { notImplemented(); }
+void PolicyCheck::call(PolicyAction) { notImplemented(); }
 
 PopupMenu::PopupMenu(RenderMenuList*) { notImplemented(); }
 PopupMenu::~PopupMenu() { notImplemented(); }
@@ -350,25 +335,78 @@ void PopupMenu::show(const IntRect&, FrameView*, int index) { notImplemented();
 void PopupMenu::hide() { notImplemented(); }
 void PopupMenu::updateFromElement() { notImplemented(); }
 
-void RenderThemeWin::systemFont(int propId, FontDescription& fontDescription) const {}
-bool RenderThemeWin::paintMenuList(RenderObject *, const RenderObject::PaintInfo&, const IntRect&) { return false; }
-void RenderThemeWin::adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const { }
+void RenderThemeWin::systemFont(int propId, FontDescription& fontDescription) const { notImplemented(); }
+bool RenderThemeWin::paintMenuList(RenderObject *, const RenderObject::PaintInfo&, const IntRect&) { notImplemented(); return false; }
+void RenderThemeWin::adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const { notImplemented(); }
 
+void ResourceLoader::cancel() { notImplemented(); }
 bool ResourceLoader::loadsBlocked() { notImplemented(); return false; }
 
-Icon::Icon() { notImplemented(); }
-Icon::~Icon() { notImplemented(); }
-PassRefPtr<Icon> Icon::newIconForFile(const String& filename) { notImplemented(); return PassRefPtr<Icon>(new Icon()); }
-void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
+void ScrollView::addChild(Widget*) { notImplemented(); }
+void ScrollView::removeChild(Widget*) { notImplemented(); }
+void ScrollView::scrollPointRecursively(int x, int y) { notImplemented(); }
+bool ScrollView::inWindow() const { notImplemented(); return true; }
+void ScrollView::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
+void ScrollView::wheelEvent(PlatformWheelEvent&) { notImplemented(); }
+void ScrollView::themeChanged() { notImplemented(); }
+IntPoint ScrollView::convertChildToSelf(const Widget*, const IntPoint& p) const { notImplemented(); return p; }
+IntPoint ScrollView::convertSelfToChild(const Widget*, const IntPoint& p) const { notImplemented(); return p; }
+void ScrollView::geometryChanged() const { notImplemented(); };
+PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent) { notImplemented(); return 0; }
+void ScrollView::setFrameGeometry(const IntRect& r) { notImplemented(); Widget::setFrameGeometry(r); }
+IntRect ScrollView::windowResizerRect() { notImplemented(); return IntRect(); }
+bool ScrollView::resizerOverlapsContent() const { notImplemented(); return false; }
 
-void IconLoader::stopLoading() { notImplemented(); } 
-void IconLoader::startLoading() { notImplemented(); } 
-IconLoader* IconLoader::createForFrame(Frame *frame) { return 0; } 
+void TextField::selectAll() { notImplemented(); }
+void TextField::addSearchResult() { notImplemented(); }
+int TextField::selectionStart() const { notImplemented(); return 0; }
+bool TextField::hasSelectedText() const { notImplemented(); return 0; }
+String TextField::selectedText() const { notImplemented(); return String(); }
+void TextField::setAutoSaveName(String const&) { notImplemented(); }
+bool TextField::checksDescendantsForFocus() const { notImplemented(); return false; }
+void TextField::setSelection(int,int) { notImplemented(); }
+void TextField::setMaxResults(int) { notImplemented(); }
+bool TextField::edited() const { notImplemented(); return 0; }
+Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
+TextField::TextField() { notImplemented(); }
+TextField::~TextField() { notImplemented(); }
+void TextField::setFont(WebCore::Font const&) { notImplemented(); }
+void TextField::setAlignment(HorizontalAlignment) { notImplemented(); }
+void TextField::setWritingDirection(TextDirection) { notImplemented(); }
+int TextField::maxLength() const { notImplemented(); return 0; }
+void TextField::setMaxLength(int) { notImplemented(); }
+String TextField::text() const { notImplemented(); return String(); }
+void TextField::setText(String const&) { notImplemented(); }
+int TextField::cursorPosition() const { notImplemented(); return 0; }
+void TextField::setCursorPosition(int) { notImplemented(); }
+void TextField::setEdited(bool) { notImplemented(); }
+void TextField::setReadOnly(bool) { notImplemented(); }
+void TextField::setPlaceholderString(String const&) { notImplemented(); }
+void TextField::setColors(Color const&,Color const&) { notImplemented(); }
+IntSize TextField::sizeForCharacterWidth(int) const { notImplemented(); return IntSize(); }
+int TextField::baselinePosition(int) const { notImplemented(); return 0; }
+void TextField::setLiveSearch(bool) { notImplemented(); }
 
-bool IconDatabase::isIconExpiredForIconURL(const String& url) { return false; }
-bool IconDatabase::hasEntryForIconURL(const String& url) { return false; }
-IconDatabase* IconDatabase::sharedIconDatabase() { return 0; }
-bool IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) { return false; }
+void Widget::enableFlushDrawing() { notImplemented(); }
+bool Widget::isEnabled() const { notImplemented(); return 0; }
+Widget::FocusPolicy Widget::focusPolicy() const { notImplemented(); return NoFocus; }
+void Widget::disableFlushDrawing() { notImplemented(); }
+void Widget::removeFromParent() { notImplemented(); }
+GraphicsContext* Widget::lockDrawingFocus() { notImplemented(); return 0; }
+void Widget::unlockDrawingFocus(GraphicsContext*) { notImplemented(); }
+bool Widget::capturingMouse() const { notImplemented(); return false; }
+void Widget::setCapturingMouse(bool capturingMouse) { notImplemented(); }
+Widget* Widget::capturingTarget() { notImplemented(); return this; }
+Widget* Widget::capturingChild() { notImplemented(); return 0; }
+void Widget::setCapturingChild(Widget* w) { notImplemented(); }
+IntPoint Widget::convertChildToSelf(const Widget*, const IntPoint& p) const { notImplemented(); return p; }
+IntPoint Widget::convertSelfToChild(const Widget*, const IntPoint& p) const { notImplemented(); return p; }
+void Widget::setParent(ScrollView*) { notImplemented(); }
+ScrollView* Widget::parent() const { notImplemented(); return 0; }
+void Widget::setEnabled(bool) { notImplemented(); }
+void Widget::paint(GraphicsContext*,IntRect const&) { notImplemented(); }
+void Widget::setIsSelected(bool) { notImplemented(); }
+void Widget::invalidate() { notImplemented(); }
+void Widget::invalidateRect(const IntRect& r) { notImplemented(); }
 
-void systemBeep() {}
 } // namespace WebCore
index a1335a8bdb2dd49ace1dafc24224b6a7789c94d4..1c26493f301e3a5f30ee99b3660f18c6cd1f5a43 100644 (file)
@@ -99,8 +99,7 @@ void Widget::setFocus()
 
 void Widget::clearFocus()
 {
-    FrameWin::clearDocumentFocus(this);
-    SetFocus(0);
+    SetFocus(NULL);
 }
 
 const Font& Widget::font() const
index c69d043f12028cb129c501072aceed93ddcf3f5e..e477aeaadf9fda6f3362125b4b9f729fc5cb2fd0 100644 (file)
@@ -37,7 +37,9 @@
 #pragma warning( push, 0 )
 #include "Cache.h"
 #include "ChromeClientWin.h"
+#include "ContextMenuClientWin.h"
 #include "Document.h"
+#include "FrameLoader.h"
 #include "FrameView.h"
 #include "FrameWin.h"
 #include "GraphicsContext.h"
@@ -47,6 +49,7 @@
 #include "cairo-win32.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleWin.h"
+#include "ResourceRequest.h"
 #include "EditorClient.h"
 #pragma warning(pop)
 
@@ -136,7 +139,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::initWithName(
     if (FAILED(hr))
         return hr;
 
-    Page* page = new Page(new ChromeClientWin());
+    Page* page = new Page(new ChromeClientWin(), new ContextMenuClientWin());
     Frame* frame = new FrameWin(page, 0, 0, this);
 
     // FIXME: This is one-time initialization, but it gets the value of the setting from the
@@ -227,12 +230,12 @@ HRESULT STDMETHODCALLTYPE WebFrame::loadHTMLString(
 
     if (baseURL) {
         DeprecatedString baseURLString((DeprecatedChar*)baseURL, SysStringLen(baseURL));
-        d->frame->begin(KURL(baseURLString));
+        d->frame->loader()->begin(KURL(baseURLString));
     }
     else
-        d->frame->begin();
-    d->frame->write(htmlString);
-    d->frame->end();
+        d->frame->loader()->begin();
+    d->frame->loader()->write(htmlString);
+    d->frame->loader()->end();
 
     return S_OK;
 }
@@ -275,14 +278,14 @@ HRESULT STDMETHODCALLTYPE WebFrame::provisionalDataSource(
 
 HRESULT STDMETHODCALLTYPE WebFrame::stopLoading( void)
 {
-    d->frame->stopLoading(false);
+    d->frame->loader()->stopLoading(false);
     return E_NOTIMPL;
 }
 
 HRESULT STDMETHODCALLTYPE WebFrame::reload( void)
 {
-    if (!d->frame->url().url().startsWith("javascript:", false))
-        d->frame->scheduleLocationChange(d->frame->url().url(), d->frame->referrer(), true/*lock history*/, true/*userGesture*/);
+    if (!d->frame->loader()->url().url().startsWith("javascript:", false))
+        d->frame->loader()->scheduleLocationChange(d->frame->loader()->url().url(), d->frame->loader()->outgoingReferrer(), true/*lock history*/, true/*userGesture*/);
     return S_OK;
 }
 
@@ -372,7 +375,7 @@ HRESULT WebFrame::loadDataSource(WebDataSource* dataSource)
             hr = request->HTTPMethod(&method);
             if (SUCCEEDED(hr)) {
                 KURL kurl(DeprecatedString((DeprecatedChar*)url, SysStringLen(url)));
-                d->frame->didOpenURL(kurl);
+                d->frame->loader()->didOpenURL(kurl);
                 String methodString(method, SysStringLen(method));
                 const FormData* formData = 0;
                 if (wcscmp(method, TEXT("GET"))) {
@@ -462,27 +465,12 @@ int WebFrame::getObjectCacheSize()
 
 // ResourceHandleClient
 
-void WebFrame::receivedRedirect(ResourceHandle*, const KURL& url)
+void WebFrame::didReceiveData(WebCore::ResourceHandle*, const char* data, int length)
 {
-    DeprecatedString urlStr(url.url());
-    urlStr.append('\0');
-
-    // FIXME: is this the correct way to handle a redirect?
-
-    IWebMutableURLRequest* request = WebMutableURLRequest::createInstance();
-    BSTR urlBStr = SysAllocString((LPCTSTR)urlStr.unicode());
-    if (SUCCEEDED(request->initWithURL(urlBStr, WebURLRequestUseProtocolCachePolicy, 0))) {
-        _ASSERT(m_provisionalDataSource);
-        static_cast<WebDataSource*>(m_provisionalDataSource)->replaceRequest(request);
-    }
-    SysFreeString(urlBStr);
-    request->Release();
+    // Ensure that WebFrame::receivedResponse was called.
+    _ASSERT(m_dataSource && !m_provisionalDataSource);
 
-    IWebFrameLoadDelegate* frameLoadDelegate;
-    if (SUCCEEDED(d->webView->frameLoadDelegate(&frameLoadDelegate))) {
-        frameLoadDelegate->didReceiveServerRedirectForProvisionalLoadForFrame(d->webView, this);
-        frameLoadDelegate->Release();
-    }
+    d->frame->loader()->write(data, length);
 }
 
 void WebFrame::receivedResponse(ResourceHandle* job, PlatformResponse)
@@ -508,9 +496,9 @@ void WebFrame::receivedResponse(ResourceHandle* job, PlatformResponse)
     SysFreeString(url);
 
     // Update MIME info (FIXME: get from PlatformResponse)
-    d->frame->setResponseMIMEType(String(L"text/html"));
+    d->frame->loader()->setResponseMIMEType(String(L"text/html"));
 
-    d->frame->begin(kurl);
+    d->frame->loader()->begin(kurl);
 
     if (m_loadType != WebFrameLoadTypeBack && m_loadType != WebFrameLoadTypeForward && m_loadType != WebFrameLoadTypeIndexedBackForward && !m_quickRedirectComing) {
         DeprecatedString urlStr = job->url().url();
@@ -533,20 +521,6 @@ void WebFrame::receivedResponse(ResourceHandle* job, PlatformResponse)
     }
 }
 
-void WebFrame::didReceiveData(WebCore::ResourceHandle*, const char* data, int length)
-{
-    // Ensure that WebFrame::receivedResponse was called.
-    _ASSERT(m_dataSource && !m_provisionalDataSource);
-
-    d->frame->write(data, length);
-}
-
-void WebFrame::receivedAllData(ResourceHandle* /*job*/)
-{
-    m_quickRedirectComing = false;
-    m_loadType = WebFrameLoadTypeStandard;
-}
-
 void WebFrame::receivedAllData(ResourceHandle*, PlatformData data)
 {
     IWebFrameLoadDelegate* frameLoadDelegate;
@@ -564,7 +538,7 @@ void WebFrame::receivedAllData(ResourceHandle*, PlatformData data)
         frameLoadDelegate->Release();
     }
 
-    d->frame->end();
+    d->frame->loader()->end();
 }
 
 // FrameWinClient
index 2cec827b43d2be8e58cdd038cc34abec3907fad9..1de0c3822001610b3e084d843c00ab074dadb83a 100644 (file)
@@ -131,10 +131,8 @@ public:
         /* [retval][out] */ IWebFrame ***frames);
 
     // ResourceHandleClient
-    virtual void receivedRedirect(WebCore::ResourceHandle*, const WebCore::KURL&);
-    virtual void receivedResponse(WebCore::ResourceHandle*, WebCore::PlatformResponse);
     virtual void didReceiveData(WebCore::ResourceHandle*, const char*, int);
-    virtual void receivedAllData(WebCore::ResourceHandle*);
+    virtual void receivedResponse(WebCore::ResourceHandle*, WebCore::PlatformResponse);
     virtual void receivedAllData(WebCore::ResourceHandle*, WebCore::PlatformData);
 
     // FrameWinClient
index a6278086413674e6f07a05e6d0f1c3e725d333fb..cdf98fb6c25f2bed35ee773ef79f1eea30dca29a 100644 (file)
 #include "WebBackForwardList.h"
 
 #pragma warning( push, 0 )
-#include "ResourceHandleClient.h"
-#include "FrameWin.h"
 #include "Document.h"
+#include "EventHandler.h"
 #include "FrameView.h"
+#include "FrameWin.h"
 #include "IntRect.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
+#include "ResourceHandleClient.h"
 #include "SelectionController.h"
 #include "TypingCommand.h"
 #pragma warning(pop)
@@ -99,25 +100,25 @@ WebView* WebView::createInstance()
 void WebView::mouseMoved(UINT message, WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
-    m_mainFrame->impl()->view()->handleMouseMoveEvent(mouseEvent);
+    m_mainFrame->impl()->eventHandler()->handleMouseMoveEvent(mouseEvent);
 }
 
 void WebView::mouseDown(UINT message, WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
-    m_mainFrame->impl()->view()->handleMousePressEvent(mouseEvent);
+    m_mainFrame->impl()->eventHandler()->handleMousePressEvent(mouseEvent);
 }
 
 void WebView::mouseUp(UINT message, WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
-    m_mainFrame->impl()->view()->handleMouseReleaseEvent(mouseEvent);
+    m_mainFrame->impl()->eventHandler()->handleMouseReleaseEvent(mouseEvent);
 }
 
 void WebView::mouseDoubleClick(UINT message, WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
-    m_mainFrame->impl()->view()->handleMouseReleaseEvent(mouseEvent);
+    m_mainFrame->impl()->eventHandler()->handleMouseReleaseEvent(mouseEvent);
 }
 
 bool WebView::keyPress(WPARAM wParam, LPARAM lParam)
index fc7c671eb47d9d5be9f2670c88ab2489cb269f9d..937fca6506b6f3fb8f7b0b82ba265d126796a984 100644 (file)
@@ -1,3 +1,27 @@
+2006-11-16  Don Gibson  <dgibson77@gmail.com>
+
+        Reviewed and landed by ap.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11509:
+        Windows build bustage.
+
+        * COM/WebFrame.cpp:
+        (WebFrame::initWithName):
+        (WebFrame::loadHTMLString):
+        (WebFrame::stopLoading):
+        (WebFrame::reload):
+        (WebFrame::loadDataSource):
+        (WebFrame::didReceiveData):
+        (WebFrame::receivedResponse):
+        (WebFrame::receivedAllData):
+        * COM/WebFrame.h:
+        * COM/WebView.cpp:
+        (WebView::mouseMoved):
+        (WebView::mouseDown):
+        (WebView::mouseUp):
+        (WebView::mouseDoubleClick):
+        * WebKit.vcproj/WebKit.vcproj:
+
 2006-11-16  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Tim.
index cdfb8eebc0dceb836e054912c0d73b2255339d67..ab18a37728ff5ebce9f5763635064a4250f18039 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;;&quot;$(ProjectDir)&quot;"
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;;&quot;$(ProjectDir)&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                ExceptionHandling="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;;&quot;$(ProjectDir)&quot;"
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\ecma&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&quot;;&quot;$(ProjectDir)\..\..\WebCore\kwq&quot;;&quot;$(ProjectDir)\..\..\iconv&quot;;&quot;$(ProjectDir)\..\..\libxml2&quot;;&quot;$(ProjectDir)\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\JavaScriptCore\wtf&quot;;&quot;$(ProjectDir)\..\..\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\$(ConfigurationName)\WebKitWin&quot;;&quot;$(ProjectDir)&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE"
                                ExceptionHandling="0"
                                RuntimeLibrary="2"