Changeset 83125 in webkit


Ignore:
Timestamp:
Apr 6, 2011 5:20:32 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-06 Anders Bakken <​agbakken@gmail.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] FrameLoaderClientQt.cpp has coding-style errors
​https://bugs.webkit.org/show_bug.cgi?id=40254

  • WebCoreSupport/FrameLoaderClientQt.cpp: (drtDescriptionSuitableForTestResult): (WebCore::FrameLoaderClientQt::hasWebView): (WebCore::FrameLoaderClientQt::setCopiesOnScroll): (WebCore::FrameLoaderClientQt::dispatchDidHandleOnloadEvents): (WebCore::FrameLoaderClientQt::dispatchDidReceiveTitle): (WebCore::FrameLoaderClientQt::dispatchDidChangeIcons): (WebCore::FrameLoaderClientQt::cancelPolicyCheck): (WebCore::FrameLoaderClientQt::dispatchWillSubmitForm): (WebCore::FrameLoaderClientQt::postProgressStartedNotification): (WebCore::FrameLoaderClientQt::postProgressFinishedNotification): (WebCore::FrameLoaderClientQt::setMainFrameDocumentReady): (WebCore::FrameLoaderClientQt::willChangeTitle): (WebCore::FrameLoaderClientQt::didChangeTitle): (WebCore::FrameLoaderClientQt::finishedLoading): (WebCore::FrameLoaderClientQt::frameLoadCompleted): (WebCore::FrameLoaderClientQt::provisionalLoadStarted): (WebCore::FrameLoaderClientQt::didFinishLoad): (WebCore::FrameLoaderClientQt::setTitle): (WebCore::FrameLoaderClientQt::dispatchDidReceiveIcon): (WebCore::FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld): (WebCore::FrameLoaderClientQt::updateGlobalHistory): (WebCore::FrameLoaderClientQt::shouldGoToHistoryItem): (WebCore::FrameLoaderClientQt::shouldStopLoadingForHistoryItem): (WebCore::FrameLoaderClientQt::committedLoad): (WebCore::FrameLoaderClientQt::download): (WebCore::FrameLoaderClientQt::dispatchWillSendRequest): (WebCore::FrameLoaderClientQt::shouldUseCredentialStorage): (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForResponse): (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction): (WebCore::FrameLoaderClientQt::createFrame): (WebCore::FrameLoaderClientQt::objectContentType): (WebCore::FrameLoaderClientQt::createPlugin):
Location:
trunk/Source/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r83108 r83125  
     12011-04-06  Anders Bakken  <agbakken@gmail.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] FrameLoaderClientQt.cpp has coding-style errors
     6        https://bugs.webkit.org/show_bug.cgi?id=40254
     7
     8        * WebCoreSupport/FrameLoaderClientQt.cpp:
     9        (drtDescriptionSuitableForTestResult):
     10        (WebCore::FrameLoaderClientQt::hasWebView):
     11        (WebCore::FrameLoaderClientQt::setCopiesOnScroll):
     12        (WebCore::FrameLoaderClientQt::dispatchDidHandleOnloadEvents):
     13        (WebCore::FrameLoaderClientQt::dispatchDidReceiveTitle):
     14        (WebCore::FrameLoaderClientQt::dispatchDidChangeIcons):
     15        (WebCore::FrameLoaderClientQt::cancelPolicyCheck):
     16        (WebCore::FrameLoaderClientQt::dispatchWillSubmitForm):
     17        (WebCore::FrameLoaderClientQt::postProgressStartedNotification):
     18        (WebCore::FrameLoaderClientQt::postProgressFinishedNotification):
     19        (WebCore::FrameLoaderClientQt::setMainFrameDocumentReady):
     20        (WebCore::FrameLoaderClientQt::willChangeTitle):
     21        (WebCore::FrameLoaderClientQt::didChangeTitle):
     22        (WebCore::FrameLoaderClientQt::finishedLoading):
     23        (WebCore::FrameLoaderClientQt::frameLoadCompleted):
     24        (WebCore::FrameLoaderClientQt::provisionalLoadStarted):
     25        (WebCore::FrameLoaderClientQt::didFinishLoad):
     26        (WebCore::FrameLoaderClientQt::setTitle):
     27        (WebCore::FrameLoaderClientQt::dispatchDidReceiveIcon):
     28        (WebCore::FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld):
     29        (WebCore::FrameLoaderClientQt::updateGlobalHistory):
     30        (WebCore::FrameLoaderClientQt::shouldGoToHistoryItem):
     31        (WebCore::FrameLoaderClientQt::shouldStopLoadingForHistoryItem):
     32        (WebCore::FrameLoaderClientQt::committedLoad):
     33        (WebCore::FrameLoaderClientQt::download):
     34        (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
     35        (WebCore::FrameLoaderClientQt::shouldUseCredentialStorage):
     36        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForResponse):
     37        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
     38        (WebCore::FrameLoaderClientQt::createFrame):
     39        (WebCore::FrameLoaderClientQt::objectContentType):
     40        (WebCore::FrameLoaderClientQt::createPlugin):
     41
    1422011-04-06  Alexis Menard  <alexis.menard@openbossa.org>
    243

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r82586 r83125  
    3232
    3333#include "config.h"
     34#include "FrameLoaderClientQt.h"
     35
    3436#include "CSSComputedStyleDeclaration.h"
    3537#include "CSSPropertyNames.h"
     38#include "DocumentLoader.h"
    3639#include "FormState.h"
    37 #include "FrameLoaderClientQt.h"
    3840#include "FrameNetworkingContextQt.h"
    3941#include "FrameTree.h"
    4042#include "FrameView.h"
    41 #include "DocumentLoader.h"
     43#include "HTMLAppletElement.h"
     44#include "HTMLFormElement.h"
     45#include "HTMLPlugInElement.h"
     46#include "HTTPParsers.h"
     47#include "HistoryItem.h"
    4248#include "HitTestResult.h"
    4349#if ENABLE(ICONDATABASE)
    … …  
    4652#if USE(JSC)
    4753#include "JSDOMWindowBase.h"
    48 #elif USE(V8)
    49 #include "V8DOMWindow.h"
    5054#endif
    5155#include "MIMETypeRegistry.h"
    5256#include "MouseEvent.h"
    53 #include "ResourceResponse.h"
     57#include "NotImplemented.h"
    5458#include "Page.h"
    5559#include "PluginData.h"
    5660#include "PluginDatabase.h"
    5761#include "ProgressTracker.h"
     62#include "QNetworkReplyHandler.h"
     63#include "QWebPageClient.h"
    5864#include "RenderPart.h"
     65#include "ResourceHandle.h"
     66#include "ResourceHandleInternal.h"
    5967#include "ResourceRequest.h"
    60 #include "HistoryItem.h"
    61 #include "HTMLAppletElement.h"
    62 #include "HTMLFormElement.h"
    63 #include "HTMLPlugInElement.h"
    64 #include "HTTPParsers.h"
    65 #include "NotImplemented.h"
    66 #include "QNetworkReplyHandler.h"
    67 #include "ResourceHandleInternal.h"
    68 #include "ResourceHandle.h"
     68#include "ResourceResponse.h"
    6969#include "ScriptController.h"
    7070#include "Settings.h"
    71 #include "QWebPageClient.h"
     71#if USE(V8)
     72#include "V8DOMWindow.h"
     73#endif
    7274#include "ViewportArguments.h"
    7375
     76#include "qwebframe.h"
     77#include "qwebframe_p.h"
     78#include "qwebhistory_p.h"
     79#include "qwebhistoryinterface.h"
    7480#include "qwebpage.h"
    7581#include "qwebpage_p.h"
    76 #include "qwebframe.h"
    77 #include "qwebframe_p.h"
    78 #include "qwebhistoryinterface.h"
    7982#include "qwebpluginfactory.h"
    80 
    81 #include <qfileinfo.h>
    8283
    8384#include <QCoreApplication>
    8485#include <QDebug>
     86#include <QFileInfo>
    8587#include <QGraphicsScene>
    8688#include <QGraphicsWidget>
     89#include <QNetworkReply>
    8790#include <QNetworkRequest>
    88 #include <QNetworkReply>
    8991#include <QStringList>
    90 #include "qwebhistory_p.h"
    9192#include <wtf/OwnPtr.h>
    9293
    9394static QMap<unsigned long, QString> dumpAssignedUrls;
    9495
    95 // Compare with WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm
    96 static QString drtDescriptionSuitableForTestResult(WebCore::Frame* _frame)
    97 {
    98     QWebFrame* frame = QWebFramePrivate::kit(_frame);
     96// Compare with the file "WebKit/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm".
     97static QString drtDescriptionSuitableForTestResult(WebCore::Frame* webCoreFrame)
     98{
     99    QWebFrame* frame = QWebFramePrivate::kit(webCoreFrame);
    99100    QString name = frame->frameName();
    100101
    … …  
    104105            return QString::fromLatin1("main frame \"%1\"").arg(name);
    105106        return QLatin1String("main frame");
    106     } else {
    107         if (!name.isEmpty())
    108             return QString::fromLatin1("frame \"%1\"").arg(name);
    109         return QLatin1String("frame (anonymous)");
    110     }
     107    }
     108    if (!name.isEmpty())
     109        return QString::fromLatin1("frame \"%1\"").arg(name);
     110    return QLatin1String("frame (anonymous)");
    111111}
    112112
    … …  
    118118}
    119119
    120 static QString drtDescriptionSuitableForTestResult(const WebCore::KURL& _url)
    121 {
    122     if (_url.isEmpty() || !_url.isLocalFile())
    123         return _url.string();
    124     // Remove the leading path from file urls
    125     return QString(_url.string()).remove(WebCore::FrameLoaderClientQt::dumpResourceLoadCallbacksPath).mid(1);
     120static QString drtDescriptionSuitableForTestResult(const WebCore::KURL& kurl)
     121{
     122    if (kurl.isEmpty() || !kurl.isLocalFile())
     123        return kurl.string();
     124    // Remove the leading path from file urls.
     125    return QString(kurl.string()).remove(WebCore::FrameLoaderClientQt::dumpResourceLoadCallbacksPath).mid(1);
    126126}
    127127
    … …  
    167167}
    168168
    169 namespace WebCore
    170 {
     169namespace WebCore {
    171170
    172171bool FrameLoaderClientQt::dumpFrameLoaderCallbacks = false;
    … …  
    185184QMap<QString, QString> FrameLoaderClientQt::URLsToRedirect = QMap<QString, QString>();
    186185
    187 // Taken from DumpRenderTree/chromium/WebViewHost.cpp
     186// Taken from the file "WebKit/Tools/DumpRenderTree/chromium/WebViewHost.cpp".
    188187static const char* navigationTypeToString(NavigationType type)
    189188{
    … …  
    251250bool FrameLoaderClientQt::hasWebView() const
    252251{
    253     //notImplemented();
     252    // notImplemented();
    254253    return true;
    255254}
    … …  
    332331void FrameLoaderClientQt::setCopiesOnScroll()
    333332{
    334     // apparently mac specific
     333    // Apparently this is mac specific.
    335334}
    336335
    … …  
    347346void FrameLoaderClientQt::dispatchDidHandleOnloadEvents()
    348347{
    349     // don't need this one
     348    // Don't need this one.
    350349    if (dumpFrameLoaderCallbacks)
    351350        printf("%s - didHandleOnloadEventsForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
    … …  
    450449void FrameLoaderClientQt::dispatchDidReceiveTitle(const StringWithDirection& title)
    451450{
    452     // FIXME: use direction of title.
     451    // FIXME: Use direction of title.
    453452    if (dumpFrameLoaderCallbacks)
    454453        printf("%s - didReceiveTitle: %s\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)), qPrintable(QString(title.string())));
    … …  
    469468        return;
    470469
    471     // FIXME: To be notified of changing icon URLS add notification
     470    // FIXME: In order to get notified of icon URLS' changes, add a notification.
    472471    // emit iconsChanged();
    473472}
    … …  
    548547void FrameLoaderClientQt::cancelPolicyCheck()
    549548{
    550 //    qDebug() << "FrameLoaderClientQt::cancelPolicyCheck";
     549    // qDebug() << "FrameLoaderClientQt::cancelPolicyCheck";
    551550}
    552551
    … …  
    556555{
    557556    notImplemented();
    558     // FIXME: This is surely too simple
     557    // FIXME: This is surely too simple.
    559558    callPolicyFunction(function, PolicyUse);
    560559}
    … …  
    575574{
    576575    if (m_webFrame && m_frame->page()) {
    577         // A new load starts, so lets clear the previous error.
     576        // As a new load have started, clear the previous error.
    578577        m_loadError = ResourceError();
    579578        emit loadStarted();
    … …  
    593592void FrameLoaderClientQt::postProgressFinishedNotification()
    594593{
    595     // send a mousemove event to
    596     // (1) update the cursor to change according to whatever is underneath the mouse cursor right now
    597     // (2) display the tool tip if the mouse hovers a node which has a tool tip
     594    // Send a mousemove event to:
     595    // (1) update the cursor to change according to whatever is underneath the mouse cursor right now;
     596    // (2) display the tool tip if the mouse hovers a node which has a tool tip.
    598597    if (m_frame && m_frame->eventHandler() && m_webFrame->page()) {
    599598        QWidget* view = m_webFrame->page()->view();
    … …  
    613612void FrameLoaderClientQt::setMainFrameDocumentReady(bool)
    614613{
    615     // this is only interesting once we provide an external API for the DOM
     614    // This is only interesting once we provide an external API for the DOM.
    616615}
    617616
    … …  
    619618void FrameLoaderClientQt::willChangeTitle(DocumentLoader*)
    620619{
    621     // no need for, dispatchDidReceiveTitle is the right callback
     620    // No need for, dispatchDidReceiveTitle is the right callback.
    622621}
    623622
    … …  
    625624void FrameLoaderClientQt::didChangeTitle(DocumentLoader*)
    626625{
    627     // no need for, dispatchDidReceiveTitle is the right callback
     626    // No need for, dispatchDidReceiveTitle is the right callback.
    628627}
    629628
    … …  
    633632    if (!m_pluginView) {
    634633        // This is necessary to create an empty document. See bug 634004.
    635         // However, we only want to do this if makeRepresentation has been called, to
    636         // match the behavior on the Mac.
     634        // However, we only want to do this if makeRepresentation has been called,
     635        // to match the behavior on the Mac.
    637636        if (m_hasRepresentation)
    638637            loader->writer()->setEncoding("", false);
    … …  
    683682void FrameLoaderClientQt::frameLoadCompleted()
    684683{
    685     // Note: Can be called multiple times.
     684    // Note that this can be called multiple times.
    686685}
    687686
    … …  
    697696void FrameLoaderClientQt::provisionalLoadStarted()
    698697{
    699     // don't need to do anything here
     698    // Don't need to do anything here.
    700699}
    701700
    … …  
    703702void FrameLoaderClientQt::didFinishLoad()
    704703{
    705 //    notImplemented();
     704    // notImplemented();
    706705}
    707706
    … …  
    715714    // Used by Apple WebKit to update the title of an existing history item.
    716715    // QtWebKit doesn't accomodate this on history items. If it ever does,
    717     // it should be privateBrowsing-aware.For now, we are just passing
     716    // it should be privateBrowsing-aware. For now, we are just passing
    718717    // globalhistory layout tests.
    719     // FIXME: use direction of title.
     718    // FIXME: Use direction of title.
    720719    if (dumpHistoryCallbacks) {
    721720        printf("WebView updated the title for history URL \"%s\" to \"%s\".\n",
    … …  
    736735void FrameLoaderClientQt::dispatchDidReceiveIcon()
    737736{
    738     if (m_webFrame) {
     737    if (m_webFrame)
    739738        emit m_webFrame->iconChanged();
    740     }
    741739}
    742740
    … …  
    760758        return;
    761759
    762     if (m_webFrame) {
     760    if (m_webFrame)
    763761        emit m_webFrame->javaScriptWindowObjectCleared();
    764     }
    765762}
    766763
    … …  
    798795void FrameLoaderClientQt::updateGlobalHistory()
    799796{
    800     QWebHistoryInterface *history = QWebHistoryInterface::defaultInterface();
     797    QWebHistoryInterface* history = QWebHistoryInterface::defaultInterface();
    801798    WebCore::DocumentLoader* loader = m_frame->loader()->documentLoader();
    802799    if (history)
    … …  
    843840}
    844841
    845 bool FrameLoaderClientQt::shouldGoToHistoryItem(WebCore::HistoryItem *) const
     842bool FrameLoaderClientQt::shouldGoToHistoryItem(WebCore::HistoryItem*) const
    846843{
    847844    return true;
    848845}
    849846
    850 bool FrameLoaderClientQt::shouldStopLoadingForHistoryItem(WebCore::HistoryItem *) const
     847bool FrameLoaderClientQt::shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const
    851848{
    852849    return true;
    … …  
    908905        loader->commitData(data, length);
    909906   
    910     // We re-check here as the plugin can have been created
     907    // We re-check here as the plugin can have been created.
    911908    if (m_pluginView && m_pluginView->isPluginView()) {
    912909        if (!m_hasSentResponseToPlugin) {
    913910            m_pluginView->didReceiveResponse(loader->response());
    914             // didReceiveResponse sets up a new stream to the plug-in. on a full-page plug-in, a failure in
    915             // setting up this stream can cause the main document load to be cancelled, setting m_pluginView
    916             // to null
     911            // The function didReceiveResponse sets up a new stream to the plug-in.
     912            // On a full-page plug-in, a failure in setting up this stream can cause the
     913            // main document load to be cancelled, setting m_pluginView to null.
    917914            if (!m_pluginView)
    918915                return;
    … …  
    931928}
    932929
    933 // copied from WebKit/Misc/WebKitErrors[Private].h
     930// This was copied from file "WebKit/Source/WebKit/mac/Misc/WebKitErrors.h".
    934931enum {
    935932    WebKitErrorCannotShowMIMEType =                             100,
    936933    WebKitErrorCannotShowURL =                                  101,
    937934    WebKitErrorFrameLoadInterruptedByPolicyChange =             102,
    938     WebKitErrorCannotUseRestrictedPort = 103,
     935    WebKitErrorCannotUseRestrictedPort =                        103,
    939936    WebKitErrorCannotFindPlugIn =                               200,
    940937    WebKitErrorCannotLoadPlugIn =                               201,
    … …  
    10141011    QNetworkReply* reply = handler->release();
    10151012    if (reply) {
    1016         QWebPage *page = m_webFrame->page();
     1013        QWebPage* page = m_webFrame->page();
    10171014        if (page->forwardUnsupportedContent())
    10181015            emit page->unsupportedContent(reply);
    … …  
    10531050            newRequest.setURL(QUrl(URLsToRedirect[url]));
    10541051    }
    1055     // seems like the Mac code doesn't do anything here by default neither
    1056     //qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string`();
    1057 }
    1058 
    1059 bool
    1060 FrameLoaderClientQt::shouldUseCredentialStorage(DocumentLoader*, unsigned long)
     1052    // Seems like the Mac code doesn't do anything here by default neither.
     1053    // qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string();
     1054}
     1055
     1056bool FrameLoaderClientQt::shouldUseCredentialStorage(DocumentLoader*, unsigned long)
    10611057{
    10621058    notImplemented();
    … …  
    11811177void FrameLoaderClientQt::dispatchDecidePolicyForResponse(FramePolicyFunction function, const WebCore::ResourceResponse& response, const WebCore::ResourceRequest&)
    11821178{
    1183     // we need to call directly here
     1179    // We need to call directly here.
    11841180    if (WebCore::contentDispositionType(response.httpHeaderField("Content-Disposition")) == WebCore::ContentDispositionAttachment)
    11851181        callPolicyFunction(function, PolicyDownload);
    … …  
    12181214    PolicyAction result;
    12191215
    1220     // Currently, this is only enabled by DRT
     1216    // Currently, this is only enabled by DRT.
    12211217    if (policyDelegateEnabled) {
    12221218        RefPtr<Node> node;
    … …  
    12991295    emit m_webFrame->page()->frameCreated(webFrame);
    13001296
    1301     // ### set override encoding if we have one
     1297    // FIXME: Set override encoding if we have one.
    13021298
    13031299    m_frame->loader()->loadURLIntoChildFrame(frameData.url, frameData.referrer, frameData.frame.get());
    … …  
    13341330ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)
    13351331{
    1336 //    qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<mimeTypeIn;
     1332    // qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<mimeTypeIn;
    13371333    QFileInfo fi(url.path());
    13381334    String extension = fi.suffix();
    … …  
    14351431            return;
    14361432
    1437         // if setMask is set with an empty QRegion, no clipping will
    1438         // be performed, so in that case we hide the platformWidget
     1433        // If setMask is set with an empty QRegion, no clipping will
     1434        // be performed, so in that case we hide the platformWidget.
    14391435        QRegion mask = platformWidget()->mask();
    14401436        platformWidget()->setVisible(!mask.isEmpty());
    … …  
    14701466        graphicsWidget->setGeometry(QRect(windowRect));
    14711467
    1472         // FIXME: clipping of graphics widgets
     1468        // FIXME: Make the code handle clipping of graphics widgets.
    14731469    }
    14741470    virtual void show()
    … …  
    14971493                                          const Vector<String>& paramValues, const String& mimeType, bool loadManually)
    14981494{
    1499 //    qDebug()<<"------ Creating plugin in FrameLoaderClientQt::createPlugin for "<<url.prettyURL() << mimeType;
    1500 //    qDebug()<<"------\t url = "<<url.prettyURL();
     1495    // qDebug()<<"------ Creating plugin in FrameLoaderClientQt::createPlugin for "<<url.prettyURL() << mimeType;
     1496    // qDebug()<<"------\t url = "<<url.prettyURL();
    15011497
    15021498    if (!m_webFrame)
    … …  
    15561552            if (m_webFrame->page()->d->client)
    15571553                parentWidget = qobject_cast<QWidget*>(m_webFrame->page()->d->client->pluginParent());
    1558             if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
     1554            if (parentWidget) // Don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
    15591555                widget->setParent(parentWidget);
    15601556            widget->hide();
    15611557            RefPtr<QtPluginWidget> w = adoptRef(new QtPluginWidget());
    15621558            w->setPlatformWidget(widget);
    1563             // Make sure it's invisible until properly placed into the layout
     1559            // Make sure it's invisible until properly placed into the layout.
    15641560            w->setFrameRect(IntRect(0, 0, 0, 0));
    15651561            return w;
    … …  
    15731569                parentWidget = qobject_cast<QGraphicsObject*>(m_webFrame->page()->d->client->pluginParent());
    15741570            graphicsWidget->hide();
    1575             if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
     1571            if (parentWidget) // Don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
    15761572                graphicsWidget->setParentItem(parentWidget);
    15771573            RefPtr<QtPluginGraphicsWidget> w = QtPluginGraphicsWidget::create(graphicsWidget);
    1578             // Make sure it's invisible until properly placed into the layout
     1574            // Make sure it's invisible until properly placed into the layout.
    15791575            w->setFrameRect(IntRect(0, 0, 0, 0));
    15801576            return w;
    … …  
    15821578#endif // QT_NO_GRAPHICSVIEW
    15831579
    1584         // FIXME: make things work for widgetless plugins as well
     1580        // FIXME: Make things work for widgetless plugins as well.
    15851581        delete object;
    15861582    }
    … …  
    15951591            size_t wmodeIndex = params.find("wmode");
    15961592            if (wmodeIndex == -1) {
    1597                 // Disable XEmbed mode and force it to opaque mode
     1593                // Disable XEmbed mode and force it to opaque mode.
    15981594                params.append("wmode");
    15991595                values.append("opaque");
    16001596            } else if (!isQWebView) {
    1601                 // Disable transparency if client is not a QWebView
     1597                // Disable transparency if client is not a QWebView.
    16021598                values[wmodeIndex] = "opaque";
    16031599            }
    16041600#else
    16051601            if (!isQWebView) {
    1606                 // inject wmode=opaque when there is no client or the client is not a QWebView
     1602                // Inject wmode=opaque when there is no client or the client is not a QWebView.
    16071603                size_t wmodeIndex = params.find("wmode");
    16081604                if (wmodeIndex == -1) {
Note: See TracChangeset for help on using the changeset viewer.