34885 2010-02-12 04:04:00 -0800 [Qt] QGraphicsWebView should have a mode that makes it automatically resize itself to the content size 2010-02-16 18:19:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED Qt P3 Normal --- 31552 1 koivisto webkit-unassigned ariya.hidayat hausmann laszlo.gombos oldest_to_newest 190001 0 koivisto 2010-02-12 04:04:00 -0800 This is useful for cases where the client wants to implement page panning and zooming by manipulating the graphics item. You can do this already in the client by listening to QWebPage::contentsSizeChanged signal but WebKit internal implementation has more optimization possibilities in the future. 190003 1 48634 koivisto 2010-02-12 04:12:06 -0800 Created attachment 48634 add QGraphicsWebView resizesToContent mode 190005 2 48634 kenneth 2010-02-12 04:21:46 -0800 Comment on attachment 48634 add QGraphicsWebView resizesToContent mode Please fix the comment before committing > +/*! > + \property QGraphicsWebView::resizesToContent > + \brief whether the QGraphicsView size changes to match the content size whether the size of the QGraphics_Web_View and it's viewport changes to match the contents size. > + > + If this property is set, the QGraphicsWebView will automatically change its > + size to match the size of the main frame content. As a result the top level frame > + will never have scrollbars. > + > + This property should be used in conjunction with the QWebPage::preferredContentsSize > + property. If not the preferredContentsSize is automatically set to a resonable size (?) > + > + \sa QWebPage::setPreferredContentsSize > +*/ Needs a \since 4.7 and you should add the bug to the 4.7 API tracker bug 31552. It might be a good idea to tell that the preferredContentsSize is set to a default value if not set on before hand. > +void QGraphicsWebView::setResizesToContent(bool enabled) Better use contents with s! as it is called preferredContent_s_Size etc. This should be fixed everywhere. > +{ > + d->resizesToContent = enabled; > + if (enabled && d->page) > + d->enableResizesToContentForPage(); > +} > + > +bool QGraphicsWebView::resizesToContent() const > +{ > + return d->resizesToContent; > +} > + > /*! \reimp > */ > void QGraphicsWebView::hoverMoveEvent(QGraphicsSceneHoverEvent* ev) > Index: WebKit/qt/Api/qgraphicswebview.h > =================================================================== > --- WebKit/qt/Api/qgraphicswebview.h (revision 54651) > +++ WebKit/qt/Api/qgraphicswebview.h (working copy) > @@ -45,6 +45,7 @@ class QWEBKIT_EXPORT QGraphicsWebView : > Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) > > Q_PROPERTY(bool modified READ isModified) > + Q_PROPERTY(bool resizesToContent READ resizesToContent WRITE setResizesToContent) > > public: > explicit QGraphicsWebView(QGraphicsItem* parent = 0); > @@ -79,6 +80,9 @@ public: > > bool findText(const QString& subString, QWebPage::FindFlags options = 0); > > + bool resizesToContent() const; > + void setResizesToContent(bool enabled); > + > virtual void setGeometry(const QRectF& rect); > virtual void updateGeometry(); > virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = 0); > @@ -137,6 +141,7 @@ private: > // we don't want to change the moc based on USE() macro, so this function is here > // but will be empty if ACCLERATED_COMPOSITING is disabled > Q_PRIVATE_SLOT(d, void syncLayers()) > + Q_PRIVATE_SLOT(d, void _q_contentsSizeChanged(QSize)) > > QGraphicsWebViewPrivate* const d; > friend class QGraphicsWebViewPrivate; > Index: WebKit/qt/QGVLauncher/main.cpp > =================================================================== > --- WebKit/qt/QGVLauncher/main.cpp (revision 54651) > +++ WebKit/qt/QGVLauncher/main.cpp (working copy) > @@ -74,6 +74,8 @@ public: > { > if (QApplication::instance()->arguments().contains("--cacheWebView")) > setCacheMode(QGraphicsItem::DeviceCoordinateCache); > + if (QApplication::instance()->arguments().contains("--resizesToContent")) > + setResizesToContent(true); Would be cool to have this support in the QtLauncher now it supports the -graphicsbased, but can be done in another commit. > + if (!QApplication::instance()->arguments().contains("--resizesToContent")) { > + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); > + setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); > + } Maybe we should turn these off automatically when enabling the mode? Fits with the documentation even. 190006 3 hausmann 2010-02-12 04:23:48 -0800 +void QGraphicsWebViewPrivate::_q_contentsSizeChanged(QSize size) Preference: I'd use a const QSize& here > --- WebKit/qt/QGVLauncher/main.cpp (revision 54651) > +++ WebKit/qt/QGVLauncher/main.cpp (working copy) > @@ -74,6 +74,8 @@ public: > { > if (QApplication::instance()->arguments().contains("--cacheWebView")) > setCacheMode(QGraphicsItem::DeviceCoordinateCache); > + if (QApplication::instance()->arguments().contains("--resizesToContent")) > + setResizesToContent(true); I think it would be nice to tie this feature to an action in the GUI instead of the commandline. The commandline is "hard" to use on Symbian. I find it easier to tap through the menu. For example it could be a simple checkable action in the "Developer" menu. > +void QGraphicsWebView::setResizesToContent(bool enabled) > +{ > + d->resizesToContent = enabled; > + if (enabled && d->page) > + d->enableResizesToContentForPage(); > +} When the feature is disabled, shouldn't we disconnect from the contentsSizeChanged signal? 190036 4 48642 koivisto 2010-02-12 06:46:03 -0800 Created attachment 48642 updated patch - rename resizesToContent to resizesToContents - comment cleanup - disconnect the signal when needed 190037 5 koivisto 2010-02-12 06:49:51 -0800 > > + if (!QApplication::instance()->arguments().contains("--resizesToContent")) { > > + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); > > + setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); > > + } > > Maybe we should turn these off automatically when enabling the mode? Fits with > the documentation even. Not sure what you mean here. QGraphicsWebView does not really know about the QGraphicsView it is in and should definitely not change any settings there. 190038 6 koivisto 2010-02-12 06:51:05 -0800 (In reply to comment #3) > +void QGraphicsWebViewPrivate::_q_contentsSizeChanged(QSize size) > > Preference: I'd use a const QSize& here fixed > I think it would be nice to tie this feature to an action in the GUI instead of > the commandline. The commandline is "hard" to use on Symbian. I find it easier > to tap through the menu. For example it could be a simple checkable action in > the "Developer" menu. yeah, but better handled separately > When the feature is disabled, shouldn't we disconnect from the > contentsSizeChanged signal? fixed (though this is probably usually one time thing) 190039 7 48642 hausmann 2010-02-12 06:56:44 -0800 Comment on attachment 48642 updated patch LGTM 190403 8 koivisto 2010-02-15 01:45:53 -0800 Sending WebKit/qt/Api/qgraphicswebview.cpp Sending WebKit/qt/Api/qgraphicswebview.h Sending WebKit/qt/ChangeLog Sending WebKit/qt/QGVLauncher/main.cpp Transmitting file data .... Committed revision 54767. 190404 9 koivisto 2010-02-15 01:48:05 -0800 > ... and you should add the bug to the 4.7 API tracker bug 31552. done 190716 10 48822 ariya.hidayat 2010-02-16 13:32:37 -0800 Created attachment 48822 Fix build with Qt 4.5 190788 11 laszlo.gombos 2010-02-16 15:30:52 -0800 Changed the status to REOPENED to make sure commit-bot will be happy to commit attachment 48822. 190846 12 ariya.hidayat 2010-02-16 18:19:49 -0800 Manually committed in r54854: http://trac.webkit.org/changeset/54854 48634 2010-02-12 04:12:06 -0800 2010-02-12 06:46:03 -0800 add QGraphicsWebView resizesToContent mode qgwv-resizes-to-content.patch text/plain 8359 koivisto SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTQ3MTgpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDItMTIgIEFudHRpIEtvaXZpc3RvICA8a29pdmlz dG9AaWtpLmZpPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODg1 CisgICAgICAgIEFkZCBhIFFHcmFwaGljc1dlYlZpZXcgbW9kZSB0aGF0IG1ha2VzIGl0IGF1dG9t YXRpY2FsbHkgcmVzaXplIGl0c2VsZiB0byB0aGUgc2l6ZSBvZiB0aGUgY29udGVudC4KKworICAg ICAgICBUaGlzIGlzIHVzZWZ1bCBmb3IgY2FzZXMgd2hlcmUgdGhlIGNsaWVudCB3YW50cyB0byBp bXBsZW1lbnQgcGFnZSBwYW5uaW5nIGFuZCB6b29taW5nIGJ5IG1hbmlwdWxhdGluZworICAgICAg ICB0aGUgZ3JhcGhpY3MgaXRlbS4KKyAgICAgICAgCisgICAgICAgIEFkZCBhIG9wdGlvbiB0byBR R1ZMYXVuY2hlciB0byB0ZXN0IHRoaXMgbW9kZS4KKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjpRR3JhcGhpY3NX ZWJWaWV3UHJpdmF0ZSk6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6ZW5hYmxl UmVzaXplc1RvQ29udGVudEZvclBhZ2UpOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlld1ByaXZh dGU6Ol9xX2NvbnRlbnRzU2l6ZUNoYW5nZWQpOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6 c2V0UGFnZSk6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3OjpzZXRSZXNpemVzVG9Db250ZW50 KToKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXc6OnJlc2l6ZXNUb0NvbnRlbnQpOgorICAgICAg ICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3Lmg6CisgICAgICAgICogUUdWTGF1bmNoZXIvbWFpbi5j cHA6CisgICAgICAgIChXZWJWaWV3OjpXZWJWaWV3KToKKyAgICAgICAgKE1haW5WaWV3OjpNYWlu Vmlldyk6CisgICAgICAgIChNYWluVmlldzo6c2V0TWFpbldpZGdldCk6CisgICAgICAgIChNYWlu Vmlldzo6cmVzaXplRXZlbnQpOgorICAgICAgICAobWFpbik6CisKIDIwMTAtMDItMTAgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBUb3IgQXJuZSBWZXN0YsO4LgpJbmRleDogV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcu Y3BwCShyZXZpc2lvbiA1NDY1MSkKKysrIFdlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDcgQEAgcHVibGljOgogICAgIFFHcmFwaGlj c1dlYlZpZXdQcml2YXRlKFFHcmFwaGljc1dlYlZpZXcqIHBhcmVudCkKICAgICAgICAgOiBxKHBh cmVudCkKICAgICAgICAgLCBwYWdlKDApCisgICAgICAgICwgcmVzaXplc1RvQ29udGVudChmYWxz ZSkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgICwgcm9vdEdyYXBo aWNzTGF5ZXIoMCkKICAgICAgICAgLCBzaG91bGRTeW5jKGZhbHNlKQpAQCAtMTE3LDEyICsxMTgs MTggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBtYXJrRm9yU3luYyhib29sIHNjaGVkdWxl U3luYyk7CiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ1Njcm9sbFBvc2l0aW9uKCk7CiAjZW5k aWYKKyAgICAKKyAgICB2b2lkIGVuYWJsZVJlc2l6ZXNUb0NvbnRlbnRGb3JQYWdlKCk7CiAKICAg ICB2b2lkIHN5bmNMYXllcnMoKTsKICAgICB2b2lkIF9xX2RvTG9hZEZpbmlzaGVkKGJvb2wgc3Vj Y2Vzcyk7CisgICAgdm9pZCBfcV9jb250ZW50c1NpemVDaGFuZ2VkKFFTaXplIHNpemUpOwogCiAg ICAgUUdyYXBoaWNzV2ViVmlldyogcTsKICAgICBRV2ViUGFnZSogcGFnZTsKKworICAgIGJvb2wg cmVzaXplc1RvQ29udGVudDsKKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAg ICBRR3JhcGhpY3NJdGVtKiByb290R3JhcGhpY3NMYXllcjsKIApAQCAtMzA0LDYgKzMxMSwyNiBA QCBRU3R5bGUqIFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjpzdHlsZSgpCiAgICAgcmV0dXJuIHEt PnN0eWxlKCk7CiB9CiAKK3ZvaWQgUUdyYXBoaWNzV2ViVmlld1ByaXZhdGU6OmVuYWJsZVJlc2l6 ZXNUb0NvbnRlbnRGb3JQYWdlKCkKK3sKKyAgICBBU1NFUlQocmVzaXplc1RvQ29udGVudCk7Cisg ICAgQVNTRVJUKHBhZ2UpOworICAgIAorICAgIC8vIHJlc2l6ZXMgdG8gY29udGVudCBtb2RlIHJl cXVpcmVzIHByZWZlcnJlZCBjb250ZW50IHNpemUgdG8gYmUgc2V0CisgICAgaWYgKCFwYWdlLT5w cmVmZXJyZWRDb250ZW50c1NpemUoKS5pc1ZhbGlkKCkpCisgICAgICAgIHBhZ2UtPnNldFByZWZl cnJlZENvbnRlbnRzU2l6ZShRU2l6ZSg5NjAsIDgwMCkpOworCisgICAgUU9iamVjdDo6Y29ubmVj dChwYWdlLT5tYWluRnJhbWUoKSwgU0lHTkFMKGNvbnRlbnRzU2l6ZUNoYW5nZWQoUVNpemUpKSwK KyAgICAgICAgICAgIHEsIFNMT1QoX3FfY29udGVudHNTaXplQ2hhbmdlZChRU2l6ZSkpLCBRdDo6 VW5pcXVlQ29ubmVjdGlvbik7Cit9CisKK3ZvaWQgUUdyYXBoaWNzV2ViVmlld1ByaXZhdGU6Ol9x X2NvbnRlbnRzU2l6ZUNoYW5nZWQoUVNpemUgc2l6ZSkKK3sKKyAgICBpZiAoIXJlc2l6ZXNUb0Nv bnRlbnQpCisgICAgICAgIHJldHVybjsKKyAgICBxLT5zZXRHZW9tZXRyeShRUmVjdEYocS0+Z2Vv bWV0cnkoKS50b3BMZWZ0KCksIHNpemUpKTsKK30KKwogLyohCiAgICAgXGNsYXNzIFFHcmFwaGlj c1dlYlZpZXcKICAgICBcYnJpZWYgVGhlIFFHcmFwaGljc1dlYlZpZXcgY2xhc3MgYWxsb3dzIFdl YiBjb250ZW50IHRvIGJlIGFkZGVkIHRvIGEgR3JhcGhpY3NWaWV3LgpAQCAtNTg2LDYgKzYxMyw5 IEBAIHZvaWQgUUdyYXBoaWNzV2ViVmlldzo6c2V0UGFnZShRV2ViUGFnZSoKIAogICAgIFFTaXpl IHNpemUgPSBnZW9tZXRyeSgpLnNpemUoKS50b1NpemUoKTsKICAgICBwYWdlLT5zZXRWaWV3cG9y dFNpemUoc2l6ZSk7CisgICAgCisgICAgaWYgKGQtPnJlc2l6ZXNUb0NvbnRlbnQpCisgICAgICAg IGQtPmVuYWJsZVJlc2l6ZXNUb0NvbnRlbnRGb3JQYWdlKCk7CiAKICAgICBRV2ViRnJhbWUqIG1h aW5GcmFtZSA9IGQtPnBhZ2UtPm1haW5GcmFtZSgpOwogCkBAIC05MTgsNiArOTQ4LDMxIEBAIGJv b2wgUUdyYXBoaWNzV2ViVmlldzo6ZmluZFRleHQoY29uc3QgUVMKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKKy8qIQorICAgIFxwcm9wZXJ0eSBRR3JhcGhpY3NXZWJWaWV3OjpyZXNpemVzVG9Db250 ZW50CisgICAgXGJyaWVmIHdoZXRoZXIgdGhlIFFHcmFwaGljc1ZpZXcgc2l6ZSBjaGFuZ2VzIHRv IG1hdGNoIHRoZSBjb250ZW50IHNpemUKKworICAgIElmIHRoaXMgcHJvcGVydHkgaXMgc2V0LCB0 aGUgUUdyYXBoaWNzV2ViVmlldyB3aWxsIGF1dG9tYXRpY2FsbHkgY2hhbmdlIGl0cworICAgIHNp emUgdG8gbWF0Y2ggdGhlIHNpemUgb2YgdGhlIG1haW4gZnJhbWUgY29udGVudC4gQXMgYSByZXN1 bHQgdGhlIHRvcCBsZXZlbCBmcmFtZQorICAgIHdpbGwgbmV2ZXIgaGF2ZSBzY3JvbGxiYXJzLgor CisgICAgVGhpcyBwcm9wZXJ0eSBzaG91bGQgYmUgdXNlZCBpbiBjb25qdW5jdGlvbiB3aXRoIHRo ZSBRV2ViUGFnZTo6cHJlZmVycmVkQ29udGVudHNTaXplCisgICAgcHJvcGVydHkuCisKKyAgICBc c2EgUVdlYlBhZ2U6OnNldFByZWZlcnJlZENvbnRlbnRzU2l6ZQorKi8KK3ZvaWQgUUdyYXBoaWNz V2ViVmlldzo6c2V0UmVzaXplc1RvQ29udGVudChib29sIGVuYWJsZWQpCit7CisgICAgZC0+cmVz aXplc1RvQ29udGVudCA9IGVuYWJsZWQ7CisgICAgaWYgKGVuYWJsZWQgJiYgZC0+cGFnZSkKKyAg ICAgICAgZC0+ZW5hYmxlUmVzaXplc1RvQ29udGVudEZvclBhZ2UoKTsKK30KKworYm9vbCBRR3Jh cGhpY3NXZWJWaWV3OjpyZXNpemVzVG9Db250ZW50KCkgY29uc3QKK3sKKyAgICByZXR1cm4gZC0+ cmVzaXplc1RvQ29udGVudDsKK30KKwogLyohIFxyZWltcAogKi8KIHZvaWQgUUdyYXBoaWNzV2Vi Vmlldzo6aG92ZXJNb3ZlRXZlbnQoUUdyYXBoaWNzU2NlbmVIb3ZlckV2ZW50KiBldikKSW5kZXg6 IFdlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC9BcGkvcWdyYXBoaWNzd2Vidmlldy5oCShyZXZpc2lvbiA1NDY1MSkKKysrIFdlYktpdC9xdC9B cGkvcWdyYXBoaWNzd2Vidmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw3IEBAIGNs YXNzIFFXRUJLSVRfRVhQT1JUIFFHcmFwaGljc1dlYlZpZXcgOiAKICAgICBRX1BST1BFUlRZKFFV cmwgdXJsIFJFQUQgdXJsIFdSSVRFIHNldFVybCBOT1RJRlkgdXJsQ2hhbmdlZCkKIAogICAgIFFf UFJPUEVSVFkoYm9vbCBtb2RpZmllZCBSRUFEIGlzTW9kaWZpZWQpCisgICAgUV9QUk9QRVJUWShi b29sIHJlc2l6ZXNUb0NvbnRlbnQgUkVBRCByZXNpemVzVG9Db250ZW50IFdSSVRFIHNldFJlc2l6 ZXNUb0NvbnRlbnQpCiAKIHB1YmxpYzoKICAgICBleHBsaWNpdCBRR3JhcGhpY3NXZWJWaWV3KFFH cmFwaGljc0l0ZW0qIHBhcmVudCA9IDApOwpAQCAtNzksNiArODAsOSBAQCBwdWJsaWM6CiAKICAg ICBib29sIGZpbmRUZXh0KGNvbnN0IFFTdHJpbmcmIHN1YlN0cmluZywgUVdlYlBhZ2U6OkZpbmRG bGFncyBvcHRpb25zID0gMCk7CiAKKyAgICBib29sIHJlc2l6ZXNUb0NvbnRlbnQoKSBjb25zdDsK KyAgICB2b2lkIHNldFJlc2l6ZXNUb0NvbnRlbnQoYm9vbCBlbmFibGVkKTsKKwogICAgIHZpcnR1 YWwgdm9pZCBzZXRHZW9tZXRyeShjb25zdCBRUmVjdEYmIHJlY3QpOwogICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVHZW9tZXRyeSgpOwogICAgIHZpcnR1YWwgdm9pZCBwYWludChRUGFpbnRlciosIGNv bnN0IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbSogb3B0aW9ucywgUVdpZGdldCogd2lkZ2V0ID0g MCk7CkBAIC0xMzcsNiArMTQxLDcgQEAgcHJpdmF0ZToKICAgICAvLyB3ZSBkb24ndCB3YW50IHRv IGNoYW5nZSB0aGUgbW9jIGJhc2VkIG9uIFVTRSgpIG1hY3JvLCBzbyB0aGlzIGZ1bmN0aW9uIGlz IGhlcmUKICAgICAvLyBidXQgd2lsbCBiZSBlbXB0eSBpZiBBQ0NMRVJBVEVEX0NPTVBPU0lUSU5H IGlzIGRpc2FibGVkCiAgICAgUV9QUklWQVRFX1NMT1QoZCwgdm9pZCBzeW5jTGF5ZXJzKCkpCisg ICAgUV9QUklWQVRFX1NMT1QoZCwgdm9pZCBfcV9jb250ZW50c1NpemVDaGFuZ2VkKFFTaXplKSkK IAogICAgIFFHcmFwaGljc1dlYlZpZXdQcml2YXRlKiBjb25zdCBkOwogICAgIGZyaWVuZCBjbGFz cyBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTsKSW5kZXg6IFdlYktpdC9xdC9RR1ZMYXVuY2hlci9t YWluLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvUUdWTGF1bmNoZXIvbWFpbi5jcHAJKHJl dmlzaW9uIDU0NjUxKQorKysgV2ViS2l0L3F0L1FHVkxhdW5jaGVyL21haW4uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NCw2ICs3NCw4IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIGlmIChRQXBw bGljYXRpb246Omluc3RhbmNlKCktPmFyZ3VtZW50cygpLmNvbnRhaW5zKCItLWNhY2hlV2ViVmll dyIpKQogICAgICAgICAgICAgc2V0Q2FjaGVNb2RlKFFHcmFwaGljc0l0ZW06OkRldmljZUNvb3Jk aW5hdGVDYWNoZSk7CisgICAgICAgIGlmIChRQXBwbGljYXRpb246Omluc3RhbmNlKCktPmFyZ3Vt ZW50cygpLmNvbnRhaW5zKCItLXJlc2l6ZXNUb0NvbnRlbnQiKSkKKyAgICAgICAgICAgIHNldFJl c2l6ZXNUb0NvbnRlbnQodHJ1ZSk7CiAgICAgfQogICAgIHZvaWQgc2V0WVJvdGF0aW9uKHFyZWFs IGFuZ2xlKQogICAgIHsKQEAgLTEyOSw4ICsxMzEsMTEgQEAgcHVibGljOgogICAgICAgICAsIG1f bnVtVG90YWxQYWludHMoMCkKICAgICAgICAgLCBtX251bVBhaW50c1NpbmNlTGFzdE1lYXN1cmUo MCkKICAgICB7Ci0gICAgICAgIHNldEhvcml6b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9s bEJhckFsd2F5c09mZik7Ci0gICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KFF0OjpT Y3JvbGxCYXJBbHdheXNPZmYpOworICAgICAgICAvLyBVc2UgdGhlIGdyYXBoaWNzIHZpZXcgc2Ny b2xsYmFycyB3aGVuIHRoZSB3ZWJ2aWV3IGlzIHNldCB0byBzaXplIHRvIHRoZSBjb250ZW50Lgor ICAgICAgICBpZiAoIVFBcHBsaWNhdGlvbjo6aW5zdGFuY2UoKS0+YXJndW1lbnRzKCkuY29udGFp bnMoIi0tcmVzaXplc1RvQ29udGVudCIpKSB7CisgICAgICAgICAgICBzZXRIb3Jpem9udGFsU2Ny b2xsQmFyUG9saWN5KFF0OjpTY3JvbGxCYXJBbHdheXNPZmYpOworICAgICAgICAgICAgc2V0VmVy dGljYWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CisgICAgICAgIH0K IAogICAgICAgICBzZXRGcmFtZVNoYXBlKFFGcmFtZTo6Tm9GcmFtZSk7CiAgICAgICAgIHNldFNp emVQb2xpY3koUVNpemVQb2xpY3k6OkV4cGFuZGluZywgUVNpemVQb2xpY3k6OkV4cGFuZGluZyk7 CkBAIC0xNDMsMTcgKzE0OCwxOSBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKLSAgICB2 b2lkIHNldE1haW5XaWRnZXQoUUdyYXBoaWNzV2lkZ2V0KiB3aWRnZXQpCisgICAgdm9pZCBzZXRN YWluV2lkZ2V0KFdlYlZpZXcqIHdpZGdldCkKICAgICB7Ci0gICAgICAgIFFSZWN0RiByZWN0KFFS ZWN0KFFQb2ludCgwLCAwKSwgc2l6ZSgpKSk7Ci0gICAgICAgIHdpZGdldC0+c2V0R2VvbWV0cnko cmVjdCk7CiAgICAgICAgIG1fbWFpbldpZGdldCA9IHdpZGdldDsKKyAgICAgICAgaWYgKG1fbWFp bldpZGdldC0+cmVzaXplc1RvQ29udGVudCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICBRUmVjdEYgcmVjdChRUmVjdChRUG9pbnQoMCwgMCksIHNpemUoKSkpOworICAgICAgICBtX21h aW5XaWRnZXQtPnNldEdlb21ldHJ5KHJlY3QpOwogICAgIH0KIAogICAgIHZvaWQgcmVzaXplRXZl bnQoUVJlc2l6ZUV2ZW50KiBldmVudCkKICAgICB7CiAgICAgICAgIFFHcmFwaGljc1ZpZXc6OnJl c2l6ZUV2ZW50KGV2ZW50KTsKLSAgICAgICAgaWYgKCFtX21haW5XaWRnZXQpCisgICAgICAgIGlm ICghbV9tYWluV2lkZ2V0IHx8IG1fbWFpbldpZGdldC0+cmVzaXplc1RvQ29udGVudCgpKQogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICBRUmVjdEYgcmVjdChRUG9pbnQoMCwgMCksIGV2ZW50 LT5zaXplKCkpOwogICAgICAgICBtX21haW5XaWRnZXQtPnNldEdlb21ldHJ5KHJlY3QpOwpAQCAt MjMxLDcgKzIzOCw3IEBAIHNpZ25hbHM6CiAgICAgdm9pZCBmbGlwUmVxdWVzdCgpOwogCiBwcml2 YXRlOgotICAgIFFHcmFwaGljc1dpZGdldCogbV9tYWluV2lkZ2V0OworICAgIFdlYlZpZXcqIG1f bWFpbldpZGdldDsKICAgICBib29sIG1fbWVhc3VyZUZwczsKICAgICBpbnQgbV9udW1Ub3RhbFBh aW50czsKICAgICBpbnQgbV9udW1QYWludHNTaW5jZUxhc3RNZWFzdXJlOwpAQCAtNDkzLDcgKzUw MCw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKIHsKICAgICBRQXBwbGljYXRp b24gYXBwKGFyZ2MsIGFyZ3YpOwogICAgIGlmIChhcHAuYXJndW1lbnRzKCkuY29udGFpbnMoIi0t aGVscCIpKSB7Ci0gICAgICAgIHFEZWJ1ZygpIDw8ICJVc2FnZTogUUdWTGF1bmNoZXIgWy0tdXJs IHVybF0gWy0tY29tcG9zaXRpbmddIFstLXVwZGF0ZU1vZGUgRnVsbHxNaW5pbWFsfFNtYXJ0fE5v fEJvdW5kaW5nUmVjdF0gWy0tY2FjaGVXZWJWaWV3XVxuIjsKKyAgICAgICAgcURlYnVnKCkgPDwg IlVzYWdlOiBRR1ZMYXVuY2hlciBbLS11cmwgdXJsXSBbLS1jb21wb3NpdGluZ10gWy0tdXBkYXRl TW9kZSBGdWxsfE1pbmltYWx8U21hcnR8Tm98Qm91bmRpbmdSZWN0XSBbLS1jYWNoZVdlYlZpZXdd IFstLXJlc2l6ZXNUb0NvbnRlbnRdXG4iOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAg UVN0cmluZyB1cmwgPSBRU3RyaW5nKCJmaWxlOi8vJTEvJTIiKS5hcmcoUURpcjo6aG9tZVBhdGgo KSkuYXJnKFFMYXRpbjFTdHJpbmcoImluZGV4Lmh0bWwiKSk7Cg== 48642 2010-02-12 06:46:03 -0800 2010-02-16 13:32:33 -0800 updated patch qgwv-resizes-to-content-2.patch text/plain 8798 koivisto SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTQ3MjQpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDItMTIgIEFudHRpIEtvaXZpc3RvICA8a29pdmlz dG9AaWtpLmZpPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODg1 CisgICAgICAgIEFkZCBhIFFHcmFwaGljc1dlYlZpZXcgbW9kZSB0aGF0IG1ha2VzIGl0IGF1dG9t YXRpY2FsbHkgcmVzaXplIGl0c2VsZiB0byB0aGUgc2l6ZSBvZiB0aGUgY29udGVudC4KKworICAg ICAgICBUaGlzIGlzIHVzZWZ1bCBmb3IgY2FzZXMgd2hlcmUgdGhlIGNsaWVudCB3YW50cyB0byBp bXBsZW1lbnQgcGFnZSBwYW5uaW5nIGFuZCB6b29taW5nIGJ5IG1hbmlwdWxhdGluZworICAgICAg ICB0aGUgZ3JhcGhpY3MgaXRlbS4KKyAgICAgICAgCisgICAgICAgIEFkZCBhIG9wdGlvbiB0byBR R1ZMYXVuY2hlciB0byB0ZXN0IHRoaXMgbW9kZS4KKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjpRR3JhcGhpY3NX ZWJWaWV3UHJpdmF0ZSk6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6dXBkYXRl UmVzaXplc1RvQ29udGVudHNGb3JQYWdlKToKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXdQcml2 YXRlOjpfcV9jb250ZW50c1NpemVDaGFuZ2VkKToKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXc6 OnNldFBhZ2UpOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6c2V0UmVzaXplc1RvQ29udGVu dHMpOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6cmVzaXplc1RvQ29udGVudHMpOgorICAg ICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3Lmg6CisgICAgICAgICogUUdWTGF1bmNoZXIvbWFp bi5jcHA6CisgICAgICAgIChXZWJWaWV3OjpXZWJWaWV3KToKKyAgICAgICAgKE1haW5WaWV3OjpN YWluVmlldyk6CisgICAgICAgIChNYWluVmlldzo6c2V0TWFpbldpZGdldCk6CisgICAgICAgIChN YWluVmlldzo6cmVzaXplRXZlbnQpOgorICAgICAgICAobWFpbik6CisKIDIwMTAtMDItMTIgIERp ZWdvIEdvbnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KSW5kZXg6IFdlYktpdC9xdC9B cGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xZ3Jh cGhpY3N3ZWJ2aWV3LmNwcAkocmV2aXNpb24gNTQ2NTEpCisrKyBXZWJLaXQvcXQvQXBpL3FncmFw aGljc3dlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw2ICs3Nyw3IEBAIHB1YmxpYzoK ICAgICBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZShRR3JhcGhpY3NXZWJWaWV3KiBwYXJlbnQpCiAg ICAgICAgIDogcShwYXJlbnQpCiAgICAgICAgICwgcGFnZSgwKQorICAgICAgICAsIHJlc2l6ZXNU b0NvbnRlbnRzKGZhbHNlKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAg ICAgLCByb290R3JhcGhpY3NMYXllcigwKQogICAgICAgICAsIHNob3VsZFN5bmMoZmFsc2UpCkBA IC0xMTcsMTIgKzExOCwxOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG1hcmtGb3JTeW5j KGJvb2wgc2NoZWR1bGVTeW5jKTsKICAgICB2b2lkIHVwZGF0ZUNvbXBvc2l0aW5nU2Nyb2xsUG9z aXRpb24oKTsKICNlbmRpZgorICAgIAorICAgIHZvaWQgdXBkYXRlUmVzaXplc1RvQ29udGVudHNG b3JQYWdlKCk7CiAKICAgICB2b2lkIHN5bmNMYXllcnMoKTsKICAgICB2b2lkIF9xX2RvTG9hZEZp bmlzaGVkKGJvb2wgc3VjY2Vzcyk7CisgICAgdm9pZCBfcV9jb250ZW50c1NpemVDaGFuZ2VkKGNv bnN0IFFTaXplJik7CiAKICAgICBRR3JhcGhpY3NXZWJWaWV3KiBxOwogICAgIFFXZWJQYWdlKiBw YWdlOworCisgICAgYm9vbCByZXNpemVzVG9Db250ZW50czsKKwogI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKICAgICBRR3JhcGhpY3NJdGVtKiByb290R3JhcGhpY3NMYXllcjsKIApA QCAtMzA0LDYgKzMxMSwzMCBAQCBRU3R5bGUqIFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjpzdHls ZSgpCiAgICAgcmV0dXJuIHEtPnN0eWxlKCk7CiB9CiAKK3ZvaWQgUUdyYXBoaWNzV2ViVmlld1By aXZhdGU6OnVwZGF0ZVJlc2l6ZXNUb0NvbnRlbnRzRm9yUGFnZSgpCit7CisgICAgQVNTRVJUKHBh Z2UpOworCisgICAgaWYgKHJlc2l6ZXNUb0NvbnRlbnRzKSB7CisgICAgICAgIC8vIHJlc2l6ZXMg dG8gY29udGVudHMgbW9kZSByZXF1aXJlcyBwcmVmZXJyZWQgY29udGVudHMgc2l6ZSB0byBiZSBz ZXQKKyAgICAgICAgaWYgKCFwYWdlLT5wcmVmZXJyZWRDb250ZW50c1NpemUoKS5pc1ZhbGlkKCkp CisgICAgICAgICAgICBwYWdlLT5zZXRQcmVmZXJyZWRDb250ZW50c1NpemUoUVNpemUoOTYwLCA4 MDApKTsKKworICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KHBhZ2UtPm1haW5GcmFtZSgpLCBTSUdO QUwoY29udGVudHNTaXplQ2hhbmdlZChRU2l6ZSkpLAorICAgICAgICAgICAgcSwgU0xPVChfcV9j b250ZW50c1NpemVDaGFuZ2VkKGNvbnN0IFFTaXplJikpLCBRdDo6VW5pcXVlQ29ubmVjdGlvbik7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgUU9iamVjdDo6ZGlzY29ubmVjdChwYWdlLT5tYWluRnJh bWUoKSwgU0lHTkFMKGNvbnRlbnRzU2l6ZUNoYW5nZWQoUVNpemUpKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICBxLCBTTE9UKF9xX2NvbnRlbnRzU2l6ZUNoYW5nZWQoY29uc3QgUVNpemUmKSkp OworICAgIH0KK30KKwordm9pZCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6X3FfY29udGVudHNT aXplQ2hhbmdlZChjb25zdCBRU2l6ZSYgc2l6ZSkKK3sKKyAgICBpZiAoIXJlc2l6ZXNUb0NvbnRl bnRzKQorICAgICAgICByZXR1cm47CisgICAgcS0+c2V0R2VvbWV0cnkoUVJlY3RGKHEtPmdlb21l dHJ5KCkudG9wTGVmdCgpLCBzaXplKSk7Cit9CisKIC8qIQogICAgIFxjbGFzcyBRR3JhcGhpY3NX ZWJWaWV3CiAgICAgXGJyaWVmIFRoZSBRR3JhcGhpY3NXZWJWaWV3IGNsYXNzIGFsbG93cyBXZWIg Y29udGVudCB0byBiZSBhZGRlZCB0byBhIEdyYXBoaWNzVmlldy4KQEAgLTU4Niw2ICs2MTcsOSBA QCB2b2lkIFFHcmFwaGljc1dlYlZpZXc6OnNldFBhZ2UoUVdlYlBhZ2UqCiAKICAgICBRU2l6ZSBz aXplID0gZ2VvbWV0cnkoKS5zaXplKCkudG9TaXplKCk7CiAgICAgcGFnZS0+c2V0Vmlld3BvcnRT aXplKHNpemUpOworICAgIAorICAgIGlmIChkLT5yZXNpemVzVG9Db250ZW50cykKKyAgICAgICAg ZC0+dXBkYXRlUmVzaXplc1RvQ29udGVudHNGb3JQYWdlKCk7CiAKICAgICBRV2ViRnJhbWUqIG1h aW5GcmFtZSA9IGQtPnBhZ2UtPm1haW5GcmFtZSgpOwogCkBAIC05MTgsNiArOTUyLDM0IEBAIGJv b2wgUUdyYXBoaWNzV2ViVmlldzo6ZmluZFRleHQoY29uc3QgUVMKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKKy8qIQorICAgIFxwcm9wZXJ0eSBRR3JhcGhpY3NXZWJWaWV3OjpyZXNpemVzVG9Db250 ZW50cworICAgIFxicmllZiB3aGV0aGVyIHRoZSBzaXplIG9mIHRoZSBRR3JhcGhpY3NXZWJWaWV3 IGFuZCBpdHMgdmlld3BvcnQgY2hhbmdlcyB0byBtYXRjaCB0aGUgY29udGVudHMgc2l6ZQorICAg IFxzaW5jZSA0LjcgCisKKyAgICBJZiB0aGlzIHByb3BlcnR5IGlzIHNldCwgdGhlIFFHcmFwaGlj c1dlYlZpZXcgd2lsbCBhdXRvbWF0aWNhbGx5IGNoYW5nZSBpdHMKKyAgICBzaXplIHRvIG1hdGNo IHRoZSBzaXplIG9mIHRoZSBtYWluIGZyYW1lIGNvbnRlbnRzLiBBcyBhIHJlc3VsdCB0aGUgdG9w IGxldmVsIGZyYW1lCisgICAgd2lsbCBuZXZlciBoYXZlIHNjcm9sbGJhcnMuCisKKyAgICBUaGlz IHByb3BlcnR5IHNob3VsZCBiZSB1c2VkIGluIGNvbmp1bmN0aW9uIHdpdGggdGhlIFFXZWJQYWdl OjpwcmVmZXJyZWRDb250ZW50c1NpemUgcHJvcGVydHkuCisgICAgSWYgbm90IGV4cGxpY2l0bHkg c2V0LCB0aGUgcHJlZmVycmVkQ29udGVudHNTaXplIGlzIGF1dG9tYXRpY2FsbHkgc2V0IHRvIGEg cmVhc29uYWJsZSB2YWx1ZS4KKworICAgIFxzYSBRV2ViUGFnZTo6c2V0UHJlZmVycmVkQ29udGVu dHNTaXplCisqLwordm9pZCBRR3JhcGhpY3NXZWJWaWV3OjpzZXRSZXNpemVzVG9Db250ZW50cyhi b29sIGVuYWJsZWQpCit7CisgICAgaWYgKGQtPnJlc2l6ZXNUb0NvbnRlbnRzID09IGVuYWJsZWQp CisgICAgICAgIHJldHVybjsKKyAgICBkLT5yZXNpemVzVG9Db250ZW50cyA9IGVuYWJsZWQ7Cisg ICAgaWYgKGQtPnBhZ2UpCisgICAgICAgIGQtPnVwZGF0ZVJlc2l6ZXNUb0NvbnRlbnRzRm9yUGFn ZSgpOworfQorCitib29sIFFHcmFwaGljc1dlYlZpZXc6OnJlc2l6ZXNUb0NvbnRlbnRzKCkgY29u c3QKK3sKKyAgICByZXR1cm4gZC0+cmVzaXplc1RvQ29udGVudHM7Cit9CisKIC8qISBccmVpbXAK ICovCiB2b2lkIFFHcmFwaGljc1dlYlZpZXc6OmhvdmVyTW92ZUV2ZW50KFFHcmFwaGljc1NjZW5l SG92ZXJFdmVudCogZXYpCkluZGV4OiBXZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuaAkocmV2aXNpb24g NTQ2NTEpCisrKyBXZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuaAkod29ya2luZyBjb3B5 KQpAQCAtNDUsNiArNDUsNyBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRR3JhcGhpY3NXZWJWaWV3 IDogCiAgICAgUV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBXUklURSBzZXRVcmwgTk9USUZZ IHVybENoYW5nZWQpCiAKICAgICBRX1BST1BFUlRZKGJvb2wgbW9kaWZpZWQgUkVBRCBpc01vZGlm aWVkKQorICAgIFFfUFJPUEVSVFkoYm9vbCByZXNpemVzVG9Db250ZW50cyBSRUFEIHJlc2l6ZXNU b0NvbnRlbnRzIFdSSVRFIHNldFJlc2l6ZXNUb0NvbnRlbnRzKQogCiBwdWJsaWM6CiAgICAgZXhw bGljaXQgUUdyYXBoaWNzV2ViVmlldyhRR3JhcGhpY3NJdGVtKiBwYXJlbnQgPSAwKTsKQEAgLTc5 LDYgKzgwLDkgQEAgcHVibGljOgogCiAgICAgYm9vbCBmaW5kVGV4dChjb25zdCBRU3RyaW5nJiBz dWJTdHJpbmcsIFFXZWJQYWdlOjpGaW5kRmxhZ3Mgb3B0aW9ucyA9IDApOwogCisgICAgYm9vbCBy ZXNpemVzVG9Db250ZW50cygpIGNvbnN0OworICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHMo Ym9vbCBlbmFibGVkKTsKKwogICAgIHZpcnR1YWwgdm9pZCBzZXRHZW9tZXRyeShjb25zdCBRUmVj dEYmIHJlY3QpOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVHZW9tZXRyeSgpOwogICAgIHZpcnR1 YWwgdm9pZCBwYWludChRUGFpbnRlciosIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbSog b3B0aW9ucywgUVdpZGdldCogd2lkZ2V0ID0gMCk7CkBAIC0xMzcsNiArMTQxLDcgQEAgcHJpdmF0 ZToKICAgICAvLyB3ZSBkb24ndCB3YW50IHRvIGNoYW5nZSB0aGUgbW9jIGJhc2VkIG9uIFVTRSgp IG1hY3JvLCBzbyB0aGlzIGZ1bmN0aW9uIGlzIGhlcmUKICAgICAvLyBidXQgd2lsbCBiZSBlbXB0 eSBpZiBBQ0NMRVJBVEVEX0NPTVBPU0lUSU5HIGlzIGRpc2FibGVkCiAgICAgUV9QUklWQVRFX1NM T1QoZCwgdm9pZCBzeW5jTGF5ZXJzKCkpCisgICAgUV9QUklWQVRFX1NMT1QoZCwgdm9pZCBfcV9j b250ZW50c1NpemVDaGFuZ2VkKGNvbnN0IFFTaXplJikpCiAKICAgICBRR3JhcGhpY3NXZWJWaWV3 UHJpdmF0ZSogY29uc3QgZDsKICAgICBmcmllbmQgY2xhc3MgUUdyYXBoaWNzV2ViVmlld1ByaXZh dGU7CkluZGV4OiBXZWJLaXQvcXQvUUdWTGF1bmNoZXIvbWFpbi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L3F0L1FHVkxhdW5jaGVyL21haW4uY3BwCShyZXZpc2lvbiA1NDY1MSkKKysrIFdlYktp dC9xdC9RR1ZMYXVuY2hlci9tYWluLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzQsNiArNzQsOCBA QCBwdWJsaWM6CiAgICAgewogICAgICAgICBpZiAoUUFwcGxpY2F0aW9uOjppbnN0YW5jZSgpLT5h cmd1bWVudHMoKS5jb250YWlucygiLS1jYWNoZVdlYlZpZXciKSkKICAgICAgICAgICAgIHNldENh Y2hlTW9kZShRR3JhcGhpY3NJdGVtOjpEZXZpY2VDb29yZGluYXRlQ2FjaGUpOworICAgICAgICBp ZiAoUUFwcGxpY2F0aW9uOjppbnN0YW5jZSgpLT5hcmd1bWVudHMoKS5jb250YWlucygiLS1yZXNp emVzVG9Db250ZW50cyIpKQorICAgICAgICAgICAgc2V0UmVzaXplc1RvQ29udGVudHModHJ1ZSk7 CiAgICAgfQogICAgIHZvaWQgc2V0WVJvdGF0aW9uKHFyZWFsIGFuZ2xlKQogICAgIHsKQEAgLTEy OSw4ICsxMzEsMTEgQEAgcHVibGljOgogICAgICAgICAsIG1fbnVtVG90YWxQYWludHMoMCkKICAg ICAgICAgLCBtX251bVBhaW50c1NpbmNlTGFzdE1lYXN1cmUoMCkKICAgICB7Ci0gICAgICAgIHNl dEhvcml6b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7Ci0gICAg ICAgIHNldFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxCYXJBbHdheXNPZmYpOwor ICAgICAgICAvLyBVc2UgdGhlIGdyYXBoaWNzIHZpZXcgc2Nyb2xsYmFycyB3aGVuIHRoZSB3ZWJ2 aWV3IGlzIHNldCB0byBzaXplIHRvIHRoZSBjb250ZW50LgorICAgICAgICBpZiAoIVFBcHBsaWNh dGlvbjo6aW5zdGFuY2UoKS0+YXJndW1lbnRzKCkuY29udGFpbnMoIi0tcmVzaXplc1RvQ29udGVu dHMiKSkgeworICAgICAgICAgICAgc2V0SG9yaXpvbnRhbFNjcm9sbEJhclBvbGljeShRdDo6U2Ny b2xsQmFyQWx3YXlzT2ZmKTsKKyAgICAgICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5 KFF0OjpTY3JvbGxCYXJBbHdheXNPZmYpOworICAgICAgICB9CiAKICAgICAgICAgc2V0RnJhbWVT aGFwZShRRnJhbWU6Ok5vRnJhbWUpOwogICAgICAgICBzZXRTaXplUG9saWN5KFFTaXplUG9saWN5 OjpFeHBhbmRpbmcsIFFTaXplUG9saWN5OjpFeHBhbmRpbmcpOwpAQCAtMTQzLDE3ICsxNDgsMTkg QEAgcHVibGljOgogICAgICAgICB9CiAgICAgfQogCi0gICAgdm9pZCBzZXRNYWluV2lkZ2V0KFFH cmFwaGljc1dpZGdldCogd2lkZ2V0KQorICAgIHZvaWQgc2V0TWFpbldpZGdldChXZWJWaWV3KiB3 aWRnZXQpCiAgICAgewotICAgICAgICBRUmVjdEYgcmVjdChRUmVjdChRUG9pbnQoMCwgMCksIHNp emUoKSkpOwotICAgICAgICB3aWRnZXQtPnNldEdlb21ldHJ5KHJlY3QpOwogICAgICAgICBtX21h aW5XaWRnZXQgPSB3aWRnZXQ7CisgICAgICAgIGlmIChtX21haW5XaWRnZXQtPnJlc2l6ZXNUb0Nv bnRlbnRzKCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIFFSZWN0RiByZWN0KFFSZWN0 KFFQb2ludCgwLCAwKSwgc2l6ZSgpKSk7CisgICAgICAgIG1fbWFpbldpZGdldC0+c2V0R2VvbWV0 cnkocmVjdCk7CiAgICAgfQogCiAgICAgdm9pZCByZXNpemVFdmVudChRUmVzaXplRXZlbnQqIGV2 ZW50KQogICAgIHsKICAgICAgICAgUUdyYXBoaWNzVmlldzo6cmVzaXplRXZlbnQoZXZlbnQpOwot ICAgICAgICBpZiAoIW1fbWFpbldpZGdldCkKKyAgICAgICAgaWYgKCFtX21haW5XaWRnZXQgfHwg bV9tYWluV2lkZ2V0LT5yZXNpemVzVG9Db250ZW50cygpKQogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICBRUmVjdEYgcmVjdChRUG9pbnQoMCwgMCksIGV2ZW50LT5zaXplKCkpOwogICAgICAg ICBtX21haW5XaWRnZXQtPnNldEdlb21ldHJ5KHJlY3QpOwpAQCAtMjMxLDcgKzIzOCw3IEBAIHNp Z25hbHM6CiAgICAgdm9pZCBmbGlwUmVxdWVzdCgpOwogCiBwcml2YXRlOgotICAgIFFHcmFwaGlj c1dpZGdldCogbV9tYWluV2lkZ2V0OworICAgIFdlYlZpZXcqIG1fbWFpbldpZGdldDsKICAgICBi b29sIG1fbWVhc3VyZUZwczsKICAgICBpbnQgbV9udW1Ub3RhbFBhaW50czsKICAgICBpbnQgbV9u dW1QYWludHNTaW5jZUxhc3RNZWFzdXJlOwpAQCAtNDkzLDcgKzUwMCw3IEBAIGludCBtYWluKGlu dCBhcmdjLCBjaGFyKiogYXJndikKIHsKICAgICBRQXBwbGljYXRpb24gYXBwKGFyZ2MsIGFyZ3Yp OwogICAgIGlmIChhcHAuYXJndW1lbnRzKCkuY29udGFpbnMoIi0taGVscCIpKSB7Ci0gICAgICAg IHFEZWJ1ZygpIDw8ICJVc2FnZTogUUdWTGF1bmNoZXIgWy0tdXJsIHVybF0gWy0tY29tcG9zaXRp bmddIFstLXVwZGF0ZU1vZGUgRnVsbHxNaW5pbWFsfFNtYXJ0fE5vfEJvdW5kaW5nUmVjdF0gWy0t Y2FjaGVXZWJWaWV3XVxuIjsKKyAgICAgICAgcURlYnVnKCkgPDwgIlVzYWdlOiBRR1ZMYXVuY2hl ciBbLS11cmwgdXJsXSBbLS1jb21wb3NpdGluZ10gWy0tdXBkYXRlTW9kZSBGdWxsfE1pbmltYWx8 U21hcnR8Tm98Qm91bmRpbmdSZWN0XSBbLS1jYWNoZVdlYlZpZXddIFstLXJlc2l6ZXNUb0NvbnRl bnRzXVxuIjsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogICAgIFFTdHJpbmcgdXJsID0gUVN0 cmluZygiZmlsZTovLyUxLyUyIikuYXJnKFFEaXI6OmhvbWVQYXRoKCkpLmFyZyhRTGF0aW4xU3Ry aW5nKCJpbmRleC5odG1sIikpOwo= 48822 2010-02-16 13:32:37 -0800 2010-02-16 15:29:39 -0800 Fix build with Qt 4.5 bug-34885-20100216133235.patch text/plain 1485 ariya.hidayat ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDVmNDk0NjMuLjk3MjBlMGMgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMzIwLDggKzMyMCwxMyBAQCB2b2lkIFFHcmFw aGljc1dlYlZpZXdQcml2YXRlOjp1cGRhdGVSZXNpemVzVG9Db250ZW50c0ZvclBhZ2UoKQogICAg ICAgICBpZiAoIXBhZ2UtPnByZWZlcnJlZENvbnRlbnRzU2l6ZSgpLmlzVmFsaWQoKSkKICAgICAg ICAgICAgIHBhZ2UtPnNldFByZWZlcnJlZENvbnRlbnRzU2l6ZShRU2l6ZSg5NjAsIDgwMCkpOwog CisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCiAgICAgICAgIFFP YmplY3Q6OmNvbm5lY3QocGFnZS0+bWFpbkZyYW1lKCksIFNJR05BTChjb250ZW50c1NpemVDaGFu Z2VkKFFTaXplKSksCiAgICAgICAgICAgICBxLCBTTE9UKF9xX2NvbnRlbnRzU2l6ZUNoYW5nZWQo Y29uc3QgUVNpemUmKSksIFF0OjpVbmlxdWVDb25uZWN0aW9uKTsKKyNlbHNlCisgICAgICAgIFFP YmplY3Q6OmNvbm5lY3QocGFnZS0+bWFpbkZyYW1lKCksIFNJR05BTChjb250ZW50c1NpemVDaGFu Z2VkKFFTaXplKSksCisgICAgICAgICAgICBxLCBTTE9UKF9xX2NvbnRlbnRzU2l6ZUNoYW5nZWQo Y29uc3QgUVNpemUmKSkpOworI2VuZGlmCiAgICAgfSBlbHNlIHsKICAgICAgICAgUU9iamVjdDo6 ZGlzY29ubmVjdChwYWdlLT5tYWluRnJhbWUoKSwgU0lHTkFMKGNvbnRlbnRzU2l6ZUNoYW5nZWQo UVNpemUpKSwKICAgICAgICAgICAgICAgICAgICAgICAgICBxLCBTTE9UKF9xX2NvbnRlbnRzU2l6 ZUNoYW5nZWQoY29uc3QgUVNpemUmKSkpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxv ZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMjU2ODUwNC4uNWNkZmY1NSAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTMgQEAKKzIwMTAtMDItMTYgIEFyaXlhIEhpZGF5YXQgIDxhcml5YS5oaWRheWF0QGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggYnVpbGRpbmcgd2l0aCBRdCA8IDQuNi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM0ODg1CisKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vidmll dy5jcHA6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6dXBkYXRlUmVzaXplc1Rv Q29udGVudHNGb3JQYWdlKToKKwogMjAxMC0wMi0xNiAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5o YXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBTeW1iaWFuIGJ1aWxkIGZp eC4K