Changeset 19954 in webkit


Ignore:
Timestamp:
Mar 4, 2007 1:24:32 PM (17 years ago)
Author:
kjk
Message:

WebCore:

Reviewed by Nikolas Zimmermann.

Move ScrollView stubs to ScrollViewGdk.cpp

  • platform/gdk/FrameGdk.h: remove comment that no longer makes sense
  • platform/gdk/ScrollViewGdk.cpp: (WebCore::ScrollView::addChild): (WebCore::ScrollView::removeChild): (WebCore::ScrollView::scrollPointRecursively): (WebCore::ScrollView::inWindow): (WebCore::ScrollView::wheelEvent): (WebCore::ScrollView::updateScrollbars): (WebCore::ScrollView::updateScrollInfo): (WebCore::ScrollView::windowToContents): (WebCore::ScrollView::contentsToWindow): (WebCore::ScrollView::scrollbarUnderMouse):
  • platform/gdk/TemporaryLinkStubs.cpp:

WebKitTools:

Reviewed by Nikolas Zimmermann.

Load a url given on a command line in a way that also
works for local (​file://) urls.

  • GdkLauncher/main.cpp: (main):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r19952 r19954  
     12007-03-04  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
     2
     3        Reviewed by Nikolas Zimmermann.
     4
     5        Move ScrollView stubs to ScrollViewGdk.cpp
     6
     7        * platform/gdk/FrameGdk.h: remove comment that no longer makes sense
     8        * platform/gdk/ScrollViewGdk.cpp:
     9        (WebCore::ScrollView::addChild):
     10        (WebCore::ScrollView::removeChild):
     11        (WebCore::ScrollView::scrollPointRecursively):
     12        (WebCore::ScrollView::inWindow):
     13        (WebCore::ScrollView::wheelEvent):
     14        (WebCore::ScrollView::updateScrollbars):
     15        (WebCore::ScrollView::updateScrollInfo):
     16        (WebCore::ScrollView::windowToContents):
     17        (WebCore::ScrollView::contentsToWindow):
     18        (WebCore::ScrollView::scrollbarUnderMouse):
     19        * platform/gdk/TemporaryLinkStubs.cpp:
     20
    1212007-03-02  Kevin McCullough  <kmccullough@apple.com>
    222

  • trunk/WebCore/platform/gdk/FrameGdk.h

    r19741 r19954  
    4646    virtual ~FrameGdk();
    4747
    48     // FrameGdk-only
    4948    void handleGdkEvent(GdkEvent*);
    5049    bool keyPress(const PlatformKeyboardEvent& keyEvent);

  • trunk/WebCore/platform/gdk/ScrollViewGdk.cpp

    r19866 r19954  
    3434#include "GraphicsContext.h"
    3535#include "IntRect.h"
     36#include "NotImplementedGdk.h"
    3637#include "RenderLayer.h"
    37 #include "assert.h"
    38 #include <algorithm>
     38
    3939#include <gdk/gdk.h>
    4040
    … …  
    259259}
    260260
    261 }
     261
     262void ScrollView::addChild(Widget*)
     263{
     264    notImplementedGdk();
     265}
     266
     267void ScrollView::removeChild(Widget*)
     268{
     269    notImplementedGdk();
     270}
     271
     272void ScrollView::scrollPointRecursively(int x, int y)
     273{
     274    notImplementedGdk();
     275}
     276
     277bool ScrollView::inWindow() const
     278{
     279    notImplementedGdk();
     280    return true;
     281}
     282
     283void ScrollView::wheelEvent(PlatformWheelEvent&)
     284{
     285    notImplementedGdk();
     286}
     287
     288void ScrollView::updateScrollbars()
     289{
     290    notImplementedGdk();
     291}
     292
     293int ScrollView::updateScrollInfo(short type, int current, int max, int pageSize)
     294{
     295    notImplementedGdk();
     296    return 0;
     297}
     298
     299IntPoint ScrollView::windowToContents(const IntPoint& point) const
     300{
     301    notImplementedGdk();
     302    return point;
     303}
     304
     305IntPoint ScrollView::contentsToWindow(const IntPoint& point) const
     306{
     307    notImplementedGdk();
     308    return point;
     309}
     310
     311PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
     312{
     313    return 0;
     314    notImplementedGdk();
     315}
     316
     317}

  • trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp

    r19922 r19954  
    248248SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) : PopupMenu(client) { notImplementedGdk(); }
    249249
    250 void ScrollView::addChild(Widget*) { }
    251 void ScrollView::removeChild(Widget*) { }
    252 void ScrollView::scrollPointRecursively(int x, int y) { }
    253 bool ScrollView::inWindow() const { return true; }
    254 void ScrollView::wheelEvent(PlatformWheelEvent&) { }
    255 void ScrollView::updateScrollbars() { }
    256 int ScrollView::updateScrollInfo(short type, int current, int max, int pageSize) { return 0; }
    257 IntPoint ScrollView::windowToContents(const IntPoint& point) const { return point; }
    258 IntPoint ScrollView::contentsToWindow(const IntPoint& point) const { return point; }
    259 PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent) { return 0; }
    260 
    261250PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize) : Scrollbar(client, orientation, controlSize) { notImplementedGdk(); }
    262251PlatformScrollbar::~PlatformScrollbar() { notImplementedGdk(); }

  • trunk/WebKitTools/ChangeLog

    r19950 r19954  
     12007-03-04  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
     2
     3        Reviewed by Nikolas Zimmermann.
     4
     5        Load a url given on a command line in a way that also
     6        works for local (file://) urls.
     7
     8        * GdkLauncher/main.cpp:
     9        (main):
     10
    1112007-03-02  Geoffrey Garen  <ggaren@apple.com>
    212

  • trunk/WebKitTools/GdkLauncher/main.cpp

    r19839 r19954  
    163163
    164164    printf("OPENING URL == %s \n", url);
    165     gFrame->loader()->load(url, 0);
     165    gFrame->loader()->load(ResourceRequest(KURL(url)));
    166166    gtk_main();
    167167#if 0 // FIXME: this crashes at the moment. needs to provide DragClient
Note: See TracChangeset for help on using the changeset viewer.