Changeset 73867 in webkit
- Timestamp:
- Dec 11, 2010 7:42:44 PM (13 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qgraphicswebview.cpp
r72653 r73867 81 81 if (!page || !page->d->client) 82 82 return 0; 83 return static_cast<PageClientQGraphicsWidget*>(page->d->client)->overlay; 84 } 83 return pageClient()->overlay; 84 } 85 86 PageClientQGraphicsWidget* pageClient() const 87 { 88 return static_cast<WebCore::PageClientQGraphicsWidget*> (page->d->client.get()); 89 } 85 90 }; 86 91 … … 93 98 { 94 99 #if USE(ACCELERATED_COMPOSITING) 95 static_cast<PageClientQGraphicsWidget*>(page->d->client)->syncLayers();100 pageClient()->syncLayers(); 96 101 #endif 97 102 } … … 129 134 { 130 135 ASSERT(page); 131 static_cast<PageClientQGraphicsWidget*>(page->d->client)->viewResizesToContents = resizesToContents;136 pageClient()->viewResizesToContents = resizesToContents; 132 137 if (resizesToContents) { 133 138 // resizes to contents mode requires preferred contents size to be set … … 157 162 if (!page) 158 163 return; 159 static_cast<PageClientQGraphicsWidget*>(page->d->client)->updateTiledBackingStoreScale();164 pageClient()->updateTiledBackingStoreScale(); 160 165 #endif 161 166 } … … 415 420 416 421 page->d->view.clear(); 417 418 // The client has always to be deleted.419 delete page->d->client;420 422 page->d->client = 0; 421 423 -
trunk/WebKit/qt/Api/qwebpage.cpp
r73789 r73867 2009 2009 if (d->client) { 2010 2010 if (d->client->isQWidgetClient()) 2011 static_cast<PageClientQWidget*>(d->client )->view = view;2011 static_cast<PageClientQWidget*>(d->client.get())->view = view; 2012 2012 return; 2013 2013 } -
trunk/WebKit/qt/Api/qwebpage_p.h
r72726 r73867 36 36 #include "PlatformString.h" 37 37 38 #include <wtf/OwnPtr.h> 38 39 #include <wtf/RefPtr.h> 39 40 … … 161 162 QWebPage *q; 162 163 WebCore::Page *page; 163 QWebPageClient*client;164 OwnPtr<QWebPageClient> client; 164 165 QPointer<QWebFrame> mainFrame; 165 166 -
trunk/WebKit/qt/Api/qwebview.cpp
r68517 r73867 354 354 355 355 if (page->d->client && page->d->client->isQWidgetClient()) 356 delete page->d->client;357 358 page->d->client = 0;356 page->d->client.clear(); 357 358 page->d->client.release(); 359 359 360 360 // if the page was created by us, we own it and need to -
trunk/WebKit/qt/ChangeLog
r73865 r73867 1 2010-12-11 Yi Shen <yi.4.shen@nokia.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Memory leaks for QWebPageClient 6 https://bugs.webkit.org/show_bug.cgi?id=50267 7 8 Use OwnPtr to solve this memory leak issue. 9 10 * Api/qgraphicswebview.cpp: 11 (QGraphicsWebViewPrivate::overlay): 12 (QGraphicsWebViewPrivate::QWebViewPrivate::pageClient): 13 (QGraphicsWebViewPrivate::syncLayers): 14 (QGraphicsWebViewPrivate::updateResizesToContentsForPage): 15 (QGraphicsWebViewPrivate::_q_scaleChanged): 16 (QGraphicsWebViewPrivate::detachCurrentPage): 17 * Api/qwebpage_p.h: 18 * Api/qwebview.cpp: 19 (QWebViewPrivate::detachCurrentPage): 20 * WebCoreSupport/ChromeClientQt.cpp: 21 (WebCore::ChromeClientQt::platformPageClient): 22 * WebCoreSupport/EditorClientQt.cpp: 23 (WebCore::EditorClientQt::setInputMethodState): 24 * WebCoreSupport/FrameLoaderClientQt.cpp: 25 (WebCore::FrameLoaderClientQt::createPlugin): 26 1 27 2010-12-11 Jan Erik Hanssen <jhanssen@sencha.com> 2 28 -
trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r73789 r73867 75 75 #include <qtextdocument.h> 76 76 #include <qtooltip.h> 77 #include <wtf/OwnPtr.h> 77 78 78 79 namespace WebCore { … … 454 455 PlatformPageClient ChromeClientQt::platformPageClient() const 455 456 { 456 return m_webPage->d->client ;457 return m_webPage->d->client.get(); 457 458 } 458 459 -
trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
r73088 r73867 54 54 #include <QUndoStack> 55 55 #include <stdio.h> 56 #include <wtf/OwnPtr.h> 56 57 57 58 #define methodDebug() qDebug("EditorClientQt: %s", __FUNCTION__); … … 575 576 void EditorClientQt::setInputMethodState(bool active) 576 577 { 577 QWebPageClient* webPageClient = m_page->d->client ;578 QWebPageClient* webPageClient = m_page->d->client.get(); 578 579 if (webPageClient) { 579 580 Qt::InputMethodHints hints; -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r73710 r73867 87 87 #include <QStringList> 88 88 #include "qwebhistory_p.h" 89 #include <wtf/OwnPtr.h> 89 90 90 91 static QMap<unsigned long, QString> dumpAssignedUrls; … … 1537 1538 #if !OS(SYMBIAN) 1538 1539 if (mimeType == "application/x-shockwave-flash") { 1539 QWebPageClient* client = m_webFrame->page()->d->client ;1540 QWebPageClient* client = m_webFrame->page()->d->client.get(); 1540 1541 const bool isQWebView = client && qobject_cast<QWidget*>(client->pluginParent()); 1541 1542 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
Note: See TracChangeset
for help on using the changeset viewer.