Changeset 74344 in webkit
- Timestamp:
- Dec 20, 2010 6:57:30 AM (13 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/ChangeLog
r74271 r74344 1 2010-12-20 Benjamin Poulain <benjamin.poulain@nokia.com> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] Improve the readability of FrameLoaderClientQt::createPlugin() 6 https://bugs.webkit.org/show_bug.cgi?id=51330 7 8 Redefine the scopes to improve readability. Objects are now created in 9 the scope they are used in. 10 11 * WebCoreSupport/FrameLoaderClientQt.cpp: 12 (WebCore::FrameLoaderClientQt::createPlugin): 13 1 14 2010-12-17 Ariya Hidayat <ariya@sencha.com> 2 15 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r74057 r74344 1467 1467 QUrl qurl = urlStr; 1468 1468 1469 QObject* object = 0;1470 1471 1469 if (mimeType == "application/x-qt-plugin" || mimeType == "application/x-qt-styled-widget") { 1472 object = m_webFrame->page()->createPlugin(classid, qurl, params, values);1470 QObject* object = m_webFrame->page()->createPlugin(classid, qurl, params, values); 1473 1471 #ifndef QT_NO_STYLE_STYLESHEET 1474 1472 QWidget* widget = qobject_cast<QWidget*>(object); … … 1491 1489 } 1492 1490 #endif // QT_NO_STYLE_STYLESHEET 1493 }1494 1491 1495 1492 if (!object) { … … 1500 1497 1501 1498 if (object) { 1502 QWidget* widget = qobject_cast<QWidget*>(object); 1503 if (widget) { 1499 if (QWidget* widget = qobject_cast<QWidget*>(object)) { 1504 1500 QWidget* parentWidget = 0; 1505 1501 if (m_webFrame->page()->d->client) … … 1515 1511 } 1516 1512 1517 QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(object); 1518 if (graphicsWidget) { 1513 if (QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(object)) { 1519 1514 QGraphicsObject* parentWidget = 0; 1520 1515 if (m_webFrame->page()->d->client) … … 1531 1526 // FIXME: make things work for widgetless plugins as well 1532 1527 delete object; 1528 } 1533 1529 } 1534 1530 #if ENABLE(NETSCAPE_PLUGIN_API)
Note: See TracChangeset
for help on using the changeset viewer.