Changeset 85062 in webkit


Ignore:
Timestamp:
Apr 27, 2011 10:55:30 AM (13 years ago)
Author:
yi.4.shen@nokia.com
Message:

2011-04-27 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Upstream Symbian platform plugin
​https://bugs.webkit.org/show_bug.cgi?id=58435

Upstream Symbian platform plugin.

  • Source/WebKit.pro: Add platformplugin path to the SUBDIRS.

2011-04-27 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Upstream Symbian platform plugin
​https://bugs.webkit.org/show_bug.cgi?id=58435

Exempting directory WebKit/qt/symbian/platformplugin from style guide.

  • Scripts/webkitpy/style/checker.py:
  • Scripts/webkitpy/style/checker_unittest.py:

2011-04-27 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Upstream Symbian platform plugin
​https://bugs.webkit.org/show_bug.cgi?id=58435

Upstream Symbian platform plugin.

  • QtWebKit.pro: Add platformplugin.dll to the QtWebKit.sis.
  • symbian/platformplugin: Added.
  • symbian/platformplugin/WebPlugin.cpp: Added. (ItemListDelegate::ItemListDelegate): (ItemListDelegate::paint): (Popup::Popup): (Popup::resizeEvent): (Popup::populateList): (Popup::onItemSelected): (Popup::updateSelectionsBeforeDialogClosing): (Popup::updateAndClose): (WebPopup::WebPopup): (WebPopup::~WebPopup): (WebPopup::createSingleSelectionPopup): (WebPopup::createMultipleSelectionPopup): (WebPopup::createPopup): (WebPopup::show): (WebPopup::hide): (WebPopup::popupClosed): (WebPopup::itemClicked): (SingleSelectionPopup::SingleSelectionPopup): (MultipleSelectionPopup::MultipleSelectionPopup): (WebNotificationPresenter::showNotification): (WebPlugin::supportsExtension): (WebPlugin::createExtension):
  • symbian/platformplugin/WebPlugin.h: Added. (Popup::preSelectedIndices): (Popup::listWidget): (WebNotificationPresenter::WebNotificationPresenter): (WebNotificationPresenter::~WebNotificationPresenter):
  • symbian/platformplugin/platformplugin.pro: Added.
  • symbian/platformplugin/qwebkitplatformplugin.h: Copied from WebKit/qt/Api/qwebkitplatformplugin.h. (QWebSelectData::~QWebSelectData): (QWebSelectMethod::~QWebSelectMethod): (QWebNotificationData::~QWebNotificationData): (QWebNotificationPresenter::QWebNotificationPresenter): (QWebNotificationPresenter::~QWebNotificationPresenter): (QWebTouchModifier::~QWebTouchModifier): (QWebFullScreenVideoHandler::QWebFullScreenVideoHandler): (QWebFullScreenVideoHandler::~QWebFullScreenVideoHandler): (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
Location:
trunk
Files:
4 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r85058 r85062  
     12011-04-27  Yi Shen  <yi.4.shen@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Upstream Symbian platform plugin
     6        https://bugs.webkit.org/show_bug.cgi?id=58435
     7
     8        Upstream Symbian platform plugin.
     9
     10        * Source/WebKit.pro: Add platformplugin path to the SUBDIRS.
     11
    1122011-04-27  Steve Block  <steveblock@google.com>
    213

  • trunk/Source/WebKit.pro

    r84734 r85062  
    3333
    3434symbian {
     35    exists($$PWD/WebKit/qt/symbian/platformplugin): SUBDIRS += WebKit/qt/symbian/platformplugin
     36
    3537    # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
    3638    install.commands = $(MAKE) -C WebCore install

  • trunk/Source/WebKit/qt/ChangeLog

    r84974 r85062  
    1 2011-04-26  Yi Shen  <yi.4.shen@nokia.com>
    2 
    3         Reviewed by Tor Arne Vestbø.
    4 
    5         [Qt][Symbian] Fix Api test failure -- tst_QWebFrame::setHtmlWithBaseURL 
    6         https://bugs.webkit.org/show_bug.cgi?id=56946
    7 
    8         Deployed the missing resource for Symbian platform.
    9 
    10         * tests/qwebframe/qwebframe.pro:
    11 
    12 2011-04-26  Siddharth Mathur  <siddharth.mathur@nokia.com>
    13 
    14         Reviewed by Andreas Kling.
    15 
    16         [Qt] Build fix: QtDeclarative Webview element has a fixed white background
    17         https://bugs.webkit.org/show_bug.cgi?id=40918
    18 
    19         Macro Q_REVISION and associated qdeclarativeitem.h signals are not available in 4.7.3 headers in Nokia Qt SDK.
    20 
    21         * declarative/plugin.cpp: Bump up required version to 4.7.4+
    22         (WebKitQmlPlugin::registerTypes):
    23         * declarative/qdeclarativewebview.cpp: ditto
    24         * declarative/qdeclarativewebview_p.h: ditto
    25         * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: ditto
    26 
    27 2011-04-26  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
    28 
    29         Reviewed by Csaba Osztrogonác.
    30 
    31         [Qt] Implement LayoutTestController::setAutofilled
    32         https://bugs.webkit.org/show_bug.cgi?id=59439
    33 
    34         * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
    35         (DumpRenderTreeSupportQt::setAutofilled):
    36         * WebCoreSupport/DumpRenderTreeSupportQt.h:
    37 
    38 2011-04-22  Sheriff Bot  <webkit.review.bot@gmail.com>
    39 
    40         Unreviewed, rolling out r84627.
    41         http://trac.webkit.org/changeset/84627
    42         https://bugs.webkit.org/show_bug.cgi?id=59271
    43 
    44         It broke Symbian build (Requested by Ossy on #webkit).
    45 
    46         * QtWebKit.pro:
    47         * symbian/platformplugin/WebPlugin.cpp: Removed.
    48         * symbian/platformplugin/WebPlugin.h: Removed.
    49         * symbian/platformplugin/platformplugin.pro: Removed.
    50         * symbian/platformplugin/qwebkitplatformplugin.h: Removed.
    51 
    52 2011-04-22  Sam Weinig  <sam@webkit.org>
    53 
    54         Fix qt build.
    55 
    56         * Api/qwebelement.cpp:
    57         (setupScriptContext):
    58 
    59 2011-04-22  Yi Shen  <yi.4.shen@nokia.com>
     12011-04-27  Yi Shen  <yi.4.shen@nokia.com>
    602
    613        Reviewed by Kenneth Rohde Christiansen.
    … …  
    10850        (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
    10951
     522011-04-26  Yi Shen  <yi.4.shen@nokia.com>
     53
     54        Reviewed by Tor Arne Vestbø.
     55
     56        [Qt][Symbian] Fix Api test failure -- tst_QWebFrame::setHtmlWithBaseURL 
     57        https://bugs.webkit.org/show_bug.cgi?id=56946
     58
     59        Deployed the missing resource for Symbian platform.
     60
     61        * tests/qwebframe/qwebframe.pro:
     62
     632011-04-26  Siddharth Mathur  <siddharth.mathur@nokia.com>
     64
     65        Reviewed by Andreas Kling.
     66
     67        [Qt] Build fix: QtDeclarative Webview element has a fixed white background
     68        https://bugs.webkit.org/show_bug.cgi?id=40918
     69
     70        Macro Q_REVISION and associated qdeclarativeitem.h signals are not available in 4.7.3 headers in Nokia Qt SDK.
     71
     72        * declarative/plugin.cpp: Bump up required version to 4.7.4+
     73        (WebKitQmlPlugin::registerTypes):
     74        * declarative/qdeclarativewebview.cpp: ditto
     75        * declarative/qdeclarativewebview_p.h: ditto
     76        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: ditto
     77
     782011-04-26  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
     79
     80        Reviewed by Csaba Osztrogonác.
     81
     82        [Qt] Implement LayoutTestController::setAutofilled
     83        https://bugs.webkit.org/show_bug.cgi?id=59439
     84
     85        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     86        (DumpRenderTreeSupportQt::setAutofilled):
     87        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     88
     892011-04-22  Sheriff Bot  <webkit.review.bot@gmail.com>
     90
     91        Unreviewed, rolling out r84627.
     92        http://trac.webkit.org/changeset/84627
     93        https://bugs.webkit.org/show_bug.cgi?id=59271
     94
     95        It broke Symbian build (Requested by Ossy on #webkit).
     96
     97        * QtWebKit.pro:
     98        * symbian/platformplugin/WebPlugin.cpp: Removed.
     99        * symbian/platformplugin/WebPlugin.h: Removed.
     100        * symbian/platformplugin/platformplugin.pro: Removed.
     101        * symbian/platformplugin/qwebkitplatformplugin.h: Removed.
     102
     1032011-04-22  Sam Weinig  <sam@webkit.org>
     104
     105        Fix qt build.
     106
     107        * Api/qwebelement.cpp:
     108        (setupScriptContext):
     109
     1102011-04-22  Yi Shen  <yi.4.shen@nokia.com>
     111
     112        Reviewed by Kenneth Rohde Christiansen.
     113
     114        [Qt] Upstream Symbian platform plugin
     115        https://bugs.webkit.org/show_bug.cgi?id=58435
     116
     117        Upstream Symbian platform plugin.
     118
     119        * QtWebKit.pro: Add platformplugin.dll to the QtWebKit.sis.
     120        * symbian/platformplugin: Added.
     121        * symbian/platformplugin/WebPlugin.cpp: Added.
     122        (ItemListDelegate::ItemListDelegate):
     123        (ItemListDelegate::paint):
     124        (Popup::Popup):
     125        (Popup::resizeEvent):
     126        (Popup::populateList):
     127        (Popup::onItemSelected):
     128        (Popup::updateSelectionsBeforeDialogClosing):
     129        (Popup::updateAndClose):
     130        (WebPopup::WebPopup):
     131        (WebPopup::~WebPopup):
     132        (WebPopup::createSingleSelectionPopup):
     133        (WebPopup::createMultipleSelectionPopup):
     134        (WebPopup::createPopup):
     135        (WebPopup::show):
     136        (WebPopup::hide):
     137        (WebPopup::popupClosed):
     138        (WebPopup::itemClicked):
     139        (SingleSelectionPopup::SingleSelectionPopup):
     140        (MultipleSelectionPopup::MultipleSelectionPopup):
     141        (WebNotificationPresenter::showNotification):
     142        (WebPlugin::supportsExtension):
     143        (WebPlugin::createExtension):
     144        * symbian/platformplugin/WebPlugin.h: Added.
     145        (Popup::preSelectedIndices):
     146        (Popup::listWidget):
     147        (WebNotificationPresenter::WebNotificationPresenter):
     148        (WebNotificationPresenter::~WebNotificationPresenter):
     149        * symbian/platformplugin/platformplugin.pro: Added.
     150        * symbian/platformplugin/qwebkitplatformplugin.h: Copied from WebKit/qt/Api/qwebkitplatformplugin.h.
     151        (QWebSelectData::~QWebSelectData):
     152        (QWebSelectMethod::~QWebSelectMethod):
     153        (QWebNotificationData::~QWebNotificationData):
     154        (QWebNotificationPresenter::QWebNotificationPresenter):
     155        (QWebNotificationPresenter::~QWebNotificationPresenter):
     156        (QWebTouchModifier::~QWebTouchModifier):
     157        (QWebFullScreenVideoHandler::QWebFullScreenVideoHandler):
     158        (QWebFullScreenVideoHandler::~QWebFullScreenVideoHandler):
     159        (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
     160
    1101612011-04-21  Ryosuke Niwa  <rniwa@webkit.org>
    111162

  • trunk/Source/WebKit/qt/QtWebKit.pro

    r84734 r85062  
    124124    }
    125125
    126     DEPLOYMENT += webkitsisheader webkitlibs webkitbackup
     126    platformplugin.sources = $$OUTPUT_DIR/plugins/QtWebKit/platformplugin$${QT_LIBINFIX}.dll
     127    platformplugin.path = c:$$QT_PLUGINS_BASE_DIR/QtWebKit
     128
     129    DEPLOYMENT += webkitsisheader webkitlibs webkitbackup platformplugin
    127130    !CONFIG(production):CONFIG-=def_files
    128131

  • trunk/Tools/ChangeLog

    r85049 r85062  
     12011-04-27  Yi Shen  <yi.4.shen@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Upstream Symbian platform plugin
     6        https://bugs.webkit.org/show_bug.cgi?id=58435
     7
     8        Exempting directory WebKit/qt/symbian/platformplugin from style guide.
     9
     10        * Scripts/webkitpy/style/checker.py:
     11        * Scripts/webkitpy/style/checker_unittest.py:
     12
    1132011-04-27  Jeff Miller  <jeffm@apple.com>
    214

  • trunk/Tools/Scripts/webkitpy/style/checker.py

    r84734 r85062  
    199199      "+pep8/W291",  # Trailing white space
    200200      "+whitespace/carriage_return"]),
     201
     202    ([# Qt Symbian platform plugin has no config.h or header guard.
     203      # Qt code uses '_' in some places (such as private slots
     204      # and on test xxx_data methos on tests).
     205      "Source/WebKit/qt/symbian/platformplugin/"],
     206     ["-readability/naming",
     207      "-build/header_guard",
     208      "-build/include_order"]),
    201209]
    202210

  • trunk/Tools/Scripts/webkitpy/style/checker_unittest.py

    r84734 r85062  
    238238        assertCheck("Source/WebKit/qt/examples/platformplugin/WebPlugin.cpp",
    239239                    "readability/braces")
     240        assertCheck("Source/WebKit/qt/symbian/platformplugin/WebPlugin.cpp",
     241                    "readability/braces")
    240242        assertNoCheck("Source/JavaScriptCore/qt/api/qscriptengine.cpp",
    241243                      "readability/naming")
    … …  
    251253        assertNoCheck("Source/WebKit/qt/examples/platformplugin/WebPlugin.cpp",
    252254                      "readability/naming")
     255        assertNoCheck("Source/WebKit/qt/symbian/platformplugin/WebPlugin.cpp",
     256                      "build/header_guard")
    253257
    254258        assertNoCheck("Tools/MiniBrowser/qt/UrlLoader.cpp",
Note: See TracChangeset for help on using the changeset viewer.