2006-09-05 MorganL <morlmor@yahoocom>

        Reviewed/landed by aroben.

        Fixes bug 10743: Windows build is busted.

        WebCore:
                * WebCore.vcproj/WebCore/WebCore.vcproj:
                * bridge/win/FrameWin.h:
                * platform/ResourceLoaderInternal.h:
                * platform/TextEncodingRegistry.cpp:
                * platform/win/ResourceLoaderWin.cpp:
                (WebCore::ResourceLoaderWndProc):
                (WebCore::ResourceLoader::start):
                * platform/win/TemporaryLinkStubs.cpp:
                (FrameWin::markMisspellings):
                (FrameWin::shouldChangeSelection):
                (FrameWin::respondToChangedSelection):
                (FrameWin::respondToChangedContents):
                (RenderThemeWin::adjustMenuListStyle):

        WebKit:
                * COM/WebView.cpp:
                (WebView::keyPress):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4dae7f35de710f48100951a0951108b896e181d8..e2e6c0fa7e31605fc12835236778cb424d2a98f3 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2006-09-05  MorganL  <morlmor@yahoocom>
+
+        Reviewed/landed by aroben.
+
+        Fixes bug 10743: Windows build is busted.
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * bridge/win/FrameWin.h:
+        * platform/ResourceLoaderInternal.h:
+        * platform/TextEncodingRegistry.cpp:
+        * platform/win/ResourceLoaderWin.cpp:
+        (WebCore::ResourceLoaderWndProc):
+        (WebCore::ResourceLoader::start):
+        * platform/win/TemporaryLinkStubs.cpp:
+        (FrameWin::markMisspellings):
+        (FrameWin::shouldChangeSelection):
+        (FrameWin::respondToChangedSelection):
+        (FrameWin::respondToChangedContents):
+        (RenderThemeWin::adjustMenuListStyle):
+
 2006-09-05  Darin Adler  <darin@apple.com>
 
         - some quick build fixes

diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index 859a8c397662373c3cd1879e97118d3893e30070..89d8a18f9d315224ba280ab87e45bd5ea764d55b 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -1134,6 +1134,14 @@
                                RelativePath="..\..\platform\CookieJar.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\platform\CString.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\platform\CString.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\platform\Cursor.h"
                                >
@@ -2474,6 +2482,10 @@
                                RelativePath="..\..\css\CSSBorderImageValue.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\css\CSSCharsetRule.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\css\CSSCharsetRule.h"
                                >

diff --git a/WebCore/bridge/win/FrameWin.h b/WebCore/bridge/win/FrameWin.h
index 15d56fea9b8d99b2802325e74fced63cfeab3c3d..797cf9c4f61f47b80aee4fb729b56037f351bbde 100644 (file)
--- a/WebCore/bridge/win/FrameWin.h
+++ b/WebCore/bridge/win/FrameWin.h
@@ -87,7 +87,7 @@ public:
     virtual String mimeTypeForFileName(const String&) const;
 
     virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
-    virtual void markMisspellings(const SelectionController&);
+    virtual void markMisspellings(const Selection&);
 
     virtual bool lastEventIsMouseUp() const;
 
@@ -110,9 +110,9 @@ public:
     virtual void issuePasteCommand();
     virtual void issuePasteAndMatchStyleCommand();
     virtual void issueTransposeCommand();
-    virtual void respondToChangedSelection(const SelectionController& oldSelection, bool closeTyping);
-    void FrameWin::respondToChangedContents(const SelectionController &endingSelection);
-    virtual bool shouldChangeSelection(const SelectionController& oldSelection, const SelectionController& newSelection, EAffinity affinity, bool stillSelecting) const;
+    virtual void respondToChangedSelection(const Selection& oldSelection, bool closeTyping);
+    void FrameWin::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;

diff --git a/WebCore/platform/ResourceLoaderInternal.h b/WebCore/platform/ResourceLoaderInternal.h
index cb48f57cd86b11718c2f351c417ee5a323579113..b271c429bc49bb1cab1059a3d9c6cca4e90ce453 100644 (file)
--- a/WebCore/platform/ResourceLoaderInternal.h
+++ b/WebCore/platform/ResourceLoaderInternal.h
@@ -151,7 +151,7 @@ namespace WebCore {
         char* m_formDataString;
         int m_formDataLength;
         int m_bytesRemainingToWrite;
-        DeprecatedString m_postReferrer;
+        String m_postReferrer;
 #endif
 #if PLATFORM(GDK)
         CURL *m_handle;

diff --git a/WebCore/platform/TextEncodingRegistry.cpp b/WebCore/platform/TextEncodingRegistry.cpp
index 3baac4a9827c18f0b0c31723a0271f7a763ea4f3..4cf1b0ec0c6703e97e59b51b2e43fa0f06b74985 100644 (file)
--- a/WebCore/platform/TextEncodingRegistry.cpp
+++ b/WebCore/platform/TextEncodingRegistry.cpp
@@ -38,6 +38,9 @@
 #if PLATFORM(MAC)
 #include "StreamingTextDecoderMac.h"
 #endif
+#if PLATFORM(WIN)
+#include <ctype.h>
+#endif
 
 namespace WebCore {
 

diff --git a/WebCore/platform/win/ResourceLoaderWin.cpp b/WebCore/platform/win/ResourceLoaderWin.cpp
index 6771f7ce26c82d37be25ff9f89123e334b48ee5b..28452c065149475f4f97057233d424807dacfec0 100644 (file)
--- a/WebCore/platform/win/ResourceLoaderWin.cpp
+++ b/WebCore/platform/win/ResourceLoaderWin.cpp
@@ -121,11 +121,11 @@ LRESULT CALLBACK ResourceLoaderWndProc(HWND hWnd, UINT message, WPARAM wParam, L
                 job->d->m_secondaryHandle = HINTERNET(dwResult);
                 
                 // Need to actually send the request now.
-                DeprecatedString headers = "Content-Type: application/x-www-form-urlencoded\n";
+                String headers = "Content-Type: application/x-www-form-urlencoded\n";
                 headers += "Referer: ";
                 headers += job->d->m_postReferrer;
                 headers += "\n";
-                DeprecatedString formData = job->postData().flattenToString();
+                String formData = job->postData().flattenToString();
                 INTERNET_BUFFERSA buffers;
                 memset(&buffers, 0, sizeof(buffers));
                 buffers.dwStructSize = sizeof(INTERNET_BUFFERSA);
@@ -290,7 +290,7 @@ bool ResourceLoader::start(DocLoader* docLoader)
         // For form posting, we can't use InternetOpenURL.  We have to use InternetConnect followed by
         // HttpSendRequest.
         HINTERNET urlHandle;
-        DeprecatedString referrer = docLoader->frame()->referrer();
+        String referrer = docLoader->frame()->referrer();
         if (method() == "POST") {
             d->m_postReferrer = referrer;
             DeprecatedString host = d->URL.host();
@@ -302,9 +302,9 @@ bool ResourceLoader::start(DocLoader* docLoader)
             int fragmentIndex = urlStr.find('#');
             if (fragmentIndex != -1)
                 urlStr = urlStr.left(fragmentIndex);
-            DeprecatedString headers;
+            String headers;
             if (!referrer.isEmpty())
-                headers += DeprecatedString("Referer: ") + referrer + "\r\n";
+                headers += String("Referer: ") + referrer + "\r\n";
 
             urlHandle = InternetOpenUrlA(internetHandle, urlStr.ascii(), headers.ascii(), headers.length(),
                                          INTERNET_FLAG_KEEP_CONNECTION, (DWORD_PTR)d->m_jobId);

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index 26483a426f67ffa7b27f86ddb436e87c54827f6e..130fcc29cea49f631846bc069f90d62b4766935f 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -171,7 +171,7 @@ void FrameWin::issueUndoCommand() { notImplemented(); }
 String FrameWin::mimeTypeForFileName(String const&) const { notImplemented(); return String(); }
 void FrameWin::issuePasteCommand() { notImplemented(); }
 void FrameWin::scheduleClose() { notImplemented(); }
-void FrameWin::markMisspellings(WebCore::SelectionController const&) { notImplemented(); }
+void FrameWin::markMisspellings(const WebCore::Selection&) { notImplemented(); }
 bool FrameWin::menubarVisible() { notImplemented(); return 0; }
 bool FrameWin::personalbarVisible() { notImplemented(); return 0; }
 bool FrameWin::statusbarVisible() { notImplemented(); return 0; }
@@ -228,15 +228,15 @@ Range* FrameWin::markedTextRange() const { return 0; }
 bool FrameWin::passSubframeEventToSubframe(WebCore::MouseEventWithHitTestResults&, Frame*) { return false; }
 bool FrameWin::lastEventIsMouseUp() const { return false; }
 void FrameWin::addMessageToConsole(String const&,unsigned int,String const&) { }
-bool FrameWin::shouldChangeSelection(SelectionController const&,SelectionController const&,WebCore::EAffinity,bool) const { return true; }
-void FrameWin::respondToChangedSelection(WebCore::SelectionController const&,bool) { }
+bool FrameWin::shouldChangeSelection(const WebCore::Selection&,const WebCore::Selection&,WebCore::EAffinity,bool) const { return true; }
+void FrameWin::respondToChangedSelection(const WebCore::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(WebCore::VisiblePosition const&) { }
-void FrameWin::respondToChangedContents(const SelectionController &endingSelection) { }
+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; }
@@ -372,6 +372,3 @@ void RenderPopupMenuWin::addOption(HTMLOptionElement*) { 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 { }
-
-CString::CString(const DeprecatedCString&) { }
-const char* CString::data() const { return 0; }

diff --git a/WebKit/COM/WebView.cpp b/WebKit/COM/WebView.cpp
index 4896dec58b9a05e3ca58bd8c8e7f85117a38ea6a..caf7df8271d4fcebb47a67ce21b2e4dfa38346c6 100644 (file)
--- a/WebKit/COM/WebView.cpp
+++ b/WebKit/COM/WebView.cpp
@@ -127,7 +127,7 @@ bool WebView::keyPress(WPARAM wParam, LPARAM lParam)
     FrameWin* frame = static_cast<FrameWin*>(m_mainFrame->impl());
     bool handled = frame->keyPress(keyEvent);
     if (!handled && !keyEvent.isKeyUp()) {
-        Node* start = frame->selection().start().node();
+        Node* start = frame->selectionController()->start().node();
         if (start && start->isContentEditable()) {
             switch(keyEvent.WindowsKeyCode()) {
             case VK_BACK:
@@ -137,16 +137,16 @@ bool WebView::keyPress(WPARAM wParam, LPARAM lParam)
                 TypingCommand::forwardDeleteKeyPressed(frame->document());
                 break;
             case VK_LEFT:
-                frame->selection().modify(SelectionController::MOVE, SelectionController::LEFT, CharacterGranularity);
+                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::LEFT, CharacterGranularity);
                 break;
             case VK_RIGHT:
-                frame->selection().modify(SelectionController::MOVE, SelectionController::RIGHT, CharacterGranularity);
+                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::RIGHT, CharacterGranularity);
                 break;
             case VK_UP:
-                frame->selection().modify(SelectionController::MOVE, SelectionController::BACKWARD, ParagraphGranularity);
+                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::BACKWARD, ParagraphGranularity);
                 break;
             case VK_DOWN:
-                frame->selection().modify(SelectionController::MOVE, SelectionController::FORWARD, ParagraphGranularity);
+                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::FORWARD, ParagraphGranularity);
                 break;
             case VK_RETURN:
                 if (start->isContentRichlyEditable())

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1bf72cc1aac1ba53c59ba74db302dd3c51f56973..651d3b564b494999b591e6483c09cb4d0bf4bca3 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-05  MorganL  <morlmor@yahoocom>
+
+        Reviewed/landed by aroben.
+
+        Fixes bug 10743: Windows build is busted.
+
+        * COM/WebView.cpp:
+        (WebView::keyPress):
+
 2006-09-05  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin.