Changeset 82585 in webkit


Ignore:
Timestamp:
Mar 31, 2011 9:07:25 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-03-31 Nancy Piedra <​nancy.piedra@nokia.com>

Reviewed by Benjamin Poulain.

[Qt] ChromeClientQt.h has coding-style errors
​https://bugs.webkit.org/show_bug.cgi?id=40239

  • WebCoreSupport/ChromeClientQt.h: (WebCore::ChromeClientQt::scrollbarsModeDidChange): (WebCore::ChromeClientQt::needTouchEvents): (WebCore::ChromeClientQt::formStateDidChange): (WebCore::ChromeClientQt::scrollRectIntoView): (WebCore::ChromeClientQt::requestGeolocationPermissionForFrame): (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
Location:
trunk/Source/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r82582 r82585  
     12011-03-31  Nancy Piedra  <nancy.piedra@nokia.com>
     2
     3        Reviewed by Benjamin Poulain.
     4
     5        [Qt] ChromeClientQt.h has coding-style errors
     6        https://bugs.webkit.org/show_bug.cgi?id=40239
     7
     8        * WebCoreSupport/ChromeClientQt.h:
     9        (WebCore::ChromeClientQt::scrollbarsModeDidChange):
     10        (WebCore::ChromeClientQt::needTouchEvents):
     11        (WebCore::ChromeClientQt::formStateDidChange):
     12        (WebCore::ChromeClientQt::scrollRectIntoView):
     13        (WebCore::ChromeClientQt::requestGeolocationPermissionForFrame):
     14        (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
     15
    1162011-03-31  Evan Martin  <evan@chromium.org>
    217

  • trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h

    r80716 r82585  
    2727 */
    2828
    29 #ifndef ChromeClientQt_H
    30 #define ChromeClientQt_H
     29#ifndef ChromeClientQt_h
     30#define ChromeClientQt_h
    3131
    3232#include "ChromeClient.h"
    3333#include "FloatRect.h"
    34 #include "RefCounted.h"
    3534#include "KURL.h"
    3635#include "PlatformString.h"
    3736#include "QtPlatformPlugin.h"
     37#include <wtf/RefCounted.h>
    3838
    3939QT_BEGIN_NAMESPACE
    … …  
    4545namespace WebCore {
    4646
    47     class FileChooser;
    48     class FloatRect;
    49     class Page;
    50     struct FrameLoadRequest;
    51     class QtAbstractWebPopup;
    52     struct ViewportArguments;
     47class FileChooser;
     48class FloatRect;
     49class Page;
     50struct FrameLoadRequest;
     51class QtAbstractWebPopup;
     52struct ViewportArguments;
    5353#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
    54     class FullScreenVideoQt;
    55 #endif
    56 
    57     class ChromeClientQt : public ChromeClient
    58     {
    59     public:
    60         ChromeClientQt(QWebPage* webPage);
    61         virtual ~ChromeClientQt();
    62         virtual void chromeDestroyed();
    63 
    64         virtual void setWindowRect(const FloatRect&);
    65         virtual FloatRect windowRect();
    66 
    67         virtual FloatRect pageRect();
    68 
    69         virtual float scaleFactor();
    70 
    71         virtual void focus();
    72         virtual void unfocus();
    73 
    74         virtual bool canTakeFocus(FocusDirection);
    75         virtual void takeFocus(FocusDirection);
    76 
    77         virtual void focusedNodeChanged(Node*);
    78         virtual void focusedFrameChanged(Frame*);
    79 
    80         virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);
    81         virtual void show();
    82 
    83         virtual bool canRunModal();
    84         virtual void runModal();
    85 
    86         virtual void setToolbarsVisible(bool);
    87         virtual bool toolbarsVisible();
    88 
    89         virtual void setStatusbarVisible(bool);
    90         virtual bool statusbarVisible();
    91 
    92         virtual void setScrollbarsVisible(bool);
    93         virtual bool scrollbarsVisible();
    94 
    95         virtual void setMenubarVisible(bool);
    96         virtual bool menubarVisible();
    97 
    98         virtual void setResizable(bool);
    99 
    100         virtual void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message,
    101                                          unsigned int lineNumber, const String& sourceID);
    102 
    103         virtual bool canRunBeforeUnloadConfirmPanel();
    104         virtual bool runBeforeUnloadConfirmPanel(const String& message, Frame* frame);
    105 
    106         virtual void closeWindowSoon();
    107 
    108         virtual void runJavaScriptAlert(Frame*, const String&);
    109         virtual bool runJavaScriptConfirm(Frame*, const String&);
    110         virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
    111         virtual bool shouldInterruptJavaScript();
    112 
    113         virtual void setStatusbarText(const String&);
    114 
    115         virtual WebCore::KeyboardUIMode keyboardUIMode();
    116         virtual IntRect windowResizerRect() const;
    117 
    118         virtual void invalidateWindow(const IntRect&, bool);
    119         virtual void invalidateContentsAndWindow(const IntRect&, bool);
    120         virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
    121         virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
     54class FullScreenVideoQt;
     55#endif
     56
     57class ChromeClientQt : public ChromeClient {
     58public:
     59    ChromeClientQt(QWebPage*);
     60    virtual ~ChromeClientQt();
     61    virtual void chromeDestroyed();
     62
     63    virtual void setWindowRect(const FloatRect&);
     64    virtual FloatRect windowRect();
     65
     66    virtual FloatRect pageRect();
     67
     68    virtual float scaleFactor();
     69
     70    virtual void focus();
     71    virtual void unfocus();
     72
     73    virtual bool canTakeFocus(FocusDirection);
     74    virtual void takeFocus(FocusDirection);
     75
     76    virtual void focusedNodeChanged(Node*);
     77    virtual void focusedFrameChanged(Frame*);
     78
     79    virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);
     80    virtual void show();
     81
     82    virtual bool canRunModal();
     83    virtual void runModal();
     84
     85    virtual void setToolbarsVisible(bool);
     86    virtual bool toolbarsVisible();
     87
     88    virtual void setStatusbarVisible(bool);
     89    virtual bool statusbarVisible();
     90
     91    virtual void setScrollbarsVisible(bool);
     92    virtual bool scrollbarsVisible();
     93
     94    virtual void setMenubarVisible(bool);
     95    virtual bool menubarVisible();
     96
     97    virtual void setResizable(bool);
     98
     99    virtual void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID);
     100
     101    virtual bool canRunBeforeUnloadConfirmPanel();
     102    virtual bool runBeforeUnloadConfirmPanel(const String& message, Frame*);
     103
     104    virtual void closeWindowSoon();
     105
     106    virtual void runJavaScriptAlert(Frame*, const String&);
     107    virtual bool runJavaScriptConfirm(Frame*, const String&);
     108    virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
     109    virtual bool shouldInterruptJavaScript();
     110
     111    virtual void setStatusbarText(const String&);
     112
     113    virtual KeyboardUIMode keyboardUIMode();
     114    virtual IntRect windowResizerRect() const;
     115
     116    virtual void invalidateWindow(const IntRect&, bool);
     117    virtual void invalidateContentsAndWindow(const IntRect&, bool);
     118    virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
     119    virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
    122120#if ENABLE(TILED_BACKING_STORE)
    123         virtual void delegatedScrollRequested(const IntPoint& scrollPoint);
    124 #endif
    125 
    126         virtual IntPoint screenToWindow(const IntPoint&) const;
    127         virtual IntRect windowToScreen(const IntRect&) const;
    128         virtual PlatformPageClient platformPageClient() const;
    129         virtual void contentsSizeChanged(Frame*, const IntSize&) const;
    130 
    131         virtual void scrollbarsModeDidChange() const { }
    132         virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
    133 
    134         virtual void setToolTip(const String&, TextDirection);
    135 
    136         virtual void print(Frame*);
     121    virtual void delegatedScrollRequested(const IntPoint& scrollPoint);
     122#endif
     123
     124    virtual IntPoint screenToWindow(const IntPoint&) const;
     125    virtual IntRect windowToScreen(const IntRect&) const;
     126    virtual PlatformPageClient platformPageClient() const;
     127    virtual void contentsSizeChanged(Frame*, const IntSize&) const;
     128
     129    virtual void scrollbarsModeDidChange() const { }
     130    virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
     131
     132    virtual void setToolTip(const String&, TextDirection);
     133
     134    virtual void print(Frame*);
    137135#if ENABLE(DATABASE)
    138         virtual void exceededDatabaseQuota(Frame*, const String&);
     136    virtual void exceededDatabaseQuota(Frame*, const String&);
    139137#endif
    140138#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    141         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
    142         virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
     139    virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
     140    virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
    143141#endif
    144142#if ENABLE(CONTEXT_MENUS)
    … …  
    147145
    148146#if ENABLE(NOTIFICATIONS)
    149         virtual NotificationPresenter* notificationPresenter() const;
     147    virtual NotificationPresenter* notificationPresenter() const;
    150148#endif
    151149
    152150#if USE(ACCELERATED_COMPOSITING)
    153         // see ChromeClient.h
    154         // this is a hook for WebCore to tell us what we need to do with the GraphicsLayers
    155         virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*);
    156         virtual void setNeedsOneShotDrawingSynchronization();
    157         virtual void scheduleCompositingLayerSync();
    158         virtual CompositingTriggerFlags allowedCompositingTriggers() const;
     151    // This is a hook for WebCore to tell us what we need to do with the GraphicsLayers.
     152    virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*);
     153    virtual void setNeedsOneShotDrawingSynchronization();
     154    virtual void scheduleCompositingLayerSync();
     155    virtual CompositingTriggerFlags allowedCompositingTriggers() const;
    159156#endif
    160157
    161158#if ENABLE(TILED_BACKING_STORE)
    162         virtual IntRect visibleRectForTiledBackingStore() const;
     159    virtual IntRect visibleRectForTiledBackingStore() const;
    163160#endif
    164161
    165162#if ENABLE(TOUCH_EVENTS)
    166         virtual void needTouchEvents(bool) { }
     163    virtual void needTouchEvents(bool) { }
    167164#endif
    168165 
    169166#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
    170         virtual bool supportsFullscreenForNode(const Node*);
    171         virtual void enterFullscreenForNode(Node*);
    172         virtual void exitFullscreenForNode(Node*);
    173         virtual bool requiresFullscreenForVideoPlayback();
    174         FullScreenVideoQt* fullScreenVideo();
    175 #endif
    176 
    177         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
    178         virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
    179 
    180         virtual void formStateDidChange(const Node*) { }
    181 
    182         virtual void setCursor(const Cursor&);
    183 
    184         virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const { }
    185 
    186         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) { }
    187         virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
    188 
    189         virtual bool selectItemWritingDirectionIsNatural();
    190         virtual bool selectItemAlignmentFollowsMenuWritingDirection();
    191         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
    192         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
    193         virtual void populateVisitedLinks();
    194 
    195         QWebSelectMethod* createSelectPopup() const;
    196 
    197         virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
    198 
    199         QWebPage* m_webPage;
    200         WebCore::KURL lastHoverURL;
    201         WTF::String lastHoverTitle;
    202         WTF::String lastHoverContent;
    203 
    204         bool toolBarsVisible;
    205         bool statusBarVisible;
    206         bool menuBarVisible;
    207         QEventLoop* m_eventLoop;
     167    virtual bool supportsFullscreenForNode(const Node*);
     168    virtual void enterFullscreenForNode(Node*);
     169    virtual void exitFullscreenForNode(Node*);
     170    virtual bool requiresFullscreenForVideoPlayback();
     171    FullScreenVideoQt* fullScreenVideo();
     172#endif
     173     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
     174     virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
     175
     176    virtual void formStateDidChange(const Node*) { }
     177
     178    virtual void setCursor(const Cursor&);
     179
     180    virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const { }
     181
     182    virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) { }
     183    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
     184
     185    virtual bool selectItemWritingDirectionIsNatural();
     186    virtual bool selectItemAlignmentFollowsMenuWritingDirection();
     187    virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
     188    virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
     189    virtual void populateVisitedLinks();
     190
     191    QWebSelectMethod* createSelectPopup() const;
     192
     193    virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
     194
     195    QWebPage* m_webPage;
     196    KURL lastHoverURL;
     197    String lastHoverTitle;
     198    String lastHoverContent;
     199
     200    bool toolBarsVisible;
     201    bool statusBarVisible;
     202    bool menuBarVisible;
     203    QEventLoop* m_eventLoop;
    208204
    209205#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
    210         FullScreenVideoQt* m_fullScreenVideo;
    211 #endif
    212 
    213         static bool dumpVisitedLinksCallbacks;
    214 
    215         mutable QtPlatformPlugin m_platformPlugin;
    216     };
     206    FullScreenVideoQt* m_fullScreenVideo;
     207#endif
     208
     209    static bool dumpVisitedLinksCallbacks;
     210
     211    mutable QtPlatformPlugin m_platformPlugin;
     212};
    217213}
    218214
Note: See TracChangeset for help on using the changeset viewer.