Changeset 16248 in webkit


Ignore:
Timestamp:
Sep 6, 2006 12:09:41 AM (18 years ago)
Author:
aroben
Message:

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):
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r16247 r16248  
     12006-09-05  MorganL  <morlmor@yahoocom>
     2
     3        Reviewed/landed by aroben.
     4
     5        Fixes bug 10743: Windows build is busted.
     6
     7        * WebCore.vcproj/WebCore/WebCore.vcproj:
     8        * bridge/win/FrameWin.h:
     9        * platform/ResourceLoaderInternal.h:
     10        * platform/TextEncodingRegistry.cpp:
     11        * platform/win/ResourceLoaderWin.cpp:
     12        (WebCore::ResourceLoaderWndProc):
     13        (WebCore::ResourceLoader::start):
     14        * platform/win/TemporaryLinkStubs.cpp:
     15        (FrameWin::markMisspellings):
     16        (FrameWin::shouldChangeSelection):
     17        (FrameWin::respondToChangedSelection):
     18        (FrameWin::respondToChangedContents):
     19        (RenderThemeWin::adjustMenuListStyle):
     20
    1212006-09-05  Darin Adler  <darin@apple.com>
    222
  • trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj

    r16245 r16248  
    11361136                        </File>
    11371137                        <File
     1138                                RelativePath="..\..\platform\CString.cpp"
     1139                                >
     1140                        </File>
     1141                        <File
     1142                                RelativePath="..\..\platform\CString.h"
     1143                                >
     1144                        </File>
     1145                        <File
    11381146                                RelativePath="..\..\platform\Cursor.h"
    11391147                                >
     
    24732481                        <File
    24742482                                RelativePath="..\..\css\CSSBorderImageValue.h"
     2483                                >
     2484                        </File>
     2485                        <File
     2486                                RelativePath="..\..\css\CSSCharsetRule.cpp"
    24752487                                >
    24762488                        </File>
  • trunk/WebCore/bridge/win/FrameWin.h

    r16190 r16248  
    8888
    8989    virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
    90     virtual void markMisspellings(const SelectionController&);
     90    virtual void markMisspellings(const Selection&);
    9191
    9292    virtual bool lastEventIsMouseUp() const;
     
    111111    virtual void issuePasteAndMatchStyleCommand();
    112112    virtual void issueTransposeCommand();
    113     virtual void respondToChangedSelection(const SelectionController& oldSelection, bool closeTyping);
    114     void FrameWin::respondToChangedContents(const SelectionController &endingSelection);
    115     virtual bool shouldChangeSelection(const SelectionController& oldSelection, const SelectionController& newSelection, EAffinity affinity, bool stillSelecting) const;
     113    virtual void respondToChangedSelection(const Selection& oldSelection, bool closeTyping);
     114    void FrameWin::respondToChangedContents(const Selection& endingSelection);
     115    virtual bool shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity affinity, bool stillSelecting) const;
    116116    virtual void partClearedInBegin();
    117117
  • trunk/WebCore/platform/ResourceLoaderInternal.h

    r16103 r16248  
    152152        int m_formDataLength;
    153153        int m_bytesRemainingToWrite;
    154         DeprecatedString m_postReferrer;
     154        String m_postReferrer;
    155155#endif
    156156#if PLATFORM(GDK)
  • trunk/WebCore/platform/TextEncodingRegistry.cpp

    r16245 r16248  
    3939#include "StreamingTextDecoderMac.h"
    4040#endif
     41#if PLATFORM(WIN)
     42#include <ctype.h>
     43#endif
    4144
    4245namespace WebCore {
  • trunk/WebCore/platform/win/ResourceLoaderWin.cpp

    r15730 r16248  
    122122               
    123123                // Need to actually send the request now.
    124                 DeprecatedString headers = "Content-Type: application/x-www-form-urlencoded\n";
     124                String headers = "Content-Type: application/x-www-form-urlencoded\n";
    125125                headers += "Referer: ";
    126126                headers += job->d->m_postReferrer;
    127127                headers += "\n";
    128                 DeprecatedString formData = job->postData().flattenToString();
     128                String formData = job->postData().flattenToString();
    129129                INTERNET_BUFFERSA buffers;
    130130                memset(&buffers, 0, sizeof(buffers));
     
    291291        // HttpSendRequest.
    292292        HINTERNET urlHandle;
    293         DeprecatedString referrer = docLoader->frame()->referrer();
     293        String referrer = docLoader->frame()->referrer();
    294294        if (method() == "POST") {
    295295            d->m_postReferrer = referrer;
     
    303303            if (fragmentIndex != -1)
    304304                urlStr = urlStr.left(fragmentIndex);
    305             DeprecatedString headers;
     305            String headers;
    306306            if (!referrer.isEmpty())
    307                 headers += DeprecatedString("Referer: ") + referrer + "\r\n";
     307                headers += String("Referer: ") + referrer + "\r\n";
    308308
    309309            urlHandle = InternetOpenUrlA(internetHandle, urlStr.ascii(), headers.ascii(), headers.length(),
  • trunk/WebCore/platform/win/TemporaryLinkStubs.cpp

    r16190 r16248  
    172172void FrameWin::issuePasteCommand() { notImplemented(); }
    173173void FrameWin::scheduleClose() { notImplemented(); }
    174 void FrameWin::markMisspellings(WebCore::SelectionController const&) { notImplemented(); }
     174void FrameWin::markMisspellings(const WebCore::Selection&) { notImplemented(); }
    175175bool FrameWin::menubarVisible() { notImplemented(); return 0; }
    176176bool FrameWin::personalbarVisible() { notImplemented(); return 0; }
     
    229229bool FrameWin::lastEventIsMouseUp() const { return false; }
    230230void FrameWin::addMessageToConsole(String const&,unsigned int,String const&) { }
    231 bool FrameWin::shouldChangeSelection(SelectionController const&,SelectionController const&,WebCore::EAffinity,bool) const { return true; }
    232 void FrameWin::respondToChangedSelection(WebCore::SelectionController const&,bool) { }
     231bool FrameWin::shouldChangeSelection(const WebCore::Selection&,const WebCore::Selection&,WebCore::EAffinity,bool) const { return true; }
     232void FrameWin::respondToChangedSelection(const WebCore::Selection&,bool) { }
    233233static int frameNumber = 0;
    234234Frame* FrameWin::createFrame(KURL const&,String const&,Element*,String const&) { return 0; }
     
    237237String FrameWin::incomingReferrer() const { return String(); }
    238238void FrameWin::markMisspellingsInAdjacentWords(WebCore::VisiblePosition const&) { }
    239 void FrameWin::respondToChangedContents(const SelectionController &endingSelection) { }
     239void FrameWin::respondToChangedContents(const Selection&) { }
    240240void FrameWin::handledOnloadEvents() { }
    241241Plugin* FrameWin::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { return 0; }
     
    373373bool RenderThemeWin::paintMenuList(RenderObject *, const RenderObject::PaintInfo&, const IntRect&) { return false; }
    374374void RenderThemeWin::adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const { }
    375 
    376 CString::CString(const DeprecatedCString&) { }
    377 const char* CString::data() const { return 0; }
  • trunk/WebKit/COM/WebView.cpp

    r15754 r16248  
    128128    bool handled = frame->keyPress(keyEvent);
    129129    if (!handled && !keyEvent.isKeyUp()) {
    130         Node* start = frame->selection().start().node();
     130        Node* start = frame->selectionController()->start().node();
    131131        if (start && start->isContentEditable()) {
    132132            switch(keyEvent.WindowsKeyCode()) {
     
    138138                break;
    139139            case VK_LEFT:
    140                 frame->selection().modify(SelectionController::MOVE, SelectionController::LEFT, CharacterGranularity);
     140                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::LEFT, CharacterGranularity);
    141141                break;
    142142            case VK_RIGHT:
    143                 frame->selection().modify(SelectionController::MOVE, SelectionController::RIGHT, CharacterGranularity);
     143                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::RIGHT, CharacterGranularity);
    144144                break;
    145145            case VK_UP:
    146                 frame->selection().modify(SelectionController::MOVE, SelectionController::BACKWARD, ParagraphGranularity);
     146                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::BACKWARD, ParagraphGranularity);
    147147                break;
    148148            case VK_DOWN:
    149                 frame->selection().modify(SelectionController::MOVE, SelectionController::FORWARD, ParagraphGranularity);
     149                frame->selectionController()->modify(SelectionController::MOVE, SelectionController::FORWARD, ParagraphGranularity);
    150150                break;
    151151            case VK_RETURN:
  • trunk/WebKit/ChangeLog

    r16246 r16248  
     12006-09-05  MorganL  <morlmor@yahoocom>
     2
     3        Reviewed/landed by aroben.
     4
     5        Fixes bug 10743: Windows build is busted.
     6
     7        * COM/WebView.cpp:
     8        (WebView::keyPress):
     9
    1102006-09-05  Timothy Hatcher  <timothy@apple.com>
    211
Note: See TracChangeset for help on using the changeset viewer.