Changeset 47358 in webkit


Ignore:
Timestamp:
Aug 17, 2009 6:51:46 AM (15 years ago)
Author:
treat@webkit.org
Message:

Style fixes for DumpRenderTree/qt/jsobjects.cpp based on cpp_style.py and
WebKit style guide.

Patch by Mike Fenton <​mike.fenton@torchmobile.com> on 2009-08-10
Reviewed by Adam Treat.

​https://bugs.webkit.org/show_bug.cgi?id=28161

  • DumpRenderTree/qt/jsobjects.cpp:

(findFrameNamed):
(LoadItem::invoke):
(LayoutTestController::provisionalLoad):
(LayoutTestController::timerEvent):
(LayoutTestController::pauseAnimationAtTimeOnElementWithId):
(LayoutTestController::pauseTransitionAtTimeOnElementWithId):
(LayoutTestController::numberOfActiveAnimations):
(EventSender::keyDown):
(EventSender::frameUnderMouse):
(TextInputController::doCommand):

Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r47346 r47358  
     12009-08-10  Mike Fenton  <mike.fenton@torchmobile.com>
     2
     3        Reviewed by Adam Treat.
     4
     5        Style fixes for DumpRenderTree/qt/jsobjects.cpp based on cpp_style.py and
     6        WebKit style guide.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=28161
     9
     10        * DumpRenderTree/qt/jsobjects.cpp:
     11        (findFrameNamed):
     12        (LoadItem::invoke):
     13        (LayoutTestController::provisionalLoad):
     14        (LayoutTestController::timerEvent):
     15        (LayoutTestController::pauseAnimationAtTimeOnElementWithId):
     16        (LayoutTestController::pauseTransitionAtTimeOnElementWithId):
     17        (LayoutTestController::numberOfActiveAnimations):
     18        (EventSender::keyDown):
     19        (EventSender::frameUnderMouse):
     20        (TextInputController::doCommand):
     21
    1222009-08-16  David Kilzer  <ddkilzer@apple.com>
    223

  • trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp

    r47077 r47358  
    2828 */
    2929#include <jsobjects.h>
    30 #include <qwebpage.h>
    31 #include <qwebhistory.h>
    32 #include <qwebframe.h>
    33 #include <qwebsecurityorigin.h>
    34 #include <qwebdatabase.h>
    35 #include <qevent.h>
     30
     31#include "DumpRenderTree.h"
     32#include "WorkQueue.h"
     33#include "WorkQueueItem.h"
     34
    3635#include <qapplication.h>
    3736#include <qevent.h>
    3837#include <qtimer.h>
    39 
    40 #include "DumpRenderTree.h"
    41 #include "WorkQueueItem.h"
    42 #include "WorkQueue.h"
     38#include <qwebdatabase.h>
     39#include <qwebframe.h>
     40#include <qwebhistory.h>
     41#include <qwebpage.h>
     42#include <qwebsecurityorigin.h>
     43
    4344extern void qt_dump_editing_callbacks(bool b);
    4445extern void qt_dump_resource_load_callbacks(bool b);
    … …  
    4849extern int qt_drt_numberOfActiveAnimations(QWebFrame*);
    4950
    50 QWebFrame *findFrameNamed(const QString &frameName, QWebFrame *frame)
     51QWebFrame* findFrameNamed(const QString &frameName, QWebFrame* frame)
    5152{
    5253    if (frame->frameName() == frameName)
    … …  
    6566    Q_ASSERT(m_webPage);
    6667
    67     QWebFrame *frame = 0;
     68    QWebFrame* frame = 0;
    6869    const QString t = target();
    6970    if (t.isEmpty())
    … …  
    245246void LayoutTestController::provisionalLoad()
    246247{
    247     QWebFrame *frame = qobject_cast<QWebFrame*>(sender());
     248    QWebFrame* frame = qobject_cast<QWebFrame*>(sender());
    248249    if (!m_topLoadingFrame && m_isLoading)
    249250        m_topLoadingFrame = frame;
    … …  
    255256        qDebug() << ">>>>>>>>>>>>> timeout";
    256257        notifyDone();
    257     } else {
     258    } else
    258259        QObject::timerEvent(ev);
    259     }
    260260}
    261261
    … …  
    294294                                                               const QString &elementId)
    295295{
    296     QWebFrame *frame = m_drt->webPage()->mainFrame();
     296    QWebFrame* frame = m_drt->webPage()->mainFrame();
    297297    Q_ASSERT(frame);
    298298    return qt_drt_pauseAnimation(frame, animationName, time, elementId);
    … …  
    303303                                                                const QString &elementId)
    304304{
    305     QWebFrame *frame = m_drt->webPage()->mainFrame();
     305    QWebFrame* frame = m_drt->webPage()->mainFrame();
    306306    Q_ASSERT(frame);
    307307    return qt_drt_pauseTransitionOfProperty(frame, propertyName, time, elementId);
    … …  
    310310unsigned LayoutTestController::numberOfActiveAnimations() const
    311311{
    312     QWebFrame *frame = m_drt->webPage()->mainFrame();
     312    QWebFrame* frame = m_drt->webPage()->mainFrame();
    313313    Q_ASSERT(frame);
    314314    return qt_drt_numberOfActiveAnimations(frame);
    … …  
    448448            code = Qt::Key_Home;
    449449            modifs = 0;
    450         } else {
     450        } else
    451451            code = string.unicode()->toUpper().unicode();
    452         }
    453452    } else {
    454453        qDebug() << ">>>>>>>>> keyDown" << string;
    … …  
    487486}
    488487
    489 QWebFrame *EventSender::frameUnderMouse() const
    490 {
    491     QWebFrame *frame = m_page->mainFrame();
     488QWebFrame* EventSender::frameUnderMouse() const
     489{
     490    QWebFrame* frame = m_page->mainFrame();
    492491
    493492redo:
    … …  
    517516        modifiers |= Qt::ShiftModifier;
    518517        keycode = Qt::Key_Left;
    519     } else if(command =="moveDown:") {
     518    } else if (command =="moveDown:") {
    520519        keycode = Qt::Key_Down;
    521     } else if(command =="moveDownAndModifySelection:") {
     520    } else if (command =="moveDownAndModifySelection:") {
    522521        modifiers |= Qt::ShiftModifier;
    523522        keycode = Qt::Key_Down;
    524     } else if(command =="moveForward:") {
     523    } else if (command =="moveForward:") {
    525524        keycode = Qt::Key_Right;
    526     } else if(command =="moveForwardAndModifySelection:") {
     525    } else if (command =="moveForwardAndModifySelection:") {
    527526        modifiers |= Qt::ShiftModifier;
    528527        keycode = Qt::Key_Right;
    529     } else if(command =="moveLeft:") {
     528    } else if (command =="moveLeft:") {
    530529        keycode = Qt::Key_Left;
    531     } else if(command =="moveLeftAndModifySelection:") {
     530    } else if (command =="moveLeftAndModifySelection:") {
    532531        modifiers |= Qt::ShiftModifier;
    533532        keycode = Qt::Key_Left;
    534     } else if(command =="moveRight:") {
     533    } else if (command =="moveRight:") {
    535534        keycode = Qt::Key_Right;
    536     } else if(command =="moveRightAndModifySelection:") {
     535    } else if (command =="moveRightAndModifySelection:") {
    537536        modifiers |= Qt::ShiftModifier;
    538537        keycode = Qt::Key_Right;
    539     } else if(command =="moveToBeginningOfDocument:") {
     538    } else if (command =="moveToBeginningOfDocument:") {
    540539        modifiers |= Qt::ControlModifier;
    541540        keycode = Qt::Key_Home;
    542     } else if(command =="moveToBeginningOfLine:") {
     541    } else if (command =="moveToBeginningOfLine:") {
    543542        keycode = Qt::Key_Home;
    544 //     } else if(command =="moveToBeginningOfParagraph:") {
    545     } else if(command =="moveToEndOfDocument:") {
     543//     } else if (command =="moveToBeginningOfParagraph:") {
     544    } else if (command =="moveToEndOfDocument:") {
    546545        modifiers |= Qt::ControlModifier;
    547546        keycode = Qt::Key_End;
    548     } else if(command =="moveToEndOfLine:") {
     547    } else if (command =="moveToEndOfLine:") {
    549548        keycode = Qt::Key_End;
    550 //     } else if(command =="moveToEndOfParagraph:") {
    551     } else if(command =="moveUp:") {
     549//     } else if (command =="moveToEndOfParagraph:") {
     550    } else if (command =="moveUp:") {
    552551        keycode = Qt::Key_Up;
    553     } else if(command =="moveUpAndModifySelection:") {
     552    } else if (command =="moveUpAndModifySelection:") {
    554553        modifiers |= Qt::ShiftModifier;
    555554        keycode = Qt::Key_Up;
    556     } else if(command =="moveWordBackward:") {
     555    } else if (command =="moveWordBackward:") {
    557556        modifiers |= Qt::ControlModifier;
    558557        keycode = Qt::Key_Up;
    559     } else if(command =="moveWordBackwardAndModifySelection:") {
     558    } else if (command =="moveWordBackwardAndModifySelection:") {
    560559        modifiers |= Qt::ShiftModifier;
    561560        modifiers |= Qt::ControlModifier;
    562561        keycode = Qt::Key_Left;
    563     } else if(command =="moveWordForward:") {
     562    } else if (command =="moveWordForward:") {
    564563        modifiers |= Qt::ControlModifier;
    565564        keycode = Qt::Key_Right;
    566     } else if(command =="moveWordForwardAndModifySelection:") {
     565    } else if (command =="moveWordForwardAndModifySelection:") {
    567566        modifiers |= Qt::ControlModifier;
    568567        modifiers |= Qt::ShiftModifier;
    569568        keycode = Qt::Key_Right;
    570     } else if(command =="moveWordLeft:") {
     569    } else if (command =="moveWordLeft:") {
    571570        modifiers |= Qt::ControlModifier;
    572571        keycode = Qt::Key_Left;
    573     } else if(command =="moveWordRight:") {
     572    } else if (command =="moveWordRight:") {
    574573        modifiers |= Qt::ControlModifier;
    575574        keycode = Qt::Key_Left;
    576     } else if(command =="moveWordRightAndModifySelection:") {
     575    } else if (command =="moveWordRightAndModifySelection:") {
    577576        modifiers |= Qt::ShiftModifier;
    578577        modifiers |= Qt::ControlModifier;
    579578        keycode = Qt::Key_Right;
    580     } else if(command =="moveWordLeftAndModifySelection:") {
     579    } else if (command =="moveWordLeftAndModifySelection:") {
    581580        modifiers |= Qt::ShiftModifier;
    582581        modifiers |= Qt::ControlModifier;
    583582        keycode = Qt::Key_Left;
    584     } else if(command =="pageDown:") {
    585         keycode = Qt::Key_PageDown;       
    586     } else if(command =="pageUp:") {
    587         keycode = Qt::Key_PageUp;       
    588     } else if(command == "deleteWordBackward:") {
     583    } else if (command =="pageDown:") {
     584        keycode = Qt::Key_PageDown;
     585    } else if (command =="pageUp:") {
     586        keycode = Qt::Key_PageUp;
     587    } else if (command == "deleteWordBackward:") {
    589588        modifiers |= Qt::ControlModifier;
    590589        keycode = Qt::Key_Backspace;
    591     } else if(command == "deleteBackward:") {
     590    } else if (command == "deleteBackward:") {
    592591        keycode = Qt::Key_Backspace;
    593     } else if(command == "deleteForward:") {
     592    } else if (command == "deleteForward:") {
    594593        keycode = Qt::Key_Delete;
    595594    }
Note: See TracChangeset for help on using the changeset viewer.