Changeset 84627 in webkit


Ignore:
Timestamp:
Apr 22, 2011 7:43:07 AM (13 years ago)
Author:
yi.4.shen@nokia.com
Message:

2011-04-22 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-22 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):

2011-04-22 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:
Location:
trunk
Files:
5 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r84589 r84627  
     12011-04-22  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-21  Maciej Stachowiak  <mjs@apple.com>
    213

  • trunk/Source/WebKit.pro

    r79945 r84627  
    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

    r84574 r84627  
     12011-04-22  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        * QtWebKit.pro: Add platformplugin.dll to the QtWebKit.sis.
     11        * symbian/platformplugin: Added.
     12        * symbian/platformplugin/WebPlugin.cpp: Added.
     13        (ItemListDelegate::ItemListDelegate):
     14        (ItemListDelegate::paint):
     15        (Popup::Popup):
     16        (Popup::resizeEvent):
     17        (Popup::populateList):
     18        (Popup::onItemSelected):
     19        (Popup::updateSelectionsBeforeDialogClosing):
     20        (Popup::updateAndClose):
     21        (WebPopup::WebPopup):
     22        (WebPopup::~WebPopup):
     23        (WebPopup::createSingleSelectionPopup):
     24        (WebPopup::createMultipleSelectionPopup):
     25        (WebPopup::createPopup):
     26        (WebPopup::show):
     27        (WebPopup::hide):
     28        (WebPopup::popupClosed):
     29        (WebPopup::itemClicked):
     30        (SingleSelectionPopup::SingleSelectionPopup):
     31        (MultipleSelectionPopup::MultipleSelectionPopup):
     32        (WebNotificationPresenter::showNotification):
     33        (WebPlugin::supportsExtension):
     34        (WebPlugin::createExtension):
     35        * symbian/platformplugin/WebPlugin.h: Added.
     36        (Popup::preSelectedIndices):
     37        (Popup::listWidget):
     38        (WebNotificationPresenter::WebNotificationPresenter):
     39        (WebNotificationPresenter::~WebNotificationPresenter):
     40        * symbian/platformplugin/platformplugin.pro: Added.
     41        * symbian/platformplugin/qwebkitplatformplugin.h: Copied from WebKit/qt/Api/qwebkitplatformplugin.h.
     42        (QWebSelectData::~QWebSelectData):
     43        (QWebSelectMethod::~QWebSelectMethod):
     44        (QWebNotificationData::~QWebNotificationData):
     45        (QWebNotificationPresenter::QWebNotificationPresenter):
     46        (QWebNotificationPresenter::~QWebNotificationPresenter):
     47        (QWebTouchModifier::~QWebTouchModifier):
     48        (QWebFullScreenVideoHandler::QWebFullScreenVideoHandler):
     49        (QWebFullScreenVideoHandler::~QWebFullScreenVideoHandler):
     50        (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
     51
    1522011-04-21  Ryosuke Niwa  <rniwa@webkit.org>
    253

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

    r84364 r84627  
    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

    r84615 r84627  
     12011-04-22  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-22  Balazs Kelemen  <kbalazs@webkit.org>
    214

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

    r82382 r84627  
    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

    r82382 r84627  
    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.