88410 2012-06-06 06:10:44 -0700 [Qt] Improve the visual of the viewport info box 2012-06-07 05:12:04 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann michael.bruning oldest_to_newest 642406 0 kenneth 2012-06-06 06:10:44 -0700 SSIA 642407 1 146005 kenneth 2012-06-06 06:11:28 -0700 Created attachment 146005 Patch 642408 2 146006 kenneth 2012-06-06 06:13:23 -0700 Created attachment 146006 Patch 642410 3 146006 michael.bruning 2012-06-06 06:18:32 -0700 Comment on attachment 146006 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146006&action=review LGTM (two comments below) :) - Maybe Tor Arne can have a look too and r+? > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:25 > + anchors.margins: 10 As discussed with Tor Arne on irc, anchors { ... } would be the preferred way. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:37 > + Same as above regarding the anchors. 642411 4 146007 kenneth 2012-06-06 06:27:24 -0700 Created attachment 146007 Patch 642418 5 146010 kenneth 2012-06-06 06:38:58 -0700 Created attachment 146010 Patch 642436 6 146010 michael.bruning 2012-06-06 07:08:38 -0700 Comment on attachment 146010 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146010&action=review Looks good in general. but there are a couple of problems with the property access, which leads to accessing undefined properties and hence warnings. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:78 > + font.family: parent.fontFamily This does not seem to work properly as the font.family is defined in the parent's grandparent (i.e. the Text's parent is the inner column, the inner Column's parent is the outer Column, the outer columns parent is the Item which has the property) - MiniBrowser put's out some warnings about undefined properties on the console. You could either go up the hierarchy (parent.parent.parent) or assign an id to the Item (e.g. "infoColumContainer"?) to access the properties. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:79 > + color: parent.fontColor The above applies to fontColor as well. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:86 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:87 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:91 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:92 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:96 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:97 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:104 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:105 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:109 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:110 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:114 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:115 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:122 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:123 > + color: parent.fontColor Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:127 > + font.family: parent.fontFamily Same as above. > Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml:128 > + color: parent.fontColor Same as above. 642441 7 146018 kenneth 2012-06-06 07:18:18 -0700 Created attachment 146018 Patch 642443 8 michael.bruning 2012-06-06 07:22:13 -0700 Looks good to me. 643438 9 kenneth 2012-06-07 05:12:04 -0700 Landed in r119710 146005 2012-06-06 06:11:28 -0700 2012-06-06 06:13:16 -0700 Patch bug-88410-20120606150929.patch text/plain 8209 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDliZTNmOGY4Yzg1NDMzMmU2NTVjZjRiMTMzNmU2NjU2 YWVmYTQzNS4uNDQ4MTc3MzEzODgwZTQ3YzIxYzliZTRiZTI2OTRkNmI1MjI2Zjk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA2LTA2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KKworICAgICAgICBbUXRdIEltcHJvdmUgdGhlIHZpc3VhbCBvZiB0aGUgdmlld3Bv cnQgaW5mbyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg4NDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wcm92ZSB0aGUgdmlzdWFsIGFuZCBtYWtlIGl0IHBvc3NpYmxlIHRvIHNlZSB0aGUgY29u dGVudCBtb3JlIGVhc3kuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJ bmZvSXRlbS5xbWw6CisKIDIwMTItMDYtMDYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVsLmJy dW5pbmdAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgcHJlZmVycmVkTWluaW11 bUNvbnRlbnRzV2lkdGggdG8gdGhlIHZpZXdwb3J0IGluZm8gaW4gTWluaUJyb3dzZXIuCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKaW5kZXggODYwYTcz NDExMTg2OTYzMjZjYWY2YWIwMzE2YjQ5MDVmMjBiZGQ3NC4uZjRmYjlhOTVlZWFjNGVjYzFkNWYx MzE2ZTIwZmMwZGE4YjA2OTE2YSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1s L1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9WaWV3 cG9ydEluZm9JdGVtLnFtbApAQCAtMSw5MiArMSwxMzUgQEAKIGltcG9ydCBRdFF1aWNrIDIuMAog aW1wb3J0IFF0V2ViS2l0IDMuMAogCi1SZWN0YW5nbGUgeworSXRlbSB7CiAgICAgcHJvcGVydHkg dmFyIHRlc3QKICAgICBwcm9wZXJ0eSB2YXIgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGgK IAotICAgIGNvbG9yOiAiYmxhY2siCi0gICAgb3BhY2l0eTogMC44CisgICAgZnVuY3Rpb24gZm9y bWF0U2NhbGUodmFsdWUpCisgICAgeworICAgICAgICByZXR1cm4gcGFyc2VGbG9hdCh2YWx1ZS50 b0ZpeGVkKDQpKSArICJ4IjsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBmb3JtYXRTaXplKHZhbHVl KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHZhbHVlLndpZHRoLnRvRml4ZWQoKSArICJ4IiArIHZh bHVlLmhlaWdodC50b0ZpeGVkKCkgKyAicHgiCisgICAgfQorCisgICAgZnVuY3Rpb24gZm9ybWF0 Qm9vbCh2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiAodmFsdWUgPyAieWVzIiA6ICJubyIp CisgICAgfQorCisgICAgUmVjdGFuZ2xlIHsKKyAgICAgICAgaWQ6IHRpdGxlOwogCi0gICAgSXRl bSB7Ci0gICAgICAgIGFuY2hvcnMuZmlsbDogcGFyZW50Ci0gICAgICAgIGFuY2hvcnMubWFyZ2lu czogMjAKKyAgICAgICAgYW5jaG9ycy50b3A6IHBhcmVudC50b3AKKyAgICAgICAgYW5jaG9ycy5s ZWZ0OiBwYXJlbnQubGVmdAorICAgICAgICBhbmNob3JzLm1hcmdpbnM6IDEwCisgICAgICAgIGhl aWdodDogNTAKKyAgICAgICAgd2lkdGg6IDIyMAogCi0gICAgICAgIHByb3BlcnR5IHN0cmluZyBm b250RmFtaWx5OiAiTm9raWEgUHVyZSwgSGVsdmV0aWNhIgotICAgICAgICBwcm9wZXJ0eSBjb2xv ciBmb250Q29sb3I6ICJ3aGl0ZSIKKyAgICAgICAgY29sb3I6ICJibHVlIgogCiAgICAgICAgIFRl eHQgewogICAgICAgICAgICAgaWQ6IHZpZXdwb3J0SW5mb0xhYmVsCisKKyAgICAgICAgICAgIGFu Y2hvcnMudmVydGljYWxDZW50ZXI6IHBhcmVudC52ZXJ0aWNhbENlbnRlcgorICAgICAgICAgICAg YW5jaG9ycy5sZWZ0OiBwYXJlbnQubGVmdAorICAgICAgICAgICAgYW5jaG9ycy5sZWZ0TWFyZ2lu OiAxMAorCiAgICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgSW5mbyIKICAgICAgICAgICAgIGNv bG9yOiAid2hpdGUiCiAgICAgICAgICAgICBmb250LmZhbWlseTogIk5va2lhIFB1cmUsIEhlbHZl dGljYSIKICAgICAgICAgICAgIGZvbnQucG9pbnRTaXplOiAyNAogICAgICAgICB9Ci0gICAgICAg IFRleHQgewotICAgICAgICAgICAgaWQ6IGN1cnJlbnRTY2FsZUxhYmVsCi0gICAgICAgICAgICBh bmNob3JzLnRvcDogdmlld3BvcnRJbmZvTGFiZWwuYm90dG9tCi0gICAgICAgICAgICBhbmNob3Jz LnRvcE1hcmdpbjogMzAKLSAgICAgICAgICAgIHRleHQ6ICJDdXJyZW50IHNjYWxlOiAiICsgcGFy c2VGbG9hdCh0ZXN0LmNvbnRlbnRzU2NhbGUudG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZvbnQu ZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250 Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBpbml0aWFs U2NhbGVMYWJlbAotICAgICAgICAgICAgYW5jaG9ycy50b3A6IGN1cnJlbnRTY2FsZUxhYmVsLmJv dHRvbQotICAgICAgICAgICAgdGV4dDogIkluaXRpYWwgc2NhbGU6ICIgKyBwYXJzZUZsb2F0KHRl c3QuaW5pdGlhbFNjYWxlLnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFy ZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAg ICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogbWluaW11bVNjYWxlTGFiZWwK LSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBpbml0aWFsU2NhbGVMYWJlbC5ib3R0b20KLSAgICAg ICAgICAgIHRleHQ6ICJNaW5pbXVtIHNjYWxlOiAiICsgcGFyc2VGbG9hdCh0ZXN0Lm1pbmltdW1T Y2FsZS50b0ZpeGVkKDQpKQotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFt aWx5Ci0gICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAg ICAgIFRleHQgewotICAgICAgICAgICAgaWQ6IG1heGltdW1TY2FsZUxhYmVsCi0gICAgICAgICAg ICBhbmNob3JzLnRvcDogbWluaW11bVNjYWxlTGFiZWwuYm90dG9tCi0gICAgICAgICAgICB0ZXh0 OiAiTWF4aW11bSBzY2FsZTogIiArIHBhcnNlRmxvYXQodGVzdC5tYXhpbXVtU2NhbGUudG9GaXhl ZCg0KSkKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAg ICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsK LSAgICAgICAgICAgIGlkOiBkZXZpY2VQaXhlbFJhdGlvTGFiZWwKLSAgICAgICAgICAgIGFuY2hv cnMudG9wOiBtYXhpbXVtU2NhbGVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIGFuY2hvcnMudG9w TWFyZ2luOiAzMAotICAgICAgICAgICAgdGV4dDogIkRldmljZSBwaXhlbCByYXRpbzogIiArIHBh cnNlRmxvYXQodGVzdC5kZXZpY2VQaXhlbFJhdGlvLnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBm b250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQu Zm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogY29u dGVudHNTaXplTGFiZWwKLSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBkZXZpY2VQaXhlbFJhdGlv TGFiZWwuYm90dG9tCi0gICAgICAgICAgICB0ZXh0OiAiQ29udGVudHMgc2l6ZTogIiArIHRlc3Qu Y29udGVudHNTaXplLndpZHRoICsgIngiICsgdGVzdC5jb250ZW50c1NpemUuaGVpZ2h0Ci0gICAg ICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9y OiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAg ICBpZDogbGF5b3V0U2l6ZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogY29udGVudHNT aXplTGFiZWwuYm90dG9tCi0gICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgbGF5b3V0IHNpemU6 ICIgKyB0ZXN0LmxheW91dFNpemUud2lkdGggKyAieCIgKyB0ZXN0LmxheW91dFNpemUuaGVpZ2h0 Ci0gICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAg IGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAg ICAgICAgICBpZDogcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGhMYWJlbAotICAgICAgICAg ICAgYW5jaG9ycy50b3A6IGxheW91dFNpemVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6 ICJQcmVmZXJyZWQgbWluaW11bSBjb250ZW50cyB3aWR0aDogIiArIHByZWZlcnJlZE1pbmltdW1D b250ZW50c1dpZHRoCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkK LSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAg VGV4dCB7Ci0gICAgICAgICAgICBpZDogc2NhbGFibGVMYWJlbAotICAgICAgICAgICAgYW5jaG9y cy50b3A6IHByZWZlcnJlZE1pbmltdW1Db250ZW50c1dpZHRoTGFiZWwuYm90dG9tCi0gICAgICAg ICAgICBhbmNob3JzLnRvcE1hcmdpbjogMzAKLSAgICAgICAgICAgIHRleHQ6ICJWaWV3ICIgKyAo dGVzdC5pc1NjYWxhYmxlID8gImlzICIgOiAiaXMgbm90ICIgKSArICJzY2FsYWJsZS4iCi0gICAg ICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9y OiBwYXJlbnQuZm9udENvbG9yCisgICAgfQorCisgICAgUmVjdGFuZ2xlIHsKKyAgICAgICAgY29s b3I6ICJncmF5IgorICAgICAgICBvcGFjaXR5OiAwLjkKKworICAgICAgICBhbmNob3JzLnRvcDog dGl0bGUuYm90dG9tCisgICAgICAgIGFuY2hvcnMubGVmdDogdGl0bGUubGVmdAorICAgICAgICBh bmNob3JzLnRvcE1hcmdpbjogMTAKKworICAgICAgICB3aWR0aDogMzQwCisgICAgICAgIGhlaWdo dDogMjgwCisKKyAgICAgICAgSXRlbSB7CisgICAgICAgICAgICBhbmNob3JzLmZpbGw6IHBhcmVu dAorICAgICAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiAxMAorCisgICAgICAgICAgICBwcm9wZXJ0 eSBzdHJpbmcgZm9udEZhbWlseTogIk5va2lhIFB1cmUsIEhlbHZldGljYSIKKyAgICAgICAgICAg IHByb3BlcnR5IGNvbG9yIGZvbnRDb2xvcjogImJsYWNrIgorCisgICAgICAgICAgICBUZXh0IHsK KyAgICAgICAgICAgICAgICBpZDogY3VycmVudFNjYWxlTGFiZWwKKyAgICAgICAgICAgICAgICBh bmNob3JzLnRvcDogdmlld3BvcnRJbmZvTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAgYW5j aG9ycy50b3BNYXJnaW46IDMwCisgICAgICAgICAgICAgICAgdGV4dDogIkN1cnJlbnQgc2NhbGU6 ICIgKyBmb3JtYXRTY2FsZSh0ZXN0LmNvbnRlbnRzU2NhbGUpCisgICAgICAgICAgICAgICAgZm9u dC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVu dC5mb250Q29sb3IKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFRleHQgeworICAgICAgICAg ICAgICAgIGlkOiBpbml0aWFsU2NhbGVMYWJlbAorICAgICAgICAgICAgICAgIGFuY2hvcnMudG9w TWFyZ2luOiAzMAorICAgICAgICAgICAgICAgIGFuY2hvcnMudG9wOiBjdXJyZW50U2NhbGVMYWJl bC5ib3R0b20KKyAgICAgICAgICAgICAgICB0ZXh0OiAiSW5pdGlhbCBzY2FsZTogIiArIGZvcm1h dFNjYWxlKHRlc3QuaW5pdGlhbFNjYWxlKQorICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBw YXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9y CisgICAgICAgICAgICB9CisgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICBpZDog bWluaW11bVNjYWxlTGFiZWwKKyAgICAgICAgICAgICAgICBhbmNob3JzLnRvcDogaW5pdGlhbFNj YWxlTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAgdGV4dDogIk1pbmltdW0gc2NhbGU6ICIg KyBmb3JtYXRTY2FsZSh0ZXN0Lm1pbmltdW1TY2FsZSkKKyAgICAgICAgICAgICAgICBmb250LmZh bWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZv bnRDb2xvcgorICAgICAgICAgICAgfQorICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAg ICAgaWQ6IG1heGltdW1TY2FsZUxhYmVsCisgICAgICAgICAgICAgICAgYW5jaG9ycy50b3A6IG1p bmltdW1TY2FsZUxhYmVsLmJvdHRvbQorICAgICAgICAgICAgICAgIHRleHQ6ICJNYXhpbXVtIHNj YWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC5tYXhpbXVtU2NhbGUpCisgICAgICAgICAgICAgICAg Zm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgY29sb3I6IHBh cmVudC5mb250Q29sb3IKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFRleHQgeworICAgICAg ICAgICAgICAgIGlkOiBkZXZpY2VQaXhlbFJhdGlvTGFiZWwKKyAgICAgICAgICAgICAgICBhbmNo b3JzLnRvcDogbWF4aW11bVNjYWxlTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAgYW5jaG9y cy50b3BNYXJnaW46IDMwCisgICAgICAgICAgICAgICAgdGV4dDogIkRldmljZSBwaXhlbCByYXRp bzogIiArIGZvcm1hdFNjYWxlKHRlc3QuZGV2aWNlUGl4ZWxSYXRpbykKKyAgICAgICAgICAgICAg ICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICBjb2xvcjog cGFyZW50LmZvbnRDb2xvcgorICAgICAgICAgICAgfQorICAgICAgICAgICAgVGV4dCB7CisgICAg ICAgICAgICAgICAgaWQ6IGNvbnRlbnRzU2l6ZUxhYmVsCisgICAgICAgICAgICAgICAgYW5jaG9y cy50b3A6IGRldmljZVBpeGVsUmF0aW9MYWJlbC5ib3R0b20KKyAgICAgICAgICAgICAgICB0ZXh0 OiAiQ29udGVudHMgc2l6ZTogIiArIGZvcm1hdFNpemUodGVzdC5jb250ZW50c1NpemUpCisgICAg ICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAg ICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFRl eHQgeworICAgICAgICAgICAgICAgIGlkOiBsYXlvdXRTaXplTGFiZWwKKyAgICAgICAgICAgICAg ICBhbmNob3JzLnRvcDogY29udGVudHNTaXplTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAg dGV4dDogIlZpZXdwb3J0IGxheW91dCBzaXplOiAiICsgZm9ybWF0U2l6ZSh0ZXN0LmxheW91dFNp emUpCisgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAg ICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIFRleHQgeworICAgICAgICAgICAgICAgIGlkOiBwcmVmZXJyZWRNaW5pbXVtQ29udGVu dHNXaWR0aExhYmVsCisgICAgICAgICAgICAgICAgYW5jaG9ycy50b3BNYXJnaW46IDMwCisgICAg ICAgICAgICAgICAgYW5jaG9ycy50b3A6IGxheW91dFNpemVMYWJlbC5ib3R0b20KKyAgICAgICAg ICAgICAgICB0ZXh0OiAiQWRhcHQgZm9yIHNtYWxsIHNjcmVlbnM6ICIgKyBmb3JtYXRCb29sKHBy ZWZlcnJlZE1pbmltdW1Db250ZW50c1dpZHRoKQorICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5 OiBwYXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENv bG9yCisgICAgICAgICAgICB9CisgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICBp ZDogc2NhbGFibGVMYWJlbAorICAgICAgICAgICAgICAgIGFuY2hvcnMudG9wOiBwcmVmZXJyZWRN aW5pbXVtQ29udGVudHNXaWR0aExhYmVsLmJvdHRvbQorICAgICAgICAgICAgICAgIHRleHQ6ICJB bGxvd3Mgc2NhbGluZzogIiArIGZvcm1hdEJvb2wodGVzdC5pc1NjYWxhYmxlKQorICAgICAgICAg ICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgIGNv bG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiB9 Cg== 146006 2012-06-06 06:13:23 -0700 2012-06-06 06:27:17 -0700 Patch bug-88410-20120606151124.patch text/plain 8194 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDliZTNmOGY4Yzg1NDMzMmU2NTVjZjRiMTMzNmU2NjU2 YWVmYTQzNS4uNDQ4MTc3MzEzODgwZTQ3YzIxYzliZTRiZTI2OTRkNmI1MjI2Zjk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA2LTA2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KKworICAgICAgICBbUXRdIEltcHJvdmUgdGhlIHZpc3VhbCBvZiB0aGUgdmlld3Bv cnQgaW5mbyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg4NDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wcm92ZSB0aGUgdmlzdWFsIGFuZCBtYWtlIGl0IHBvc3NpYmxlIHRvIHNlZSB0aGUgY29u dGVudCBtb3JlIGVhc3kuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJ bmZvSXRlbS5xbWw6CisKIDIwMTItMDYtMDYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVsLmJy dW5pbmdAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgcHJlZmVycmVkTWluaW11 bUNvbnRlbnRzV2lkdGggdG8gdGhlIHZpZXdwb3J0IGluZm8gaW4gTWluaUJyb3dzZXIuCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKaW5kZXggODYwYTcz NDExMTg2OTYzMjZjYWY2YWIwMzE2YjQ5MDVmMjBiZGQ3NC4uMjFhMTRiNmQyNjJjMmEzYzg1ZTY0 ZTQ4ZDY1NGMzYTg3MjM4YjY1OSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1s L1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9WaWV3 cG9ydEluZm9JdGVtLnFtbApAQCAtMSw5MiArMSwxMzIgQEAKIGltcG9ydCBRdFF1aWNrIDIuMAog aW1wb3J0IFF0V2ViS2l0IDMuMAogCi1SZWN0YW5nbGUgeworSXRlbSB7CiAgICAgcHJvcGVydHkg dmFyIHRlc3QKICAgICBwcm9wZXJ0eSB2YXIgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGgK IAotICAgIGNvbG9yOiAiYmxhY2siCi0gICAgb3BhY2l0eTogMC44CisgICAgZnVuY3Rpb24gZm9y bWF0U2NhbGUodmFsdWUpIHsKKyAgICAgICAgcmV0dXJuIHBhcnNlRmxvYXQodmFsdWUudG9GaXhl ZCg0KSkgKyAieCI7CisgICAgfQorCisgICAgZnVuY3Rpb24gZm9ybWF0U2l6ZSh2YWx1ZSkgewor ICAgICAgICByZXR1cm4gdmFsdWUud2lkdGgudG9GaXhlZCgpICsgIngiICsgdmFsdWUuaGVpZ2h0 LnRvRml4ZWQoKSArICJweCIKKyAgICB9CisKKyAgICBmdW5jdGlvbiBmb3JtYXRCb29sKHZhbHVl KSB7CisgICAgICAgIHJldHVybiAodmFsdWUgPyAieWVzIiA6ICJubyIpCisgICAgfQorCisgICAg UmVjdGFuZ2xlIHsKKyAgICAgICAgaWQ6IHRpdGxlOwogCi0gICAgSXRlbSB7Ci0gICAgICAgIGFu Y2hvcnMuZmlsbDogcGFyZW50Ci0gICAgICAgIGFuY2hvcnMubWFyZ2luczogMjAKKyAgICAgICAg YW5jaG9ycy50b3A6IHBhcmVudC50b3AKKyAgICAgICAgYW5jaG9ycy5sZWZ0OiBwYXJlbnQubGVm dAorICAgICAgICBhbmNob3JzLm1hcmdpbnM6IDEwCisgICAgICAgIGhlaWdodDogNTAKKyAgICAg ICAgd2lkdGg6IDIyMAogCi0gICAgICAgIHByb3BlcnR5IHN0cmluZyBmb250RmFtaWx5OiAiTm9r aWEgUHVyZSwgSGVsdmV0aWNhIgotICAgICAgICBwcm9wZXJ0eSBjb2xvciBmb250Q29sb3I6ICJ3 aGl0ZSIKKyAgICAgICAgY29sb3I6ICJibHVlIgogCiAgICAgICAgIFRleHQgewogICAgICAgICAg ICAgaWQ6IHZpZXdwb3J0SW5mb0xhYmVsCisKKyAgICAgICAgICAgIGFuY2hvcnMudmVydGljYWxD ZW50ZXI6IHBhcmVudC52ZXJ0aWNhbENlbnRlcgorICAgICAgICAgICAgYW5jaG9ycy5sZWZ0OiBw YXJlbnQubGVmdAorICAgICAgICAgICAgYW5jaG9ycy5sZWZ0TWFyZ2luOiAxMAorCiAgICAgICAg ICAgICB0ZXh0OiAiVmlld3BvcnQgSW5mbyIKICAgICAgICAgICAgIGNvbG9yOiAid2hpdGUiCiAg ICAgICAgICAgICBmb250LmZhbWlseTogIk5va2lhIFB1cmUsIEhlbHZldGljYSIKICAgICAgICAg ICAgIGZvbnQucG9pbnRTaXplOiAyNAogICAgICAgICB9Ci0gICAgICAgIFRleHQgewotICAgICAg ICAgICAgaWQ6IGN1cnJlbnRTY2FsZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogdmll d3BvcnRJbmZvTGFiZWwuYm90dG9tCi0gICAgICAgICAgICBhbmNob3JzLnRvcE1hcmdpbjogMzAK LSAgICAgICAgICAgIHRleHQ6ICJDdXJyZW50IHNjYWxlOiAiICsgcGFyc2VGbG9hdCh0ZXN0LmNv bnRlbnRzU2NhbGUudG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQu Zm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAgICAg fQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBpbml0aWFsU2NhbGVMYWJlbAotICAg ICAgICAgICAgYW5jaG9ycy50b3A6IGN1cnJlbnRTY2FsZUxhYmVsLmJvdHRvbQotICAgICAgICAg ICAgdGV4dDogIkluaXRpYWwgc2NhbGU6ICIgKyBwYXJzZUZsb2F0KHRlc3QuaW5pdGlhbFNjYWxl LnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkK LSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAg VGV4dCB7Ci0gICAgICAgICAgICBpZDogbWluaW11bVNjYWxlTGFiZWwKLSAgICAgICAgICAgIGFu Y2hvcnMudG9wOiBpbml0aWFsU2NhbGVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJN aW5pbXVtIHNjYWxlOiAiICsgcGFyc2VGbG9hdCh0ZXN0Lm1pbmltdW1TY2FsZS50b0ZpeGVkKDQp KQotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAgICAg ICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewotICAg ICAgICAgICAgaWQ6IG1heGltdW1TY2FsZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDog bWluaW11bVNjYWxlTGFiZWwuYm90dG9tCi0gICAgICAgICAgICB0ZXh0OiAiTWF4aW11bSBzY2Fs ZTogIiArIHBhcnNlRmxvYXQodGVzdC5tYXhpbXVtU2NhbGUudG9GaXhlZCg0KSkKLSAgICAgICAg ICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBh cmVudC5mb250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlk OiBkZXZpY2VQaXhlbFJhdGlvTGFiZWwKLSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBtYXhpbXVt U2NhbGVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIGFuY2hvcnMudG9wTWFyZ2luOiAzMAotICAg ICAgICAgICAgdGV4dDogIkRldmljZSBwaXhlbCByYXRpbzogIiArIHBhcnNlRmxvYXQodGVzdC5k ZXZpY2VQaXhlbFJhdGlvLnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFy ZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAg ICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogY29udGVudHNTaXplTGFiZWwK LSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBkZXZpY2VQaXhlbFJhdGlvTGFiZWwuYm90dG9tCi0g ICAgICAgICAgICB0ZXh0OiAiQ29udGVudHMgc2l6ZTogIiArIHRlc3QuY29udGVudHNTaXplLndp ZHRoICsgIngiICsgdGVzdC5jb250ZW50c1NpemUuaGVpZ2h0Ci0gICAgICAgICAgICBmb250LmZh bWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENv bG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogbGF5b3V0U2l6 ZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogY29udGVudHNTaXplTGFiZWwuYm90dG9t Ci0gICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgbGF5b3V0IHNpemU6ICIgKyB0ZXN0LmxheW91 dFNpemUud2lkdGggKyAieCIgKyB0ZXN0LmxheW91dFNpemUuaGVpZ2h0Ci0gICAgICAgICAgICBm b250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQu Zm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogcHJl ZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGhMYWJlbAotICAgICAgICAgICAgYW5jaG9ycy50b3A6 IGxheW91dFNpemVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJQcmVmZXJyZWQgbWlu aW11bSBjb250ZW50cyB3aWR0aDogIiArIHByZWZlcnJlZE1pbmltdW1Db250ZW50c1dpZHRoCi0g ICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNv bG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAg ICAgICBpZDogc2NhbGFibGVMYWJlbAotICAgICAgICAgICAgYW5jaG9ycy50b3A6IHByZWZlcnJl ZE1pbmltdW1Db250ZW50c1dpZHRoTGFiZWwuYm90dG9tCi0gICAgICAgICAgICBhbmNob3JzLnRv cE1hcmdpbjogMzAKLSAgICAgICAgICAgIHRleHQ6ICJWaWV3ICIgKyAodGVzdC5pc1NjYWxhYmxl ID8gImlzICIgOiAiaXMgbm90ICIgKSArICJzY2FsYWJsZS4iCi0gICAgICAgICAgICBmb250LmZh bWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENv bG9yCisgICAgfQorCisgICAgUmVjdGFuZ2xlIHsKKyAgICAgICAgY29sb3I6ICJncmF5IgorICAg ICAgICBvcGFjaXR5OiAwLjkKKworICAgICAgICBhbmNob3JzLnRvcDogdGl0bGUuYm90dG9tCisg ICAgICAgIGFuY2hvcnMubGVmdDogdGl0bGUubGVmdAorICAgICAgICBhbmNob3JzLnRvcE1hcmdp bjogMTAKKworICAgICAgICB3aWR0aDogMzQwCisgICAgICAgIGhlaWdodDogMjgwCisKKyAgICAg ICAgSXRlbSB7CisgICAgICAgICAgICBhbmNob3JzLmZpbGw6IHBhcmVudAorICAgICAgICAgICAg YW5jaG9ycy5tYXJnaW5zOiAxMAorCisgICAgICAgICAgICBwcm9wZXJ0eSBzdHJpbmcgZm9udEZh bWlseTogIk5va2lhIFB1cmUsIEhlbHZldGljYSIKKyAgICAgICAgICAgIHByb3BlcnR5IGNvbG9y IGZvbnRDb2xvcjogImJsYWNrIgorCisgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAg ICBpZDogY3VycmVudFNjYWxlTGFiZWwKKyAgICAgICAgICAgICAgICBhbmNob3JzLnRvcDogdmll d3BvcnRJbmZvTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAgYW5jaG9ycy50b3BNYXJnaW46 IDMwCisgICAgICAgICAgICAgICAgdGV4dDogIkN1cnJlbnQgc2NhbGU6ICIgKyBmb3JtYXRTY2Fs ZSh0ZXN0LmNvbnRlbnRzU2NhbGUpCisgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVu dC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIFRleHQgeworICAgICAgICAgICAgICAgIGlkOiBpbml0 aWFsU2NhbGVMYWJlbAorICAgICAgICAgICAgICAgIGFuY2hvcnMudG9wTWFyZ2luOiAzMAorICAg ICAgICAgICAgICAgIGFuY2hvcnMudG9wOiBjdXJyZW50U2NhbGVMYWJlbC5ib3R0b20KKyAgICAg ICAgICAgICAgICB0ZXh0OiAiSW5pdGlhbCBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3QuaW5p dGlhbFNjYWxlKQorICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWls eQorICAgICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICB9 CisgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICBpZDogbWluaW11bVNjYWxlTGFi ZWwKKyAgICAgICAgICAgICAgICBhbmNob3JzLnRvcDogaW5pdGlhbFNjYWxlTGFiZWwuYm90dG9t CisgICAgICAgICAgICAgICAgdGV4dDogIk1pbmltdW0gc2NhbGU6ICIgKyBmb3JtYXRTY2FsZSh0 ZXN0Lm1pbmltdW1TY2FsZSkKKyAgICAgICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZv bnRGYW1pbHkKKyAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgorICAgICAg ICAgICAgfQorICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgaWQ6IG1heGltdW1T Y2FsZUxhYmVsCisgICAgICAgICAgICAgICAgYW5jaG9ycy50b3A6IG1pbmltdW1TY2FsZUxhYmVs LmJvdHRvbQorICAgICAgICAgICAgICAgIHRleHQ6ICJNYXhpbXVtIHNjYWxlOiAiICsgZm9ybWF0 U2NhbGUodGVzdC5tYXhpbXVtU2NhbGUpCisgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBh cmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFRleHQgeworICAgICAgICAgICAgICAgIGlkOiBk ZXZpY2VQaXhlbFJhdGlvTGFiZWwKKyAgICAgICAgICAgICAgICBhbmNob3JzLnRvcDogbWF4aW11 bVNjYWxlTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAgYW5jaG9ycy50b3BNYXJnaW46IDMw CisgICAgICAgICAgICAgICAgdGV4dDogIkRldmljZSBwaXhlbCByYXRpbzogIiArIGZvcm1hdFNj YWxlKHRlc3QuZGV2aWNlUGl4ZWxSYXRpbykKKyAgICAgICAgICAgICAgICBmb250LmZhbWlseTog cGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xv cgorICAgICAgICAgICAgfQorICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgaWQ6 IGNvbnRlbnRzU2l6ZUxhYmVsCisgICAgICAgICAgICAgICAgYW5jaG9ycy50b3A6IGRldmljZVBp eGVsUmF0aW9MYWJlbC5ib3R0b20KKyAgICAgICAgICAgICAgICB0ZXh0OiAiQ29udGVudHMgc2l6 ZTogIiArIGZvcm1hdFNpemUodGVzdC5jb250ZW50c1NpemUpCisgICAgICAgICAgICAgICAgZm9u dC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVu dC5mb250Q29sb3IKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFRleHQgeworICAgICAgICAg ICAgICAgIGlkOiBsYXlvdXRTaXplTGFiZWwKKyAgICAgICAgICAgICAgICBhbmNob3JzLnRvcDog Y29udGVudHNTaXplTGFiZWwuYm90dG9tCisgICAgICAgICAgICAgICAgdGV4dDogIlZpZXdwb3J0 IGxheW91dCBzaXplOiAiICsgZm9ybWF0U2l6ZSh0ZXN0LmxheW91dFNpemUpCisgICAgICAgICAg ICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgY29s b3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFRleHQgewor ICAgICAgICAgICAgICAgIGlkOiBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aExhYmVsCisg ICAgICAgICAgICAgICAgYW5jaG9ycy50b3BNYXJnaW46IDMwCisgICAgICAgICAgICAgICAgYW5j aG9ycy50b3A6IGxheW91dFNpemVMYWJlbC5ib3R0b20KKyAgICAgICAgICAgICAgICB0ZXh0OiAi QWRhcHQgZm9yIHNtYWxsIHNjcmVlbnM6ICIgKyBmb3JtYXRCb29sKHByZWZlcnJlZE1pbmltdW1D b250ZW50c1dpZHRoKQorICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZh bWlseQorICAgICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAg ICB9CisgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICBpZDogc2NhbGFibGVMYWJl bAorICAgICAgICAgICAgICAgIGFuY2hvcnMudG9wOiBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNX aWR0aExhYmVsLmJvdHRvbQorICAgICAgICAgICAgICAgIHRleHQ6ICJBbGxvd3Mgc2NhbGluZzog IiArIGZvcm1hdEJvb2wodGVzdC5pc1NjYWxhYmxlKQorICAgICAgICAgICAgICAgIGZvbnQuZmFt aWx5OiBwYXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9u dENvbG9yCisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiB9Cg== 146007 2012-06-06 06:27:24 -0700 2012-06-06 06:38:51 -0700 Patch bug-88410-20120606152525.patch text/plain 7881 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDliZTNmOGY4Yzg1NDMzMmU2NTVjZjRiMTMzNmU2NjU2 YWVmYTQzNS4uNDQ4MTc3MzEzODgwZTQ3YzIxYzliZTRiZTI2OTRkNmI1MjI2Zjk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA2LTA2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KKworICAgICAgICBbUXRdIEltcHJvdmUgdGhlIHZpc3VhbCBvZiB0aGUgdmlld3Bv cnQgaW5mbyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg4NDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wcm92ZSB0aGUgdmlzdWFsIGFuZCBtYWtlIGl0IHBvc3NpYmxlIHRvIHNlZSB0aGUgY29u dGVudCBtb3JlIGVhc3kuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJ bmZvSXRlbS5xbWw6CisKIDIwMTItMDYtMDYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVsLmJy dW5pbmdAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgcHJlZmVycmVkTWluaW11 bUNvbnRlbnRzV2lkdGggdG8gdGhlIHZpZXdwb3J0IGluZm8gaW4gTWluaUJyb3dzZXIuCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKaW5kZXggODYwYTcz NDExMTg2OTYzMjZjYWY2YWIwMzE2YjQ5MDVmMjBiZGQ3NC4uYjk0ZTZkMjUyZjZiYzQ1NGZiMTM5 ZDJjNmJlYWViNjY1OTAyMTAxNyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1s L1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9WaWV3 cG9ydEluZm9JdGVtLnFtbApAQCAtMSw5MiArMSwxMjUgQEAKIGltcG9ydCBRdFF1aWNrIDIuMAog aW1wb3J0IFF0V2ViS2l0IDMuMAogCi1SZWN0YW5nbGUgeworSXRlbSB7CiAgICAgcHJvcGVydHkg dmFyIHRlc3QKICAgICBwcm9wZXJ0eSB2YXIgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGgK IAotICAgIGNvbG9yOiAiYmxhY2siCi0gICAgb3BhY2l0eTogMC44CisgICAgZnVuY3Rpb24gZm9y bWF0U2NhbGUodmFsdWUpIHsKKyAgICAgICAgcmV0dXJuICI8Yj4iICsgcGFyc2VGbG9hdCh2YWx1 ZS50b0ZpeGVkKDQpKSArICI8L2I+eCI7CisgICAgfQorCisgICAgZnVuY3Rpb24gZm9ybWF0U2l6 ZSh2YWx1ZSkgeworICAgICAgICByZXR1cm4gIjxiPiIgKyB2YWx1ZS53aWR0aC50b0ZpeGVkKCkg KyAieCIgKyB2YWx1ZS5oZWlnaHQudG9GaXhlZCgpICsgIjwvYj5weCIKKyAgICB9CisKKyAgICBm dW5jdGlvbiBmb3JtYXRCb29sKHZhbHVlKSB7CisgICAgICAgIHJldHVybiAiPGI+IiArICh2YWx1 ZSA/ICJ5ZXMiIDogIm5vIikgKyAiPC9iPiIKKyAgICB9CiAKLSAgICBJdGVtIHsKLSAgICAgICAg YW5jaG9ycy5maWxsOiBwYXJlbnQKLSAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiAyMAorICAgIFJl Y3RhbmdsZSB7CisgICAgICAgIGlkOiB0aXRsZTsKIAotICAgICAgICBwcm9wZXJ0eSBzdHJpbmcg Zm9udEZhbWlseTogIk5va2lhIFB1cmUsIEhlbHZldGljYSIKLSAgICAgICAgcHJvcGVydHkgY29s b3IgZm9udENvbG9yOiAid2hpdGUiCisgICAgICAgIGFuY2hvcnMudG9wOiBwYXJlbnQudG9wCisg ICAgICAgIGFuY2hvcnMubGVmdDogcGFyZW50LmxlZnQKKyAgICAgICAgYW5jaG9ycy5tYXJnaW5z OiAxMAorICAgICAgICBoZWlnaHQ6IDUwCisgICAgICAgIHdpZHRoOiAyNTAKKworICAgICAgICBj b2xvcjogImJsdWUiCiAKICAgICAgICAgVGV4dCB7CiAgICAgICAgICAgICBpZDogdmlld3BvcnRJ bmZvTGFiZWwKKworICAgICAgICAgICAgYW5jaG9ycy52ZXJ0aWNhbENlbnRlcjogcGFyZW50LnZl cnRpY2FsQ2VudGVyCisgICAgICAgICAgICBhbmNob3JzLmxlZnQ6IHBhcmVudC5sZWZ0CisgICAg ICAgICAgICBhbmNob3JzLmxlZnRNYXJnaW46IDEwCisKICAgICAgICAgICAgIHRleHQ6ICJWaWV3 cG9ydCBJbmZvIgogICAgICAgICAgICAgY29sb3I6ICJ3aGl0ZSIKLSAgICAgICAgICAgIGZvbnQu ZmFtaWx5OiAiTm9raWEgUHVyZSwgSGVsdmV0aWNhIgorICAgICAgICAgICAgZm9udC5mYW1pbHk6 ICJOb2tpYSBbUHVyZV0iCiAgICAgICAgICAgICBmb250LnBvaW50U2l6ZTogMjQKICAgICAgICAg fQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBjdXJyZW50U2NhbGVMYWJlbAotICAg ICAgICAgICAgYW5jaG9ycy50b3A6IHZpZXdwb3J0SW5mb0xhYmVsLmJvdHRvbQotICAgICAgICAg ICAgYW5jaG9ycy50b3BNYXJnaW46IDMwCi0gICAgICAgICAgICB0ZXh0OiAiQ3VycmVudCBzY2Fs ZTogIiArIHBhcnNlRmxvYXQodGVzdC5jb250ZW50c1NjYWxlLnRvRml4ZWQoNCkpCi0gICAgICAg ICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKLSAgICAgICAgICAgIGNvbG9yOiBw YXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAgICAgVGV4dCB7Ci0gICAgICAgICAgICBp ZDogaW5pdGlhbFNjYWxlTGFiZWwKLSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBjdXJyZW50U2Nh bGVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJJbml0aWFsIHNjYWxlOiAiICsgcGFy c2VGbG9hdCh0ZXN0LmluaXRpYWxTY2FsZS50b0ZpeGVkKDQpKQotICAgICAgICAgICAgZm9udC5m YW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRD b2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewotICAgICAgICAgICAgaWQ6IG1pbmltdW1T Y2FsZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogaW5pdGlhbFNjYWxlTGFiZWwuYm90 dG9tCi0gICAgICAgICAgICB0ZXh0OiAiTWluaW11bSBzY2FsZTogIiArIHBhcnNlRmxvYXQodGVz dC5taW5pbXVtU2NhbGUudG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJl bnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAg ICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBtYXhpbXVtU2NhbGVMYWJlbAot ICAgICAgICAgICAgYW5jaG9ycy50b3A6IG1pbmltdW1TY2FsZUxhYmVsLmJvdHRvbQotICAgICAg ICAgICAgdGV4dDogIk1heGltdW0gc2NhbGU6ICIgKyBwYXJzZUZsb2F0KHRlc3QubWF4aW11bVNj YWxlLnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1p bHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAg ICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogZGV2aWNlUGl4ZWxSYXRpb0xhYmVsCi0gICAgICAg ICAgICBhbmNob3JzLnRvcDogbWF4aW11bVNjYWxlTGFiZWwuYm90dG9tCi0gICAgICAgICAgICBh bmNob3JzLnRvcE1hcmdpbjogMzAKLSAgICAgICAgICAgIHRleHQ6ICJEZXZpY2UgcGl4ZWwgcmF0 aW86ICIgKyBwYXJzZUZsb2F0KHRlc3QuZGV2aWNlUGl4ZWxSYXRpby50b0ZpeGVkKDQpKQotICAg ICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAgICAgICBjb2xv cjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewotICAgICAgICAg ICAgaWQ6IGNvbnRlbnRzU2l6ZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogZGV2aWNl UGl4ZWxSYXRpb0xhYmVsLmJvdHRvbQotICAgICAgICAgICAgdGV4dDogIkNvbnRlbnRzIHNpemU6 ICIgKyB0ZXN0LmNvbnRlbnRzU2l6ZS53aWR0aCArICJ4IiArIHRlc3QuY29udGVudHNTaXplLmhl aWdodAotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAg ICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewot ICAgICAgICAgICAgaWQ6IGxheW91dFNpemVMYWJlbAotICAgICAgICAgICAgYW5jaG9ycy50b3A6 IGNvbnRlbnRzU2l6ZUxhYmVsLmJvdHRvbQotICAgICAgICAgICAgdGV4dDogIlZpZXdwb3J0IGxh eW91dCBzaXplOiAiICsgdGVzdC5sYXlvdXRTaXplLndpZHRoICsgIngiICsgdGVzdC5sYXlvdXRT aXplLmhlaWdodAotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0g ICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAgICAgIFRl eHQgewotICAgICAgICAgICAgaWQ6IHByZWZlcnJlZE1pbmltdW1Db250ZW50c1dpZHRoTGFiZWwK LSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBsYXlvdXRTaXplTGFiZWwuYm90dG9tCi0gICAgICAg ICAgICB0ZXh0OiAiUHJlZmVycmVkIG1pbmltdW0gY29udGVudHMgd2lkdGg6ICIgKyBwcmVmZXJy ZWRNaW5pbXVtQ29udGVudHNXaWR0aAotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5m b250RmFtaWx5Ci0gICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9 Ci0gICAgICAgIFRleHQgewotICAgICAgICAgICAgaWQ6IHNjYWxhYmxlTGFiZWwKLSAgICAgICAg ICAgIGFuY2hvcnMudG9wOiBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aExhYmVsLmJvdHRv bQotICAgICAgICAgICAgYW5jaG9ycy50b3BNYXJnaW46IDMwCi0gICAgICAgICAgICB0ZXh0OiAi VmlldyAiICsgKHRlc3QuaXNTY2FsYWJsZSA/ICJpcyAiIDogImlzIG5vdCAiICkgKyAic2NhbGFi bGUuIgotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAg ICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgorICAgIH0KKworICAgIFJlY3RhbmdsZSB7Cisg ICAgICAgIGNvbG9yOiAiZ3JheSIKKyAgICAgICAgb3BhY2l0eTogMC45CisKKyAgICAgICAgYW5j aG9ycy50b3A6IHRpdGxlLmJvdHRvbQorICAgICAgICBhbmNob3JzLmxlZnQ6IHRpdGxlLmxlZnQK KyAgICAgICAgYW5jaG9ycy50b3BNYXJnaW46IDEwCisKKyAgICAgICAgd2lkdGg6IDM0MAorICAg ICAgICBoZWlnaHQ6IDI4MAorCisgICAgICAgIEl0ZW0geworICAgICAgICAgICAgYW5jaG9ycy5m aWxsOiBwYXJlbnQKKyAgICAgICAgICAgIGFuY2hvcnMubWFyZ2luczogMTAKKworICAgICAgICAg ICAgcHJvcGVydHkgc3RyaW5nIGZvbnRGYW1pbHk6ICJOb2tpYSBbUHVyZV0iCisgICAgICAgICAg ICBwcm9wZXJ0eSBjb2xvciBmb250Q29sb3I6ICJibGFjayIKKworICAgICAgICAgICAgQ29sdW1u IHsKKyAgICAgICAgICAgICAgICBhbmNob3JzLmZpbGw6IHBhcmVudAorICAgICAgICAgICAgICAg IHNwYWNpbmc6IDIwCisgICAgICAgICAgICAgICAgQ29sdW1uIHsKKyAgICAgICAgICAgICAgICAg ICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiQ3VycmVudCBzY2FsZTog IiArIGZvcm1hdFNjYWxlKHRlc3QuY29udGVudHNTY2FsZSkKKyAgICAgICAgICAgICAgICAgICAg ICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgICAgICAg ICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIENvbHVtbiB7CisgICAgICAgICAgICAgICAg ICAgIFRleHQgeworICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIkluaXRpYWwgc2NhbGU6 ICIgKyBmb3JtYXRTY2FsZSh0ZXN0LmluaXRpYWxTY2FsZSkKKyAgICAgICAgICAgICAgICAgICAg ICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgICAgICAg ICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJNaW5p bXVtIHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC5taW5pbXVtU2NhbGUpCisgICAgICAgICAg ICAgICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAg ICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0 ZXh0OiAiTWF4aW11bSBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3QubWF4aW11bVNjYWxlKQor ICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Cisg ICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgorICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgQ29sdW1u IHsKKyAgICAgICAgICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0 ZXh0OiAiRGV2aWNlIHBpeGVsIHJhdGlvOiAiICsgZm9ybWF0U2NhbGUodGVzdC5kZXZpY2VQaXhl bFJhdGlvKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250 RmFtaWx5CisgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgor ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIFRleHQgeworICAgICAg ICAgICAgICAgICAgICAgICAgdGV4dDogIkNvbnRlbnRzIHNpemU6ICIgKyBmb3JtYXRTaXplKHRl c3QuY29udGVudHNTaXplKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBh cmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZv bnRDb2xvcgorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIFRleHQg eworICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIlZpZXdwb3J0IGxheW91dCBzaXplOiAi ICsgZm9ybWF0U2l6ZSh0ZXN0LmxheW91dFNpemUpCisgICAgICAgICAgICAgICAgICAgICAgICBm b250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNv bG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgICAgICBDb2x1bW4geworICAgICAgICAgICAgICAgICAgICBU ZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJBZGFwdCBmb3Igc21hbGwgc2Ny ZWVuczogIiArIGZvcm1hdEJvb2wocHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGgpCisgICAg ICAgICAgICAgICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAg ICAgICB0ZXh0OiAiQWxsb3dzIHNjYWxpbmc6ICIgKyBmb3JtYXRCb29sKHRlc3QuaXNTY2FsYWJs ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWls eQorICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KIH0K 146010 2012-06-06 06:38:58 -0700 2012-06-06 07:18:11 -0700 Patch bug-88410-20120606153659.patch text/plain 7964 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDliZTNmOGY4Yzg1NDMzMmU2NTVjZjRiMTMzNmU2NjU2 YWVmYTQzNS4uNDQ4MTc3MzEzODgwZTQ3YzIxYzliZTRiZTI2OTRkNmI1MjI2Zjk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA2LTA2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KKworICAgICAgICBbUXRdIEltcHJvdmUgdGhlIHZpc3VhbCBvZiB0aGUgdmlld3Bv cnQgaW5mbyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg4NDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wcm92ZSB0aGUgdmlzdWFsIGFuZCBtYWtlIGl0IHBvc3NpYmxlIHRvIHNlZSB0aGUgY29u dGVudCBtb3JlIGVhc3kuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJ bmZvSXRlbS5xbWw6CisKIDIwMTItMDYtMDYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVsLmJy dW5pbmdAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgcHJlZmVycmVkTWluaW11 bUNvbnRlbnRzV2lkdGggdG8gdGhlIHZpZXdwb3J0IGluZm8gaW4gTWluaUJyb3dzZXIuCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKaW5kZXggODYwYTcz NDExMTg2OTYzMjZjYWY2YWIwMzE2YjQ5MDVmMjBiZGQ3NC4uNzNkMjEzZWU5NDJlYTQ2NTFjZGYz NTI5YTAzYmRkMWYwYjU4ZjQxYSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1s L1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9WaWV3 cG9ydEluZm9JdGVtLnFtbApAQCAtMSw5MiArMSwxMzQgQEAKIGltcG9ydCBRdFF1aWNrIDIuMAog aW1wb3J0IFF0V2ViS2l0IDMuMAogCi1SZWN0YW5nbGUgeworSXRlbSB7CiAgICAgcHJvcGVydHkg dmFyIHRlc3QKICAgICBwcm9wZXJ0eSB2YXIgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGgK IAotICAgIGNvbG9yOiAiYmxhY2siCi0gICAgb3BhY2l0eTogMC44CisgICAgZnVuY3Rpb24gZm9y bWF0U2NhbGUodmFsdWUpIHsKKyAgICAgICAgcmV0dXJuICI8Yj4iICsgcGFyc2VGbG9hdCh2YWx1 ZS50b0ZpeGVkKDQpKSArICI8L2I+eCI7CisgICAgfQogCi0gICAgSXRlbSB7Ci0gICAgICAgIGFu Y2hvcnMuZmlsbDogcGFyZW50Ci0gICAgICAgIGFuY2hvcnMubWFyZ2luczogMjAKKyAgICBmdW5j dGlvbiBmb3JtYXRTaXplKHZhbHVlKSB7CisgICAgICAgIHJldHVybiAiPGI+IiArIHZhbHVlLndp ZHRoLnRvRml4ZWQoKSArICJ4IiArIHZhbHVlLmhlaWdodC50b0ZpeGVkKCkgKyAiPC9iPnB4Igor ICAgIH0KIAotICAgICAgICBwcm9wZXJ0eSBzdHJpbmcgZm9udEZhbWlseTogIk5va2lhIFB1cmUs IEhlbHZldGljYSIKLSAgICAgICAgcHJvcGVydHkgY29sb3IgZm9udENvbG9yOiAid2hpdGUiCisg ICAgZnVuY3Rpb24gZm9ybWF0Qm9vbCh2YWx1ZSkgeworICAgICAgICByZXR1cm4gIjxiPiIgKyAo dmFsdWUgPyAieWVzIiA6ICJubyIpICsgIjwvYj4iCisgICAgfQorCisgICAgUmVjdGFuZ2xlIHsK KyAgICAgICAgaWQ6IHRpdGxlOworCisgICAgICAgIGFuY2hvcnMgeworICAgICAgICAgICAgdG9w OiBwYXJlbnQudG9wCisgICAgICAgICAgICBsZWZ0OiBwYXJlbnQubGVmdAorICAgICAgICAgICAg bWFyZ2luczogMTAKKyAgICAgICAgfQorCisgICAgICAgIGhlaWdodDogNTAKKyAgICAgICAgd2lk dGg6IDI1MAorCisgICAgICAgIGNvbG9yOiAiYmx1ZSIKIAogICAgICAgICBUZXh0IHsKICAgICAg ICAgICAgIGlkOiB2aWV3cG9ydEluZm9MYWJlbAorCisgICAgICAgICAgICBhbmNob3JzIHsKKyAg ICAgICAgICAgICAgICB2ZXJ0aWNhbENlbnRlcjogcGFyZW50LnZlcnRpY2FsQ2VudGVyCisgICAg ICAgICAgICAgICAgbGVmdDogcGFyZW50LmxlZnQKKyAgICAgICAgICAgICAgICBsZWZ0TWFyZ2lu OiAxMAorICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgSW5mbyIK ICAgICAgICAgICAgIGNvbG9yOiAid2hpdGUiCi0gICAgICAgICAgICBmb250LmZhbWlseTogIk5v a2lhIFB1cmUsIEhlbHZldGljYSIKKyAgICAgICAgICAgIGZvbnQuZmFtaWx5OiAiTm9raWEgW1B1 cmVdIgogICAgICAgICAgICAgZm9udC5wb2ludFNpemU6IDI0CiAgICAgICAgIH0KLSAgICAgICAg VGV4dCB7Ci0gICAgICAgICAgICBpZDogY3VycmVudFNjYWxlTGFiZWwKLSAgICAgICAgICAgIGFu Y2hvcnMudG9wOiB2aWV3cG9ydEluZm9MYWJlbC5ib3R0b20KLSAgICAgICAgICAgIGFuY2hvcnMu dG9wTWFyZ2luOiAzMAotICAgICAgICAgICAgdGV4dDogIkN1cnJlbnQgc2NhbGU6ICIgKyBwYXJz ZUZsb2F0KHRlc3QuY29udGVudHNTY2FsZS50b0ZpeGVkKDQpKQotICAgICAgICAgICAgZm9udC5m YW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRD b2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewotICAgICAgICAgICAgaWQ6IGluaXRpYWxT Y2FsZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogY3VycmVudFNjYWxlTGFiZWwuYm90 dG9tCi0gICAgICAgICAgICB0ZXh0OiAiSW5pdGlhbCBzY2FsZTogIiArIHBhcnNlRmxvYXQodGVz dC5pbml0aWFsU2NhbGUudG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJl bnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAg ICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBtaW5pbXVtU2NhbGVMYWJlbAot ICAgICAgICAgICAgYW5jaG9ycy50b3A6IGluaXRpYWxTY2FsZUxhYmVsLmJvdHRvbQotICAgICAg ICAgICAgdGV4dDogIk1pbmltdW0gc2NhbGU6ICIgKyBwYXJzZUZsb2F0KHRlc3QubWluaW11bVNj YWxlLnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1p bHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAg ICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogbWF4aW11bVNjYWxlTGFiZWwKLSAgICAgICAgICAg IGFuY2hvcnMudG9wOiBtaW5pbXVtU2NhbGVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6 ICJNYXhpbXVtIHNjYWxlOiAiICsgcGFyc2VGbG9hdCh0ZXN0Lm1heGltdW1TY2FsZS50b0ZpeGVk KDQpKQotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAg ICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewot ICAgICAgICAgICAgaWQ6IGRldmljZVBpeGVsUmF0aW9MYWJlbAotICAgICAgICAgICAgYW5jaG9y cy50b3A6IG1heGltdW1TY2FsZUxhYmVsLmJvdHRvbQotICAgICAgICAgICAgYW5jaG9ycy50b3BN YXJnaW46IDMwCi0gICAgICAgICAgICB0ZXh0OiAiRGV2aWNlIHBpeGVsIHJhdGlvOiAiICsgcGFy c2VGbG9hdCh0ZXN0LmRldmljZVBpeGVsUmF0aW8udG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZv bnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5m b250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBjb250 ZW50c1NpemVMYWJlbAotICAgICAgICAgICAgYW5jaG9ycy50b3A6IGRldmljZVBpeGVsUmF0aW9M YWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJDb250ZW50cyBzaXplOiAiICsgdGVzdC5j b250ZW50c1NpemUud2lkdGggKyAieCIgKyB0ZXN0LmNvbnRlbnRzU2l6ZS5oZWlnaHQKLSAgICAg ICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6 IHBhcmVudC5mb250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAg IGlkOiBsYXlvdXRTaXplTGFiZWwKLSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBjb250ZW50c1Np emVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJWaWV3cG9ydCBsYXlvdXQgc2l6ZTog IiArIHRlc3QubGF5b3V0U2l6ZS53aWR0aCArICJ4IiArIHRlc3QubGF5b3V0U2l6ZS5oZWlnaHQK LSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAg Y29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAg ICAgICAgIGlkOiBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aExhYmVsCi0gICAgICAgICAg ICBhbmNob3JzLnRvcDogbGF5b3V0U2l6ZUxhYmVsLmJvdHRvbQotICAgICAgICAgICAgdGV4dDog IlByZWZlcnJlZCBtaW5pbXVtIGNvbnRlbnRzIHdpZHRoOiAiICsgcHJlZmVycmVkTWluaW11bUNv bnRlbnRzV2lkdGgKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQot ICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICB9CisKKyAgICBSZWN0YW5n bGUgeworICAgICAgICBjb2xvcjogImdyYXkiCisgICAgICAgIG9wYWNpdHk6IDAuOQorCisgICAg ICAgIGFuY2hvcnMgeworICAgICAgICAgICAgdG9wOiB0aXRsZS5ib3R0b20KKyAgICAgICAgICAg IGxlZnQ6IHRpdGxlLmxlZnQKKyAgICAgICAgICAgIHRvcE1hcmdpbjogMTAKICAgICAgICAgfQot ICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBzY2FsYWJsZUxhYmVsCi0gICAgICAgICAg ICBhbmNob3JzLnRvcDogcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGhMYWJlbC5ib3R0b20K LSAgICAgICAgICAgIGFuY2hvcnMudG9wTWFyZ2luOiAzMAotICAgICAgICAgICAgdGV4dDogIlZp ZXcgIiArICh0ZXN0LmlzU2NhbGFibGUgPyAiaXMgIiA6ICJpcyBub3QgIiApICsgInNjYWxhYmxl LiIKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAg ICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKworICAgICAgICB3aWR0aDogMzQwCisgICAgICAg IGhlaWdodDogMjcwCisKKyAgICAgICAgSXRlbSB7CisgICAgICAgICAgICBhbmNob3JzIHsKKyAg ICAgICAgICAgICAgICBmaWxsOiBwYXJlbnQKKyAgICAgICAgICAgICAgICBtYXJnaW5zOiAxMAor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBwcm9wZXJ0eSBzdHJpbmcgZm9udEZhbWlseTog Ik5va2lhIFtQdXJlXSIKKyAgICAgICAgICAgIHByb3BlcnR5IGNvbG9yIGZvbnRDb2xvcjogImJs YWNrIgorCisgICAgICAgICAgICBDb2x1bW4geworICAgICAgICAgICAgICAgIGFuY2hvcnMuZmls bDogcGFyZW50CisgICAgICAgICAgICAgICAgc3BhY2luZzogMjAKKyAgICAgICAgICAgICAgICBD b2x1bW4geworICAgICAgICAgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHRleHQ6ICJDdXJyZW50IHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC5jb250ZW50c1Nj YWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFt aWx5CisgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgorICAg ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAg Q29sdW1uIHsKKyAgICAgICAgICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAg ICAgICB0ZXh0OiAiSW5pdGlhbCBzY2FsZTogIiArIGZvcm1hdFNjYWxlKHRlc3QuaW5pdGlhbFNj YWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFt aWx5CisgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgorICAg ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIFRleHQgeworICAgICAgICAg ICAgICAgICAgICAgICAgdGV4dDogIk1pbmltdW0gc2NhbGU6ICIgKyBmb3JtYXRTY2FsZSh0ZXN0 Lm1pbmltdW1TY2FsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJl bnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250 Q29sb3IKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBUZXh0IHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJNYXhpbXVtIHNjYWxlOiAiICsgZm9ybWF0 U2NhbGUodGVzdC5tYXhpbXVtU2NhbGUpCisgICAgICAgICAgICAgICAgICAgICAgICBmb250LmZh bWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbG9yOiBw YXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgICAgICBDb2x1bW4geworICAgICAgICAgICAgICAgICAgICBUZXh0IHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJEZXZpY2UgcGl4ZWwgcmF0aW86ICIgKyBm b3JtYXRTY2FsZSh0ZXN0LmRldmljZVBpeGVsUmF0aW8pCisgICAgICAgICAgICAgICAgICAgICAg ICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICAgICAgICAg IGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiQ29udGVu dHMgc2l6ZTogIiArIGZvcm1hdFNpemUodGVzdC5jb250ZW50c1NpemUpCisgICAgICAgICAgICAg ICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAg ICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0 OiAiVmlld3BvcnQgbGF5b3V0IHNpemU6ICIgKyBmb3JtYXRTaXplKHRlc3QubGF5b3V0U2l6ZSkK KyAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQor ICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIENvbHVt biB7CisgICAgICAgICAgICAgICAgICAgIFRleHQgeworICAgICAgICAgICAgICAgICAgICAgICAg dGV4dDogIkFkYXB0IGZvciBzbWFsbCBzY3JlZW5zOiAiICsgZm9ybWF0Qm9vbChwcmVmZXJyZWRN aW5pbXVtQ29udGVudHNXaWR0aCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5 OiBwYXJlbnQuZm9udEZhbWlseQorICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHBhcmVu dC5mb250Q29sb3IKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBU ZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJBbGxvd3Mgc2NhbGluZzogIiAr IGZvcm1hdEJvb2wodGVzdC5pc1NjYWxhYmxlKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9u dC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgICAgICAgICBjb2xv cjogcGFyZW50LmZvbnRDb2xvcgorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogfQo= 146018 2012-06-06 07:18:18 -0700 2012-06-07 04:50:56 -0700 Patch bug-88410-20120606161618.patch text/plain 8009 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDliZTNmOGY4Yzg1NDMzMmU2NTVjZjRiMTMzNmU2NjU2 YWVmYTQzNS4uNDQ4MTc3MzEzODgwZTQ3YzIxYzliZTRiZTI2OTRkNmI1MjI2Zjk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA2LTA2ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Vi a2l0Lm9yZz4KKworICAgICAgICBbUXRdIEltcHJvdmUgdGhlIHZpc3VhbCBvZiB0aGUgdmlld3Bv cnQgaW5mbyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg4NDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wcm92ZSB0aGUgdmlzdWFsIGFuZCBtYWtlIGl0IHBvc3NpYmxlIHRvIHNlZSB0aGUgY29u dGVudCBtb3JlIGVhc3kuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJ bmZvSXRlbS5xbWw6CisKIDIwMTItMDYtMDYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVsLmJy dW5pbmdAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgcHJlZmVycmVkTWluaW11 bUNvbnRlbnRzV2lkdGggdG8gdGhlIHZpZXdwb3J0IGluZm8gaW4gTWluaUJyb3dzZXIuCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWwKaW5kZXggODYwYTcz NDExMTg2OTYzMjZjYWY2YWIwMzE2YjQ5MDVmMjBiZGQ3NC4uNjAzNmUyMDNkMWYwMTY0MmEzODNl MzRmOGNkOGNlMDM0ZGY3ZGI3MSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1s L1ZpZXdwb3J0SW5mb0l0ZW0ucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9WaWV3 cG9ydEluZm9JdGVtLnFtbApAQCAtMSw5MiArMSwxMzYgQEAKIGltcG9ydCBRdFF1aWNrIDIuMAog aW1wb3J0IFF0V2ViS2l0IDMuMAogCi1SZWN0YW5nbGUgeworSXRlbSB7CiAgICAgcHJvcGVydHkg dmFyIHRlc3QKICAgICBwcm9wZXJ0eSB2YXIgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGgK IAotICAgIGNvbG9yOiAiYmxhY2siCi0gICAgb3BhY2l0eTogMC44CisgICAgZnVuY3Rpb24gZm9y bWF0U2NhbGUodmFsdWUpIHsKKyAgICAgICAgcmV0dXJuICI8Yj4iICsgcGFyc2VGbG9hdCh2YWx1 ZS50b0ZpeGVkKDQpKSArICI8L2I+eCI7CisgICAgfQorCisgICAgZnVuY3Rpb24gZm9ybWF0U2l6 ZSh2YWx1ZSkgeworICAgICAgICByZXR1cm4gIjxiPiIgKyB2YWx1ZS53aWR0aC50b0ZpeGVkKCkg KyAieCIgKyB2YWx1ZS5oZWlnaHQudG9GaXhlZCgpICsgIjwvYj5weCIKKyAgICB9CisKKyAgICBm dW5jdGlvbiBmb3JtYXRCb29sKHZhbHVlKSB7CisgICAgICAgIHJldHVybiAiPGI+IiArICh2YWx1 ZSA/ICJ5ZXMiIDogIm5vIikgKyAiPC9iPiIKKyAgICB9CiAKLSAgICBJdGVtIHsKLSAgICAgICAg YW5jaG9ycy5maWxsOiBwYXJlbnQKLSAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiAyMAorICAgIFJl Y3RhbmdsZSB7CisgICAgICAgIGlkOiB0aXRsZTsKIAotICAgICAgICBwcm9wZXJ0eSBzdHJpbmcg Zm9udEZhbWlseTogIk5va2lhIFB1cmUsIEhlbHZldGljYSIKLSAgICAgICAgcHJvcGVydHkgY29s b3IgZm9udENvbG9yOiAid2hpdGUiCisgICAgICAgIGFuY2hvcnMgeworICAgICAgICAgICAgdG9w OiBwYXJlbnQudG9wCisgICAgICAgICAgICBsZWZ0OiBwYXJlbnQubGVmdAorICAgICAgICAgICAg bWFyZ2luczogMTAKKyAgICAgICAgfQorCisgICAgICAgIGhlaWdodDogNTAKKyAgICAgICAgd2lk dGg6IDI1MAorCisgICAgICAgIGNvbG9yOiAiYmx1ZSIKIAogICAgICAgICBUZXh0IHsKICAgICAg ICAgICAgIGlkOiB2aWV3cG9ydEluZm9MYWJlbAorCisgICAgICAgICAgICBhbmNob3JzIHsKKyAg ICAgICAgICAgICAgICB2ZXJ0aWNhbENlbnRlcjogcGFyZW50LnZlcnRpY2FsQ2VudGVyCisgICAg ICAgICAgICAgICAgbGVmdDogcGFyZW50LmxlZnQKKyAgICAgICAgICAgICAgICBsZWZ0TWFyZ2lu OiAxMAorICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgSW5mbyIK ICAgICAgICAgICAgIGNvbG9yOiAid2hpdGUiCi0gICAgICAgICAgICBmb250LmZhbWlseTogIk5v a2lhIFB1cmUsIEhlbHZldGljYSIKKyAgICAgICAgICAgIGZvbnQuZmFtaWx5OiAiTm9raWEgW1B1 cmVdIgogICAgICAgICAgICAgZm9udC5wb2ludFNpemU6IDI0CiAgICAgICAgIH0KLSAgICAgICAg VGV4dCB7Ci0gICAgICAgICAgICBpZDogY3VycmVudFNjYWxlTGFiZWwKLSAgICAgICAgICAgIGFu Y2hvcnMudG9wOiB2aWV3cG9ydEluZm9MYWJlbC5ib3R0b20KLSAgICAgICAgICAgIGFuY2hvcnMu dG9wTWFyZ2luOiAzMAotICAgICAgICAgICAgdGV4dDogIkN1cnJlbnQgc2NhbGU6ICIgKyBwYXJz ZUZsb2F0KHRlc3QuY29udGVudHNTY2FsZS50b0ZpeGVkKDQpKQotICAgICAgICAgICAgZm9udC5m YW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAgICAgICBjb2xvcjogcGFyZW50LmZvbnRD b2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewotICAgICAgICAgICAgaWQ6IGluaXRpYWxT Y2FsZUxhYmVsCi0gICAgICAgICAgICBhbmNob3JzLnRvcDogY3VycmVudFNjYWxlTGFiZWwuYm90 dG9tCi0gICAgICAgICAgICB0ZXh0OiAiSW5pdGlhbCBzY2FsZTogIiArIHBhcnNlRmxvYXQodGVz dC5pbml0aWFsU2NhbGUudG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJl bnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAg ICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBtaW5pbXVtU2NhbGVMYWJlbAot ICAgICAgICAgICAgYW5jaG9ycy50b3A6IGluaXRpYWxTY2FsZUxhYmVsLmJvdHRvbQotICAgICAg ICAgICAgdGV4dDogIk1pbmltdW0gc2NhbGU6ICIgKyBwYXJzZUZsb2F0KHRlc3QubWluaW11bVNj YWxlLnRvRml4ZWQoNCkpCi0gICAgICAgICAgICBmb250LmZhbWlseTogcGFyZW50LmZvbnRGYW1p bHkKLSAgICAgICAgICAgIGNvbG9yOiBwYXJlbnQuZm9udENvbG9yCi0gICAgICAgIH0KLSAgICAg ICAgVGV4dCB7Ci0gICAgICAgICAgICBpZDogbWF4aW11bVNjYWxlTGFiZWwKLSAgICAgICAgICAg IGFuY2hvcnMudG9wOiBtaW5pbXVtU2NhbGVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6 ICJNYXhpbXVtIHNjYWxlOiAiICsgcGFyc2VGbG9hdCh0ZXN0Lm1heGltdW1TY2FsZS50b0ZpeGVk KDQpKQotICAgICAgICAgICAgZm9udC5mYW1pbHk6IHBhcmVudC5mb250RmFtaWx5Ci0gICAgICAg ICAgICBjb2xvcjogcGFyZW50LmZvbnRDb2xvcgotICAgICAgICB9Ci0gICAgICAgIFRleHQgewot ICAgICAgICAgICAgaWQ6IGRldmljZVBpeGVsUmF0aW9MYWJlbAotICAgICAgICAgICAgYW5jaG9y cy50b3A6IG1heGltdW1TY2FsZUxhYmVsLmJvdHRvbQotICAgICAgICAgICAgYW5jaG9ycy50b3BN YXJnaW46IDMwCi0gICAgICAgICAgICB0ZXh0OiAiRGV2aWNlIHBpeGVsIHJhdGlvOiAiICsgcGFy c2VGbG9hdCh0ZXN0LmRldmljZVBpeGVsUmF0aW8udG9GaXhlZCg0KSkKLSAgICAgICAgICAgIGZv bnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6IHBhcmVudC5m b250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBjb250 ZW50c1NpemVMYWJlbAotICAgICAgICAgICAgYW5jaG9ycy50b3A6IGRldmljZVBpeGVsUmF0aW9M YWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJDb250ZW50cyBzaXplOiAiICsgdGVzdC5j b250ZW50c1NpemUud2lkdGggKyAieCIgKyB0ZXN0LmNvbnRlbnRzU2l6ZS5oZWlnaHQKLSAgICAg ICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAgY29sb3I6 IHBhcmVudC5mb250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAgICAgICAg IGlkOiBsYXlvdXRTaXplTGFiZWwKLSAgICAgICAgICAgIGFuY2hvcnMudG9wOiBjb250ZW50c1Np emVMYWJlbC5ib3R0b20KLSAgICAgICAgICAgIHRleHQ6ICJWaWV3cG9ydCBsYXlvdXQgc2l6ZTog IiArIHRlc3QubGF5b3V0U2l6ZS53aWR0aCArICJ4IiArIHRlc3QubGF5b3V0U2l6ZS5oZWlnaHQK LSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAgICAg Y29sb3I6IHBhcmVudC5mb250Q29sb3IKLSAgICAgICAgfQotICAgICAgICBUZXh0IHsKLSAgICAg ICAgICAgIGlkOiBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aExhYmVsCi0gICAgICAgICAg ICBhbmNob3JzLnRvcDogbGF5b3V0U2l6ZUxhYmVsLmJvdHRvbQotICAgICAgICAgICAgdGV4dDog IlByZWZlcnJlZCBtaW5pbXVtIGNvbnRlbnRzIHdpZHRoOiAiICsgcHJlZmVycmVkTWluaW11bUNv bnRlbnRzV2lkdGgKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQot ICAgICAgICAgICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKyAgICB9CisKKyAgICBSZWN0YW5n bGUgeworICAgICAgICBjb2xvcjogImdyYXkiCisgICAgICAgIG9wYWNpdHk6IDAuOQorCisgICAg ICAgIGFuY2hvcnMgeworICAgICAgICAgICAgdG9wOiB0aXRsZS5ib3R0b20KKyAgICAgICAgICAg IGxlZnQ6IHRpdGxlLmxlZnQKKyAgICAgICAgICAgIHRvcE1hcmdpbjogMTAKICAgICAgICAgfQot ICAgICAgICBUZXh0IHsKLSAgICAgICAgICAgIGlkOiBzY2FsYWJsZUxhYmVsCi0gICAgICAgICAg ICBhbmNob3JzLnRvcDogcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGhMYWJlbC5ib3R0b20K LSAgICAgICAgICAgIGFuY2hvcnMudG9wTWFyZ2luOiAzMAotICAgICAgICAgICAgdGV4dDogIlZp ZXcgIiArICh0ZXN0LmlzU2NhbGFibGUgPyAiaXMgIiA6ICJpcyBub3QgIiApICsgInNjYWxhYmxl LiIKLSAgICAgICAgICAgIGZvbnQuZmFtaWx5OiBwYXJlbnQuZm9udEZhbWlseQotICAgICAgICAg ICAgY29sb3I6IHBhcmVudC5mb250Q29sb3IKKworICAgICAgICB3aWR0aDogMzQwCisgICAgICAg IGhlaWdodDogMjcwCisKKyAgICAgICAgSXRlbSB7CisgICAgICAgICAgICBpZDogdGV4dEJveAor CisgICAgICAgICAgICBhbmNob3JzIHsKKyAgICAgICAgICAgICAgICBmaWxsOiBwYXJlbnQKKyAg ICAgICAgICAgICAgICBtYXJnaW5zOiAxMAorICAgICAgICAgICAgfQorCisgICAgICAgICAgICBw cm9wZXJ0eSBzdHJpbmcgZm9udEZhbWlseTogIk5va2lhIFtQdXJlXSIKKyAgICAgICAgICAgIHBy b3BlcnR5IGNvbG9yIGZvbnRDb2xvcjogImJsYWNrIgorCisgICAgICAgICAgICBDb2x1bW4gewor ICAgICAgICAgICAgICAgIGFuY2hvcnMuZmlsbDogcGFyZW50CisgICAgICAgICAgICAgICAgc3Bh Y2luZzogMjAKKyAgICAgICAgICAgICAgICBDb2x1bW4geworICAgICAgICAgICAgICAgICAgICBU ZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJDdXJyZW50IHNjYWxlOiAiICsg Zm9ybWF0U2NhbGUodGVzdC5jb250ZW50c1NjYWxlKQorICAgICAgICAgICAgICAgICAgICAgICAg Zm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZhbWlseQorICAgICAgICAgICAgICAgICAgICAgICAg Y29sb3I6IHRleHRCb3guZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBDb2x1bW4geworICAgICAgICAgICAgICAgICAg ICBUZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJJbml0aWFsIHNjYWxlOiAi ICsgZm9ybWF0U2NhbGUodGVzdC5pbml0aWFsU2NhbGUpCisgICAgICAgICAgICAgICAgICAgICAg ICBmb250LmZhbWlseTogdGV4dEJveC5mb250RmFtaWx5CisgICAgICAgICAgICAgICAgICAgICAg ICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6ICJNaW5p bXVtIHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC5taW5pbXVtU2NhbGUpCisgICAgICAgICAg ICAgICAgICAgICAgICBmb250LmZhbWlseTogdGV4dEJveC5mb250RmFtaWx5CisgICAgICAgICAg ICAgICAgICAgICAgICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKKyAgICAgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgICAgICAgICBUZXh0IHsKKyAgICAgICAgICAgICAgICAgICAgICAg IHRleHQ6ICJNYXhpbXVtIHNjYWxlOiAiICsgZm9ybWF0U2NhbGUodGVzdC5tYXhpbXVtU2NhbGUp CisgICAgICAgICAgICAgICAgICAgICAgICBmb250LmZhbWlseTogdGV4dEJveC5mb250RmFtaWx5 CisgICAgICAgICAgICAgICAgICAgICAgICBjb2xvcjogdGV4dEJveC5mb250Q29sb3IKKyAgICAg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIENv bHVtbiB7CisgICAgICAgICAgICAgICAgICAgIFRleHQgeworICAgICAgICAgICAgICAgICAgICAg ICAgdGV4dDogIkRldmljZSBwaXhlbCByYXRpbzogIiArIGZvcm1hdFNjYWxlKHRlc3QuZGV2aWNl UGl4ZWxSYXRpbykKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiB0ZXh0Qm94 LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZvbnRD b2xvcgorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIFRleHQgewor ICAgICAgICAgICAgICAgICAgICAgICAgdGV4dDogIkNvbnRlbnRzIHNpemU6ICIgKyBmb3JtYXRT aXplKHRlc3QuY29udGVudHNTaXplKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1p bHk6IHRleHRCb3guZm9udEZhbWlseQorICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRl eHRCb3guZm9udENvbG9yCisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAg ICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiVmlld3BvcnQgbGF5b3V0 IHNpemU6ICIgKyBmb3JtYXRTaXplKHRlc3QubGF5b3V0U2l6ZSkKKyAgICAgICAgICAgICAgICAg ICAgICAgIGZvbnQuZmFtaWx5OiB0ZXh0Qm94LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZvbnRDb2xvcgorICAgICAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgQ29sdW1uIHsKKyAgICAgICAgICAg ICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0OiAiQWRhcHQgZm9y IHNtYWxsIHNjcmVlbnM6ICIgKyBmb3JtYXRCb29sKHByZWZlcnJlZE1pbmltdW1Db250ZW50c1dp ZHRoKQorICAgICAgICAgICAgICAgICAgICAgICAgZm9udC5mYW1pbHk6IHRleHRCb3guZm9udEZh bWlseQorICAgICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHRleHRCb3guZm9udENvbG9yCisg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgVGV4dCB7CisgICAgICAg ICAgICAgICAgICAgICAgICB0ZXh0OiAiQWxsb3dzIHNjYWxpbmc6ICIgKyBmb3JtYXRCb29sKHRl c3QuaXNTY2FsYWJsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQuZmFtaWx5OiB0ZXh0 Qm94LmZvbnRGYW1pbHkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbG9yOiB0ZXh0Qm94LmZv bnRDb2xvcgorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgfQogfQo=