Changeset 60910 in webkit
- Timestamp:
- Jun 9, 2010 1:53:30 PM (14 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/ChangeLog
r60895 r60910 1 2010-06-09 Anders Bakken <agbakken@gmail.com> 2 3 Reviewed by David Levin. 4 5 [Qt] ChromeClientQt.cpp has coding-style errors 6 https://bugs.webkit.org/show_bug.cgi?id=40240 7 8 * WebCoreSupport/ChromeClientQt.cpp: 9 (WebCore::ChromeClientQt::pageRect): 10 (WebCore::ChromeClientQt::createWindow): 11 (WebCore::ChromeClientQt::runJavaScriptAlert): 12 (WebCore::ChromeClientQt::runJavaScriptConfirm): 13 (WebCore::ChromeClientQt::runJavaScriptPrompt): 14 (WebCore::ChromeClientQt::print): 15 (WebCore::ChromeClientQt::attachRootGraphicsLayer): 16 (WebCore::ChromeClientQt::visibleRectForTiledBackingStore): 17 1 18 2010-06-09 Sheriff Bot <webkit.review.bot@gmail.com> 2 19 -
trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r60566 r60910 30 30 #include "ChromeClientQt.h" 31 31 32 #include "DatabaseTracker.h" 32 33 #include "FileChooser.h" 33 34 #include "Frame.h" … … 38 39 #include "HitTestResult.h" 39 40 #include "Icon.h" 41 #include "NotImplemented.h" 40 42 #include "NotificationPresenterClientQt.h" 41 #include "NotImplemented.h"42 43 #include "ScrollbarTheme.h" 43 44 #include "WindowFeatures.h" 44 #include "DatabaseTracker.h"45 45 #if defined(Q_WS_MAEMO_5) 46 46 #include "QtMaemoWebPopup.h" … … 51 51 #include "SecurityOrigin.h" 52 52 53 #include "qwebframe_p.h" 54 #include "qwebpage.h" 55 #include "qwebpage_p.h" 56 #include "qwebsecurityorigin.h" 57 #include "qwebsecurityorigin_p.h" 58 #include "qwebview.h" 59 53 60 #include <qdebug.h> 54 61 #include <qeventloop.h> … … 56 63 #include <qtooltip.h> 57 64 58 #include "qwebpage.h"59 #include "qwebpage_p.h"60 #include "qwebframe_p.h"61 #include "qwebsecurityorigin.h"62 #include "qwebsecurityorigin_p.h"63 #include "qwebview.h"64 65 65 #if USE(ACCELERATED_COMPOSITING) 66 66 #include "GraphicsLayerQt.h" … … 107 107 if (!m_webPage) 108 108 return FloatRect(); 109 return FloatRect(QRectF(QPointF(0, 0), m_webPage->viewportSize()));109 return FloatRect(QRectF(QPointF(0, 0), m_webPage->viewportSize())); 110 110 } 111 111 … … 164 164 Page* ChromeClientQt::createWindow(Frame*, const FrameLoadRequest& request, const WindowFeatures& features) 165 165 { 166 QWebPage *newPage = m_webPage->createWindow(features.dialog ? QWebPage::WebModalDialog : QWebPage::WebBrowserWindow);166 QWebPage* newPage = m_webPage->createWindow(features.dialog ? QWebPage::WebModalDialog : QWebPage::WebBrowserWindow); 167 167 if (!newPage) 168 168 return 0; … … 291 291 { 292 292 QString x = msg; 293 FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());293 FrameLoaderClientQt* fl = static_cast<FrameLoaderClientQt*>(f->loader()->client()); 294 294 m_webPage->javaScriptAlert(fl->webFrame(), x); 295 295 } … … 298 298 { 299 299 QString x = msg; 300 FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());300 FrameLoaderClientQt* fl = static_cast<FrameLoaderClientQt*>(f->loader()->client()); 301 301 return m_webPage->javaScriptConfirm(fl->webFrame(), x); 302 302 } … … 305 305 { 306 306 QString x = result; 307 FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());307 FrameLoaderClientQt* fl = static_cast<FrameLoaderClientQt*>(f->loader()->client()); 308 308 bool rc = m_webPage->javaScriptPrompt(fl->webFrame(), (QString)message, (QString)defaultValue, &x); 309 309 … … 460 460 } 461 461 462 void ChromeClientQt::print(Frame *frame)462 void ChromeClientQt::print(Frame* frame) 463 463 { 464 464 emit m_webPage->printRequested(QWebFramePrivate::kit(frame)); … … 543 543 #if USE(ACCELERATED_COMPOSITING) 544 544 void ChromeClientQt::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer) 545 { 545 { 546 546 if (platformPageClient()) 547 547 platformPageClient()->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->nativeLayer() : 0); … … 568 568 569 569 #endif 570 570 571 571 #if ENABLE(TILED_BACKING_STORE) 572 572 IntRect ChromeClientQt::visibleRectForTiledBackingStore() const 573 { 573 { 574 574 if (!platformPageClient() || !m_webPage) 575 575 return IntRect();
Note: See TracChangeset
for help on using the changeset viewer.