80832 2012-03-12 06:49:41 -0700 [Qt][WK2] Add support for rudimentary scroll indicators in MiniBrowser 2012-03-12 11:03:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Linux RESOLVED FIXED P2 Normal --- 1 abecsi abecsi hausmann laszlo.gombos menard vestbo webkit.review.bot zoltan oldest_to_newest 576101 0 abecsi 2012-03-12 06:49:41 -0700 The flickable WebView needs scroll indicators in a similar manner as the ScrollDecorator QML component. 576104 1 vestbo 2012-03-12 06:54:19 -0700 I assume this is an intermediate step before we make the WebView inherit Flickable so we can re-use other scroll-indicator-implementations? 576109 2 131321 abecsi 2012-03-12 07:14:54 -0700 Created attachment 131321 proposed patch 576110 3 abecsi 2012-03-12 07:20:54 -0700 (In reply to comment #1) > I assume this is an intermediate step before we make the WebView inherit Flickable so we can re-use other scroll-indicator-implementations? Yes this would be an intermediate step, that's why I used the same API as the ScrollDecorator. Later on we could check whether the platform has a scroll indicator implementation, and if it has none MiniBrowser could use this basic implementation. 576281 4 131321 abecsi 2012-03-12 11:03:13 -0700 Comment on attachment 131321 proposed patch Clearing flags on attachment: 131321 Committed r110447: <http://trac.webkit.org/changeset/110447> 576283 5 abecsi 2012-03-12 11:03:23 -0700 All reviewed patches have been landed. Closing bug. 131321 2012-03-12 07:14:54 -0700 2012-03-12 11:03:13 -0700 proposed patch 0001-Basic-Scroll-Indicator-for-MiniBrowser.patch text/plain 11947 abecsi RnJvbSAxZDAzNjIyOGU0NzFkMTI4MTlkNjliNmU4NmYzNWE3MDNmZDIzNjNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyYXMgQmVjc2kgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+ CkRhdGU6IE1vbiwgMTIgTWFyIDIwMTIgMTU6MDQ6MjIgKzAxMDAKU3ViamVjdDogW1BBVENIXSBC YXNpYyBTY3JvbGwgSW5kaWNhdG9yIGZvciBNaW5pQnJvd3NlcgoKLS0tCiBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNyArKysKIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgfCAgIDE4ICsrLQogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaCB8ICAgIDQgKwog VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTQg KysrCiBUb29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5xcmMgICAgICAgICAgICAgIHwg ICAgMSArCiBUb29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWwgICAgICAg IHwgICAgNCArCiBUb29scy9NaW5pQnJvd3Nlci9xdC9xbWwvU2Nyb2xsSW5kaWNhdG9yLnFtbCAg ICAgIHwgIDEzOSArKysrKysrKysrKysrKysrKysrKysKIDcgZmlsZXMgY2hhbmdlZCwgMTk2IGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBUb29scy9NaW5p QnJvd3Nlci9xdC9xbWwvU2Nyb2xsSW5kaWNhdG9yLnFtbAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAzYTNjNzc4 Li5iNzM3YzRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDMtMTIgIEFuZHJh cyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIEFk ZCBzdXBwb3J0IGZvciBydWRpbWVudGFyeSBzY3JvbGwgaW5kaWNhdG9ycyBpbiBNaW5pQnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA4MzIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW5jZSB0 aGUgU2Nyb2xsRGVjb3JhdG9yIFFNTCBjb21wb25lbnQgcmVxdWlyZXMgYSBGbGlja2FibGUgaW4g aXRzIEFQSQorICAgICAgICB3ZSBuZWVkIHRvIGV4cG9zZSB0aGUgRmxpY2thYmxlIGluIFFNTCBm b3Igbm93IGFuZCB3ZSBhbHNvIG5lZWQgdG8gYWRkCisgICAgICAgIGEgbm90aWZpZXIgYmVjYXVz ZSB3ZSBpbnN0YW50aWF0ZSB0aGUgaW50ZXJuYWwgRmxpY2thYmxlIG9ubHkgd2hlbiB0aGUKKyAg ICAgICAgV2ViVmlldyBjb21wb25lbnQgY29tcGxldGVzIGNvbnN0cnVjdGlvbi4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6b25Db21wb25lbnRDb21wbGV0ZSk6CisgICAgICAgIChR UXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpmbGlja2FibGUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmg6CisKIDIwMTItMDMtMTEgIEFuZHkgRXN0ZXMgIDxh ZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBjYWxsIHRvIE5T U2l6ZVRvQ0dTaXplKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3LmNwcAppbmRleCA2ZTUxOGZmLi4zNjUxNTZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTQ0LDYgKzQ0 LDcgQEAKICNpbmNsdWRlICJxd2VicHJlZmVyZW5jZXNfcF9wLmgiCiAjaW5jbHVkZSAicXdlYnZp ZXdwb3J0aW5mb19wLmgiCiAKKyNpbmNsdWRlIDxwcml2YXRlL3FxdWlja2ZsaWNrYWJsZV9wLmg+ CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSW5pdGlhbGl6ZVRocmVhZGluZy5oPgogI2luY2x1 ZGUgPFFEZWNsYXJhdGl2ZUVuZ2luZT4KICNpbmNsdWRlIDxRRmlsZURpYWxvZz4KQEAgLTU2MSw3 ICs1NjIsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpvbkNvbXBvbmVu dENvbXBsZXRlKCkKICAgICBmbGlja1Byb3ZpZGVyID0gbmV3IFF0RmxpY2tQcm92aWRlcihxLCBw YWdlVmlldy5kYXRhKCkpOwogCiAgICAgLy8gUHJvcGFnYXRlIGZsaWNrYWJsZSBzaWduYWxzLgot ICAgIGNvbnN0IFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwqIGV4cGVyaW1lbnRhbCA9IHEtPmV4 cGVyaW1lbnRhbCgpOworICAgIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwqIGV4cGVyaW1lbnRh bCA9IHEtPmV4cGVyaW1lbnRhbCgpOwogICAgIFFPYmplY3Q6OmNvbm5lY3QoZmxpY2tQcm92aWRl ciwgU0lHTkFMKGNvbnRlbnRXaWR0aENoYW5nZWQoKSksIGV4cGVyaW1lbnRhbCwgU0lHTkFMKGNv bnRlbnRXaWR0aENoYW5nZWQoKSkpOwogICAgIFFPYmplY3Q6OmNvbm5lY3QoZmxpY2tQcm92aWRl ciwgU0lHTkFMKGNvbnRlbnRIZWlnaHRDaGFuZ2VkKCkpLCBleHBlcmltZW50YWwsIFNJR05BTChj b250ZW50SGVpZ2h0Q2hhbmdlZCgpKSk7CiAgICAgUU9iamVjdDo6Y29ubmVjdChmbGlja1Byb3Zp ZGVyLCBTSUdOQUwoY29udGVudFhDaGFuZ2VkKCkpLCBleHBlcmltZW50YWwsIFNJR05BTChjb250 ZW50WENoYW5nZWQoKSkpOwpAQCAtNTg2LDYgKzU4Nyw4IEBAIHZvaWQgUVF1aWNrV2ViVmlld0Zs aWNrYWJsZVByaXZhdGU6Om9uQ29tcG9uZW50Q29tcGxldGUoKQogICAgIF9xX29uVmlzaWJsZUNo YW5nZWQoKTsKIAogICAgIFFRdWlja1dlYlZpZXdQcml2YXRlOjpvbkNvbXBvbmVudENvbXBsZXRl KCk7CisKKyAgICBlbWl0IGV4cGVyaW1lbnRhbC0+ZmxpY2thYmxlQ2hhbmdlZCgpOwogfQogCiB2 b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpsb2FkRGlkU3VjY2VlZCgpCkBAIC0x MDU5LDYgKzEwNjIsMTkgQEAgUURlY2xhcmF0aXZlTGlzdFByb3BlcnR5PFFPYmplY3Q+IFFRdWlj a1dlYlZpZXdFeHBlcmltZW50YWw6OmZsaWNrYWJsZURhdGEoKQogICAgIHJldHVybiBkLT5mbGlj a1Byb3ZpZGVyLT5mbGlja2FibGVEYXRhKCk7CiB9CiAKK1FRdWlja0ZsaWNrYWJsZSogUVF1aWNr V2ViVmlld0V4cGVyaW1lbnRhbDo6ZmxpY2thYmxlKCkKK3sKKyAgICBRX0QoUVF1aWNrV2ViVmll dyk7CisgICAgaWYgKCFkLT5mbGlja1Byb3ZpZGVyKQorICAgICAgICByZXR1cm4gMDsKKworICAg IFFRdWlja0ZsaWNrYWJsZSogZmxpY2thYmxlSXRlbSA9IHFvYmplY3RfY2FzdDxRUXVpY2tGbGlj a2FibGUqPihjb250ZW50SXRlbSgpLT5wYXJlbnRJdGVtKCkpOworCisgICAgQVNTRVJUKGZsaWNr YWJsZUl0ZW0pOworCisgICAgcmV0dXJuIGZsaWNrYWJsZUl0ZW07Cit9CisKIFFRdWlja0l0ZW0q IFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmNvbnRlbnRJdGVtKCkKIHsKICAgICBRX0QoUVF1 aWNrV2ViVmlldyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnZpZXdfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJ2aWV3X3AuaAppbmRleCA1MzAyOTE2Li42YWRhYjE3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKQEAgLTU5LDYgKzU5LDcg QEAgdHlwZWRlZiBjb25zdCBzdHJ1Y3QgT3BhcXVlV0tQYWdlKiBXS1BhZ2VSZWY7CiBRVF9CRUdJ Tl9OQU1FU1BBQ0UKIGNsYXNzIFFQYWludGVyOwogY2xhc3MgUVVybDsKK2NsYXNzIFFRdWlja0Zs aWNrYWJsZTsKIFFUX0VORF9OQU1FU1BBQ0UKIAogCkBAIC0yMzYsNiArMjM3LDcgQEAgY2xhc3Mg UVdFQktJVF9FWFBPUlQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbCA6IHB1YmxpYyBRT2JqZWN0 IHsKICAgICBRX1BST1BFUlRZKHFyZWFsIGNvbnRlbnRIZWlnaHQgUkVBRCBjb250ZW50SGVpZ2h0 IFdSSVRFIHNldENvbnRlbnRIZWlnaHQgTk9USUZZIGNvbnRlbnRIZWlnaHRDaGFuZ2VkKQogICAg IFFfUFJPUEVSVFkocXJlYWwgY29udGVudFggUkVBRCBjb250ZW50WCBXUklURSBzZXRDb250ZW50 WCBOT1RJRlkgY29udGVudFhDaGFuZ2VkKQogICAgIFFfUFJPUEVSVFkocXJlYWwgY29udGVudFkg UkVBRCBjb250ZW50WSBXUklURSBzZXRDb250ZW50WSBOT1RJRlkgY29udGVudFlDaGFuZ2VkKQor ICAgIFFfUFJPUEVSVFkoUVF1aWNrRmxpY2thYmxlKiBmbGlja2FibGUgUkVBRCBmbGlja2FibGUg Tk9USUZZIGZsaWNrYWJsZUNoYW5nZWQpCiAgICAgUV9QUk9QRVJUWShRUXVpY2tJdGVtKiBjb250 ZW50SXRlbSBSRUFEIGNvbnRlbnRJdGVtIENPTlNUQU5UKQogICAgIFFfUFJPUEVSVFkoUURlY2xh cmF0aXZlTGlzdFByb3BlcnR5PFFPYmplY3Q+IGZsaWNrYWJsZURhdGEgUkVBRCBmbGlja2FibGVE YXRhKQogICAgIFFfUFJPUEVSVFkoYm9vbCB0cmFuc3BhcmVudEJhY2tncm91bmQgV1JJVEUgc2V0 VHJhbnNwYXJlbnRCYWNrZ3JvdW5kIFJFQUQgdHJhbnNwYXJlbnRCYWNrZ3JvdW5kKQpAQCAtMjkx LDYgKzI5Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGludm9rZUFwcGxpY2F0aW9uU2NoZW1lSGFu ZGxlcihXVEY6OlBhc3NSZWZQdHI8V2ViS2l0OjpRdFJlZkNvdW50ZWROZXR3b3JrUmVxdWVzdERh dGE+KTsKICAgICB2b2lkIHNlbmRBcHBsaWNhdGlvblNjaGVtZVJlcGx5KFFRdWlja05ldHdvcmtS ZXBseSopOwogCisgICAgUVF1aWNrRmxpY2thYmxlKiBmbGlja2FibGUoKTsKICAgICBRUXVpY2tJ dGVtKiBjb250ZW50SXRlbSgpOwogICAgIHFyZWFsIGNvbnRlbnRXaWR0aCgpIGNvbnN0OwogICAg IHZvaWQgc2V0Q29udGVudFdpZHRoKHFyZWFsKTsKQEAgLTMxNSw2ICszMTgsNyBAQCBwdWJsaWMg UV9TTE9UUzoKICAgICB2b2lkIHBvc3RNZXNzYWdlKGNvbnN0IFFTdHJpbmcmKTsKIAogUV9TSUdO QUxTOgorICAgIHZvaWQgZmxpY2thYmxlQ2hhbmdlZCgpOwogICAgIHZvaWQgY29udGVudFdpZHRo Q2hhbmdlZCgpOwogICAgIHZvaWQgY29udGVudEhlaWdodENoYW5nZWQoKTsKICAgICB2b2lkIGNv bnRlbnRYQ2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDlmZWUxNDEuLjRlN2IyZjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wMy0xMiAgQW5k cmFzIEJlY3NpICA8YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIHJ1ZGltZW50YXJ5IHNjcm9sbCBpbmRpY2F0b3JzIGluIE1pbmlCcm93 c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDgz MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh IGJhc2ljIHNjcm9sbCBpbmRpY2F0b3IgY29tcG9uZW50IHRvIE1pbmlCcm93c2VyIHNvIHRoYXQg aXQKKyAgICAgICAgYmVoYXZlcyBzaW1pbGFyIHRvIHRoZSBTY3JvbGxEZWNvcmF0b3IgUU1MIGNv bXBvbmVudC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFyYzoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWw6CisgICAgICAgICog TWluaUJyb3dzZXIvcXQvcW1sL1Njcm9sbEluZGljYXRvci5xbWw6IEFkZGVkLgorCiAyMDEyLTAz LTExICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIC0t aW5zdHJ1bWVudHMgb3B0aW9uIHRvIHN1bnNwaWRlciB0byBwcm9maWxlIHdpdGggSW5zdHJ1bWVu dHMKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFyYyBiL1Rv b2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFyYwppbmRleCAyNzIzNTBlLi5lMDBjNTFl IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5xcmMKKysrIGIv VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucXJjCkBAIC0xOSw2ICsxOSw3IEBACiAg ICAgICAgIDxmaWxlPnFtbC9Nb2NrVG91Y2hQb2ludC5xbWw8L2ZpbGU+CiAgICAgICAgIDxmaWxl PnFtbC9Qcm9tcHREaWFsb2cucW1sPC9maWxlPgogICAgICAgICA8ZmlsZT5xbWwvUHJveHlBdXRo ZW50aWNhdGlvbkRpYWxvZy5xbWw8L2ZpbGU+CisgICAgICAgIDxmaWxlPnFtbC9TY3JvbGxJbmRp Y2F0b3IucW1sPC9maWxlPgogICAgICAgICA8ZmlsZT5xbWwvVmlld3BvcnRJbmZvSXRlbS5xbWw8 L2ZpbGU+CiAgICAgICAgIDxmaWxlPnVzZXJhZ2VudGxpc3QudHh0PC9maWxlPgogICAgICAgICA8 ZmlsZT5pY29ucy9mYXZpY29uLnBuZzwvZmlsZT4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93 c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93LnFtbCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9C cm93c2VyV2luZG93LnFtbAppbmRleCBhZTFmOWYyLi4wZDYwOTNhIDEwMDY0NAotLS0gYS9Ub29s cy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWwKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5kb3cucW1sCkBAIC0zMTIsNiArMzEyLDEwIEBAIFJlY3Rh bmdsZSB7CiAgICAgICAgIGV4cGVyaW1lbnRhbC5wcm9tcHREaWFsb2c6IFByb21wdERpYWxvZyB7 IH0KICAgICAgICAgZXhwZXJpbWVudGFsLmF1dGhlbnRpY2F0aW9uRGlhbG9nOiBBdXRoZW50aWNh dGlvbkRpYWxvZyB7IH0KICAgICAgICAgZXhwZXJpbWVudGFsLnByb3h5QXV0aGVudGljYXRpb25E aWFsb2c6IFByb3h5QXV0aGVudGljYXRpb25EaWFsb2cgeyB9CisKKyAgICAgICAgU2Nyb2xsSW5k aWNhdG9yIHsKKyAgICAgICAgICAgIGZsaWNrYWJsZUl0ZW06IHdlYlZpZXcuZXhwZXJpbWVudGFs LmZsaWNrYWJsZQorICAgICAgICB9CiAgICAgfQogCiAgICAgVmlld3BvcnRJbmZvSXRlbSB7CmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvU2Nyb2xsSW5kaWNhdG9yLnFtbCBi L1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9TY3JvbGxJbmRpY2F0b3IucW1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMxYjdhM2MKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9xdC9xbWwvU2Nyb2xsSW5kaWNhdG9yLnFtbApAQCAtMCwwICsxLDEzOSBA QAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRz IHN1YnNpZGlhcnkoLWllcykKKyAqCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4g YGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBP UgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJ VFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK2lt cG9ydCBRdFF1aWNrIDIuMAorCitJdGVtIHsKKyAgICBpZDogcm9vdAorICAgIHo6IDEKKworICAg IGFuY2hvcnMuZmlsbDogcGFyZW50CisKKyAgICBwcm9wZXJ0eSBGbGlja2FibGUgZmxpY2thYmxl SXRlbQorCisgICAgcHJvcGVydHkgYm9vbCBfX21vdmluZ0hvcml6b250YWxseTogZmxpY2thYmxl SXRlbSA/IGZsaWNrYWJsZUl0ZW0ubW92aW5nSG9yaXpvbnRhbGx5IDogZmFsc2UKKyAgICBwcm9w ZXJ0eSBib29sIF9fbW92aW5nVmVydGljYWxseTogZmxpY2thYmxlSXRlbSA/IGZsaWNrYWJsZUl0 ZW0ubW92aW5nVmVydGljYWxseSA6IGZhbHNlCisKKyAgICBwcm9wZXJ0eSByZWFsIF9fdmlld1dp ZHRoOiAgZmxpY2thYmxlSXRlbSA/IGZsaWNrYWJsZUl0ZW0ud2lkdGg6IDAKKyAgICBwcm9wZXJ0 eSByZWFsIF9fdmlld0hlaWdodDogIGZsaWNrYWJsZUl0ZW0gPyBmbGlja2FibGVJdGVtLmhlaWdo dDogMAorCisgICAgcHJvcGVydHkgaW50IF9faGlkZVRpbWVvdXQ6IDgwMAorICAgIHByb3BlcnR5 IHJlYWwgX19pbmRpY2F0b3JTaXplOiA1CisgICAgcHJvcGVydHkgcmVhbCBfX2luZGljYXRvckJv cmRlcjogMQorCisgICAgSXRlbSB7CisgICAgICAgIGlkOiBob3Jpem9udGFsSW5kaWNhdG9yCisg ICAgICAgIG9wYWNpdHk6IDAKKworICAgICAgICB3aWR0aDogX192aWV3V2lkdGggLSBfX2luZGlj YXRvclNpemUKKyAgICAgICAgaGVpZ2h0OiBfX2luZGljYXRvclNpemUKKworICAgICAgICBhbmNo b3JzLmJvdHRvbTogcm9vdC5ib3R0b20KKworICAgICAgICBSZWN0YW5nbGUgeworICAgICAgICAg ICAgcmFkaXVzOiAxMAorICAgICAgICAgICAgY29sb3I6ICJibGFjayIKKyAgICAgICAgICAgIGJv cmRlci5jb2xvcjogImdyYXkiCisgICAgICAgICAgICBib3JkZXIud2lkdGg6IDIKKyAgICAgICAg ICAgIG9wYWNpdHk6IDAuNQorICAgICAgICAgICAgc21vb3RoOiB0cnVlCisKKyAgICAgICAgICAg IHg6IGZsaWNrYWJsZUl0ZW0gPyBmbGlja2FibGVJdGVtLnZpc2libGVBcmVhLnhQb3NpdGlvbiAq IGhvcml6b250YWxJbmRpY2F0b3Iud2lkdGggOiAwOworICAgICAgICAgICAgeTogMAorCisgICAg ICAgICAgICB3aWR0aDogZmxpY2thYmxlSXRlbSA/IGZsaWNrYWJsZUl0ZW0udmlzaWJsZUFyZWEu d2lkdGhSYXRpbyAqIGhvcml6b250YWxJbmRpY2F0b3Iud2lkdGg6IDA7CisgICAgICAgICAgICBo ZWlnaHQ6IF9faW5kaWNhdG9yU2l6ZQorICAgICAgICB9CisKKyAgICAgICAgc3RhdGVzOiBbCisg ICAgICAgICAgICBTdGF0ZSB7CisgICAgICAgICAgICAgICAgbmFtZTogInNob3ciCisgICAgICAg ICAgICAgICAgd2hlbjogX19tb3ZpbmdIb3Jpem9udGFsbHkKKyAgICAgICAgICAgICAgICBQcm9w ZXJ0eUNoYW5nZXMgeworICAgICAgICAgICAgICAgICAgICB0YXJnZXQ6IGhvcml6b250YWxJbmRp Y2F0b3IKKyAgICAgICAgICAgICAgICAgICAgb3BhY2l0eTogMQorICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIH0KKyAgICAgICAgXQorCisgICAgICAgIHRyYW5zaXRpb25zOiBbCisgICAg ICAgICAgICBUcmFuc2l0aW9uIHsKKyAgICAgICAgICAgICAgICBOdW1iZXJBbmltYXRpb24gewor ICAgICAgICAgICAgICAgICAgICB0YXJnZXQ6IGhvcml6b250YWxJbmRpY2F0b3IKKyAgICAgICAg ICAgICAgICAgICAgcHJvcGVydGllczogIm9wYWNpdHkiCisgICAgICAgICAgICAgICAgICAgIGR1 cmF0aW9uOiBfX2hpZGVUaW1lb3V0CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQor ICAgICAgICBdCisgICAgfQorCisgICAgSXRlbSB7CisgICAgICAgIGlkOiB2ZXJ0aWNhbEluZGlj YXRvcgorICAgICAgICBvcGFjaXR5OiAwCisKKyAgICAgICAgd2lkdGg6IF9faW5kaWNhdG9yU2l6 ZQorICAgICAgICBoZWlnaHQ6IF9fdmlld0hlaWdodCAtIF9faW5kaWNhdG9yU2l6ZQorCisgICAg ICAgIGFuY2hvcnMucmlnaHQ6IHJvb3QucmlnaHQKKworICAgICAgICBSZWN0YW5nbGUgeworICAg ICAgICAgICAgcmFkaXVzOiAxMAorICAgICAgICAgICAgY29sb3I6ICJibGFjayIKKyAgICAgICAg ICAgIGJvcmRlci5jb2xvcjogImdyYXkiCisgICAgICAgICAgICBib3JkZXIud2lkdGg6IDIKKyAg ICAgICAgICAgIG9wYWNpdHk6IDAuNQorICAgICAgICAgICAgc21vb3RoOiB0cnVlOworCisgICAg ICAgICAgICB4OiAwCisgICAgICAgICAgICB5OiBmbGlja2FibGVJdGVtID8gZmxpY2thYmxlSXRl bS52aXNpYmxlQXJlYS55UG9zaXRpb24gKiB2ZXJ0aWNhbEluZGljYXRvci5oZWlnaHQgOiAwOwor CisgICAgICAgICAgICB3aWR0aDogX19pbmRpY2F0b3JTaXplCisgICAgICAgICAgICBoZWlnaHQ6 IGZsaWNrYWJsZUl0ZW0gPyBmbGlja2FibGVJdGVtLnZpc2libGVBcmVhLmhlaWdodFJhdGlvICog dmVydGljYWxJbmRpY2F0b3IuaGVpZ2h0IDogMDsKKyAgICAgICAgfQorCisgICAgICAgIHN0YXRl czogWworICAgICAgICAgICAgU3RhdGUgeworICAgICAgICAgICAgICAgIG5hbWU6ICJzaG93Igor ICAgICAgICAgICAgICAgIHdoZW46IF9fbW92aW5nVmVydGljYWxseQorICAgICAgICAgICAgICAg IFByb3BlcnR5Q2hhbmdlcyB7CisgICAgICAgICAgICAgICAgICAgIHRhcmdldDogdmVydGljYWxJ bmRpY2F0b3IKKyAgICAgICAgICAgICAgICAgICAgb3BhY2l0eTogMQorICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgXQorCisgICAgICAgIHRyYW5zaXRpb25zOiBbCisg ICAgICAgICAgICBUcmFuc2l0aW9uIHsKKyAgICAgICAgICAgICAgICBOdW1iZXJBbmltYXRpb24g eworICAgICAgICAgICAgICAgICAgICB0YXJnZXQ6IHZlcnRpY2FsSW5kaWNhdG9yCisgICAgICAg ICAgICAgICAgICAgIHByb3BlcnRpZXM6ICJvcGFjaXR5IgorICAgICAgICAgICAgICAgICAgICBk dXJhdGlvbjogX19oaWRlVGltZW91dAorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0K KyAgICAgICAgXQorICAgIH0KK30KLS0gCjEuNy45LjIKCg==