85272 2012-05-01 03:11:42 -0700 Calendar Picker: Add capability to add platform-specific style sheet 2012-05-01 17:12:09 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 53961 1 tkent tkent haraken morrita webkit.review.bot oldest_to_newest 613320 0 tkent 2012-05-01 03:11:42 -0700 Calendar Picker: Add capability to add platform-specific style sheet 613321 1 139604 tkent 2012-05-01 03:22:55 -0700 Created attachment 139604 Patch 613436 2 139604 haraken 2012-05-01 09:12:14 -0700 Comment on attachment 139604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139604&action=review > Source/WebCore/Resources/calendarPicker.css:-99 > -/* FIXME: We'd like to use the standard button appearance for non-Mac. */ Just a confirmation: Is it OK to remove the following css? I mean, aren't other platforms using .year-month-button in calendarPicker.css? > Source/WebCore/Resources/calendarPickerMac.css:31 > +.year-month-button { Just a confirmation: calendarPickerMac.css does not have .year-month-button:hover, which had existed in calendarPicker.css. Is it intentional? 613782 3 139604 tkent 2012-05-01 16:38:58 -0700 Comment on attachment 139604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139604&action=review >> Source/WebCore/Resources/calendarPicker.css:-99 >> -/* FIXME: We'd like to use the standard button appearance for non-Mac. */ > > Just a confirmation: Is it OK to remove the following css? I mean, aren't other platforms using .year-month-button in calendarPicker.css? The year-month-button class is added to <input type=button>. Non-Mac platforms use the standard appearance of <input type=button>. >> Source/WebCore/Resources/calendarPickerMac.css:31 >> +.year-month-button { > > Just a confirmation: calendarPickerMac.css does not have .year-month-button:hover, which had existed in calendarPicker.css. Is it intentional? Yes, it's intentional. In general, OS X needs no :hover style for buttons and Windows needs it. Before this patch, we applied year-month-button style to buttons in all platforms, and it was aligned to Windows-style. The :hover rule is not needed for this file because this files is for OS X. 613784 4 139604 haraken 2012-05-01 16:40:37 -0700 Comment on attachment 139604 Patch Makes sense. r+ for the C++ part and rs for the css part. 613787 5 139604 tkent 2012-05-01 16:45:30 -0700 Comment on attachment 139604 Patch thanks! 613805 6 139604 webkit.review.bot 2012-05-01 17:12:04 -0700 Comment on attachment 139604 Patch Clearing flags on attachment: 139604 Committed r115764: <http://trac.webkit.org/changeset/115764> 613806 7 webkit.review.bot 2012-05-01 17:12:09 -0700 All reviewed patches have been landed. Closing bug. 139604 2012-05-01 03:22:55 -0700 2012-05-01 17:12:04 -0700 Patch bug-85272-20120501192253.patch text/plain 11910 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTg4NDViZWM0NDMxM2M3 ZWI1NTFlMDllY2YwM2IwYjFmNzIzYzc2MS4uN2QyZGFlMWQyYWI0M2U2NmI1NjVmOTM2OTkxMjc2 OTdmZDE4MzljMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA1LTAxICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDYWxlbmRhciBQaWNrZXI6 IEFkZCBjYXBhYmlsaXR5IHRvIGFkZCBwbGF0Zm9ybS1zcGVjaWZpYyBzdHlsZSBzaGVldAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUyNzIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgUmVuZGVyVGhl bWU6OmV4dHJhQ2FsZW5kYXJQaWNrZXJTdHlsZVNoZWV0KCkuIFRoZSByZXN1bHRhbnQgc3RyaW5n CisgICAgICAgIG9mIHRoZSBmdW5jdGlvbiBpcyBpbnNlcnRlZCBpbnRvIHRoZSBjYWxlbmRhciBw aWNrZXIgcGFnZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENhbGVuZGFyIHBpY2tlciBhcHBl cmFuY2UgaXMgbm90IHRlc3RhYmxlIHlldC4KKworICAgICAgICAqIFJlc291cmNlcy9jYWxlbmRh clBpY2tlci5jc3M6IFJlbW92ZWQgc3R5bGVzIGZvciB5ZWFyLW1vbnRoIGJ1dHRvbnMuCisgICAg ICAgICogUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyTWFjLmNzczoKKyAgICAgICAgTW92ZWQgZnJv bSBjYWxlbmRhclBpY2tlci5jc3MsIGFuZCBhZGp1c3Qgc3R5bGVzIHNvIHRoYXQgdGhleSBsb29r CisgICAgICAgIHN0YW5kYXJkIExpb24gYnV0dG9ucy4KKyAgICAgICAgKC55ZWFyLW1vbnRoLWJ1 dHRvbik6CisgICAgICAgICgueWVhci1tb250aC1idXR0b246YWN0aXZlKToKKyAgICAgICAgKC55 ZWFyLW1vbnRoLWJ1dHRvbjpkaXNhYmxlZCk6CisgICAgICAgICogV2ViQ29yZS5neXAvV2ViQ29y ZS5neXA6IEFkZCBhIHJ1bGUgdG8gcHJvZHVjZSBDYWxlbmRhclBpY2tlck1hYy57Y3BwLGh9Lgor ICAgICAgICAqIGh0bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYWxlbmRhclBpY2tlckVsZW1lbnQ6OndyaXRlRG9jdW1lbnQpOgorICAgICAg ICBBZGQgZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQoKSByZXN1bHQgdG8gdGhlIGRvY3Vt ZW50LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZTo6ZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQpOgorICAgICAg ICBBZGRlZC4gUmV0dXJucyBhbiBlbXB0eSBDU3RyaW5nIGJ5IGRlZmF1bHQuCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisgICAgICAgIChSZW5kZXJUaGVtZSk6IEFkZGVkIGV4 dHJhQ2FsZW5kYXJQaWNrZXJTdHlsZVNoZWV0KCkuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1NYWMuaDogQWRkZWQgZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQo KS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OmV4dHJhQ2FsZW5kYXJQaWNrZXJT dHlsZVNoZWV0KToKKyAgICAgICAgQWRkZWQuIFJldHVybnMgdGhlIGNvbnRlbnQgb2YgUmVzb3Vy Y2VzL2NhbGVuZGFyUGlja2VyTWFjLmNzcy4KKwogMjAxMi0wNC0zMCAgS2VudCBUYW11cmEgIDx0 a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtL1dpbmRvd3NdIEFkZCBMb2Nh bGl6ZWREYXRlV2luCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvY2FsZW5k YXJQaWNrZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmNz cwppbmRleCBiMDczN2QwZTJhMGM1MGRmY2Q5MTU0Zjk3ZGIxZDcxNmZkY2M4Y2U2Li5lZWYwYjEw NmQ3OWE2ZGJkZGFiYjdhZTQ2ZmJkN2YyNjZlZGZiNjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9SZXNvdXJjZXMvY2FsZW5kYXJQaWNrZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jl c291cmNlcy9jYWxlbmRhclBpY2tlci5jc3MKQEAgLTk2LDM0ICs5Niw2IEBAIGJvZHkgewogICAg IHdpZHRoOiAxMDAlOwogfQogCi0vKiBGSVhNRTogV2UnZCBsaWtlIHRvIHVzZSB0aGUgc3RhbmRh cmQgYnV0dG9uIGFwcGVhcmFuY2UgZm9yIG5vbi1NYWMuICovCi0ueWVhci1tb250aC1idXR0b24g ewotICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZTsKLSAgICBiYWNrZ3JvdW5kOiAtd2Via2l0 LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBmcm9tKCNlZWUpLCBjb2xv ci1zdG9wKDAuNCwgI2ZmZiksIGNvbG9yLXN0b3AoMC42LCAjZGRkZGRkKSwgdG8oI2VlZSkpOwot ICAgIGJvcmRlcjogc29saWQgMXB4ICM0NDQ7Ci0gICAgYm9yZGVyLXJhZGl1czogM3B4OwotICAg IGJveC1zaGFkb3c6IGluc2V0IDFweCAxcHggMXB4IHJnYmEoMjU1LDI1NSwyNTUsMC40KSwgaW5z ZXQgLTFweCAtMXB4IDFweCByZ2JhKDI1NSwyNTUsMjU1LDAuNCk7Ci0gICAgcGFkZGluZy1sZWZ0 OiAzcHg7Ci0gICAgcGFkZGluZy1yaWdodDogM3B4OwotfQotCi0ueWVhci1tb250aC1idXR0b246 aG92ZXIgewotICAgIGJhY2tncm91bmQ6IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0IHRv cCwgbGVmdCBib3R0b20sIGZyb20oI2UwZjBmZiksIGNvbG9yLXN0b3AoMC40LCAjZTBmMGZmKSwg Y29sb3Itc3RvcCgwLjYsICNiMGUwZmYpLCB0bygjYjBlMGZmKSk7Ci0gICAgYm9yZGVyOiBzb2xp ZCAxcHggIzQ0ODsKLX0KLQotLnllYXItbW9udGgtYnV0dG9uOmFjdGl2ZSB7Ci0gICAgYm9yZGVy OiBzb2xpZCAxcHggYmxhY2s7Ci0gICAgYm94LXNoYWRvdzogaW5zZXQgMXB4IDFweCAxcHggcmdi YSgwLDAsMCwwLjMpLCBpbnNldCAtMXB4IC0xcHggMXB4IHJnYmEoMCwwLDAsMC4zKTsKLX0KLQot LnllYXItbW9udGgtYnV0dG9uOmRpc2FibGVkIHsKLSAgICBjb2xvcjogIzg4ODsKLSAgICBiYWNr Z3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBm cm9tKCNlZWUpLCBjb2xvci1zdG9wKDAuNCwgI2ZmZiksIGNvbG9yLXN0b3AoMC42LCAjZGRkZGRk KSwgdG8oI2VlZSkpOwotICAgIGJvcmRlcjogc29saWQgMXB4ICNjY2M7Ci0gICAgYm94LXNoYWRv dzogaW5zZXQgMXB4IDFweCAxcHggcmdiYSgyNTUsMjU1LDI1NSwwLjQpLCBpbnNldCAtMXB4IC0x cHggMXB4IHJnYmEoMjU1LDI1NSwyNTUsMC40KTsKLX0KLQogLnllYXItbW9udGgtYnV0dG9uLWxl ZnQgewogICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1Jlc291cmNlcy9jYWxlbmRhclBpY2tlck1hYy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9S ZXNvdXJjZXMvY2FsZW5kYXJQaWNrZXJNYWMuY3NzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQxNDQ2NDU2MjdhOTc1 ZTdiNWE5Nzg1OTRiYWVmZjExMjA4MThiOTIKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9SZXNvdXJjZXMvY2FsZW5kYXJQaWNrZXJNYWMuY3NzCkBAIC0wLDAgKzEsNDkgQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAg KiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICog ZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBu b3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9y c2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0 aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9S UworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVS IE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAq IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisueWVh ci1tb250aC1idXR0b24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZTsKKyAgICBiYWNr Z3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBm cm9tKCNmZmYpLCBjb2xvci1zdG9wKDAuMywgI2ZmZiksIGNvbG9yLXN0b3AoMC4zNSwgI2Y3Zjdm NyksIGNvbG9yLXN0b3AoMC40OSwgI2Y3ZjdmNyksIGNvbG9yLXN0b3AoMC41LCAjZWRlZGVkKSwg dG8oI2VkZWRlZCkpOworICAgIGJvcmRlcjogc29saWQgMXB4ICNhNmE2YTY7CisgICAgYm9yZGVy LXJhZGl1czogNHB4OworICAgIGJveC1zaGFkb3c6IGluc2V0IDFweCAxcHggMXB4IHJnYmEoMjU1 LDI1NSwyNTUsMC40KSwgaW5zZXQgLTFweCAtMXB4IDFweCByZ2JhKDI1NSwyNTUsMjU1LDAuNCk7 CisgICAgcGFkZGluZy1sZWZ0OiAzcHg7CisgICAgcGFkZGluZy1yaWdodDogM3B4OworfQorCisu eWVhci1tb250aC1idXR0b246YWN0aXZlIHsKKyAgICBiYWNrZ3JvdW5kOiAtd2Via2l0LWdyYWRp ZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBmcm9tKCNhM2JmZWYpLCBjb2xvci1z dG9wKDAuNDksICAjNmJhM2VmKSwgY29sb3Itc3RvcCgwLjUsICM0NDkxZWYpLCB0bygjYTNkMWVm KSk7CisgICAgYm9yZGVyOiBzb2xpZCAxcHggIzRkNGQ1MDsKK30KKworLnllYXItbW9udGgtYnV0 dG9uOmRpc2FibGVkIHsKKyAgICBjb2xvcjogIzg4ODsKKyAgICBib3JkZXI6IHNvbGlkIDFweCAj ZDFkMWQxOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29y ZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCBiMGUw MmNhYTUwMzJkM2JkMzExODcxOTZkODdiYjIwNjZlNWVlNzNkLi41NTZjMTIzYWY1Nzg5MWIzOTBl YzE5ZDllNTI5YmY5NDNhMmQ5NDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3Jl Lmd5cApAQCAtODYzLDYgKzg2MywyNCBAQAogICAgICAgICAgIF0sCiAgICAgICAgIH0sCiAgICAg ICAgIHsKKyAgICAgICAgICAnYWN0aW9uX25hbWUnOiAnQ2FsZW5kYXJQaWNrZXJNYWMnLAorICAg ICAgICAgICdpbnB1dHMnOiBbCisgICAgICAgICAgICAnLi4vUmVzb3VyY2VzL2NhbGVuZGFyUGlj a2VyTWFjLmNzcycsCisgICAgICAgICAgXSwKKyAgICAgICAgICAnb3V0cHV0cyc6IFsKKyAgICAg ICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvQ2FsZW5kYXJQaWNrZXJN YWMuaCcsCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L0Nh bGVuZGFyUGlja2VyTWFjLmNwcCcsCisgICAgICAgICAgXSwKKyAgICAgICAgICAnYWN0aW9uJzog WworICAgICAgICAgICAgJ3B5dGhvbicsCisgICAgICAgICAgICAnLi4vbWFrZS1maWxlLWFycmF5 cy5weScsCisgICAgICAgICAgICAnLS1jb25kaXRpb249RU5BQkxFKENBTEVOREFSX1BJQ0tFUikn LAorICAgICAgICAgICAgJy0tb3V0LWg9PChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0 L0NhbGVuZGFyUGlja2VyTWFjLmgnLAorICAgICAgICAgICAgJy0tb3V0LWNwcD08KFNIQVJFRF9J TlRFUk1FRElBVEVfRElSKS93ZWJraXQvQ2FsZW5kYXJQaWNrZXJNYWMuY3BwJywKKyAgICAgICAg ICAgICc8QChfaW5wdXRzKScsCisgICAgICAgICAgXSwKKyAgICAgICAgfSwKKyAgICAgICAgewog ICAgICAgICAgICdhY3Rpb25fbmFtZSc6ICdYTGlua05hbWVzJywKICAgICAgICAgICAnaW5wdXRz JzogWwogICAgICAgICAgICAgJy4uL2RvbS9tYWtlX25hbWVzLnBsJywKQEAgLTExNDUsNiArMTE2 Myw5IEBACiAgICAgICAgICAgJ2luY2x1ZGVfZGlycyc6IFsKICAgICAgICAgICAgICc8KGNocm9t aXVtX3NyY19kaXIpL3RoaXJkX3BhcnR5L2FwcGxlX3dlYmtpdCcsCiAgICAgICAgICAgXSwKKyAg ICAgICAgICAnc291cmNlcyc6IFsKKyAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVf RElSKS93ZWJraXQvQ2FsZW5kYXJQaWNrZXJNYWMuY3BwJywKKyAgICAgICAgICBdLAogICAgICAg ICB9XSwKICAgICAgICAgWydPUz09IndpbiInLCB7CiAgICAgICAgICAgJ2RlZmluZXMnOiBbCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ2FsZW5kYXJQaWNrZXJFbGVtZW50 LmNwcAppbmRleCA3OWQ2YzY4ZTg5MmI2NDZlY2Y5NDhlZTg4MDlmZDFkMGNhZjZhMzFjLi43NWVl ZWY2MzhiYWZhYzY0MzI2MDJlMzI2ZGEwOGM5YzkwZDc3ZGJhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHAKQEAgLTQ3LDYg KzQ3LDcgQEAKICNpbmNsdWRlICJMb2NhbGl6ZWRTdHJpbmdzLmgiCiAjaW5jbHVkZSAiUGFnZS5o IgogI2luY2x1ZGUgIlJlbmRlckRldGFpbHNNYXJrZXIuaCIKKyNpbmNsdWRlICJSZW5kZXJUaGVt ZS5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogdXNpbmcgbmFtZXNw YWNlIFdURjo6VW5pY29kZTsKQEAgLTIwOCw2ICsyMDksMTEgQEAgdm9pZCBDYWxlbmRhclBpY2tl ckVsZW1lbnQ6OndyaXRlRG9jdW1lbnQoRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKIAogICAgIGFk ZExpdGVyYWwoIjwhRE9DVFlQRSBodG1sPjxoZWFkPjxtZXRhIGNoYXJzZXQ9J1VURi04Jz48c3R5 bGU+XG4iLCB3cml0ZXIpOwogICAgIHdyaXRlci5hZGREYXRhKGNhbGVuZGFyUGlja2VyQ3NzLCBz aXplb2YoY2FsZW5kYXJQaWNrZXJDc3MpKTsKKyAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpKSB7 CisgICAgICAgIENTdHJpbmcgZXh0cmFTdHlsZSA9IGRvY3VtZW50KCktPnBhZ2UoKS0+dGhlbWUo KS0+ZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQoKTsKKyAgICAgICAgaWYgKGV4dHJhU3R5 bGUubGVuZ3RoKCkpCisgICAgICAgICAgICB3cml0ZXIuYWRkRGF0YShleHRyYVN0eWxlLmRhdGEo KSwgZXh0cmFTdHlsZS5sZW5ndGgoKSk7CisgICAgfQogICAgIGFkZExpdGVyYWwoIjwvc3R5bGU+ PC9oZWFkPjxib2R5PjxkaXYgaWQ9bWFpbj5Mb2FkaW5nLi4uPC9kaXY+PHNjcmlwdD5cbiIKICAg ICAgICAgICAgICAgICJ3aW5kb3cuZGlhbG9nQXJndW1lbnRzID0ge1xuIiwgd3JpdGVyKTsKICAg ICBhZGRQcm9wZXJ0eSgibWluIiwgbWluU3RyaW5nLCB3cml0ZXIpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKaW5kZXggNGM0MWZiM2M0MmY5ZGZjZjVlZDQ5ZmJiMGMx M2U5OTJjZTI4MzU5MC4uNTg1Mzg1ZjFiYmIzNzcxNGE5ZjBlZjA0NjViZDUyZDJlNTIwODdkZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCkBAIC02MTMsNiArNjEz LDEzIEBAIENvbG9yIFJlbmRlclRoZW1lOjpwbGF0Zm9ybUluYWN0aXZlTGlzdEJveFNlbGVjdGlv bkZvcmVncm91bmRDb2xvcigpIGNvbnN0CiAgICAgcmV0dXJuIHBsYXRmb3JtSW5hY3RpdmVTZWxl Y3Rpb25Gb3JlZ3JvdW5kQ29sb3IoKTsKIH0KIAorI2lmIEVOQUJMRShDQUxFTkRBUl9QSUNLRVIp CitDU3RyaW5nIFJlbmRlclRoZW1lOjpleHRyYUNhbGVuZGFyUGlja2VyU3R5bGVTaGVldCgpCit7 CisgICAgcmV0dXJuIENTdHJpbmcoKTsKK30KKyNlbmRpZgorCiBMYXlvdXRVbml0IFJlbmRlclRo ZW1lOjpiYXNlbGluZVBvc2l0aW9uKGNvbnN0IFJlbmRlck9iamVjdCogbykgY29uc3QKIHsKICAg ICBpZiAoIW8tPmlzQm94KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmlu ZGV4IDcwMzBiNTU1MzYwNzA1MDY4OWY4ODBkYTM2MjY3MzNjMTQ1ODc3NjIuLmUzZTcxNDc1ZjA5 YzUyZWNiNzFiNTY0Nzg5ZGQ2YmJmZGI3ZTgyYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZS5oCkBAIC05NCw2ICs5NCw5IEBAIHB1YmxpYzoKICNpZiBFTkFCTEUoRlVMTFND UkVFTl9BUEkpCiAgICAgdmlydHVhbCBTdHJpbmcgZXh0cmFGdWxsU2NyZWVuU3R5bGVTaGVldCgp IHsgcmV0dXJuIFN0cmluZygpOyB9OwogI2VuZGlmCisjaWYgRU5BQkxFKENBTEVOREFSX1BJQ0tF UikKKyAgICB2aXJ0dWFsIENTdHJpbmcgZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQoKTsK KyNlbmRpZgogCiAgICAgLy8gQSBtZXRob2QgdG8gb2J0YWluIHRoZSBiYXNlbGluZSBwb3NpdGlv biBmb3IgYSAibGVhZiIgY29udHJvbC4gIFRoaXMgd2lsbCBvbmx5IGJlIHVzZWQgaWYgYSBiYXNl bGluZQogICAgIC8vIHBvc2l0aW9uIGNhbm5vdCBiZSBkZXRlcm1pbmVkIGJ5IGV4YW1pbmluZyBj aGlsZCBjb250ZW50LiBDaGVja2JveGVzIGFuZCByYWRpbyBidXR0b25zIGFyZSBleGFtcGxlcyBv ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21p dW1NYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFj LmgKaW5kZXggZTc2N2Q0MjRiZjA0N2MxM2RjMmY1YjhmMDc0NzRlNDZmMWY1MTI0NS4uMmI0Yzhj NjM1Y2MyMjNjMTgzYjUxOGIxMmNlYWVlZjUyZmFiMGM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5oCkBAIC02Nyw2ICs2Nyw5IEBA IHByaXZhdGU6CiAgICAgdmlydHVhbCBDb2xvciBkaXNhYmxlZFRleHRDb2xvcihjb25zdCBDb2xv ciYgdGV4dENvbG9yLCBjb25zdCBDb2xvciYpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRleHRD b2xvcjsgfQogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVBY3RpdmVTdGF0ZShOU0NlbGwqLCBjb25z dCBSZW5kZXJPYmplY3QqKTsKICAgICB2aXJ0dWFsIFN0cmluZyBleHRyYURlZmF1bHRTdHlsZVNo ZWV0KCk7CisjaWYgRU5BQkxFKENBTEVOREFSX1BJQ0tFUikKKyAgICB2aXJ0dWFsIENTdHJpbmcg ZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQoKSBPVkVSUklERTsKKyNlbmRpZgogICAgIHZp cnR1YWwgYm9vbCBzaG91bGRTaG93UGxhY2Vob2xkZXJXaGVuRm9jdXNlZCgpIGNvbnN0IE9WRVJS SURFOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVD aHJvbWl1bU1hYy5tbQppbmRleCA2YWZkOWQxZjI1NGNiNzY2MjE3M2ExZjI4NDk2NjkwNWYxNjNl YzlmLi5hNzc4MjI4YzU1MjJkNmMwMjk0MjcxZWYzN2E5YjQ2YzQwY2VkNTRmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbQpAQCAt MTksNiArMTksOCBAQAogICovCiAKICNpbXBvcnQgImNvbmZpZy5oIgorCisjaW1wb3J0ICJDYWxl bmRhclBpY2tlck1hYy5oIgogI2ltcG9ydCAiTG9jYWxDdXJyZW50R3JhcGhpY3NDb250ZXh0Lmgi CiAjaW1wb3J0ICJSZW5kZXJUaGVtZUNocm9taXVtTWFjLmgiCiAjaW1wb3J0ICJQYWludEluZm8u aCIKQEAgLTE5NSw2ICsxOTcsMTIgQEAgU3RyaW5nIFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OmV4 dHJhRGVmYXVsdFN0eWxlU2hlZXQoKQogICAgICAgICAgICBTdHJpbmcodGhlbWVDaHJvbWl1bVVz ZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZih0aGVtZUNocm9taXVtVXNlckFnZW50U3R5bGVTaGVl dCkpOwogfQogCisjaWYgRU5BQkxFKENBTEVOREFSX1BJQ0tFUikKK0NTdHJpbmcgUmVuZGVyVGhl bWVDaHJvbWl1bU1hYzo6ZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hlZXQoKQoreworICAgIHJl dHVybiBDU3RyaW5nKGNhbGVuZGFyUGlja2VyTWFjQ3NzLCBXVEZfQVJSQVlfTEVOR1RIKGNhbGVu ZGFyUGlja2VyTWFjQ3NzKSk7Cit9CisjZW5kaWYKIAogYm9vbCBSZW5kZXJUaGVtZUNocm9taXVt TWFjOjpwYWludE1lZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyKFJlbmRlck9iamVjdCogb2JqZWN0 LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsK