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
+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
RelativePath="..\..\platform\CookieJar.h"
>
</File>
+ <File
+ RelativePath="..\..\platform\CString.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\platform\CString.h"
+ >
+ </File>
<File
RelativePath="..\..\platform\Cursor.h"
>
RelativePath="..\..\css\CSSBorderImageValue.h"
>
</File>
+ <File
+ RelativePath="..\..\css\CSSCharsetRule.cpp"
+ >
+ </File>
<File
RelativePath="..\..\css\CSSCharsetRule.h"
>
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;
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;
char* m_formDataString;
int m_formDataLength;
int m_bytesRemainingToWrite;
- DeprecatedString m_postReferrer;
+ String m_postReferrer;
#endif
#if PLATFORM(GDK)
CURL *m_handle;
#if PLATFORM(MAC)
#include "StreamingTextDecoderMac.h"
#endif
+#if PLATFORM(WIN)
+#include <ctype.h>
+#endif
namespace WebCore {
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);
// 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();
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);
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; }
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; }
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; }
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:
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())
+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.