git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee84621)
2006-11-20 Samuel Weinig <sam@webkit.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Nov 2006 19:58:34 +0000 (19:58 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Nov 2006 19:58:34 +0000 (19:58 +0000)
        Reviewed by Alexey.

        Fix for http://bugs.webkit.org/show_bug.cgi?id=11656
        Fix Windows build

        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * bridge/win/ContextMenuClientWin.h:
        * bridge/win/EditorClientWin.h:
        * bridge/win/FrameWin.h:
        * platform/win/TemporaryLinkStubs.cpp:
        (WebCore::ContextMenu::show):
        (WebCore::ContextMenuClientWin::copyLinkToClipboard):
        (WebCore::ContextMenuClientWin::downloadURL):
        (WebCore::ContextMenuClientWin::copyImageToClipboard):
        (WebCore::ContextMenuClientWin::lookUpInDictionary):
        (WebCore::EditorClientWin::shouldInsertText):
        (WebCore::FrameLoader::reload):
        (WebCore::FrameWin::ignoreSpelling):
        (WebCore::FrameWin::learnSpelling):
2006-11-20  Samuel Weinig  <sam@webkit.org>

        Reviewed by Alexey.

        Fix for http://bugs.webkit.org/show_bug.cgi?id=11656
        Fix Windows build

        * WebKit.vcproj/WebKit.vcproj: don't include directories that no
        longer exist.

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

WebCore/ChangeLog patch | blob | history
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj patch | blob | history
WebCore/bridge/win/ContextMenuClientWin.h patch | blob | history
WebCore/bridge/win/EditorClientWin.h patch | blob | history
WebCore/bridge/win/FrameWin.h patch | blob | history
WebCore/platform/win/TemporaryLinkStubs.cpp patch | blob | history
WebKit/ChangeLog patch | blob | history
WebKit/WebKit.vcproj/WebKit.vcproj patch | blob | history

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6106cacd28caff73fa7e1342df4888eb0a796363..a5ab366eb9867fbb8c97ef2614c6bb19bb1772cf 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2006-11-20  Samuel Weinig  <sam@webkit.org>
+
+        Reviewed by Alexey.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=11656
+        Fix Windows build
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * bridge/win/ContextMenuClientWin.h:
+        * bridge/win/EditorClientWin.h:
+        * bridge/win/FrameWin.h:
+        * platform/win/TemporaryLinkStubs.cpp:
+        (WebCore::ContextMenu::show):
+        (WebCore::ContextMenuClientWin::copyLinkToClipboard):
+        (WebCore::ContextMenuClientWin::downloadURL):
+        (WebCore::ContextMenuClientWin::copyImageToClipboard):
+        (WebCore::ContextMenuClientWin::lookUpInDictionary):
+        (WebCore::EditorClientWin::shouldInsertText):
+        (WebCore::FrameLoader::reload):
+        (WebCore::FrameWin::ignoreSpelling):
+        (WebCore::FrameWin::learnSpelling):
+
 2006-11-20  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Maciej.
diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index f838f78a5d18793d86d2189c6e5688ee3c1e14e4..3b3c752cd5577cdd05fea214cdfd8d79729bbd5f 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -959,19 +959,19 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\page\ContextMenuClient.h"
+                               RelativePath="..\..\page\ChromeClient.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\page\ContextMenuController.cpp"
+                               RelativePath="..\..\page\ContextMenuClient.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\page\ContextMenuController.h"
+                               RelativePath="..\..\page\ContextMenuController.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\page\ChromeClient.h"
+                               RelativePath="..\..\page\ContextMenuController.h"
                                >
                        </File>
                        <File
@@ -4342,6 +4342,10 @@
                                RelativePath="..\..\editing\Editor.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\editing\EditorInsertAction.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\editing\FormatBlockCommand.cpp"
                                >
diff --git a/WebCore/bridge/win/ContextMenuClientWin.h b/WebCore/bridge/win/ContextMenuClientWin.h
index 97077e96e2e3c70b1c3bf9ff9b785d42ca341338..e316a48f2c80fb3697703996139a8de01fa0aabc 100644 (file)
--- a/WebCore/bridge/win/ContextMenuClientWin.h
+++ b/WebCore/bridge/win/ContextMenuClientWin.h
@@ -25,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ContextMenuClientWin_H
-#define ContextMenuClientWin_H
+#ifndef ContextMenuClientWin_h
+#define ContextMenuClientWin_h
 
 #include "ContextMenuClient.h"
 
@@ -40,8 +40,13 @@ namespace WebCore {
         virtual void deref() { Shared<ContextMenuClientWin>::deref(); }
 
         virtual void addCustomContextMenuItems(ContextMenu*);
+
+        virtual void copyLinkToClipboard(HitTestResult);
+        virtual void downloadURL(KURL);
+        virtual void copyImageToClipboard(HitTestResult);
+        virtual void lookUpInDictionary(Frame*);
     };
 
-}
+} // namespace WebCore
 
-#endif // ContextMenuClientWin_H
+#endif // ContextMenuClientWin_h
diff --git a/WebCore/bridge/win/EditorClientWin.h b/WebCore/bridge/win/EditorClientWin.h
index 885050841bcee939980ca38bdf2e1b76c1cfbac5..b67e214f1e2af3bcd43249593c062fbcbc8ff0b9 100644 (file)
--- a/WebCore/bridge/win/EditorClientWin.h
+++ b/WebCore/bridge/win/EditorClientWin.h
@@ -25,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef EditorClientWin_H
-#define EditorClientWin_H
+#ifndef EditorClientWin_h
+#define EditorClientWin_h
 
 #include "EditorClient.h"
 
@@ -51,6 +51,7 @@ namespace WebCore {
 
         virtual bool shouldBeginEditing(Range*);
         virtual bool shouldEndEditing(Range*);
+        virtual bool shouldInsertText(String, Range*, EditorInsertAction);
         virtual bool shouldApplyStyle(CSSStyleDeclaration*, Range*);
 
         virtual void didBeginEditing();
@@ -68,6 +69,6 @@ namespace WebCore {
         virtual void redo();
     };
 
-}
+} // namespace WebCore
 
-#endif // EditorClientWin_H
+#endif // EditorClientWin_h
diff --git a/WebCore/bridge/win/FrameWin.h b/WebCore/bridge/win/FrameWin.h
index 7089b56ce2159016dcc327f6c0681bd1f7ad3856..e4c5f58f80d92316aa2fbe4b442d8f2a34e96ca3 100644 (file)
--- a/WebCore/bridge/win/FrameWin.h
+++ b/WebCore/bridge/win/FrameWin.h
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef FrameWin_H
-#define FrameWin_H
+#ifndef FrameWin_h
+#define FrameWin_h
 
 #include "Frame.h"
 
@@ -74,6 +74,8 @@ namespace WebCore {
 
         virtual String mimeTypeForFileName(const String&) const;
 
+        virtual void ignoreSpelling();
+        virtual void learnSpelling();
         virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
         virtual void markMisspellings(const Selection&);
 
@@ -113,6 +115,7 @@ namespace WebCore {
 
     private:
         virtual bool passMouseDownEventToWidget(Widget*);
+
         FrameWinClient* m_client;
     };
 
@@ -121,4 +124,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif
+#endif // FrameWin_h
diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index a903d9c165a309b010892f9c8ea79ea4dada473d..760c581158b5d48f88cad9bd0c3c3cd1f37f2de7 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -147,8 +147,13 @@ bool ChromeClientWin::menubarVisible() { notImplemented(); return false; }
 void ChromeClientWin::setResizable(bool) { notImplemented(); }
 
 void ContextMenu::appendItem(ContextMenuItem item) { notImplemented(); }
+void ContextMenu::show() { notImplemented(); }
 
 void ContextMenuClientWin::addCustomContextMenuItems(ContextMenu*) { notImplemented(); }
+void ContextMenuClientWin::copyLinkToClipboard(HitTestResult) { notImplemented(); }
+void ContextMenuClientWin::downloadURL(KURL) { notImplemented(); }
+void ContextMenuClientWin::copyImageToClipboard(HitTestResult) { notImplemented(); }
+void ContextMenuClientWin::lookUpInDictionary(Frame*) { notImplemented(); }
 
 void DocumentLoader::setFrame(Frame*) { notImplemented(); }
 FrameLoader* DocumentLoader::frameLoader() const { notImplemented(); return m_frame->loader(); }
@@ -170,6 +175,7 @@ bool EditorClientWin::selectWordBeforeMenuEvent() { notImplemented(); return fal
 bool EditorClientWin::isEditable() { notImplemented(); return false; }
 bool EditorClientWin::shouldBeginEditing(Range*) { notImplemented(); return false; }
 bool EditorClientWin::shouldEndEditing(Range*) { notImplemented(); return false; }
+bool EditorClientWin::shouldInsertText(String, Range*, EditorInsertAction) { notImplemented(); return false; }
 bool EditorClientWin::shouldApplyStyle(CSSStyleDeclaration*, Range*) { notImplemented(); return false; }
 void EditorClientWin::didBeginEditing() { notImplemented(); }
 void EditorClientWin::respondToChangedContents() { notImplemented(); }
@@ -227,6 +233,7 @@ ObjectContentType FrameLoader::objectContentType(const KURL&, const String&) { n
 Widget* FrameLoader::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { notImplemented(); return 0; }
 void FrameLoader::detachFromParent() { notImplemented(); }
 void FrameLoader::checkLoadCompleteForThisFrame() { notImplemented(); }
+void FrameLoader::reload() { notImplemented(); }
 
 bool FrameLoaderClientWin::hasWebView() const { notImplemented(); return false; }
 bool FrameLoaderClientWin::hasFrameView() const { notImplemented(); return false; }
@@ -343,6 +350,8 @@ void FrameWin::respondToChangedSelection(const Selection&, bool) { notImplemente
 void FrameWin::clearUndoRedoOperations(void) { notImplemented(); }
 void FrameWin::markMisspellingsInAdjacentWords(VisiblePosition const&) { notImplemented(); }
 void FrameWin::respondToChangedContents(const Selection&) { notImplemented(); }
+void FrameWin::ignoreSpelling() { notImplemented(); }
+void FrameWin::learnSpelling() { 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(); }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 13014871f46dd372dfcde88af7f5f4303e81445a..18604276a7ec07a46117bea18b0de13081e22aa4 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-20  Samuel Weinig  <sam@webkit.org>
+
+        Reviewed by Alexey.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=11656
+        Fix Windows build
+
+        * WebKit.vcproj/WebKit.vcproj: don't include directories that no
+        longer exist.
+
 2006-11-19  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Adam.
diff --git a/WebKit/WebKit.vcproj/WebKit.vcproj b/WebKit/WebKit.vcproj/WebKit.vcproj
index ab18a37728ff5ebce9f5763635064a4250f18039..fa5a65252328cefc762203c9a20820913f500c3b 100644 (file)
--- a/WebKit/WebKit.vcproj/WebKit.vcproj
+++ b/WebKit/WebKit.vcproj/WebKit.vcproj
@@ -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\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;"
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&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"
@@ -126,7 +126,7 @@
                        />
                        <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\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;"
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\COM&quot;;&quot;$(ProjectDir)\..\..\WebCore&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge&quot;;&quot;$(ProjectDir)\..\..\WebCore\bridge\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\css&quot;;&quot;$(ProjectDir)\..\..\WebCore\dom&quot;;&quot;$(ProjectDir)\..\..\WebCore\editing&quot;;&quot;$(ProjectDir)\..\..\WebCore\html&quot;;&quot;$(ProjectDir)\..\..\WebCore\loader&quot;;&quot;$(ProjectDir)\..\..\WebCore\page&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\graphics\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\network\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\platform\win&quot;;&quot;$(ProjectDir)\..\..\WebCore\rendering&quot;;&quot;$(ProjectDir)\..\..\WebCore\xml&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"
Mirror of the WebKit open source project from svn.webkit.org.