88320 2012-06-05 04:27:32 -0700 [Qt][WK2] Make viewport related experimental.test properties encapsulated. 2012-08-24 04:27:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan cmarcelo hausmann kenneth menard michael.bruning webkit.review.bot zoltan oldest_to_newest 641405 0 zalan 2012-06-05 04:27:32 -0700 instead of having multiple properties such as QVariant contentsScale() const; QVariant devicePixelRatio() const; QVariant initialScale() const; QVariant isScalable() const; QVariant layoutSize() const; QVariant maximumScale() const; QVariant minimumScale() const; use experimental.test.viewport and expose it as an QJsonObject (list of key-value pairs) and consolidate experimental API as follows: experimental.test.contentsScale experimental.test.viewport experimental.devicePixelRatio (as the result of removing target-densitydpi from viewport meta) 703007 1 michael.bruning 2012-08-23 08:15:13 -0700 I'll take this one if you don't mind, Zalan. 703058 2 160181 michael.bruning 2012-08-23 09:14:54 -0700 Created attachment 160181 Patch 703092 3 160181 abecsi 2012-08-23 09:53:44 -0700 Comment on attachment 160181 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160181&action=review LGTM, just a few comments > Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:140 > +static QJsonObject qSizeFToJsonObject(const QSizeF& sizeF) inline maybe? > Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp:237 > + float devicePixelRatio = m_devicePixelRatio; > + if (!qFuzzyCompare(devicePixelRatio, m_rawAttributes.devicePixelRatio)) { Why not compare to m_devicePixelRatio directly instead of creating a temporary variable? > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:87 > - text: "Initial scale: " + formatScale(test.initialScale) > + text: "Initial scale: " + formatScale(test.viewport.initialScale) I think having m_rawAttributes.initialScale in the info item makes not much sense since it is almost always -1 as soon as it is applied in the viewport handler. We could either remove it from the info item or change the way it is marked as used when applied. 703195 4 michael.bruning 2012-08-23 11:40:29 -0700 (In reply to comment #3) > (From update of attachment 160181 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=160181&action=review > > LGTM, just a few comments > > > Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:140 > > +static QJsonObject qSizeFToJsonObject(const QSizeF& sizeF) > > inline maybe? Good idea :). > > > Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp:237 > > + float devicePixelRatio = m_devicePixelRatio; > > + if (!qFuzzyCompare(devicePixelRatio, m_rawAttributes.devicePixelRatio)) { > > Why not compare to m_devicePixelRatio directly instead of creating a temporary variable? Basically, I was following a pattern that was used further down because the two data types are different (float and qreal), but realized that that place calls a method to store in the temporary variable. I'll replace it with a cast. > > > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:87 > > - text: "Initial scale: " + formatScale(test.initialScale) > > + text: "Initial scale: " + formatScale(test.viewport.initialScale) > > I think having m_rawAttributes.initialScale in the info item makes not much sense since it is almost always -1 as soon as it is applied in the viewport handler. > We could either remove it from the info item or change the way it is marked as used when applied. True. I have no strong opinion on whether it should stay or not, maybe one of the others on cc (Kenneth? :)) has an opinion on this? 703917 5 160365 michael.bruning 2012-08-24 02:23:17 -0700 Created attachment 160365 Patch 703921 6 160365 kenneth 2012-08-24 02:32:10 -0700 Comment on attachment 160365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160365&action=review > Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:140 > +static inline QJsonObject qSizeFToJsonObject(const QSizeF& sizeF) you could just call it toJSonObject() as you might have more of these in the future. toJsonObject(QSizeF()) is pretty clear 703938 7 160372 michael.bruning 2012-08-24 03:04:35 -0700 Created attachment 160372 Patch 703968 8 160372 webkit.review.bot 2012-08-24 04:03:29 -0700 Comment on attachment 160372 Patch Rejecting attachment 160372 from commit-queue. michaelbruening@gmail.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 703981 9 160372 webkit.review.bot 2012-08-24 04:27:28 -0700 Comment on attachment 160372 Patch Clearing flags on attachment: 160372 Committed r126570: <http://trac.webkit.org/changeset/126570> 703982 10 webkit.review.bot 2012-08-24 04:27:31 -0700 All reviewed patches have been landed. Closing bug. 160181 2012-08-23 09:14:54 -0700 2012-08-24 02:23:12 -0700 Patch bug-88320-20120823181450.patch text/plain 11011 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDJiZTc0YmE4OGRmZDhl ZWY1ZWJjMTUyZDI5NzJlNmM1MmNjY2MxYy4uOWZmN2M0YWJjNzI1MDczNGE3MjBmMTFjZWYwYzRj MTQ2ZGYwNGMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTIzICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbGJydWVuaW5nQGdtYWlsLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gTWFrZSB2aWV3cG9ydCByZWxhdGVkIGV4cGVyaW1lbnRhbC50ZXN0IHByb3BlcnRpZXMg ZW5jYXBzdWxhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODgzMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbnRyb2R1Y2luZyBhIG5ldyB2aWV3cG9ydCBhdHRyaWJ1dGUgdG8gUVdlYktpdFRlc3Qg dG8gZ3JvdXAgdGhlIHZpZXdwb3J0IHJlbGF0ZWQKKyAgICAgICAgYXR0cmlidXRlcyBpbnRvIG9u ZSBRSnNvbk9iamVjdC4gQWxzbyBhZGRpbmcgYSBzdGF0aWMgbWV0aG9kIHRvIGNvbnZlcnQgYSBR U2l6ZUYgdG8KKyAgICAgICAgYSBRSnNvbk9iamVjdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvcXdlYmtpdHRlc3QuY3BwOgorICAgICAgICAocVNpemVGVG9Kc29uT2JqZWN0KToKKyAg ICAgICAgKFFXZWJLaXRUZXN0Ojp2aWV3cG9ydCk6CisgICAgICAgIChRV2ViS2l0VGVzdDo6ZGV2 aWNlUGl4ZWxSYXRpbyk6CisgICAgICAgIChRV2ViS2l0VGVzdDo6Y29udGVudHNTY2FsZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmg6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3 cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQpOgorCiAyMDEyLTA4LTIxICBK ZXNzZSB2YW4gZGVuIEtpZWJvb20gIDxqZXNzZXZka0Bnbm9tZS5vcmc+IGFuZCBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgZGVz dHJveSBub3RpZnkgZm9yIHJlZ2lzdGVyX3VyaV9zY2hlbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3QuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAKaW5kZXggMWMzOWE1M2NkNTY4ZmYzNzhj Yzc5Yzc5YWE2NGYxOTkxNzY5MzlhYS4uZWJhZWJhOTQ5NmFiYTYyMGIwY2M4NmViOWIwNGIxY2I4 MGUyODdhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vi a2l0dGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0 dGVzdC5jcHAKQEAgLTEzNyw1MSArMTM3LDQzIEBAIFFTaXplIFFXZWJLaXRUZXN0Ojpjb250ZW50 c1NpemUoKSBjb25zdAogICAgIHJldHVybiBRU2l6ZShtX3dlYlZpZXdQcml2YXRlLT5wYWdlVmll dy0+Y29udGVudHNTaXplKCkudG9TaXplKCkpOwogfQogCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6 Y29udGVudHNTY2FsZSgpIGNvbnN0CitzdGF0aWMgUUpzb25PYmplY3QgcVNpemVGVG9Kc29uT2Jq ZWN0KGNvbnN0IFFTaXplRiYgc2l6ZUYpCiB7Ci0gICAgaWYgKFF0Vmlld3BvcnRIYW5kbGVyKiB2 aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKQotICAgICAgICBy ZXR1cm4gdmlld3BvcnQtPmN1cnJlbnRDU1NTY2FsZSgpOwotICAgIHJldHVybiAxLjA7CisgICAg UUpzb25PYmplY3QgcmVzdWx0OworICAgIHJlc3VsdC5pbnNlcnQoUUxhdGluMVN0cmluZygid2lk dGgiKSwgc2l6ZUYud2lkdGgoKSk7CisgICAgcmVzdWx0Lmluc2VydChRTGF0aW4xU3RyaW5nKCJo ZWlnaHQiKSwgc2l6ZUYuaGVpZ2h0KCkpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLVFWYXJp YW50IFFXZWJLaXRUZXN0OjpkZXZpY2VQaXhlbFJhdGlvKCkgY29uc3QKK1FKc29uT2JqZWN0IFFX ZWJLaXRUZXN0Ojp2aWV3cG9ydCgpIGNvbnN0CiB7Ci0gICAgaWYgKFF0Vmlld3BvcnRIYW5kbGVy KiB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKQotICAgICAg ICByZXR1cm4gdmlld3BvcnQtPm1fZGV2aWNlUGl4ZWxSYXRpbzsKLSAgICByZXR1cm4gMS4wOwot fQotCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6aW5pdGlhbFNjYWxlKCkgY29uc3QKLXsKLSAgICBp ZiAoUXRWaWV3cG9ydEhhbmRsZXIqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3Bv cnRIYW5kbGVyKCkpCi0gICAgICAgIHJldHVybiB2aWV3cG9ydC0+bV9yYXdBdHRyaWJ1dGVzLmlu aXRpYWxTY2FsZTsKLSAgICByZXR1cm4gMS4wOworICAgIFFKc29uT2JqZWN0IHZpZXdwb3J0RGF0 YTsKKyAgICBpZiAoUXRWaWV3cG9ydEhhbmRsZXIqIHZpZXdwb3J0SGFuZGxlciA9IG1fd2ViVmll d1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKSB7CisgICAgICAgIHZpZXdwb3J0RGF0YS5pbnNl cnQoUUxhdGluMVN0cmluZygiaW5pdGlhbFNjYWxlIiksIHZpZXdwb3J0SGFuZGxlci0+bV9yYXdB dHRyaWJ1dGVzLmluaXRpYWxTY2FsZSk7CisgICAgICAgIHZpZXdwb3J0RGF0YS5pbnNlcnQoUUxh dGluMVN0cmluZygibGF5b3V0U2l6ZSIpLCBxU2l6ZUZUb0pzb25PYmplY3QoUVNpemVGKHZpZXdw b3J0SGFuZGxlci0+bV9yYXdBdHRyaWJ1dGVzLmxheW91dFNpemUpKSk7CisgICAgICAgIHZpZXdw b3J0RGF0YS5pbnNlcnQoUUxhdGluMVN0cmluZygiaXNTY2FsYWJsZSIpLCAhIXZpZXdwb3J0SGFu ZGxlci0+bV9yYXdBdHRyaWJ1dGVzLnVzZXJTY2FsYWJsZSk7CisgICAgICAgIHZpZXdwb3J0RGF0 YS5pbnNlcnQoUUxhdGluMVN0cmluZygibWluaW11bVNjYWxlIiksIHZpZXdwb3J0SGFuZGxlci0+ bV9taW5pbXVtU2NhbGUpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJp bmcoIm1heGltdW1TY2FsZSIpLCB2aWV3cG9ydEhhbmRsZXItPm1fbWF4aW11bVNjYWxlKTsKKyAg ICB9IGVsc2UgeworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoImlu aXRpYWxTY2FsZSIpLCAxLjApOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFT dHJpbmcoImxheW91dFNpemUiKSwgcVNpemVGVG9Kc29uT2JqZWN0KFFTaXplRigpKSk7CisgICAg ICAgIHZpZXdwb3J0RGF0YS5pbnNlcnQoUUxhdGluMVN0cmluZygiaXNTY2FsYWJsZSIpLCBmYWxz ZSk7CisgICAgICAgIHZpZXdwb3J0RGF0YS5pbnNlcnQoUUxhdGluMVN0cmluZygibWluaW11bVNj YWxlIiksIDEuMCk7CisgICAgICAgIHZpZXdwb3J0RGF0YS5pbnNlcnQoUUxhdGluMVN0cmluZygi bWF4aW11bVNjYWxlIiksIDEuMCk7CisgICAgfQorICAgIHJldHVybiB2aWV3cG9ydERhdGE7CiB9 CiAKLVFWYXJpYW50IFFXZWJLaXRUZXN0OjptaW5pbXVtU2NhbGUoKSBjb25zdAorUVZhcmlhbnQg UVdlYktpdFRlc3Q6OmRldmljZVBpeGVsUmF0aW8oKSBjb25zdAogewogICAgIGlmIChRdFZpZXdw b3J0SGFuZGxlciogdmlld3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIo KSkKLSAgICAgICAgcmV0dXJuIHZpZXdwb3J0LT5tX21pbmltdW1TY2FsZTsKKyAgICAgICAgcmV0 dXJuIHZpZXdwb3J0LT5tX2RldmljZVBpeGVsUmF0aW87CiAgICAgcmV0dXJuIDEuMDsKIH0KIAot UVZhcmlhbnQgUVdlYktpdFRlc3Q6Om1heGltdW1TY2FsZSgpIGNvbnN0CitRVmFyaWFudCBRV2Vi S2l0VGVzdDo6Y29udGVudHNTY2FsZSgpIGNvbnN0CiB7CiAgICAgaWYgKFF0Vmlld3BvcnRIYW5k bGVyKiB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKQotICAg ICAgICByZXR1cm4gdmlld3BvcnQtPm1fbWF4aW11bVNjYWxlOworICAgICAgICByZXR1cm4gdmll d3BvcnQtPmN1cnJlbnRDU1NTY2FsZSgpOwogICAgIHJldHVybiAxLjA7CiB9Ci0KLVFWYXJpYW50 IFFXZWJLaXRUZXN0Ojppc1NjYWxhYmxlKCkgY29uc3QKLXsKLSAgICBpZiAoUXRWaWV3cG9ydEhh bmRsZXIqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRIYW5kbGVyKCkpCi0g ICAgICAgIHJldHVybiAhIXZpZXdwb3J0LT5tX3Jhd0F0dHJpYnV0ZXMudXNlclNjYWxhYmxlOwot ICAgIHJldHVybiBmYWxzZTsKLX0KLQotUVZhcmlhbnQgUVdlYktpdFRlc3Q6OmxheW91dFNpemUo KSBjb25zdAotewotICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmlld3BvcnQgPSBtX3dlYlZp ZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0dXJuIFFTaXplRih2aWV3 cG9ydC0+bV9yYXdBdHRyaWJ1dGVzLmxheW91dFNpemUpOwotICAgIHJldHVybiBRU2l6ZUYoKTsK LX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRl c3RfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmgK aW5kZXggMzc1NGYxNjlhN2FkZDYxNDljYWQ5NDhkMzg0OTI0Yjg3MTdhM2JiMi4uYmZhYmI2OWZi ODc3MWU0YzU1MzA3OGNiYzRkYzE3M2I0MTEyNmVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmgKQEAgLTI0LDYgKzI0LDcgQEAKICNpbmNs dWRlICJxd2Via2l0Z2xvYmFsLmgiCiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgiCiAKKyNp bmNsdWRlIDxRdENvcmUvUUpzb25PYmplY3Q+CiAjaW5jbHVkZSA8UXRDb3JlL1FPYmplY3Q+CiAj aW5jbHVkZSA8UXRDb3JlL1FQb2ludGVyPgogI2luY2x1ZGUgPFF0Q29yZS9RU2l6ZT4KQEAgLTQw LDE3ICs0MSwxNCBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViS2l0VGVzdCA6IHB1YmxpYyBR T2JqZWN0IHsKIAogICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgY29udGVudHNTY2FsZSBSRUFEIGNv bnRlbnRzU2NhbGUgTk9USUZZIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKQogCi0gICAgUV9QUk9QRVJU WShRVmFyaWFudCBkZXZpY2VQaXhlbFJhdGlvIFJFQUQgZGV2aWNlUGl4ZWxSYXRpbyBOT1RJRlkg dmlld3BvcnRDaGFuZ2VkKQotICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgaW5pdGlhbFNjYWxlIFJF QUQgaW5pdGlhbFNjYWxlIE5PVElGWSB2aWV3cG9ydENoYW5nZWQpCi0gICAgUV9QUk9QRVJUWShR VmFyaWFudCBpc1NjYWxhYmxlIFJFQUQgaXNTY2FsYWJsZSBOT1RJRlkgdmlld3BvcnRDaGFuZ2Vk KQotICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgbWF4aW11bVNjYWxlIFJFQUQgbWF4aW11bVNjYWxl IE5PVElGWSB2aWV3cG9ydENoYW5nZWQpCi0gICAgUV9QUk9QRVJUWShRVmFyaWFudCBtaW5pbXVt U2NhbGUgUkVBRCBtaW5pbXVtU2NhbGUgTk9USUZZIHZpZXdwb3J0Q2hhbmdlZCkKLSAgICBRX1BS T1BFUlRZKFFWYXJpYW50IGxheW91dFNpemUgUkVBRCBsYXlvdXRTaXplIE5PVElGWSB2aWV3cG9y dENoYW5nZWQpCisgICAgUV9QUk9QRVJUWShRVmFyaWFudCBkZXZpY2VQaXhlbFJhdGlvIFJFQUQg ZGV2aWNlUGl4ZWxSYXRpbyBOT1RJRlkgZGV2aWNlUGl4ZWxSYXRpb0NoYW5nZWQpCisgICAgUV9Q Uk9QRVJUWShRSnNvbk9iamVjdCB2aWV3cG9ydCBSRUFEIHZpZXdwb3J0IE5PVElGWSB2aWV3cG9y dENoYW5nZWQpCiAKIFFfU0lHTkFMUzoKICAgICB2b2lkIGNvbnRlbnRzU2l6ZUNoYW5nZWQoKTsK ICAgICB2b2lkIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKCk7CiAgICAgdm9pZCBjb250ZW50c1NjYWxl Q29tbWl0dGVkKCk7CisgICAgdm9pZCBkZXZpY2VQaXhlbFJhdGlvQ2hhbmdlZCgpOwogICAgIHZv aWQgdmlld3BvcnRDaGFuZ2VkKCk7CiAKIHB1YmxpYyBRX1NMT1RTOgpAQCAtNjgsMTEgKzY2LDcg QEAgcHVibGljOgogICAgIFFWYXJpYW50IGNvbnRlbnRzU2NhbGUoKSBjb25zdDsKIAogICAgIFFW YXJpYW50IGRldmljZVBpeGVsUmF0aW8oKSBjb25zdDsKLSAgICBRVmFyaWFudCBpbml0aWFsU2Nh bGUoKSBjb25zdDsKLSAgICBRVmFyaWFudCBpc1NjYWxhYmxlKCkgY29uc3Q7Ci0gICAgUVZhcmlh bnQgbGF5b3V0U2l6ZSgpIGNvbnN0OwotICAgIFFWYXJpYW50IG1heGltdW1TY2FsZSgpIGNvbnN0 OwotICAgIFFWYXJpYW50IG1pbmltdW1TY2FsZSgpIGNvbnN0OworICAgIFFKc29uT2JqZWN0IHZp ZXdwb3J0KCkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgUVF1aWNrV2ViVmlld1ByaXZhdGUqIG1f d2ViVmlld1ByaXZhdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRIYW5kbGVyLmNwcAppbmRleCBmYWZmMzMxYmU2YmUxMWI3MTIxYjJlYjM2NTdlY2YyZjg5 NzBkYjE3Li4yNzBhYWQ4MDVkZGU3YzBiYjIyZmYzOGM3MjQxZmU2MTBhZDBiOWRhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAKQEAg LTIzMyw3ICsyMzMsMTIgQEAgdm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6dmlld3BvcnRBdHRyaWJ1 dGVzQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnUKICAgICBtX3Jhd0F0dHJp YnV0ZXMgPSBuZXdBdHRyaWJ1dGVzOwogICAgIFdlYkNvcmU6OnJlc3RyaWN0U2NhbGVGYWN0b3JU b0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3QXR0cmlidXRlcyk7CiAKLSAgICBt X2RldmljZVBpeGVsUmF0aW8gPSBtX3Jhd0F0dHJpYnV0ZXMuZGV2aWNlUGl4ZWxSYXRpbzsgLy8g U2hvdWxkIHJldHVybiB2YWx1ZSBmcm9tIHRoZSB3ZWJQYWdlUHJveHkuCisgICAgZmxvYXQgZGV2 aWNlUGl4ZWxSYXRpbyA9IG1fZGV2aWNlUGl4ZWxSYXRpbzsKKyAgICBpZiAoIXFGdXp6eUNvbXBh cmUoZGV2aWNlUGl4ZWxSYXRpbywgbV9yYXdBdHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW8pKSB7 CisgICAgICAgIG1fZGV2aWNlUGl4ZWxSYXRpbyA9IG1fcmF3QXR0cmlidXRlcy5kZXZpY2VQaXhl bFJhdGlvOyAvLyBTaG91bGQgcmV0dXJuIHZhbHVlIGZyb20gdGhlIHdlYlBhZ2VQcm94eS4KKyAg ICAgICAgZW1pdCBtX3ZpZXdwb3J0SXRlbS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+ZGV2aWNl UGl4ZWxSYXRpb0NoYW5nZWQoKTsKKyAgICB9CisKICAgICBtX2FsbG93c1VzZXJTY2FsaW5nID0g ISFtX3Jhd0F0dHJpYnV0ZXMudXNlclNjYWxhYmxlOwogICAgIG1fbWluaW11bVNjYWxlID0gbV9y YXdBdHRyaWJ1dGVzLm1pbmltdW1TY2FsZTsKICAgICBtX21heGltdW1TY2FsZSA9IG1fcmF3QXR0 cmlidXRlcy5tYXhpbXVtU2NhbGU7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYTNjYjA1YmQ5MTI3MDdjNjdkZTk4ZmRhMjI5YTQwNTY1M2EwOTdh ZC4uZmJmN2M2ZWE3NTQ5Nzg4ZjYwNDczZjMwZDQ1ZjYwYjhiYzE1NGM4MiAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDEyLTA4LTIzICBNaWNoYWVsIEJyw7xuaW5nICA8bWljaGFlbGJydWVuaW5nQGdtYWlsLmNvbT4K KworICAgICAgICBbUXRdW1dLMl0gTWFrZSB2aWV3cG9ydCByZWxhdGVkIGV4cGVyaW1lbnRhbC50 ZXN0IHByb3BlcnRpZXMgZW5jYXBzdWxhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODgzMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDaGFuZ2VkIHRoZSBhY2Nlc3MgdG8gdGhlIHZpZXdwb3J0IGF0 dHJpYnV0ZXMgdG8gdXNlIHRoZSB2aWV3cG9ydCBvYmplY3QgdGhhdCBpcyBpbnRyb2R1Y2VkIGJ5 IHRoaXMgY2hhbmdlLgorCisgICAgICAgICogTWluaUJyb3dzZXIvcXQvcW1sL1ZpZXdwb3J0SW5m b0l0ZW0ucW1sOgorCiAyMDEyLTA4LTIxICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5u QG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgbmV3ZXIgUXQg NTogVGhlIG1lYW5pbmcgb2YgcHJpdmF0ZV9pbmNsdWRlcyBjaGFuZ2VkIHRvIGJlIGZ1bGx5CmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwg Yi9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKaW5kZXggMTVm ZDk3Zjc5NGIzNTY0NGM1OGI2NGJiYTQ4ZTgxYjVlZWJkOTFmOC4uYTkxMjFjMGM3YjM5OTc3YzIy Mzg4MTJjMzg0OTc5YWUwZmRiZGYzZCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQv cW1sL1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9W aWV3cG9ydEluZm9JdGVtLnFtbApAQCAtNzYsNyArNzYsNyBAQCBJdGVtIHsKICAgICAgICAgICAg ICAgICBzcGFjaW5nOiAyMAogICAgICAgICAgICAgICAgIENvbHVtbiB7CiAgICAgICAgICAgICAg ICAgICAgIFRleHQgewotICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIkN1cnJlbnQgc2Nh bGU6ICIgKyBmb3JtYXRTY2FsZSh0ZXN0LmNvbnRlbnRzU2NhbGUpCisgICAgICAgICAgICAgICAg ICAgICAgICB0ZXh0OiAiQ3VycmVudCBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3Qudmlld3Bv cnQuY29udGVudHNTY2FsZSkKICAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiB0 ZXh0Qm94LmZvbnRGYW1pbHkKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94 LmZvbnRDb2xvcgogICAgICAgICAgICAgICAgICAgICB9CkBAIC04NCwxNyArODQsMTcgQEAgSXRl bSB7CiAKICAgICAgICAgICAgICAgICBDb2x1bW4gewogICAgICAgICAgICAgICAgICAgICBUZXh0 IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJJbml0aWFsIHNjYWxlOiAiICsgZm9y bWF0U2NhbGUodGVzdC5pbml0aWFsU2NhbGUpCisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0 OiAiSW5pdGlhbCBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3Qudmlld3BvcnQuaW5pdGlhbFNj YWxlKQogICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZh bWlseQogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCiAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgVGV4dCB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICB0ZXh0OiAiTWluaW11bSBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRl c3QubWluaW11bVNjYWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIk1pbmltdW0g c2NhbGU6ICIgKyBmb3JtYXRTY2FsZSh0ZXN0LnZpZXdwb3J0Lm1pbmltdW1TY2FsZSkKICAgICAg ICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiB0ZXh0Qm94LmZvbnRGYW1pbHkKICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZvbnRDb2xvcgogICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIFRleHQgewotICAgICAgICAgICAgICAgICAg ICAgICAgdGV4dDogIk1heGltdW0gc2NhbGU6ICIgKyBmb3JtYXRTY2FsZSh0ZXN0Lm1heGltdW1T Y2FsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJNYXhpbXVtIHNjYWxlOiAiICsg Zm9ybWF0U2NhbGUodGVzdC52aWV3cG9ydC5tYXhpbXVtU2NhbGUpCiAgICAgICAgICAgICAgICAg ICAgICAgICBmb250LmZhbWlseTogdGV4dEJveC5mb250RmFtaWx5CiAgICAgICAgICAgICAgICAg ICAgICAgICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKICAgICAgICAgICAgICAgICAgICAgfQpA QCAtMTEyLDcgKzExMiw3IEBAIEl0ZW0gewogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6 IHRleHRCb3guZm9udENvbG9yCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICAgICAgVGV4dCB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgbGF5 b3V0IHNpemU6ICIgKyBmb3JtYXRTaXplKHRlc3QubGF5b3V0U2l6ZSkKKyAgICAgICAgICAgICAg ICAgICAgICAgIHRleHQ6ICJWaWV3cG9ydCBsYXlvdXQgc2l6ZTogIiArIGZvcm1hdFNpemUodGVz dC52aWV3cG9ydC5sYXlvdXRTaXplKQogICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1p bHk6IHRleHRCb3guZm9udEZhbWlseQogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRl eHRCb3guZm9udENvbG9yCiAgICAgICAgICAgICAgICAgICAgIH0KQEAgLTEyNSw3ICsxMjUsNyBA QCBJdGVtIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZvbnRDb2xv cgogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIFRleHQgewotICAg ICAgICAgICAgICAgICAgICAgICAgdGV4dDogIkFsbG93cyBzY2FsaW5nOiAiICsgZm9ybWF0Qm9v bCh0ZXN0LmlzU2NhbGFibGUpCisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiQWxsb3dz IHNjYWxpbmc6ICIgKyBmb3JtYXRCb29sKHRlc3Qudmlld3BvcnQuaXNTY2FsYWJsZSkKICAgICAg ICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiB0ZXh0Qm94LmZvbnRGYW1pbHkKICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZvbnRDb2xvcgogICAgICAgICAgICAg ICAgICAgICB9Cg== 160365 2012-08-24 02:23:17 -0700 2012-08-24 03:04:30 -0700 Patch bug-88320-20120824112317.patch text/plain 10509 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTc5ZDJkODg4MDYyZGY0 NWYxM2UxNDVhMDY1YzBiYjk1Njk4OWIyYS4uZjIzMjcwNGEwNDQ2NjIwZTcwYmE5MTQ0MTBlZWNj MGNmMjE5MzdhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTI0ICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbGJydWVuaW5nQGdtYWlsLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gTWFrZSB2aWV3cG9ydCByZWxhdGVkIGV4cGVyaW1lbnRhbC50ZXN0IHByb3BlcnRpZXMg ZW5jYXBzdWxhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODgzMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbnRyb2R1Y2luZyBhIG5ldyB2aWV3cG9ydCBhdHRyaWJ1dGUgdG8gUVdlYktpdFRlc3Qg dG8gZ3JvdXAgdGhlIHZpZXdwb3J0IHJlbGF0ZWQKKyAgICAgICAgYXR0cmlidXRlcyBpbnRvIG9u ZSBRSnNvbk9iamVjdC4gQWxzbyBhZGRpbmcgYSBzdGF0aWMgbWV0aG9kIHRvIGNvbnZlcnQgYSBR U2l6ZUYgdG8KKyAgICAgICAgYSBRSnNvbk9iamVjdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvcXdlYmtpdHRlc3QuY3BwOgorICAgICAgICAocVNpemVGVG9Kc29uT2JqZWN0KToKKyAg ICAgICAgKFFXZWJLaXRUZXN0Ojp2aWV3cG9ydCk6CisgICAgICAgIChRV2ViS2l0VGVzdDo6ZGV2 aWNlUGl4ZWxSYXRpbyk6CisgICAgICAgIChRV2ViS2l0VGVzdDo6Y29udGVudHNTY2FsZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmg6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3 cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQpOgorCiAyMDEyLTA4LTI0ICBN YXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgPGh0dHA6Ly93ZWJraXQub3Jn L2IvOTQ5MTA+IENvcHkgdGhlIGVudGlyZSB3ZWJraXQyIG1vZHVsZSBpbiB0byB0aGUgV2ViS2l0 MiBmcmFtZXdvcmsgd3JhcHBlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdlYmtpdHRlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2Via2l0dGVzdC5jcHAKaW5kZXggMWMzOWE1M2NkNTY4ZmYzNzhjYzc5Yzc5YWE2NGYxOTkx NzY5MzlhYS4uMjUwYTViMjEyZDExYjAyZWM0MTUzYTZkNmVjNGYyNDI3ZWEyZmI2ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAKQEAgLTEz Nyw1MSArMTM3LDQzIEBAIFFTaXplIFFXZWJLaXRUZXN0Ojpjb250ZW50c1NpemUoKSBjb25zdAog ICAgIHJldHVybiBRU2l6ZShtX3dlYlZpZXdQcml2YXRlLT5wYWdlVmlldy0+Y29udGVudHNTaXpl KCkudG9TaXplKCkpOwogfQogCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6Y29udGVudHNTY2FsZSgp IGNvbnN0CitzdGF0aWMgaW5saW5lIFFKc29uT2JqZWN0IHFTaXplRlRvSnNvbk9iamVjdChjb25z dCBRU2l6ZUYmIHNpemVGKQogewotICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmlld3BvcnQg PSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0dXJuIHZp ZXdwb3J0LT5jdXJyZW50Q1NTU2NhbGUoKTsKLSAgICByZXR1cm4gMS4wOworICAgIFFKc29uT2Jq ZWN0IHJlc3VsdDsKKyAgICByZXN1bHQuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoIndpZHRoIiksIHNp emVGLndpZHRoKCkpOworICAgIHJlc3VsdC5pbnNlcnQoUUxhdGluMVN0cmluZygiaGVpZ2h0Iiks IHNpemVGLmhlaWdodCgpKTsKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCi1RVmFyaWFudCBRV2Vi S2l0VGVzdDo6ZGV2aWNlUGl4ZWxSYXRpbygpIGNvbnN0CitRSnNvbk9iamVjdCBRV2ViS2l0VGVz dDo6dmlld3BvcnQoKSBjb25zdAogewotICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmlld3Bv cnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0dXJu IHZpZXdwb3J0LT5tX2RldmljZVBpeGVsUmF0aW87Ci0gICAgcmV0dXJuIDEuMDsKLX0KLQotUVZh cmlhbnQgUVdlYktpdFRlc3Q6OmluaXRpYWxTY2FsZSgpIGNvbnN0Ci17Ci0gICAgaWYgKFF0Vmll d3BvcnRIYW5kbGVyKiB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxl cigpKQotICAgICAgICByZXR1cm4gdmlld3BvcnQtPm1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2Nh bGU7Ci0gICAgcmV0dXJuIDEuMDsKKyAgICBRSnNvbk9iamVjdCB2aWV3cG9ydERhdGE7CisgICAg aWYgKFF0Vmlld3BvcnRIYW5kbGVyKiB2aWV3cG9ydEhhbmRsZXIgPSBtX3dlYlZpZXdQcml2YXRl LT52aWV3cG9ydEhhbmRsZXIoKSkgeworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRp bjFTdHJpbmcoImluaXRpYWxTY2FsZSIpLCB2aWV3cG9ydEhhbmRsZXItPm1fcmF3QXR0cmlidXRl cy5pbml0aWFsU2NhbGUpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJp bmcoImxheW91dFNpemUiKSwgcVNpemVGVG9Kc29uT2JqZWN0KFFTaXplRih2aWV3cG9ydEhhbmRs ZXItPm1fcmF3QXR0cmlidXRlcy5sYXlvdXRTaXplKSkpOworICAgICAgICB2aWV3cG9ydERhdGEu aW5zZXJ0KFFMYXRpbjFTdHJpbmcoImlzU2NhbGFibGUiKSwgISF2aWV3cG9ydEhhbmRsZXItPm1f cmF3QXR0cmlidXRlcy51c2VyU2NhbGFibGUpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0 KFFMYXRpbjFTdHJpbmcoIm1pbmltdW1TY2FsZSIpLCB2aWV3cG9ydEhhbmRsZXItPm1fbWluaW11 bVNjYWxlKTsKKyAgICAgICAgdmlld3BvcnREYXRhLmluc2VydChRTGF0aW4xU3RyaW5nKCJtYXhp bXVtU2NhbGUiKSwgdmlld3BvcnRIYW5kbGVyLT5tX21heGltdW1TY2FsZSk7CisgICAgfSBlbHNl IHsKKyAgICAgICAgdmlld3BvcnREYXRhLmluc2VydChRTGF0aW4xU3RyaW5nKCJpbml0aWFsU2Nh bGUiKSwgMS4wKTsKKyAgICAgICAgdmlld3BvcnREYXRhLmluc2VydChRTGF0aW4xU3RyaW5nKCJs YXlvdXRTaXplIiksIHFTaXplRlRvSnNvbk9iamVjdChRU2l6ZUYoKSkpOworICAgICAgICB2aWV3 cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoImlzU2NhbGFibGUiKSwgZmFsc2UpOworICAg ICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoIm1pbmltdW1TY2FsZSIpLCAx LjApOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoIm1heGltdW1T Y2FsZSIpLCAxLjApOworICAgIH0KKyAgICByZXR1cm4gdmlld3BvcnREYXRhOwogfQogCi1RVmFy aWFudCBRV2ViS2l0VGVzdDo6bWluaW11bVNjYWxlKCkgY29uc3QKK1FWYXJpYW50IFFXZWJLaXRU ZXN0OjpkZXZpY2VQaXhlbFJhdGlvKCkgY29uc3QKIHsKICAgICBpZiAoUXRWaWV3cG9ydEhhbmRs ZXIqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRIYW5kbGVyKCkpCi0gICAg ICAgIHJldHVybiB2aWV3cG9ydC0+bV9taW5pbXVtU2NhbGU7CisgICAgICAgIHJldHVybiB2aWV3 cG9ydC0+bV9kZXZpY2VQaXhlbFJhdGlvOwogICAgIHJldHVybiAxLjA7CiB9CiAKLVFWYXJpYW50 IFFXZWJLaXRUZXN0OjptYXhpbXVtU2NhbGUoKSBjb25zdAorUVZhcmlhbnQgUVdlYktpdFRlc3Q6 OmNvbnRlbnRzU2NhbGUoKSBjb25zdAogewogICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmll d3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0 dXJuIHZpZXdwb3J0LT5tX21heGltdW1TY2FsZTsKKyAgICAgICAgcmV0dXJuIHZpZXdwb3J0LT5j dXJyZW50Q1NTU2NhbGUoKTsKICAgICByZXR1cm4gMS4wOwogfQotCi1RVmFyaWFudCBRV2ViS2l0 VGVzdDo6aXNTY2FsYWJsZSgpIGNvbnN0Ci17Ci0gICAgaWYgKFF0Vmlld3BvcnRIYW5kbGVyKiB2 aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKQotICAgICAgICBy ZXR1cm4gISF2aWV3cG9ydC0+bV9yYXdBdHRyaWJ1dGVzLnVzZXJTY2FsYWJsZTsKLSAgICByZXR1 cm4gZmFsc2U7Ci19Ci0KLVFWYXJpYW50IFFXZWJLaXRUZXN0OjpsYXlvdXRTaXplKCkgY29uc3QK LXsKLSAgICBpZiAoUXRWaWV3cG9ydEhhbmRsZXIqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0 ZS0+dmlld3BvcnRIYW5kbGVyKCkpCi0gICAgICAgIHJldHVybiBRU2l6ZUYodmlld3BvcnQtPm1f cmF3QXR0cmlidXRlcy5sYXlvdXRTaXplKTsKLSAgICByZXR1cm4gUVNpemVGKCk7Ci19CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0X3AuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3RfcC5oCmluZGV4IDM3 NTRmMTY5YTdhZGQ2MTQ5Y2FkOTQ4ZDM4NDkyNGI4NzE3YTNiYjIuLmJmYWJiNjlmYjg3NzFlNGM1 NTMwNzhjYmM0ZGMxNzNiNDExMjZlY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3RfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdlYmtpdHRlc3RfcC5oCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5jbHVkZSAicXdl YmtpdGdsb2JhbC5oIgogI2luY2x1ZGUgInFxdWlja3dlYnZpZXdfcC5oIgogCisjaW5jbHVkZSA8 UXRDb3JlL1FKc29uT2JqZWN0PgogI2luY2x1ZGUgPFF0Q29yZS9RT2JqZWN0PgogI2luY2x1ZGUg PFF0Q29yZS9RUG9pbnRlcj4KICNpbmNsdWRlIDxRdENvcmUvUVNpemU+CkBAIC00MCwxNyArNDEs MTQgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYktpdFRlc3QgOiBwdWJsaWMgUU9iamVjdCB7 CiAKICAgICBRX1BST1BFUlRZKFFWYXJpYW50IGNvbnRlbnRzU2NhbGUgUkVBRCBjb250ZW50c1Nj YWxlIE5PVElGWSBjb250ZW50c1NjYWxlQ2hhbmdlZCkKIAotICAgIFFfUFJPUEVSVFkoUVZhcmlh bnQgZGV2aWNlUGl4ZWxSYXRpbyBSRUFEIGRldmljZVBpeGVsUmF0aW8gTk9USUZZIHZpZXdwb3J0 Q2hhbmdlZCkKLSAgICBRX1BST1BFUlRZKFFWYXJpYW50IGluaXRpYWxTY2FsZSBSRUFEIGluaXRp YWxTY2FsZSBOT1RJRlkgdmlld3BvcnRDaGFuZ2VkKQotICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQg aXNTY2FsYWJsZSBSRUFEIGlzU2NhbGFibGUgTk9USUZZIHZpZXdwb3J0Q2hhbmdlZCkKLSAgICBR X1BST1BFUlRZKFFWYXJpYW50IG1heGltdW1TY2FsZSBSRUFEIG1heGltdW1TY2FsZSBOT1RJRlkg dmlld3BvcnRDaGFuZ2VkKQotICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgbWluaW11bVNjYWxlIFJF QUQgbWluaW11bVNjYWxlIE5PVElGWSB2aWV3cG9ydENoYW5nZWQpCi0gICAgUV9QUk9QRVJUWShR VmFyaWFudCBsYXlvdXRTaXplIFJFQUQgbGF5b3V0U2l6ZSBOT1RJRlkgdmlld3BvcnRDaGFuZ2Vk KQorICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgZGV2aWNlUGl4ZWxSYXRpbyBSRUFEIGRldmljZVBp eGVsUmF0aW8gTk9USUZZIGRldmljZVBpeGVsUmF0aW9DaGFuZ2VkKQorICAgIFFfUFJPUEVSVFko UUpzb25PYmplY3Qgdmlld3BvcnQgUkVBRCB2aWV3cG9ydCBOT1RJRlkgdmlld3BvcnRDaGFuZ2Vk KQogCiBRX1NJR05BTFM6CiAgICAgdm9pZCBjb250ZW50c1NpemVDaGFuZ2VkKCk7CiAgICAgdm9p ZCBjb250ZW50c1NjYWxlQ2hhbmdlZCgpOwogICAgIHZvaWQgY29udGVudHNTY2FsZUNvbW1pdHRl ZCgpOworICAgIHZvaWQgZGV2aWNlUGl4ZWxSYXRpb0NoYW5nZWQoKTsKICAgICB2b2lkIHZpZXdw b3J0Q2hhbmdlZCgpOwogCiBwdWJsaWMgUV9TTE9UUzoKQEAgLTY4LDExICs2Niw3IEBAIHB1Ymxp YzoKICAgICBRVmFyaWFudCBjb250ZW50c1NjYWxlKCkgY29uc3Q7CiAKICAgICBRVmFyaWFudCBk ZXZpY2VQaXhlbFJhdGlvKCkgY29uc3Q7Ci0gICAgUVZhcmlhbnQgaW5pdGlhbFNjYWxlKCkgY29u c3Q7Ci0gICAgUVZhcmlhbnQgaXNTY2FsYWJsZSgpIGNvbnN0OwotICAgIFFWYXJpYW50IGxheW91 dFNpemUoKSBjb25zdDsKLSAgICBRVmFyaWFudCBtYXhpbXVtU2NhbGUoKSBjb25zdDsKLSAgICBR VmFyaWFudCBtaW5pbXVtU2NhbGUoKSBjb25zdDsKKyAgICBRSnNvbk9iamVjdCB2aWV3cG9ydCgp IGNvbnN0OwogCiBwcml2YXRlOgogICAgIFFRdWlja1dlYlZpZXdQcml2YXRlKiBtX3dlYlZpZXdQ cml2YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFu ZGxlci5jcHAKaW5kZXggZmFmZjMzMWJlNmJlMTFiNzEyMWIyZWIzNjU3ZWNmMmY4OTcwZGIxNy4u NWMzYmZhZjhhNjFjZDdlZWViMDJkNTU3NDk1YTc3NDRlMDJjMzU2MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCkBAIC0yMzMsNyAr MjMzLDExIEBAIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRlc0NoYW5n ZWQoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBdHRyaWJ1CiAgICAgbV9yYXdBdHRyaWJ1dGVzID0g bmV3QXR0cmlidXRlczsKICAgICBXZWJDb3JlOjpyZXN0cmljdFNjYWxlRmFjdG9yVG9Jbml0aWFs U2NhbGVJZk5vdFVzZXJTY2FsYWJsZShtX3Jhd0F0dHJpYnV0ZXMpOwogCi0gICAgbV9kZXZpY2VQ aXhlbFJhdGlvID0gbV9yYXdBdHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW87IC8vIFNob3VsZCBy ZXR1cm4gdmFsdWUgZnJvbSB0aGUgd2ViUGFnZVByb3h5LgorICAgIGlmICghcUZ1enp5Q29tcGFy ZShtX2RldmljZVBpeGVsUmF0aW8sIHN0YXRpY19jYXN0PHFyZWFsPihtX3Jhd0F0dHJpYnV0ZXMu ZGV2aWNlUGl4ZWxSYXRpbykpKSB7CisgICAgICAgIG1fZGV2aWNlUGl4ZWxSYXRpbyA9IG1fcmF3 QXR0cmlidXRlcy5kZXZpY2VQaXhlbFJhdGlvOyAvLyBTaG91bGQgcmV0dXJuIHZhbHVlIGZyb20g dGhlIHdlYlBhZ2VQcm94eS4KKyAgICAgICAgZW1pdCBtX3ZpZXdwb3J0SXRlbS0+ZXhwZXJpbWVu dGFsKCktPnRlc3QoKS0+ZGV2aWNlUGl4ZWxSYXRpb0NoYW5nZWQoKTsKKyAgICB9CisKICAgICBt X2FsbG93c1VzZXJTY2FsaW5nID0gISFtX3Jhd0F0dHJpYnV0ZXMudXNlclNjYWxhYmxlOwogICAg IG1fbWluaW11bVNjYWxlID0gbV9yYXdBdHRyaWJ1dGVzLm1pbmltdW1TY2FsZTsKICAgICBtX21h eGltdW1TY2FsZSA9IG1fcmF3QXR0cmlidXRlcy5tYXhpbXVtU2NhbGU7CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDJkZWI1ZDY4ZWFmNGZlYTEy NDE2OTYwNjM3YmFjYmIzZjFhOGFhOS4uODljZDA2ZmMyOTg4YmYyZjk5Yzg0MWQ5NjBhMmU3YzI4 MjliYjdmZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA4LTI0ICBNaWNoYWVsIEJyw7xuaW5nICA8bWljaGFl bGJydWVuaW5nQGdtYWlsLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gTWFrZSB2aWV3cG9ydCBy ZWxhdGVkIGV4cGVyaW1lbnRhbC50ZXN0IHByb3BlcnRpZXMgZW5jYXBzdWxhdGVkLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODgzMjAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2VkIHRoZSBhY2Nl c3MgdG8gdGhlIHZpZXdwb3J0IGF0dHJpYnV0ZXMgdG8gdXNlIHRoZSB2aWV3cG9ydCBvYmplY3Qg dGhhdCBpcyBpbnRyb2R1Y2VkIGJ5IHRoaXMgY2hhbmdlLgorCisgICAgICAgICogTWluaUJyb3dz ZXIvcXQvcW1sL1ZpZXdwb3J0SW5mb0l0ZW0ucW1sOgorCiAyMDEyLTA4LTIzICBEaXJrIFByYW5r ZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIGxlYWsgZGV0ZWN0aW9uIGJyb2tl biBhZnRlciByMTI2MjQ3IG9uIG1hYwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQv cW1sL1ZpZXdwb3J0SW5mb0l0ZW0ucW1sIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL1ZpZXdw b3J0SW5mb0l0ZW0ucW1sCmluZGV4IDE1ZmQ5N2Y3OTRiMzU2NDRjNThiNjRiYmE0OGU4MWI1ZWVi ZDkxZjguLjkyYTJhMDQxYWViMjBiNmQ0NzYwY2I0OTQ4MjUxMTJjOGEyN2FmOGYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9WaWV3cG9ydEluZm9JdGVtLnFtbAorKysgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKQEAgLTg0LDE3ICs4 NCwxNyBAQCBJdGVtIHsKIAogICAgICAgICAgICAgICAgIENvbHVtbiB7CiAgICAgICAgICAgICAg ICAgICAgIFRleHQgewotICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIkluaXRpYWwgc2Nh bGU6ICIgKyBmb3JtYXRTY2FsZSh0ZXN0LmluaXRpYWxTY2FsZSkKKyAgICAgICAgICAgICAgICAg ICAgICAgIHRleHQ6ICJJbml0aWFsIHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC52aWV3cG9y dC5pbml0aWFsU2NhbGUpCiAgICAgICAgICAgICAgICAgICAgICAgICBmb250LmZhbWlseTogdGV4 dEJveC5mb250RmFtaWx5CiAgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogdGV4dEJveC5m b250Q29sb3IKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBUZXh0 IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJNaW5pbXVtIHNjYWxlOiAiICsgZm9y bWF0U2NhbGUodGVzdC5taW5pbXVtU2NhbGUpCisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0 OiAiTWluaW11bSBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3Qudmlld3BvcnQubWluaW11bVNj YWxlKQogICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZh bWlseQogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCiAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgVGV4dCB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICB0ZXh0OiAiTWF4aW11bSBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRl c3QubWF4aW11bVNjYWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIk1heGltdW0g c2NhbGU6ICIgKyBmb3JtYXRTY2FsZSh0ZXN0LnZpZXdwb3J0Lm1heGltdW1TY2FsZSkKICAgICAg ICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiB0ZXh0Qm94LmZvbnRGYW1pbHkKICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZvbnRDb2xvcgogICAgICAgICAgICAg ICAgICAgICB9CkBAIC0xMTIsNyArMTEyLDcgQEAgSXRlbSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKICAgICAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJW aWV3cG9ydCBsYXlvdXQgc2l6ZTogIiArIGZvcm1hdFNpemUodGVzdC5sYXlvdXRTaXplKQorICAg ICAgICAgICAgICAgICAgICAgICAgdGV4dDogIlZpZXdwb3J0IGxheW91dCBzaXplOiAiICsgZm9y bWF0U2l6ZSh0ZXN0LnZpZXdwb3J0LmxheW91dFNpemUpCiAgICAgICAgICAgICAgICAgICAgICAg ICBmb250LmZhbWlseTogdGV4dEJveC5mb250RmFtaWx5CiAgICAgICAgICAgICAgICAgICAgICAg ICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKICAgICAgICAgICAgICAgICAgICAgfQpAQCAtMTI1 LDcgKzEyNSw3IEBAIEl0ZW0gewogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRleHRC b3guZm9udENvbG9yCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAg VGV4dCB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiQWxsb3dzIHNjYWxpbmc6ICIg KyBmb3JtYXRCb29sKHRlc3QuaXNTY2FsYWJsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRl eHQ6ICJBbGxvd3Mgc2NhbGluZzogIiArIGZvcm1hdEJvb2wodGVzdC52aWV3cG9ydC5pc1NjYWxh YmxlKQogICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZh bWlseQogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCiAg ICAgICAgICAgICAgICAgICAgIH0K 160372 2012-08-24 03:04:35 -0700 2012-08-24 04:27:28 -0700 Patch bug-88320-20120824120434.patch text/plain 10491 michael.bruning U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTc5ZDJkODg4MDYyZGY0 NWYxM2UxNDVhMDY1YzBiYjk1Njk4OWIyYS4uZjIzMjcwNGEwNDQ2NjIwZTcwYmE5MTQ0MTBlZWNj MGNmMjE5MzdhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTI0ICBNaWNo YWVsIEJyw7xuaW5nICA8bWljaGFlbGJydWVuaW5nQGdtYWlsLmNvbT4KKworICAgICAgICBbUXRd W1dLMl0gTWFrZSB2aWV3cG9ydCByZWxhdGVkIGV4cGVyaW1lbnRhbC50ZXN0IHByb3BlcnRpZXMg ZW5jYXBzdWxhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODgzMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbnRyb2R1Y2luZyBhIG5ldyB2aWV3cG9ydCBhdHRyaWJ1dGUgdG8gUVdlYktpdFRlc3Qg dG8gZ3JvdXAgdGhlIHZpZXdwb3J0IHJlbGF0ZWQKKyAgICAgICAgYXR0cmlidXRlcyBpbnRvIG9u ZSBRSnNvbk9iamVjdC4gQWxzbyBhZGRpbmcgYSBzdGF0aWMgbWV0aG9kIHRvIGNvbnZlcnQgYSBR U2l6ZUYgdG8KKyAgICAgICAgYSBRSnNvbk9iamVjdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvcXdlYmtpdHRlc3QuY3BwOgorICAgICAgICAocVNpemVGVG9Kc29uT2JqZWN0KToKKyAg ICAgICAgKFFXZWJLaXRUZXN0Ojp2aWV3cG9ydCk6CisgICAgICAgIChRV2ViS2l0VGVzdDo6ZGV2 aWNlUGl4ZWxSYXRpbyk6CisgICAgICAgIChRV2ViS2l0VGVzdDo6Y29udGVudHNTY2FsZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdF9wLmg6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3 cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQpOgorCiAyMDEyLTA4LTI0ICBN YXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgPGh0dHA6Ly93ZWJraXQub3Jn L2IvOTQ5MTA+IENvcHkgdGhlIGVudGlyZSB3ZWJraXQyIG1vZHVsZSBpbiB0byB0aGUgV2ViS2l0 MiBmcmFtZXdvcmsgd3JhcHBlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdlYmtpdHRlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2Via2l0dGVzdC5jcHAKaW5kZXggMWMzOWE1M2NkNTY4ZmYzNzhjYzc5Yzc5YWE2NGYxOTkx NzY5MzlhYS4uZjkyYzlmZmNjODg5ZTkwY2JhNTdlMDkzNGFlMmU3NmNlYjQ0NmZiMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAKQEAgLTEz Nyw1MSArMTM3LDQzIEBAIFFTaXplIFFXZWJLaXRUZXN0Ojpjb250ZW50c1NpemUoKSBjb25zdAog ICAgIHJldHVybiBRU2l6ZShtX3dlYlZpZXdQcml2YXRlLT5wYWdlVmlldy0+Y29udGVudHNTaXpl KCkudG9TaXplKCkpOwogfQogCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6Y29udGVudHNTY2FsZSgp IGNvbnN0CitzdGF0aWMgaW5saW5lIFFKc29uT2JqZWN0IHRvSnNvbk9iamVjdChjb25zdCBRU2l6 ZUYmIHNpemVGKQogewotICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmlld3BvcnQgPSBtX3dl YlZpZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0dXJuIHZpZXdwb3J0 LT5jdXJyZW50Q1NTU2NhbGUoKTsKLSAgICByZXR1cm4gMS4wOworICAgIFFKc29uT2JqZWN0IHJl c3VsdDsKKyAgICByZXN1bHQuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoIndpZHRoIiksIHNpemVGLndp ZHRoKCkpOworICAgIHJlc3VsdC5pbnNlcnQoUUxhdGluMVN0cmluZygiaGVpZ2h0IiksIHNpemVG LmhlaWdodCgpKTsKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCi1RVmFyaWFudCBRV2ViS2l0VGVz dDo6ZGV2aWNlUGl4ZWxSYXRpbygpIGNvbnN0CitRSnNvbk9iamVjdCBRV2ViS2l0VGVzdDo6dmll d3BvcnQoKSBjb25zdAogewotICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmlld3BvcnQgPSBt X3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0dXJuIHZpZXdw b3J0LT5tX2RldmljZVBpeGVsUmF0aW87Ci0gICAgcmV0dXJuIDEuMDsKLX0KLQotUVZhcmlhbnQg UVdlYktpdFRlc3Q6OmluaXRpYWxTY2FsZSgpIGNvbnN0Ci17Ci0gICAgaWYgKFF0Vmlld3BvcnRI YW5kbGVyKiB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKQot ICAgICAgICByZXR1cm4gdmlld3BvcnQtPm1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGU7Ci0g ICAgcmV0dXJuIDEuMDsKKyAgICBRSnNvbk9iamVjdCB2aWV3cG9ydERhdGE7CisgICAgaWYgKFF0 Vmlld3BvcnRIYW5kbGVyKiB2aWV3cG9ydEhhbmRsZXIgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3 cG9ydEhhbmRsZXIoKSkgeworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJp bmcoImluaXRpYWxTY2FsZSIpLCB2aWV3cG9ydEhhbmRsZXItPm1fcmF3QXR0cmlidXRlcy5pbml0 aWFsU2NhbGUpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoImxh eW91dFNpemUiKSwgdG9Kc29uT2JqZWN0KFFTaXplRih2aWV3cG9ydEhhbmRsZXItPm1fcmF3QXR0 cmlidXRlcy5sYXlvdXRTaXplKSkpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRp bjFTdHJpbmcoImlzU2NhbGFibGUiKSwgISF2aWV3cG9ydEhhbmRsZXItPm1fcmF3QXR0cmlidXRl cy51c2VyU2NhbGFibGUpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJp bmcoIm1pbmltdW1TY2FsZSIpLCB2aWV3cG9ydEhhbmRsZXItPm1fbWluaW11bVNjYWxlKTsKKyAg ICAgICAgdmlld3BvcnREYXRhLmluc2VydChRTGF0aW4xU3RyaW5nKCJtYXhpbXVtU2NhbGUiKSwg dmlld3BvcnRIYW5kbGVyLT5tX21heGltdW1TY2FsZSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg dmlld3BvcnREYXRhLmluc2VydChRTGF0aW4xU3RyaW5nKCJpbml0aWFsU2NhbGUiKSwgMS4wKTsK KyAgICAgICAgdmlld3BvcnREYXRhLmluc2VydChRTGF0aW4xU3RyaW5nKCJsYXlvdXRTaXplIiks IHRvSnNvbk9iamVjdChRU2l6ZUYoKSkpOworICAgICAgICB2aWV3cG9ydERhdGEuaW5zZXJ0KFFM YXRpbjFTdHJpbmcoImlzU2NhbGFibGUiKSwgZmFsc2UpOworICAgICAgICB2aWV3cG9ydERhdGEu aW5zZXJ0KFFMYXRpbjFTdHJpbmcoIm1pbmltdW1TY2FsZSIpLCAxLjApOworICAgICAgICB2aWV3 cG9ydERhdGEuaW5zZXJ0KFFMYXRpbjFTdHJpbmcoIm1heGltdW1TY2FsZSIpLCAxLjApOworICAg IH0KKyAgICByZXR1cm4gdmlld3BvcnREYXRhOwogfQogCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6 bWluaW11bVNjYWxlKCkgY29uc3QKK1FWYXJpYW50IFFXZWJLaXRUZXN0OjpkZXZpY2VQaXhlbFJh dGlvKCkgY29uc3QKIHsKICAgICBpZiAoUXRWaWV3cG9ydEhhbmRsZXIqIHZpZXdwb3J0ID0gbV93 ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRIYW5kbGVyKCkpCi0gICAgICAgIHJldHVybiB2aWV3cG9y dC0+bV9taW5pbXVtU2NhbGU7CisgICAgICAgIHJldHVybiB2aWV3cG9ydC0+bV9kZXZpY2VQaXhl bFJhdGlvOwogICAgIHJldHVybiAxLjA7CiB9CiAKLVFWYXJpYW50IFFXZWJLaXRUZXN0OjptYXhp bXVtU2NhbGUoKSBjb25zdAorUVZhcmlhbnQgUVdlYktpdFRlc3Q6OmNvbnRlbnRzU2NhbGUoKSBj b25zdAogewogICAgIGlmIChRdFZpZXdwb3J0SGFuZGxlciogdmlld3BvcnQgPSBtX3dlYlZpZXdQ cml2YXRlLT52aWV3cG9ydEhhbmRsZXIoKSkKLSAgICAgICAgcmV0dXJuIHZpZXdwb3J0LT5tX21h eGltdW1TY2FsZTsKKyAgICAgICAgcmV0dXJuIHZpZXdwb3J0LT5jdXJyZW50Q1NTU2NhbGUoKTsK ICAgICByZXR1cm4gMS4wOwogfQotCi1RVmFyaWFudCBRV2ViS2l0VGVzdDo6aXNTY2FsYWJsZSgp IGNvbnN0Ci17Ci0gICAgaWYgKFF0Vmlld3BvcnRIYW5kbGVyKiB2aWV3cG9ydCA9IG1fd2ViVmll d1ByaXZhdGUtPnZpZXdwb3J0SGFuZGxlcigpKQotICAgICAgICByZXR1cm4gISF2aWV3cG9ydC0+ bV9yYXdBdHRyaWJ1dGVzLnVzZXJTY2FsYWJsZTsKLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KLVFW YXJpYW50IFFXZWJLaXRUZXN0OjpsYXlvdXRTaXplKCkgY29uc3QKLXsKLSAgICBpZiAoUXRWaWV3 cG9ydEhhbmRsZXIqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRIYW5kbGVy KCkpCi0gICAgICAgIHJldHVybiBRU2l6ZUYodmlld3BvcnQtPm1fcmF3QXR0cmlidXRlcy5sYXlv dXRTaXplKTsKLSAgICByZXR1cm4gUVNpemVGKCk7Ci19CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0X3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRlc3RfcC5oCmluZGV4IDM3NTRmMTY5YTdhZGQ2MTQ5Y2Fk OTQ4ZDM4NDkyNGI4NzE3YTNiYjIuLmJmYWJiNjlmYjg3NzFlNGM1NTMwNzhjYmM0ZGMxNzNiNDEx MjZlY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtp dHRlc3RfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmtpdHRl c3RfcC5oCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5jbHVkZSAicXdlYmtpdGdsb2JhbC5oIgogI2lu Y2x1ZGUgInFxdWlja3dlYnZpZXdfcC5oIgogCisjaW5jbHVkZSA8UXRDb3JlL1FKc29uT2JqZWN0 PgogI2luY2x1ZGUgPFF0Q29yZS9RT2JqZWN0PgogI2luY2x1ZGUgPFF0Q29yZS9RUG9pbnRlcj4K ICNpbmNsdWRlIDxRdENvcmUvUVNpemU+CkBAIC00MCwxNyArNDEsMTQgQEAgY2xhc3MgUVdFQktJ VF9FWFBPUlQgUVdlYktpdFRlc3QgOiBwdWJsaWMgUU9iamVjdCB7CiAKICAgICBRX1BST1BFUlRZ KFFWYXJpYW50IGNvbnRlbnRzU2NhbGUgUkVBRCBjb250ZW50c1NjYWxlIE5PVElGWSBjb250ZW50 c1NjYWxlQ2hhbmdlZCkKIAotICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgZGV2aWNlUGl4ZWxSYXRp byBSRUFEIGRldmljZVBpeGVsUmF0aW8gTk9USUZZIHZpZXdwb3J0Q2hhbmdlZCkKLSAgICBRX1BS T1BFUlRZKFFWYXJpYW50IGluaXRpYWxTY2FsZSBSRUFEIGluaXRpYWxTY2FsZSBOT1RJRlkgdmll d3BvcnRDaGFuZ2VkKQotICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgaXNTY2FsYWJsZSBSRUFEIGlz U2NhbGFibGUgTk9USUZZIHZpZXdwb3J0Q2hhbmdlZCkKLSAgICBRX1BST1BFUlRZKFFWYXJpYW50 IG1heGltdW1TY2FsZSBSRUFEIG1heGltdW1TY2FsZSBOT1RJRlkgdmlld3BvcnRDaGFuZ2VkKQot ICAgIFFfUFJPUEVSVFkoUVZhcmlhbnQgbWluaW11bVNjYWxlIFJFQUQgbWluaW11bVNjYWxlIE5P VElGWSB2aWV3cG9ydENoYW5nZWQpCi0gICAgUV9QUk9QRVJUWShRVmFyaWFudCBsYXlvdXRTaXpl IFJFQUQgbGF5b3V0U2l6ZSBOT1RJRlkgdmlld3BvcnRDaGFuZ2VkKQorICAgIFFfUFJPUEVSVFko UVZhcmlhbnQgZGV2aWNlUGl4ZWxSYXRpbyBSRUFEIGRldmljZVBpeGVsUmF0aW8gTk9USUZZIGRl dmljZVBpeGVsUmF0aW9DaGFuZ2VkKQorICAgIFFfUFJPUEVSVFkoUUpzb25PYmplY3Qgdmlld3Bv cnQgUkVBRCB2aWV3cG9ydCBOT1RJRlkgdmlld3BvcnRDaGFuZ2VkKQogCiBRX1NJR05BTFM6CiAg ICAgdm9pZCBjb250ZW50c1NpemVDaGFuZ2VkKCk7CiAgICAgdm9pZCBjb250ZW50c1NjYWxlQ2hh bmdlZCgpOwogICAgIHZvaWQgY29udGVudHNTY2FsZUNvbW1pdHRlZCgpOworICAgIHZvaWQgZGV2 aWNlUGl4ZWxSYXRpb0NoYW5nZWQoKTsKICAgICB2b2lkIHZpZXdwb3J0Q2hhbmdlZCgpOwogCiBw dWJsaWMgUV9TTE9UUzoKQEAgLTY4LDExICs2Niw3IEBAIHB1YmxpYzoKICAgICBRVmFyaWFudCBj b250ZW50c1NjYWxlKCkgY29uc3Q7CiAKICAgICBRVmFyaWFudCBkZXZpY2VQaXhlbFJhdGlvKCkg Y29uc3Q7Ci0gICAgUVZhcmlhbnQgaW5pdGlhbFNjYWxlKCkgY29uc3Q7Ci0gICAgUVZhcmlhbnQg aXNTY2FsYWJsZSgpIGNvbnN0OwotICAgIFFWYXJpYW50IGxheW91dFNpemUoKSBjb25zdDsKLSAg ICBRVmFyaWFudCBtYXhpbXVtU2NhbGUoKSBjb25zdDsKLSAgICBRVmFyaWFudCBtaW5pbXVtU2Nh bGUoKSBjb25zdDsKKyAgICBRSnNvbk9iamVjdCB2aWV3cG9ydCgpIGNvbnN0OwogCiBwcml2YXRl OgogICAgIFFRdWlja1dlYlZpZXdQcml2YXRlKiBtX3dlYlZpZXdQcml2YXRlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAKaW5kZXggZmFm ZjMzMWJlNmJlMTFiNzEyMWIyZWIzNjU3ZWNmMmY4OTcwZGIxNy4uNWMzYmZhZjhhNjFjZDdlZWVi MDJkNTU3NDk1YTc3NDRlMDJjMzU2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCkBAIC0yMzMsNyArMjMzLDExIEBAIHZvaWQgUXRW aWV3cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQoY29uc3QgV2ViQ29yZTo6 Vmlld3BvcnRBdHRyaWJ1CiAgICAgbV9yYXdBdHRyaWJ1dGVzID0gbmV3QXR0cmlidXRlczsKICAg ICBXZWJDb3JlOjpyZXN0cmljdFNjYWxlRmFjdG9yVG9Jbml0aWFsU2NhbGVJZk5vdFVzZXJTY2Fs YWJsZShtX3Jhd0F0dHJpYnV0ZXMpOwogCi0gICAgbV9kZXZpY2VQaXhlbFJhdGlvID0gbV9yYXdB dHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW87IC8vIFNob3VsZCByZXR1cm4gdmFsdWUgZnJvbSB0 aGUgd2ViUGFnZVByb3h5LgorICAgIGlmICghcUZ1enp5Q29tcGFyZShtX2RldmljZVBpeGVsUmF0 aW8sIHN0YXRpY19jYXN0PHFyZWFsPihtX3Jhd0F0dHJpYnV0ZXMuZGV2aWNlUGl4ZWxSYXRpbykp KSB7CisgICAgICAgIG1fZGV2aWNlUGl4ZWxSYXRpbyA9IG1fcmF3QXR0cmlidXRlcy5kZXZpY2VQ aXhlbFJhdGlvOyAvLyBTaG91bGQgcmV0dXJuIHZhbHVlIGZyb20gdGhlIHdlYlBhZ2VQcm94eS4K KyAgICAgICAgZW1pdCBtX3ZpZXdwb3J0SXRlbS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+ZGV2 aWNlUGl4ZWxSYXRpb0NoYW5nZWQoKTsKKyAgICB9CisKICAgICBtX2FsbG93c1VzZXJTY2FsaW5n ID0gISFtX3Jhd0F0dHJpYnV0ZXMudXNlclNjYWxhYmxlOwogICAgIG1fbWluaW11bVNjYWxlID0g bV9yYXdBdHRyaWJ1dGVzLm1pbmltdW1TY2FsZTsKICAgICBtX21heGltdW1TY2FsZSA9IG1fcmF3 QXR0cmlidXRlcy5tYXhpbXVtU2NhbGU7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggMDJkZWI1ZDY4ZWFmNGZlYTEyNDE2OTYwNjM3YmFjYmIzZjFh OGFhOS4uODljZDA2ZmMyOTg4YmYyZjk5Yzg0MWQ5NjBhMmU3YzI4MjliYjdmZCAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDEyLTA4LTI0ICBNaWNoYWVsIEJyw7xuaW5nICA8bWljaGFlbGJydWVuaW5nQGdtYWlsLmNv bT4KKworICAgICAgICBbUXRdW1dLMl0gTWFrZSB2aWV3cG9ydCByZWxhdGVkIGV4cGVyaW1lbnRh bC50ZXN0IHByb3BlcnRpZXMgZW5jYXBzdWxhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODgzMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2VkIHRoZSBhY2Nlc3MgdG8gdGhlIHZpZXdwb3J0 IGF0dHJpYnV0ZXMgdG8gdXNlIHRoZSB2aWV3cG9ydCBvYmplY3QgdGhhdCBpcyBpbnRyb2R1Y2Vk IGJ5IHRoaXMgY2hhbmdlLgorCisgICAgICAgICogTWluaUJyb3dzZXIvcXQvcW1sL1ZpZXdwb3J0 SW5mb0l0ZW0ucW1sOgorCiAyMDEyLTA4LTIzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIGxlYWsgZGV0ZWN0aW9uIGJyb2tlbiBhZnRlciByMTI2MjQ3IG9u IG1hYwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL1ZpZXdwb3J0SW5mb0l0 ZW0ucW1sIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCmlu ZGV4IDE1ZmQ5N2Y3OTRiMzU2NDRjNThiNjRiYmE0OGU4MWI1ZWViZDkxZjguLjkyYTJhMDQxYWVi MjBiNmQ0NzYwY2I0OTQ4MjUxMTJjOGEyN2FmOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3F0L3FtbC9WaWV3cG9ydEluZm9JdGVtLnFtbAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9x dC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKQEAgLTg0LDE3ICs4NCwxNyBAQCBJdGVtIHsKIAog ICAgICAgICAgICAgICAgIENvbHVtbiB7CiAgICAgICAgICAgICAgICAgICAgIFRleHQgewotICAg ICAgICAgICAgICAgICAgICAgICAgdGV4dDogIkluaXRpYWwgc2NhbGU6ICIgKyBmb3JtYXRTY2Fs ZSh0ZXN0LmluaXRpYWxTY2FsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJJbml0 aWFsIHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC52aWV3cG9ydC5pbml0aWFsU2NhbGUpCiAg ICAgICAgICAgICAgICAgICAgICAgICBmb250LmZhbWlseTogdGV4dEJveC5mb250RmFtaWx5CiAg ICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKICAgICAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgICAg ICAgICAgICAgIHRleHQ6ICJNaW5pbXVtIHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC5taW5p bXVtU2NhbGUpCisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiTWluaW11bSBzY2FsZTog IiArIGZvcm1hdFNjYWxlKHRlc3Qudmlld3BvcnQubWluaW11bVNjYWxlKQogICAgICAgICAgICAg ICAgICAgICAgICAgZm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZhbWlseQogICAgICAgICAgICAg ICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCiAgICAgICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB0 ZXh0OiAiTWF4aW11bSBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3QubWF4aW11bVNjYWxlKQor ICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIk1heGltdW0gc2NhbGU6ICIgKyBmb3JtYXRT Y2FsZSh0ZXN0LnZpZXdwb3J0Lm1heGltdW1TY2FsZSkKICAgICAgICAgICAgICAgICAgICAgICAg IGZvbnQuZmFtaWx5OiB0ZXh0Qm94LmZvbnRGYW1pbHkKICAgICAgICAgICAgICAgICAgICAgICAg IGNvbG9yOiB0ZXh0Qm94LmZvbnRDb2xvcgogICAgICAgICAgICAgICAgICAgICB9CkBAIC0xMTIs NyArMTEyLDcgQEAgSXRlbSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogdGV4dEJv eC5mb250Q29sb3IKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBU ZXh0IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJWaWV3cG9ydCBsYXlvdXQgc2l6 ZTogIiArIGZvcm1hdFNpemUodGVzdC5sYXlvdXRTaXplKQorICAgICAgICAgICAgICAgICAgICAg ICAgdGV4dDogIlZpZXdwb3J0IGxheW91dCBzaXplOiAiICsgZm9ybWF0U2l6ZSh0ZXN0LnZpZXdw b3J0LmxheW91dFNpemUpCiAgICAgICAgICAgICAgICAgICAgICAgICBmb250LmZhbWlseTogdGV4 dEJveC5mb250RmFtaWx5CiAgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogdGV4dEJveC5m b250Q29sb3IKICAgICAgICAgICAgICAgICAgICAgfQpAQCAtMTI1LDcgKzEyNSw3IEBAIEl0ZW0g ewogICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCiAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgVGV4dCB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICB0ZXh0OiAiQWxsb3dzIHNjYWxpbmc6ICIgKyBmb3JtYXRCb29sKHRlc3Qu aXNTY2FsYWJsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJBbGxvd3Mgc2NhbGlu ZzogIiArIGZvcm1hdEJvb2wodGVzdC52aWV3cG9ydC5pc1NjYWxhYmxlKQogICAgICAgICAgICAg ICAgICAgICAgICAgZm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZhbWlseQogICAgICAgICAgICAg ICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCiAgICAgICAgICAgICAgICAgICAg IH0K