Changeset 74268 in webkit
- Timestamp:
- Dec 17, 2010 7:54:44 AM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r74224 r74268 1 2010-12-17 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r74201. 4 http://trac.webkit.org/changeset/74201 5 https://bugs.webkit.org/show_bug.cgi?id=51248 6 7 It broke ~6000 layout tests (Requested by Ossy_ on #webkit). 8 9 * UIProcess/API/qt/qgraphicswkview.cpp: 10 (QGraphicsWKView::setGeometry): 11 (QGraphicsWKView::itemChange): 12 1 13 2010-12-16 Sam Weinig <sam@webkit.org> 2 14 -
trunk/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
r74201 r74268 48 48 WKPageRef pageRef() const { return page->pageRef(); } 49 49 50 void updateViewportSize();51 50 void onScaleChanged(); 52 51 void commitScale(); … … 57 56 bool m_isChangingScale; 58 57 }; 59 60 void QGraphicsWKViewPrivate::updateViewportSize()61 {62 // NOTE: call geometry() as setGeometry ensures that63 // the geometry is within legal bounds (minimumSize, maximumSize)64 page->setViewportSize(q->geometry().size().toSize());65 }66 58 67 59 QGraphicsWKView::QGraphicsWKView(QWKContext* context, BackingStoreType backingStoreType, QGraphicsItem* parent) … … 122 114 return; 123 115 124 // Return early if not visible, since setting size on drawing 125 // areas when not visible is not supported. 126 if (!isVisible()) 127 return; 128 129 d->updateViewportSize(); 116 // NOTE: call geometry() as setGeometry ensures that 117 // the geometry is within legal bounds (minimumSize, maximumSize) 118 page()->setViewportSize(geometry().size().toSize()); 130 119 } 131 120 … … 221 210 QVariant QGraphicsWKView::itemChange(GraphicsItemChange change, const QVariant& value) 222 211 { 223 if (change == ItemVisibleChange) { 224 if (value.canConvert<bool>()) { 225 DrawingAreaProxy* drawingArea = page()->d->page->drawingArea(); 226 bool shouldBeVisible = value.toBool(); 227 drawingArea->setPageIsVisible(shouldBeVisible); 228 229 // This item might have been resized during being 230 // invisible. Update the size in any case. 231 if (shouldBeVisible) 232 d->updateViewportSize(); 233 } 234 return value; 235 } 212 // Here so that it can be reimplemented without breaking ABI. 236 213 return QGraphicsWidget::itemChange(change, value); 237 214 }
Note: See TracChangeset
for help on using the changeset viewer.