34747 2010-02-09 03:53:06 -0800 [Qt] Sync with API changes in Maemo 5 kinetic scrolling 2010-02-09 17:44:11 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 kling webkit-unassigned commit-queue oldest_to_newest 188956 0 kling 2010-02-09 03:53:06 -0800 [Qt] Sync with API changes in Maemo 5 kinetic scrolling 188958 1 48404 kling 2010-02-09 04:00:51 -0800 Created attachment 48404 Patch 188966 2 48404 kenneth 2010-02-09 04:48:27 -0800 Comment on attachment 48404 Patch > +bool qt_sendSpontaneousEvent(QObject* receiver, QEvent* ev) > +{ > + return QCoreApplication::sendSpontaneousEvent(receiver, ev); > +} Why is this needed? Are you wrapping a method with the same signature > + Patch by Robert Griebl <rgriebl@trolltech.com> As far as I understand, Robert is the committer, but the patch was done by Sandmann, 188973 3 48407 kling 2010-02-09 05:20:24 -0800 Created attachment 48407 Patch with comment + reference to original source 188974 4 48407 kenneth 2010-02-09 05:24:00 -0800 Comment on attachment 48407 Patch with comment + reference to original source > -class QWebViewKineticScroller : public QAbstractKineticScroller { > +// QCoreApplication::sendSpontaneousEvent() is private, hence this friend wrapper > +bool qt_sendSpontaneousEvent(QObject* receiver, QEvent* ev) > +{ > + return QCoreApplication::sendSpontaneousEvent(receiver, ev); > +} So this means that I cannot use QAbstractKineticScroller with the graphicswebview because I do not have access to this method? 189186 5 48407 commit-queue 2010-02-09 17:44:05 -0800 Comment on attachment 48407 Patch with comment + reference to original source Clearing flags on attachment: 48407 Committed r54575: <http://trac.webkit.org/changeset/54575> 189187 6 commit-queue 2010-02-09 17:44:11 -0800 All reviewed patches have been landed. Closing bug. 48404 2010-02-09 04:00:51 -0800 2010-02-09 05:20:24 -0800 Patch bug-34747.diff text/plain 8811 kling ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2Vidmlldy5jcHAKaW5kZXggYjVhNWE5MC4uMTU4ODEwZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTYw LDk2ICs2MCwxNDAgQEAgdm9pZCBRV2ViVmlld1ByaXZhdGU6Ol9xX3BhZ2VEZXN0cm95ZWQoKQog CiAjaWZkZWYgUV9XU19NQUVNT181CiAjaW5jbHVkZSAicWFic3RyYWN0a2luZXRpY3Njcm9sbGVy LmgiCisjaW5jbHVkZSAicWFwcGxpY2F0aW9uLmgiCiAKLWNsYXNzIFFXZWJWaWV3S2luZXRpY1Nj cm9sbGVyIDogcHVibGljIFFBYnN0cmFjdEtpbmV0aWNTY3JvbGxlciB7Citib29sIHF0X3NlbmRT cG9udGFuZW91c0V2ZW50KFFPYmplY3QqIHJlY2VpdmVyLCBRRXZlbnQqIGV2KQoreworICAgIHJl dHVybiBRQ29yZUFwcGxpY2F0aW9uOjpzZW5kU3BvbnRhbmVvdXNFdmVudChyZWNlaXZlciwgZXYp OworfQorCitjbGFzcyBRV2ViVmlld0tpbmV0aWNTY3JvbGxlciA6IHB1YmxpYyBRT2JqZWN0LCBw dWJsaWMgUUFic3RyYWN0S2luZXRpY1Njcm9sbGVyIHsKIHB1YmxpYzoKLSAgICBRV2ViVmlld0tp bmV0aWNTY3JvbGxlcigpIDogUUFic3RyYWN0S2luZXRpY1Njcm9sbGVyKCkge30KLSAgICAvLyBy ZW1lbWJlciB0aGUgZnJhbWUgd2hlcmUgdGhlIGJ1dHRvbiB3YXMgcHJlc3NlZAorICAgIFFXZWJW aWV3S2luZXRpY1Njcm9sbGVyKCkKKyAgICAgICAgOiBRT2JqZWN0KCkKKyAgICAgICAgLCBRQWJz dHJhY3RLaW5ldGljU2Nyb2xsZXIoKQorICAgICAgICAsIG1fdmlldygwKQorICAgICAgICAsIG1f aWdub3JlRXZlbnRzKGZhbHNlKQorICAgIHsKKyAgICB9CisKKyAgICB2b2lkIHNldFdpZGdldChR V2ViVmlldyogd2lkZ2V0KQorICAgIHsKKyAgICAgICAgaWYgKG1fdmlldykgeworICAgICAgICAg ICAgbV92aWV3LT5yZW1vdmVFdmVudEZpbHRlcih0aGlzKTsKKyAgICAgICAgICAgIFFXZWJGcmFt ZSogZnJhbWUgPSBtX3ZpZXctPnBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgICAgICAgICBmcmFt ZS0+c2V0U2Nyb2xsQmFyUG9saWN5KFF0OjpWZXJ0aWNhbCwgbV9vbGRWZXJ0aWNhbFNjcm9sbEJh clBvbGljeSk7CisgICAgICAgICAgICBmcmFtZS0+c2V0U2Nyb2xsQmFyUG9saWN5KFF0OjpIb3Jp em9udGFsLCBtX29sZEhvcml6b250YWxTY3JvbGxCYXJQb2xpY3kpOworICAgICAgICB9CisKKyAg ICAgICAgbV92aWV3ID0gd2lkZ2V0OworICAgICAgICBzZXRQYXJlbnQobV92aWV3KTsKKyAgICAg ICAgaWYgKG1fdmlldykgeworICAgICAgICAgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1fdmlldy0+ cGFnZSgpLT5tYWluRnJhbWUoKTsKKyAgICAgICAgICAgIG1fb2xkSG9yaXpvbnRhbFNjcm9sbEJh clBvbGljeSA9IGZyYW1lLT5zY3JvbGxCYXJQb2xpY3koUXQ6Okhvcml6b250YWwpOworICAgICAg ICAgICAgbV9vbGRWZXJ0aWNhbFNjcm9sbEJhclBvbGljeSA9IGZyYW1lLT5zY3JvbGxCYXJQb2xp Y3koUXQ6OlZlcnRpY2FsKTsKKyAgICAgICAgICAgIGZyYW1lLT5zZXRTY3JvbGxCYXJQb2xpY3ko UXQ6OlZlcnRpY2FsLCBRdDo6U2Nyb2xsQmFyQWx3YXlzT2ZmKTsKKyAgICAgICAgICAgIGZyYW1l LT5zZXRTY3JvbGxCYXJQb2xpY3koUXQ6Okhvcml6b250YWwsIFF0OjpTY3JvbGxCYXJBbHdheXNP ZmYpOworICAgICAgICAgICAgbV92aWV3LT5pbnN0YWxsRXZlbnRGaWx0ZXIodGhpcyk7CisgICAg ICAgIH0KKyAgICB9CisKK3Byb3RlY3RlZDoKICAgICBib29sIGV2ZW50RmlsdGVyKFFPYmplY3Qq IG8sIFFFdmVudCogZXYpCiAgICAgeworICAgICAgICBpZiAoIW8gfHwgbV92aWV3ICE9IG8gfHwg bV9pZ25vcmVFdmVudHMgfHwgIW1fdmlldy0+aXNFbmFibGVkKCkpCisgICAgICAgICAgICByZXR1 cm4gUU9iamVjdDo6ZXZlbnRGaWx0ZXIobywgZXYpOworCisgICAgICAgIGJvb2wgcmVzID0gZmFs c2U7CisKICAgICAgICAgc3dpdGNoIChldi0+dHlwZSgpKSB7CiAgICAgICAgIGNhc2UgUUV2ZW50 OjpNb3VzZUJ1dHRvblByZXNzOiB7CisgICAgICAgICAgICAvLyByZW1lbWJlciB0aGUgZnJhbWUg d2hlcmUgdGhlIGJ1dHRvbiB3YXMgcHJlc3NlZAogICAgICAgICAgICAgUVdlYkZyYW1lKiBoaXRG cmFtZSA9IHNjcm9sbGluZ0ZyYW1lQXQoc3RhdGljX2Nhc3Q8UU1vdXNlRXZlbnQqPihldiktPnBv cygpKTsKICAgICAgICAgICAgIGlmIChoaXRGcmFtZSkKICAgICAgICAgICAgICAgICBtX2ZyYW1l ID0gaGl0RnJhbWU7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIC8vIGZhbGwgdGhy b3VnaAogICAgICAgICB9CisgICAgICAgIGNhc2UgUUV2ZW50OjpNb3VzZU1vdmU6CisgICAgICAg IGNhc2UgUUV2ZW50OjpNb3VzZUJ1dHRvblJlbGVhc2U6CisgICAgICAgIGNhc2UgUUV2ZW50OjpN b3VzZUJ1dHRvbkRibENsaWNrOgorICAgICAgICAgICAgcmVzID0gaGFuZGxlTW91c2VFdmVudChz dGF0aWNfY2FzdDxRTW91c2VFdmVudCo+KGV2KSk7CisgICAgICAgICAgICBicmVhazsKICAgICAg ICAgZGVmYXVsdDoKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIHJldHVy biBRQWJzdHJhY3RLaW5ldGljU2Nyb2xsZXI6OmV2ZW50RmlsdGVyKG8sIGV2KTsKKyAgICAgICAg cmV0dXJuIHJlcyA/IHRydWUgOiBRT2JqZWN0OjpldmVudEZpbHRlcihvLCBldik7CiAgICAgfQog Ci1wcm90ZWN0ZWQ6Ci0gICAgUVdlYkZyYW1lKiBjdXJyZW50RnJhbWUoKSBjb25zdAorICAgIHZv aWQgY2FuY2VsTGVmdE1vdXNlQnV0dG9uUHJlc3MoY29uc3QgUVBvaW50JiAvKiBnbG9iYWxQcmVz c1BvcyAqLykKICAgICB7Ci0gICAgICAgIGlmICghbV9mcmFtZS5pc051bGwoKSkKLSAgICAgICAg ICAgIHJldHVybiBtX2ZyYW1lLmRhdGEoKTsKLQotICAgICAgICBRV2ViVmlldyogdmlldyA9IHN0 YXRpY19jYXN0PFFXZWJWaWV3Kj4od2lkZ2V0KCkpOwotICAgICAgICBRV2ViRnJhbWUqIGZyYW1l ID0gdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKTsKLSAgICAgICAgcmV0dXJuIGZyYW1lOworICAg ICAgICBRTW91c2VFdmVudCBjbWVtKFFFdmVudDo6TW91c2VNb3ZlLCBRUG9pbnQoLUlOVF9NQVgs IC1JTlRfTUFYKSwgUXQ6OkxlZnRCdXR0b24sIFFBcHBsaWNhdGlvbjo6bW91c2VCdXR0b25zKCkg fCBRdDo6TGVmdEJ1dHRvbiwgUUFwcGxpY2F0aW9uOjprZXlib2FyZE1vZGlmaWVycygpKTsKKyAg ICAgICAgc2VuZEV2ZW50KG1fdmlldywgJmNtZW0pOworICAgICAgICBRTW91c2VFdmVudCBjbWVy KFFFdmVudDo6TW91c2VCdXR0b25SZWxlYXNlLCBRUG9pbnQoLUlOVF9NQVgsIC1JTlRfTUFYKSwg UXQ6OkxlZnRCdXR0b24sIFFBcHBsaWNhdGlvbjo6bW91c2VCdXR0b25zKCkgJiB+UXQ6OkxlZnRC dXR0b24sIFFBcHBsaWNhdGlvbjo6a2V5Ym9hcmRNb2RpZmllcnMoKSk7CisgICAgICAgIHNlbmRF dmVudChtX3ZpZXcsICZjbWVyKTsKICAgICB9CiAKLSAgICAvLyBSZXR1cm5zIHRoZSBpbm5lcm1v c3QgZnJhbWUgYXQgdGhlIGdpdmVuIHBvc2l0aW9uIHRoYXQgY2FuIHNjcm9sbC4KLSAgICBRV2Vi RnJhbWUqIHNjcm9sbGluZ0ZyYW1lQXQoY29uc3QgUVBvaW50JiBwb3MpIGNvbnN0CisgICAgUVdl YkZyYW1lKiBjdXJyZW50RnJhbWUoKSBjb25zdAogICAgIHsKLSAgICAgICAgUVdlYlZpZXcqIHZp ZXcgPSBzdGF0aWNfY2FzdDxRV2ViVmlldyo+KHdpZGdldCgpKTsKLSAgICAgICAgUVdlYkZyYW1l KiBtYWluRnJhbWUgPSB2aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpOwotICAgICAgICBRV2ViRnJh bWUqIGhpdEZyYW1lID0gbWFpbkZyYW1lLT5oaXRUZXN0Q29udGVudChwb3MpLmZyYW1lKCk7Ci0g ICAgICAgIFFTaXplIHJhbmdlID0gaGl0RnJhbWUtPmNvbnRlbnRzU2l6ZSgpIC0gaGl0RnJhbWUt Pmdlb21ldHJ5KCkuc2l6ZSgpOworICAgICAgICBpZiAobV9mcmFtZSkKKyAgICAgICAgICAgIHJl dHVybiBtX2ZyYW1lOwogCi0gICAgICAgIHdoaWxlIChoaXRGcmFtZSAmJiByYW5nZS53aWR0aCgp IDw9IDEgJiYgcmFuZ2UuaGVpZ2h0KCkgPD0gMSkKLSAgICAgICAgICAgIGhpdEZyYW1lID0gaGl0 RnJhbWUtPnBhcmVudEZyYW1lKCk7CisgICAgICAgIGlmIChtX3ZpZXcpCisgICAgICAgICAgICBy ZXR1cm4gbV92aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpOwogCi0gICAgICAgIHJldHVybiBoaXRG cmFtZTsKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0gICAgdm9pZCBhdHRhY2hUb1dpZGdl dCgpCisgICAgLy8gUmV0dXJucyB0aGUgaW5uZXJtb3N0IGZyYW1lIGF0IHRoZSBnaXZlbiBwb3Np dGlvbiB0aGF0IGNhbiBzY3JvbGwuCisgICAgUVdlYkZyYW1lKiBzY3JvbGxpbmdGcmFtZUF0KGNv bnN0IFFQb2ludCYgcG9zKSBjb25zdAogICAgIHsKLSAgICAgICAgUVdlYlZpZXcqIHZpZXcgPSBz dGF0aWNfY2FzdDxRV2ViVmlldyo+KHdpZGdldCgpKTsKLSAgICAgICAgUVdlYkZyYW1lKiBtYWlu RnJhbWUgPSB2aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpOwotICAgICAgICBtX29sZEhvcml6b250 YWxTY3JvbGxCYXJQb2xpY3kgPSBtYWluRnJhbWUtPnNjcm9sbEJhclBvbGljeShRdDo6SG9yaXpv bnRhbCk7Ci0gICAgICAgIG1fb2xkVmVydGljYWxTY3JvbGxCYXJQb2xpY3kgPSBtYWluRnJhbWUt PnNjcm9sbEJhclBvbGljeShRdDo6VmVydGljYWwpOwotICAgICAgICBtYWluRnJhbWUtPnNldFNj cm9sbEJhclBvbGljeShRdDo6VmVydGljYWwsIFF0OjpTY3JvbGxCYXJBbHdheXNPZmYpOwotICAg ICAgICBtYWluRnJhbWUtPnNldFNjcm9sbEJhclBvbGljeShRdDo6SG9yaXpvbnRhbCwgUXQ6OlNj cm9sbEJhckFsd2F5c09mZik7Ci0gICAgICAgIHZpZXctPmluc3RhbGxFdmVudEZpbHRlcih0aGlz KTsKLSAgICB9CisgICAgICAgIFFXZWJGcmFtZSogaGl0RnJhbWUgPSAwOworICAgICAgICBpZiAo bV92aWV3KSB7CisgICAgICAgICAgICBRV2ViRnJhbWUqIGZyYW1lID0gbV92aWV3LT5wYWdlKCkt Pm1haW5GcmFtZSgpOworICAgICAgICAgICAgaGl0RnJhbWUgPSBmcmFtZS0+aGl0VGVzdENvbnRl bnQocG9zKS5mcmFtZSgpOworICAgICAgICAgICAgUVNpemUgcmFuZ2UgPSBoaXRGcmFtZS0+Y29u dGVudHNTaXplKCkgLSBoaXRGcmFtZS0+Z2VvbWV0cnkoKS5zaXplKCk7CiAKLSAgICB2b2lkIHJl bW92ZUZyb21XaWRnZXQoKQotICAgIHsKLSAgICAgICAgUVdlYlZpZXcqIHZpZXcgPSBzdGF0aWNf Y2FzdDxRV2ViVmlldyo+KHdpZGdldCgpKTsKLSAgICAgICAgdmlldy0+cmVtb3ZlRXZlbnRGaWx0 ZXIodGhpcyk7Ci0gICAgICAgIFFXZWJGcmFtZSogbWFpbkZyYW1lID0gdmlldy0+cGFnZSgpLT5t YWluRnJhbWUoKTsKLSAgICAgICAgbWFpbkZyYW1lLT5zZXRTY3JvbGxCYXJQb2xpY3koUXQ6OlZl cnRpY2FsLCBtX29sZFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KTsKLSAgICAgICAgbWFpbkZyYW1l LT5zZXRTY3JvbGxCYXJQb2xpY3koUXQ6Okhvcml6b250YWwsIG1fb2xkSG9yaXpvbnRhbFNjcm9s bEJhclBvbGljeSk7CisgICAgICAgICAgICB3aGlsZSAoaGl0RnJhbWUgJiYgcmFuZ2Uud2lkdGgo KSA8PSAxICYmIHJhbmdlLmhlaWdodCgpIDw9IDEpCisgICAgICAgICAgICAgICAgaGl0RnJhbWUg PSBoaXRGcmFtZS0+cGFyZW50RnJhbWUoKTsKKworICAgICAgICAgICAgcmV0dXJuIGhpdEZyYW1l OworICAgICAgICB9CiAgICAgfQogCi0gICAgUVJlY3QgcG9zaXRpb25SYW5nZSgpIGNvbnN0Cisg ICAgUVBvaW50IG1heGltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0CiAgICAgewotICAgICAgICBR UmVjdCByOwogICAgICAgICBRV2ViRnJhbWUqIGZyYW1lID0gY3VycmVudEZyYW1lKCk7Ci0gICAg ICAgIHIuc2V0U2l6ZShmcmFtZS0+Y29udGVudHNTaXplKCkgLSBmcmFtZS0+Z2VvbWV0cnkoKS5z aXplKCkpOwotICAgICAgICByZXR1cm4gcjsKKyAgICAgICAgUVNpemUgcyA9IGZyYW1lID8gZnJh bWUtPmNvbnRlbnRzU2l6ZSgpIC0gZnJhbWUtPmdlb21ldHJ5KCkuc2l6ZSgpIDogUVNpemUoMCwg MCk7CisgICAgICAgIHJldHVybiBRUG9pbnQocU1heCgwLCBzLndpZHRoKCkpLCBxTWF4KDAsIHMu aGVpZ2h0KCkpKTsKICAgICB9CiAKLSAgICBRUG9pbnQgcG9zaXRpb24oKSBjb25zdAorICAgIFFQ b2ludCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0CiAgICAgewogICAgICAgICBRV2ViRnJhbWUqIGZy YW1lID0gY3VycmVudEZyYW1lKCk7Ci0gICAgICAgIHJldHVybiBmcmFtZS0+c2Nyb2xsUG9zaXRp b24oKTsKKyAgICAgICAgcmV0dXJuIGZyYW1lID8gZnJhbWUtPnNjcm9sbFBvc2l0aW9uKCkgOiBR UG9pbnQoKTsKICAgICB9CiAKICAgICBRU2l6ZSB2aWV3cG9ydFNpemUoKSBjb25zdAogICAgIHsK LSAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFFXZWJWaWV3Kj4od2lkZ2V0KCkpLT5wYWdlKCkt PnZpZXdwb3J0U2l6ZSgpOworICAgICAgICByZXR1cm4gbV92aWV3ID8gbV92aWV3LT5wYWdlKCkt PnZpZXdwb3J0U2l6ZSgpIDogUVNpemUoKTsKICAgICB9CiAKLSAgICB2b2lkIHNldFBvc2l0aW9u KGNvbnN0IFFQb2ludCYgcG9pbnQsIGNvbnN0IFFQb2ludCYgLyogb3ZlclNob290RGVsdGEgKi8p CisgICAgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBRUG9pbnQmIHBvaW50LCBjb25zdCBR UG9pbnQmIC8qIG92ZXJTaG9vdERlbHRhICovKQogICAgIHsKICAgICAgICAgUVdlYkZyYW1lKiBm cmFtZSA9IGN1cnJlbnRGcmFtZSgpOwotICAgICAgICBmcmFtZS0+c2V0U2Nyb2xsUG9zaXRpb24o cG9pbnQpOworICAgICAgICBpZiAoZnJhbWUpCisgICAgICAgICAgICBmcmFtZS0+c2V0U2Nyb2xs UG9zaXRpb24ocG9pbnQpOworICAgIH0KKworICAgIHZvaWQgc2VuZEV2ZW50KFFXaWRnZXQqIHcs IFFFdmVudCogZXYpCisgICAgeworICAgICAgICBtX2lnbm9yZUV2ZW50cyA9IHRydWU7CisgICAg ICAgIHF0X3NlbmRTcG9udGFuZW91c0V2ZW50KHcsIGV2KTsKKyAgICAgICAgbV9pZ25vcmVFdmVu dHMgPSBmYWxzZTsKICAgICB9CiAKKyAgICBRV2ViVmlldyogbV92aWV3OworICAgIGJvb2wgbV9p Z25vcmVFdmVudHM7CiAgICAgUVBvaW50ZXI8UVdlYkZyYW1lPiBtX2ZyYW1lOwogICAgIFF0OjpT Y3JvbGxCYXJQb2xpY3kgbV9vbGRWZXJ0aWNhbFNjcm9sbEJhclBvbGljeTsKICAgICBRdDo6U2Ny b2xsQmFyUG9saWN5IG1fb2xkSG9yaXpvbnRhbFNjcm9sbEJhclBvbGljeTsKQEAgLTI1OSw3ICsz MDMsNyBAQCBRV2ViVmlldzo6UVdlYlZpZXcoUVdpZGdldCAqcGFyZW50KQogI2VuZGlmCiAjaWYg ZGVmaW5lZChRX1dTX01BRU1PXzUpCiAgICAgUUFic3RyYWN0S2luZXRpY1Njcm9sbGVyKiBzY3Jv bGxlciA9IG5ldyBRV2ViVmlld0tpbmV0aWNTY3JvbGxlcigpOwotICAgIHNjcm9sbGVyLT5zZXRX aWRnZXQodGhpcyk7CisgICAgc3RhdGljX2Nhc3Q8UVdlYlZpZXdLaW5ldGljU2Nyb2xsZXIqPihz Y3JvbGxlciktPnNldFdpZGdldCh0aGlzKTsKICAgICBzZXRQcm9wZXJ0eSgia2luZXRpY1Njcm9s bGVyIiwgUVZhcmlhbnQ6OmZyb21WYWx1ZShzY3JvbGxlcikpOwogI2VuZGlmCiAgICAgc2V0QWNj ZXB0RHJvcHModHJ1ZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCBlM2ZiODZkLi41ZThlZjczIDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAor MjAxMC0wMi0wOSAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gU3luYyB3 aXRoIEFQSSBjaGFuZ2VzIGluIE1hZW1vIDUga2luZXRpYyBzY3JvbGxpbmcKKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ3NDcKKworICAgICAgICBQ YXRjaCBieSBSb2JlcnQgR3JpZWJsIDxyZ3JpZWJsQHRyb2xsdGVjaC5jb20+CisKKyAgICAgICAg KiBBcGkvcXdlYnZpZXcuY3BwOgorICAgICAgICAocXRfc2VuZFNwb250YW5lb3VzRXZlbnQpOgor ICAgICAgICAoUVdlYlZpZXdLaW5ldGljU2Nyb2xsZXI6OlFXZWJWaWV3S2luZXRpY1Njcm9sbGVy KToKKyAgICAgICAgKFFXZWJWaWV3S2luZXRpY1Njcm9sbGVyOjpzZXRXaWRnZXQpOgorICAgICAg ICAoUVdlYlZpZXdLaW5ldGljU2Nyb2xsZXI6OmV2ZW50RmlsdGVyKToKKyAgICAgICAgKFFXZWJW aWV3S2luZXRpY1Njcm9sbGVyOjpjYW5jZWxMZWZ0TW91c2VCdXR0b25QcmVzcyk6CisgICAgICAg IChRV2ViVmlld0tpbmV0aWNTY3JvbGxlcjo6Y3VycmVudEZyYW1lKToKKyAgICAgICAgKFFXZWJW aWV3S2luZXRpY1Njcm9sbGVyOjpzY3JvbGxpbmdGcmFtZUF0KToKKyAgICAgICAgKFFXZWJWaWV3 S2luZXRpY1Njcm9sbGVyOjptYXhpbXVtU2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAoUVdlYlZp ZXdLaW5ldGljU2Nyb2xsZXI6OnNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKFFXZWJWaWV3S2lu ZXRpY1Njcm9sbGVyOjp2aWV3cG9ydFNpemUpOgorICAgICAgICAoUVdlYlZpZXdLaW5ldGljU2Ny b2xsZXI6OnNldFNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKFFXZWJWaWV3S2luZXRpY1Njcm9s bGVyOjpzZW5kRXZlbnQpOgorICAgICAgICAoUVdlYlZpZXc6OlFXZWJWaWV3KToKKwogMjAxMC0w MS0xOSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4K 48407 2010-02-09 05:20:24 -0800 2010-02-09 17:44:04 -0800 Patch with comment + reference to original source bug-34747-2.diff text/plain 8941 kling ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2Vidmlldy5jcHAKaW5kZXggYjVhNWE5MC4uNzljMTZjNyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTYw LDk2ICs2MCwxNDEgQEAgdm9pZCBRV2ViVmlld1ByaXZhdGU6Ol9xX3BhZ2VEZXN0cm95ZWQoKQog CiAjaWZkZWYgUV9XU19NQUVNT181CiAjaW5jbHVkZSAicWFic3RyYWN0a2luZXRpY3Njcm9sbGVy LmgiCisjaW5jbHVkZSAicWFwcGxpY2F0aW9uLmgiCiAKLWNsYXNzIFFXZWJWaWV3S2luZXRpY1Nj cm9sbGVyIDogcHVibGljIFFBYnN0cmFjdEtpbmV0aWNTY3JvbGxlciB7CisvLyBRQ29yZUFwcGxp Y2F0aW9uOjpzZW5kU3BvbnRhbmVvdXNFdmVudCgpIGlzIHByaXZhdGUsIGhlbmNlIHRoaXMgZnJp ZW5kIHdyYXBwZXIKK2Jvb2wgcXRfc2VuZFNwb250YW5lb3VzRXZlbnQoUU9iamVjdCogcmVjZWl2 ZXIsIFFFdmVudCogZXYpCit7CisgICAgcmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnNlbmRTcG9u dGFuZW91c0V2ZW50KHJlY2VpdmVyLCBldik7Cit9CisKK2NsYXNzIFFXZWJWaWV3S2luZXRpY1Nj cm9sbGVyIDogcHVibGljIFFPYmplY3QsIHB1YmxpYyBRQWJzdHJhY3RLaW5ldGljU2Nyb2xsZXIg ewogcHVibGljOgotICAgIFFXZWJWaWV3S2luZXRpY1Njcm9sbGVyKCkgOiBRQWJzdHJhY3RLaW5l dGljU2Nyb2xsZXIoKSB7fQotICAgIC8vIHJlbWVtYmVyIHRoZSBmcmFtZSB3aGVyZSB0aGUgYnV0 dG9uIHdhcyBwcmVzc2VkCisgICAgUVdlYlZpZXdLaW5ldGljU2Nyb2xsZXIoKQorICAgICAgICA6 IFFPYmplY3QoKQorICAgICAgICAsIFFBYnN0cmFjdEtpbmV0aWNTY3JvbGxlcigpCisgICAgICAg ICwgbV92aWV3KDApCisgICAgICAgICwgbV9pZ25vcmVFdmVudHMoZmFsc2UpCisgICAgeworICAg IH0KKworICAgIHZvaWQgc2V0V2lkZ2V0KFFXZWJWaWV3KiB3aWRnZXQpCisgICAgeworICAgICAg ICBpZiAobV92aWV3KSB7CisgICAgICAgICAgICBtX3ZpZXctPnJlbW92ZUV2ZW50RmlsdGVyKHRo aXMpOworICAgICAgICAgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1fdmlldy0+cGFnZSgpLT5tYWlu RnJhbWUoKTsKKyAgICAgICAgICAgIGZyYW1lLT5zZXRTY3JvbGxCYXJQb2xpY3koUXQ6OlZlcnRp Y2FsLCBtX29sZFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KTsKKyAgICAgICAgICAgIGZyYW1lLT5z ZXRTY3JvbGxCYXJQb2xpY3koUXQ6Okhvcml6b250YWwsIG1fb2xkSG9yaXpvbnRhbFNjcm9sbEJh clBvbGljeSk7CisgICAgICAgIH0KKworICAgICAgICBtX3ZpZXcgPSB3aWRnZXQ7CisgICAgICAg IHNldFBhcmVudChtX3ZpZXcpOworICAgICAgICBpZiAobV92aWV3KSB7CisgICAgICAgICAgICBR V2ViRnJhbWUqIGZyYW1lID0gbV92aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpOworICAgICAgICAg ICAgbV9vbGRIb3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5ID0gZnJhbWUtPnNjcm9sbEJhclBvbGlj eShRdDo6SG9yaXpvbnRhbCk7CisgICAgICAgICAgICBtX29sZFZlcnRpY2FsU2Nyb2xsQmFyUG9s aWN5ID0gZnJhbWUtPnNjcm9sbEJhclBvbGljeShRdDo6VmVydGljYWwpOworICAgICAgICAgICAg ZnJhbWUtPnNldFNjcm9sbEJhclBvbGljeShRdDo6VmVydGljYWwsIFF0OjpTY3JvbGxCYXJBbHdh eXNPZmYpOworICAgICAgICAgICAgZnJhbWUtPnNldFNjcm9sbEJhclBvbGljeShRdDo6SG9yaXpv bnRhbCwgUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CisgICAgICAgICAgICBtX3ZpZXctPmluc3Rh bGxFdmVudEZpbHRlcih0aGlzKTsKKyAgICAgICAgfQorICAgIH0KKworcHJvdGVjdGVkOgogICAg IGJvb2wgZXZlbnRGaWx0ZXIoUU9iamVjdCogbywgUUV2ZW50KiBldikKICAgICB7CisgICAgICAg IGlmICghbyB8fCBtX3ZpZXcgIT0gbyB8fCBtX2lnbm9yZUV2ZW50cyB8fCAhbV92aWV3LT5pc0Vu YWJsZWQoKSkKKyAgICAgICAgICAgIHJldHVybiBRT2JqZWN0OjpldmVudEZpbHRlcihvLCBldik7 CisKKyAgICAgICAgYm9vbCByZXMgPSBmYWxzZTsKKwogICAgICAgICBzd2l0Y2ggKGV2LT50eXBl KCkpIHsKICAgICAgICAgY2FzZSBRRXZlbnQ6Ok1vdXNlQnV0dG9uUHJlc3M6IHsKKyAgICAgICAg ICAgIC8vIHJlbWVtYmVyIHRoZSBmcmFtZSB3aGVyZSB0aGUgYnV0dG9uIHdhcyBwcmVzc2VkCiAg ICAgICAgICAgICBRV2ViRnJhbWUqIGhpdEZyYW1lID0gc2Nyb2xsaW5nRnJhbWVBdChzdGF0aWNf Y2FzdDxRTW91c2VFdmVudCo+KGV2KS0+cG9zKCkpOwogICAgICAgICAgICAgaWYgKGhpdEZyYW1l KQogICAgICAgICAgICAgICAgIG1fZnJhbWUgPSBoaXRGcmFtZTsKLSAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgLy8gZmFsbCB0aHJvdWdoCiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBR RXZlbnQ6Ok1vdXNlTW92ZToKKyAgICAgICAgY2FzZSBRRXZlbnQ6Ok1vdXNlQnV0dG9uUmVsZWFz ZToKKyAgICAgICAgY2FzZSBRRXZlbnQ6Ok1vdXNlQnV0dG9uRGJsQ2xpY2s6CisgICAgICAgICAg ICByZXMgPSBoYW5kbGVNb3VzZUV2ZW50KHN0YXRpY19jYXN0PFFNb3VzZUV2ZW50Kj4oZXYpKTsK KyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIFFBYnN0cmFjdEtpbmV0aWNTY3JvbGxlcjo6ZXZl bnRGaWx0ZXIobywgZXYpOworICAgICAgICByZXR1cm4gcmVzID8gdHJ1ZSA6IFFPYmplY3Q6OmV2 ZW50RmlsdGVyKG8sIGV2KTsKICAgICB9CiAKLXByb3RlY3RlZDoKLSAgICBRV2ViRnJhbWUqIGN1 cnJlbnRGcmFtZSgpIGNvbnN0CisgICAgdm9pZCBjYW5jZWxMZWZ0TW91c2VCdXR0b25QcmVzcyhj b25zdCBRUG9pbnQmIC8qIGdsb2JhbFByZXNzUG9zICovKQogICAgIHsKLSAgICAgICAgaWYgKCFt X2ZyYW1lLmlzTnVsbCgpKQotICAgICAgICAgICAgcmV0dXJuIG1fZnJhbWUuZGF0YSgpOwotCi0g ICAgICAgIFFXZWJWaWV3KiB2aWV3ID0gc3RhdGljX2Nhc3Q8UVdlYlZpZXcqPih3aWRnZXQoKSk7 Ci0gICAgICAgIFFXZWJGcmFtZSogZnJhbWUgPSB2aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpOwot ICAgICAgICByZXR1cm4gZnJhbWU7CisgICAgICAgIFFNb3VzZUV2ZW50IGNtZW0oUUV2ZW50OjpN b3VzZU1vdmUsIFFQb2ludCgtSU5UX01BWCwgLUlOVF9NQVgpLCBRdDo6TGVmdEJ1dHRvbiwgUUFw cGxpY2F0aW9uOjptb3VzZUJ1dHRvbnMoKSB8IFF0OjpMZWZ0QnV0dG9uLCBRQXBwbGljYXRpb246 OmtleWJvYXJkTW9kaWZpZXJzKCkpOworICAgICAgICBzZW5kRXZlbnQobV92aWV3LCAmY21lbSk7 CisgICAgICAgIFFNb3VzZUV2ZW50IGNtZXIoUUV2ZW50OjpNb3VzZUJ1dHRvblJlbGVhc2UsIFFQ b2ludCgtSU5UX01BWCwgLUlOVF9NQVgpLCBRdDo6TGVmdEJ1dHRvbiwgUUFwcGxpY2F0aW9uOjpt b3VzZUJ1dHRvbnMoKSAmIH5RdDo6TGVmdEJ1dHRvbiwgUUFwcGxpY2F0aW9uOjprZXlib2FyZE1v ZGlmaWVycygpKTsKKyAgICAgICAgc2VuZEV2ZW50KG1fdmlldywgJmNtZXIpOwogICAgIH0KIAot ICAgIC8vIFJldHVybnMgdGhlIGlubmVybW9zdCBmcmFtZSBhdCB0aGUgZ2l2ZW4gcG9zaXRpb24g dGhhdCBjYW4gc2Nyb2xsLgotICAgIFFXZWJGcmFtZSogc2Nyb2xsaW5nRnJhbWVBdChjb25zdCBR UG9pbnQmIHBvcykgY29uc3QKKyAgICBRV2ViRnJhbWUqIGN1cnJlbnRGcmFtZSgpIGNvbnN0CiAg ICAgewotICAgICAgICBRV2ViVmlldyogdmlldyA9IHN0YXRpY19jYXN0PFFXZWJWaWV3Kj4od2lk Z2V0KCkpOwotICAgICAgICBRV2ViRnJhbWUqIG1haW5GcmFtZSA9IHZpZXctPnBhZ2UoKS0+bWFp bkZyYW1lKCk7Ci0gICAgICAgIFFXZWJGcmFtZSogaGl0RnJhbWUgPSBtYWluRnJhbWUtPmhpdFRl c3RDb250ZW50KHBvcykuZnJhbWUoKTsKLSAgICAgICAgUVNpemUgcmFuZ2UgPSBoaXRGcmFtZS0+ Y29udGVudHNTaXplKCkgLSBoaXRGcmFtZS0+Z2VvbWV0cnkoKS5zaXplKCk7CisgICAgICAgIGlm IChtX2ZyYW1lKQorICAgICAgICAgICAgcmV0dXJuIG1fZnJhbWU7CiAKLSAgICAgICAgd2hpbGUg KGhpdEZyYW1lICYmIHJhbmdlLndpZHRoKCkgPD0gMSAmJiByYW5nZS5oZWlnaHQoKSA8PSAxKQot ICAgICAgICAgICAgaGl0RnJhbWUgPSBoaXRGcmFtZS0+cGFyZW50RnJhbWUoKTsKKyAgICAgICAg aWYgKG1fdmlldykKKyAgICAgICAgICAgIHJldHVybiBtX3ZpZXctPnBhZ2UoKS0+bWFpbkZyYW1l KCk7CiAKLSAgICAgICAgcmV0dXJuIGhpdEZyYW1lOworICAgICAgICByZXR1cm4gMDsKICAgICB9 CiAKLSAgICB2b2lkIGF0dGFjaFRvV2lkZ2V0KCkKKyAgICAvLyBSZXR1cm5zIHRoZSBpbm5lcm1v c3QgZnJhbWUgYXQgdGhlIGdpdmVuIHBvc2l0aW9uIHRoYXQgY2FuIHNjcm9sbC4KKyAgICBRV2Vi RnJhbWUqIHNjcm9sbGluZ0ZyYW1lQXQoY29uc3QgUVBvaW50JiBwb3MpIGNvbnN0CiAgICAgewot ICAgICAgICBRV2ViVmlldyogdmlldyA9IHN0YXRpY19jYXN0PFFXZWJWaWV3Kj4od2lkZ2V0KCkp OwotICAgICAgICBRV2ViRnJhbWUqIG1haW5GcmFtZSA9IHZpZXctPnBhZ2UoKS0+bWFpbkZyYW1l KCk7Ci0gICAgICAgIG1fb2xkSG9yaXpvbnRhbFNjcm9sbEJhclBvbGljeSA9IG1haW5GcmFtZS0+ c2Nyb2xsQmFyUG9saWN5KFF0OjpIb3Jpem9udGFsKTsKLSAgICAgICAgbV9vbGRWZXJ0aWNhbFNj cm9sbEJhclBvbGljeSA9IG1haW5GcmFtZS0+c2Nyb2xsQmFyUG9saWN5KFF0OjpWZXJ0aWNhbCk7 Ci0gICAgICAgIG1haW5GcmFtZS0+c2V0U2Nyb2xsQmFyUG9saWN5KFF0OjpWZXJ0aWNhbCwgUXQ6 OlNjcm9sbEJhckFsd2F5c09mZik7Ci0gICAgICAgIG1haW5GcmFtZS0+c2V0U2Nyb2xsQmFyUG9s aWN5KFF0OjpIb3Jpem9udGFsLCBRdDo6U2Nyb2xsQmFyQWx3YXlzT2ZmKTsKLSAgICAgICAgdmll dy0+aW5zdGFsbEV2ZW50RmlsdGVyKHRoaXMpOwotICAgIH0KKyAgICAgICAgUVdlYkZyYW1lKiBo aXRGcmFtZSA9IDA7CisgICAgICAgIGlmIChtX3ZpZXcpIHsKKyAgICAgICAgICAgIFFXZWJGcmFt ZSogZnJhbWUgPSBtX3ZpZXctPnBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgICAgICAgICBoaXRG cmFtZSA9IGZyYW1lLT5oaXRUZXN0Q29udGVudChwb3MpLmZyYW1lKCk7CisgICAgICAgICAgICBR U2l6ZSByYW5nZSA9IGhpdEZyYW1lLT5jb250ZW50c1NpemUoKSAtIGhpdEZyYW1lLT5nZW9tZXRy eSgpLnNpemUoKTsKIAotICAgIHZvaWQgcmVtb3ZlRnJvbVdpZGdldCgpCi0gICAgewotICAgICAg ICBRV2ViVmlldyogdmlldyA9IHN0YXRpY19jYXN0PFFXZWJWaWV3Kj4od2lkZ2V0KCkpOwotICAg ICAgICB2aWV3LT5yZW1vdmVFdmVudEZpbHRlcih0aGlzKTsKLSAgICAgICAgUVdlYkZyYW1lKiBt YWluRnJhbWUgPSB2aWV3LT5wYWdlKCktPm1haW5GcmFtZSgpOwotICAgICAgICBtYWluRnJhbWUt PnNldFNjcm9sbEJhclBvbGljeShRdDo6VmVydGljYWwsIG1fb2xkVmVydGljYWxTY3JvbGxCYXJQ b2xpY3kpOwotICAgICAgICBtYWluRnJhbWUtPnNldFNjcm9sbEJhclBvbGljeShRdDo6SG9yaXpv bnRhbCwgbV9vbGRIb3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5KTsKKyAgICAgICAgICAgIHdoaWxl IChoaXRGcmFtZSAmJiByYW5nZS53aWR0aCgpIDw9IDEgJiYgcmFuZ2UuaGVpZ2h0KCkgPD0gMSkK KyAgICAgICAgICAgICAgICBoaXRGcmFtZSA9IGhpdEZyYW1lLT5wYXJlbnRGcmFtZSgpOworCisg ICAgICAgICAgICByZXR1cm4gaGl0RnJhbWU7CisgICAgICAgIH0KICAgICB9CiAKLSAgICBRUmVj dCBwb3NpdGlvblJhbmdlKCkgY29uc3QKKyAgICBRUG9pbnQgbWF4aW11bVNjcm9sbFBvc2l0aW9u KCkgY29uc3QKICAgICB7Ci0gICAgICAgIFFSZWN0IHI7CiAgICAgICAgIFFXZWJGcmFtZSogZnJh bWUgPSBjdXJyZW50RnJhbWUoKTsKLSAgICAgICAgci5zZXRTaXplKGZyYW1lLT5jb250ZW50c1Np emUoKSAtIGZyYW1lLT5nZW9tZXRyeSgpLnNpemUoKSk7Ci0gICAgICAgIHJldHVybiByOworICAg ICAgICBRU2l6ZSBzID0gZnJhbWUgPyBmcmFtZS0+Y29udGVudHNTaXplKCkgLSBmcmFtZS0+Z2Vv bWV0cnkoKS5zaXplKCkgOiBRU2l6ZSgwLCAwKTsKKyAgICAgICAgcmV0dXJuIFFQb2ludChxTWF4 KDAsIHMud2lkdGgoKSksIHFNYXgoMCwgcy5oZWlnaHQoKSkpOwogICAgIH0KIAotICAgIFFQb2lu dCBwb3NpdGlvbigpIGNvbnN0CisgICAgUVBvaW50IHNjcm9sbFBvc2l0aW9uKCkgY29uc3QKICAg ICB7CiAgICAgICAgIFFXZWJGcmFtZSogZnJhbWUgPSBjdXJyZW50RnJhbWUoKTsKLSAgICAgICAg cmV0dXJuIGZyYW1lLT5zY3JvbGxQb3NpdGlvbigpOworICAgICAgICByZXR1cm4gZnJhbWUgPyBm cmFtZS0+c2Nyb2xsUG9zaXRpb24oKSA6IFFQb2ludCgpOwogICAgIH0KIAogICAgIFFTaXplIHZp ZXdwb3J0U2l6ZSgpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UVdl YlZpZXcqPih3aWRnZXQoKSktPnBhZ2UoKS0+dmlld3BvcnRTaXplKCk7CisgICAgICAgIHJldHVy biBtX3ZpZXcgPyBtX3ZpZXctPnBhZ2UoKS0+dmlld3BvcnRTaXplKCkgOiBRU2l6ZSgpOwogICAg IH0KIAotICAgIHZvaWQgc2V0UG9zaXRpb24oY29uc3QgUVBvaW50JiBwb2ludCwgY29uc3QgUVBv aW50JiAvKiBvdmVyU2hvb3REZWx0YSAqLykKKyAgICB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNv bnN0IFFQb2ludCYgcG9pbnQsIGNvbnN0IFFQb2ludCYgLyogb3ZlclNob290RGVsdGEgKi8pCiAg ICAgewogICAgICAgICBRV2ViRnJhbWUqIGZyYW1lID0gY3VycmVudEZyYW1lKCk7Ci0gICAgICAg IGZyYW1lLT5zZXRTY3JvbGxQb3NpdGlvbihwb2ludCk7CisgICAgICAgIGlmIChmcmFtZSkKKyAg ICAgICAgICAgIGZyYW1lLT5zZXRTY3JvbGxQb3NpdGlvbihwb2ludCk7CisgICAgfQorCisgICAg dm9pZCBzZW5kRXZlbnQoUVdpZGdldCogdywgUUV2ZW50KiBldikKKyAgICB7CisgICAgICAgIG1f aWdub3JlRXZlbnRzID0gdHJ1ZTsKKyAgICAgICAgcXRfc2VuZFNwb250YW5lb3VzRXZlbnQodywg ZXYpOworICAgICAgICBtX2lnbm9yZUV2ZW50cyA9IGZhbHNlOwogICAgIH0KIAorICAgIFFXZWJW aWV3KiBtX3ZpZXc7CisgICAgYm9vbCBtX2lnbm9yZUV2ZW50czsKICAgICBRUG9pbnRlcjxRV2Vi RnJhbWU+IG1fZnJhbWU7CiAgICAgUXQ6OlNjcm9sbEJhclBvbGljeSBtX29sZFZlcnRpY2FsU2Ny b2xsQmFyUG9saWN5OwogICAgIFF0OjpTY3JvbGxCYXJQb2xpY3kgbV9vbGRIb3Jpem9udGFsU2Ny b2xsQmFyUG9saWN5OwpAQCAtMjU5LDcgKzMwNCw3IEBAIFFXZWJWaWV3OjpRV2ViVmlldyhRV2lk Z2V0ICpwYXJlbnQpCiAjZW5kaWYKICNpZiBkZWZpbmVkKFFfV1NfTUFFTU9fNSkKICAgICBRQWJz dHJhY3RLaW5ldGljU2Nyb2xsZXIqIHNjcm9sbGVyID0gbmV3IFFXZWJWaWV3S2luZXRpY1Njcm9s bGVyKCk7Ci0gICAgc2Nyb2xsZXItPnNldFdpZGdldCh0aGlzKTsKKyAgICBzdGF0aWNfY2FzdDxR V2ViVmlld0tpbmV0aWNTY3JvbGxlcio+KHNjcm9sbGVyKS0+c2V0V2lkZ2V0KHRoaXMpOwogICAg IHNldFByb3BlcnR5KCJraW5ldGljU2Nyb2xsZXIiLCBRVmFyaWFudDo6ZnJvbVZhbHVlKHNjcm9s bGVyKSk7CiAjZW5kaWYKICAgICBzZXRBY2NlcHREcm9wcyh0cnVlKTsKZGlmZiAtLWdpdCBhL1dl YktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGUzZmI4NmQuLmQ0 YmM5ODggMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0No YW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEwLTAyLTA5ICBBbmRyZWFzIEtsaW5nICA8YW5k cmVhcy5rbGluZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBTeW5jIHdpdGggQVBJIGNoYW5nZXMgaW4gTWFlbW8gNSBraW5l dGljIHNjcm9sbGluZworCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zNDc0NworCisgICAgICAgIFRoaXMgaXMgYSBmb3J3YXJkLXBvcnQgb2YgaHR0cDov L3F0LmdpdG9yaW91cy5vcmcvK3F0LWRldmVsb3BlcnMvcXQveDExLW1hZW1vL2NvbW1pdC8wODQ5 NzU2MQorCisgICAgICAgICogQXBpL3F3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHF0X3NlbmRTcG9u dGFuZW91c0V2ZW50KToKKyAgICAgICAgKFFXZWJWaWV3S2luZXRpY1Njcm9sbGVyOjpRV2ViVmll d0tpbmV0aWNTY3JvbGxlcik6CisgICAgICAgIChRV2ViVmlld0tpbmV0aWNTY3JvbGxlcjo6c2V0 V2lkZ2V0KToKKyAgICAgICAgKFFXZWJWaWV3S2luZXRpY1Njcm9sbGVyOjpldmVudEZpbHRlcik6 CisgICAgICAgIChRV2ViVmlld0tpbmV0aWNTY3JvbGxlcjo6Y2FuY2VsTGVmdE1vdXNlQnV0dG9u UHJlc3MpOgorICAgICAgICAoUVdlYlZpZXdLaW5ldGljU2Nyb2xsZXI6OmN1cnJlbnRGcmFtZSk6 CisgICAgICAgIChRV2ViVmlld0tpbmV0aWNTY3JvbGxlcjo6c2Nyb2xsaW5nRnJhbWVBdCk6Cisg ICAgICAgIChRV2ViVmlld0tpbmV0aWNTY3JvbGxlcjo6bWF4aW11bVNjcm9sbFBvc2l0aW9uKToK KyAgICAgICAgKFFXZWJWaWV3S2luZXRpY1Njcm9sbGVyOjpzY3JvbGxQb3NpdGlvbik6CisgICAg ICAgIChRV2ViVmlld0tpbmV0aWNTY3JvbGxlcjo6dmlld3BvcnRTaXplKToKKyAgICAgICAgKFFX ZWJWaWV3S2luZXRpY1Njcm9sbGVyOjpzZXRTY3JvbGxQb3NpdGlvbik6CisgICAgICAgIChRV2Vi Vmlld0tpbmV0aWNTY3JvbGxlcjo6c2VuZEV2ZW50KToKKyAgICAgICAgKFFXZWJWaWV3OjpRV2Vi Vmlldyk6CisKIDIwMTAtMDEtMTkgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0 aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCg==