41932 2010-07-08 23:01:18 -0700 [Chromium] Update ThemeChromiumMac.mm for the recent changes of ThemeMac.mm 2010-07-15 23:25:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 38570 1 tkent webkit-unassigned abarth eric webkit.review.bot oldest_to_newest 248754 0 tkent 2010-07-08 23:01:18 -0700 [Chromium] Update ThemeChromiumMac.mm for the recent changes of ThemeMac.mm 248840 1 61017 tkent 2010-07-09 01:58:58 -0700 Created attachment 61017 Patch 252305 2 61017 eric 2010-07-15 21:22:10 -0700 Comment on attachment 61017 Patch I don't think there is much I can review here. Only really rubber-stamp. Assuming it works for Chromium, rs=me. 252308 3 61017 joepeck 2010-07-15 21:32:16 -0700 Comment on attachment 61017 Patch > +++ b/WebCore/platform/chromium/ThemeChromiumMac.mm > + case OuterSpinButtonPart: { > + static const int stepperMargin[4] = { 0, 0, 0, 0}; Probably a negligible style issue. Missing a space at the end? "0 };" 252311 4 tkent 2010-07-15 21:55:28 -0700 Committed r63514: <http://trac.webkit.org/changeset/63514> 252323 5 tkent 2010-07-15 22:19:04 -0700 (In reply to comment #3) > (From update of attachment 61017 [details]) > > +++ b/WebCore/platform/chromium/ThemeChromiumMac.mm > > + case OuterSpinButtonPart: { > > + static const int stepperMargin[4] = { 0, 0, 0, 0}; > > Probably a negligible style issue. Missing a space at the end? "0 };" Thank you for pointing it out. I have fixed it and the same one in ThemeMac.mm by http://trac.webkit.org/changeset/63518 252345 6 webkit.review.bot 2010-07-15 23:25:10 -0700 http://trac.webkit.org/changeset/63514 might have broken Chromium Win Release The following changes are on the blame list: http://trac.webkit.org/changeset/63514 http://trac.webkit.org/changeset/63515 http://trac.webkit.org/changeset/63516 http://trac.webkit.org/changeset/63517 http://trac.webkit.org/changeset/63518 61017 2010-07-09 01:58:58 -0700 2010-07-15 21:32:16 -0700 Patch bug-41932-20100709175856.patch text/plain 10722 tkent ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjZiOWRlY2VlODBlY2NmMGUzMmE3Zjg1Zjg2ZGZkODk3MjhiZjEwMy4uZWMzOTlhMmYzMGUzNDMw NjQ3NDc3N2M1NTc5ZTdlOThmOTk3NjBiYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wNy0wOSAgS2Vu dCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBVcGRhdGUgVGhlbWVDaHJvbWl1bU1h Yy5tbSBmb3IgdGhlIHJlY2VudCBjaGFuZ2VzIG9mIFRoZW1lTWFjLm1tCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTkzMgorCisgICAgICAgIFN5bmMg d2l0aCBUaGVtZU1hYy5tbSByNjE3NjAuCisgICAgICAgIFRoaXMgY2hhbmdlIGRvZXNuJ3QgY29u dGFpbiByNTQyOTksIHI1NzYwMywgcjU3NzM0LCByNTc3NDEsIGFuZAorICAgICAgICByNTg1MzMg YmVjYXVzZSB0aGV5IGNvbmZsaWN0IHdpdGggQ2hyb21pdW0gY2hhbmdlIGZvcgorICAgICAgICBG bGlwcGVkVmlldygpLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vVGhlbWVDaHJvbWl1 bU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNpemVGcm9tTlNDb250cm9sU2l6ZSk6CisgICAg ICAgIChXZWJDb3JlOjpzaXplRnJvbUZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Y29udHJvbFNp emVGcm9tUGl4ZWxTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OnNldENvbnRyb2xTaXplKToKKyAg ICAgICAgKFdlYkNvcmU6OmNvbnZlcnRDb250cm9sU3RhdGVzVG9UaGVtZURyYXdTdGF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpzdGVwcGVyU2l6ZXMpOgorICAgICAgICAoV2ViQ29yZTo6c3RlcHBl ckNvbnRyb2xTaXplRm9yRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpwYWludFN0ZXBwZXIpOgor ICAgICAgICAoV2ViQ29yZTo6VGhlbWVDaHJvbWl1bU1hYzo6Y29udHJvbFNpemUpOgorICAgICAg ICAoV2ViQ29yZTo6VGhlbWVDaHJvbWl1bU1hYzo6bWluaW11bUNvbnRyb2xTaXplKToKKyAgICAg ICAgKFdlYkNvcmU6OlRoZW1lQ2hyb21pdW1NYWM6OmluZmxhdGVDb250cm9sUGFpbnRSZWN0KToK KyAgICAgICAgKFdlYkNvcmU6OlRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KToKKwogMjAxMC0wNy0w OCAgRXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Ro ZW1lQ2hyb21pdW1NYWMubW0gYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1RoZW1lQ2hyb21p dW1NYWMubW0KaW5kZXggNTc2OWUzODI5ZjAwYThhMDU4YjMwZWM4MThkNDU0M2JhNjY3YmFmMy4u N2QwNmVjMDEwMmVlMWRmYmU0NDY1NTRjM2FhZWM3ZjlmMmVjNjg1MCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9UaGVtZUNocm9taXVtTWFjLm1tCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vVGhlbWVDaHJvbWl1bU1hYy5tbQpAQCAtMzIsNiArMzIsNyBAQAog I2ltcG9ydCAiTG9jYWxDdXJyZW50R3JhcGhpY3NDb250ZXh0LmgiCiAjaW1wb3J0ICJTY3JvbGxW aWV3LmgiCiAjaW1wb3J0ICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgiCisjaW1wb3J0IDxDYXJi b24vQ2FyYm9uLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2ltcG9ydCA8b2Jq Yy9ydW50aW1lLmg+CiAKQEAgLTIxMCw5ICsyMTEsOSBAQCBzdGF0aWMgTlNDb250cm9sU2l6ZSBj b250cm9sU2l6ZUZvckZvbnQoY29uc3QgRm9udCYgZm9udCkKICAgICByZXR1cm4gTlNNaW5pQ29u dHJvbFNpemU7CiB9CiAKLXN0YXRpYyBMZW5ndGhTaXplIHNpemVGcm9tRm9udChjb25zdCBGb250 JiBmb250LCBjb25zdCBMZW5ndGhTaXplJiB6b29tZWRTaXplLCBmbG9hdCB6b29tRmFjdG9yLCBj b25zdCBJbnRTaXplKiBzaXplcykKK3N0YXRpYyBMZW5ndGhTaXplIHNpemVGcm9tTlNDb250cm9s U2l6ZShOU0NvbnRyb2xTaXplIG5zQ29udHJvbFNpemUsIGNvbnN0IExlbmd0aFNpemUmIHpvb21l ZFNpemUsIGZsb2F0IHpvb21GYWN0b3IsIGNvbnN0IEludFNpemUqIHNpemVzKQogewotICAgIElu dFNpemUgY29udHJvbFNpemUgPSBzaXplc1tjb250cm9sU2l6ZUZvckZvbnQoZm9udCldOworICAg IEludFNpemUgY29udHJvbFNpemUgPSBzaXplc1tuc0NvbnRyb2xTaXplXTsKICAgICBpZiAoem9v bUZhY3RvciAhPSAxLjBmKQogICAgICAgICBjb250cm9sU2l6ZSA9IEludFNpemUoY29udHJvbFNp emUud2lkdGgoKSAqIHpvb21GYWN0b3IsIGNvbnRyb2xTaXplLmhlaWdodCgpICogem9vbUZhY3Rv cik7CiAgICAgTGVuZ3RoU2l6ZSByZXN1bHQgPSB6b29tZWRTaXplOwpAQCAtMjIzLDE5ICsyMjQs MjcgQEAgc3RhdGljIExlbmd0aFNpemUgc2l6ZUZyb21Gb250KGNvbnN0IEZvbnQmIGZvbnQsIGNv bnN0IExlbmd0aFNpemUmIHpvb21lZFNpemUsIGYKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1z dGF0aWMgdm9pZCBzZXRDb250cm9sU2l6ZShOU0NlbGwqIGNlbGwsIGNvbnN0IEludFNpemUqIHNp emVzLCBjb25zdCBJbnRTaXplJiBtaW5ab29tZWRTaXplLCBmbG9hdCB6b29tRmFjdG9yKQorc3Rh dGljIExlbmd0aFNpemUgc2l6ZUZyb21Gb250KGNvbnN0IEZvbnQmIGZvbnQsIGNvbnN0IExlbmd0 aFNpemUmIHpvb21lZFNpemUsIGZsb2F0IHpvb21GYWN0b3IsIGNvbnN0IEludFNpemUqIHNpemVz KQoreworICAgIHJldHVybiBzaXplRnJvbU5TQ29udHJvbFNpemUoY29udHJvbFNpemVGb3JGb250 KGZvbnQpLCB6b29tZWRTaXplLCB6b29tRmFjdG9yLCBzaXplcyk7Cit9CisKK3N0YXRpYyBDb250 cm9sU2l6ZSBjb250cm9sU2l6ZUZyb21QaXhlbFNpemUoY29uc3QgSW50U2l6ZSogc2l6ZXMsIGNv bnN0IEludFNpemUmIG1pblpvb21lZFNpemUsIGZsb2F0IHpvb21GYWN0b3IpCiB7Ci0gICAgTlND b250cm9sU2l6ZSBzaXplOwogICAgIGlmIChtaW5ab29tZWRTaXplLndpZHRoKCkgPj0gc3RhdGlj X2Nhc3Q8aW50PihzaXplc1tOU1JlZ3VsYXJDb250cm9sU2l6ZV0ud2lkdGgoKSAqIHpvb21GYWN0 b3IpICYmCiAgICAgICAgIG1pblpvb21lZFNpemUuaGVpZ2h0KCkgPj0gc3RhdGljX2Nhc3Q8aW50 PihzaXplc1tOU1JlZ3VsYXJDb250cm9sU2l6ZV0uaGVpZ2h0KCkgKiB6b29tRmFjdG9yKSkKLSAg ICAgICAgc2l6ZSA9IE5TUmVndWxhckNvbnRyb2xTaXplOwotICAgIGVsc2UgaWYgKG1pblpvb21l ZFNpemUud2lkdGgoKSA+PSBzdGF0aWNfY2FzdDxpbnQ+KHNpemVzW05TU21hbGxDb250cm9sU2l6 ZV0ud2lkdGgoKSAqIHpvb21GYWN0b3IpICYmCi0gICAgICAgICAgICAgbWluWm9vbWVkU2l6ZS5o ZWlnaHQoKSA+PSBzdGF0aWNfY2FzdDxpbnQ+KHNpemVzW05TU21hbGxDb250cm9sU2l6ZV0uaGVp Z2h0KCkgKiB6b29tRmFjdG9yKSkKLSAgICAgICAgc2l6ZSA9IE5TU21hbGxDb250cm9sU2l6ZTsK LSAgICBlbHNlCi0gICAgICAgIHNpemUgPSBOU01pbmlDb250cm9sU2l6ZTsKKyAgICAgICAgcmV0 dXJuIE5TUmVndWxhckNvbnRyb2xTaXplOworICAgIGlmIChtaW5ab29tZWRTaXplLndpZHRoKCkg Pj0gc3RhdGljX2Nhc3Q8aW50PihzaXplc1tOU1NtYWxsQ29udHJvbFNpemVdLndpZHRoKCkgKiB6 b29tRmFjdG9yKSAmJgorICAgICAgICBtaW5ab29tZWRTaXplLmhlaWdodCgpID49IHN0YXRpY19j YXN0PGludD4oc2l6ZXNbTlNTbWFsbENvbnRyb2xTaXplXS5oZWlnaHQoKSAqIHpvb21GYWN0b3Ip KQorICAgICAgICByZXR1cm4gTlNTbWFsbENvbnRyb2xTaXplOworICAgIHJldHVybiBOU01pbmlD b250cm9sU2l6ZTsKK30KKworc3RhdGljIHZvaWQgc2V0Q29udHJvbFNpemUoTlNDZWxsKiBjZWxs LCBjb25zdCBJbnRTaXplKiBzaXplcywgY29uc3QgSW50U2l6ZSYgbWluWm9vbWVkU2l6ZSwgZmxv YXQgem9vbUZhY3RvcikKK3sKKyAgICBDb250cm9sU2l6ZSBzaXplID0gY29udHJvbFNpemVGcm9t UGl4ZWxTaXplKHNpemVzLCBtaW5ab29tZWRTaXplLCB6b29tRmFjdG9yKTsKICAgICBpZiAoc2l6 ZSAhPSBbY2VsbCBjb250cm9sU2l6ZV0pIC8vIE9ubHkgdXBkYXRlIGlmIHdlIGhhdmUgdG8sIHNp bmNlIEFwcEtpdCBkb2VzIHdvcmsgZXZlbiBpZiB0aGUgc2l6ZSBpcyB0aGUgc2FtZS4KLSAgICAg ICAgW2NlbGwgc2V0Q29udHJvbFNpemU6c2l6ZV07CisgICAgICAgIFtjZWxsIHNldENvbnRyb2xT aXplOihOU0NvbnRyb2xTaXplKXNpemVdOwogfQogCiBzdGF0aWMgdm9pZCB1cGRhdGVTdGF0ZXMo TlNDZWxsKiBjZWxsLCBDb250cm9sU3RhdGVzIHN0YXRlcykKQEAgLTI3Nyw2ICsyODYsMjIgQEAg c3RhdGljIHZvaWQgdXBkYXRlU3RhdGVzKE5TQ2VsbCogY2VsbCwgQ29udHJvbFN0YXRlcyBzdGF0 ZXMpCiAgICAgICAgIFtjZWxsIHNldENvbnRyb2xUaW50OnRpbnRdOwogfQogCitzdGF0aWMgVGhl bWVEcmF3U3RhdGUgY29udmVydENvbnRyb2xTdGF0ZXNUb1RoZW1lRHJhd1N0YXRlKFRoZW1lQnV0 dG9uS2luZCBraW5kLCBDb250cm9sU3RhdGVzIHN0YXRlcykKK3sKKyAgICBpZiAoc3RhdGVzICYg UmVhZE9ubHlTdGF0ZSkKKyAgICAgICAgcmV0dXJuIGtUaGVtZVN0YXRlVW5hdmFpbGFibGVJbmFj dGl2ZTsKKyAgICBpZiAoIShzdGF0ZXMgJiBFbmFibGVkU3RhdGUpKQorICAgICAgICByZXR1cm4g a1RoZW1lU3RhdGVVbmF2YWlsYWJsZUluYWN0aXZlOworCisgICAgLy8gRG8gbm90IHByb2Nlc3Mg UHJlc3NlZFN0YXRlIGlmICFFbmFibGVkU3RhdGUgb3IgUmVhZE9ubHlTdGF0ZS4KKyAgICBpZiAo c3RhdGVzICYgUHJlc3NlZFN0YXRlKSB7CisgICAgICAgIGlmIChraW5kID09IGtUaGVtZUluY0Rl Y0J1dHRvbiB8fCBraW5kID09IGtUaGVtZUluY0RlY0J1dHRvblNtYWxsIHx8IGtpbmQgPT0ga1Ro ZW1lSW5jRGVjQnV0dG9uTWluaSkKKyAgICAgICAgICAgIHJldHVybiBzdGF0ZXMgJiBTcGluVXBT dGF0ZSA/IGtUaGVtZVN0YXRlUHJlc3NlZFVwIDoga1RoZW1lU3RhdGVQcmVzc2VkRG93bjsKKyAg ICAgICAgcmV0dXJuIGtUaGVtZVN0YXRlUHJlc3NlZDsKKyAgICB9CisgICAgcmV0dXJuIGtUaGVt ZVN0YXRlQWN0aXZlOworfQorCiBzdGF0aWMgSW50UmVjdCBpbmZsYXRlUmVjdChjb25zdCBJbnRS ZWN0JiB6b29tZWRSZWN0LCBjb25zdCBJbnRTaXplJiB6b29tZWRTaXplLCBjb25zdCBpbnQqIG1h cmdpbnMsIGZsb2F0IHpvb21GYWN0b3IpCiB7CiAgICAgLy8gT25seSBkbyB0aGUgaW5mbGF0aW9u IGlmIHRoZSBhdmFpbGFibGUgd2lkdGgvaGVpZ2h0IGFyZSB0b28gc21hbGwuICBPdGhlcndpc2Ug dHJ5IHRvCkBAIC01NzEsNiArNTk2LDY0IEBAIHN0YXRpYyB2b2lkIHBhaW50QnV0dG9uKENvbnRy b2xQYXJ0IHBhcnQsIENvbnRyb2xTdGF0ZXMgc3RhdGVzLCBHcmFwaGljc0NvbnRleHQqCiAgICAg RU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUwogfQogCisvLyBTdGVwcGVyCisKK3N0YXRpYyBjb25z dCBJbnRTaXplKiBzdGVwcGVyU2l6ZXMoKQoreworICAgIHN0YXRpYyBjb25zdCBJbnRTaXplIHNp emVzWzNdID0geyBJbnRTaXplKDE5LCAyNyksIEludFNpemUoMTUsIDIyKSwgSW50U2l6ZSgxMywg MTUpIH07CisgICAgcmV0dXJuIHNpemVzOworfQorCisvLyBXZSBkb24ndCB1c2UgY29udHJvbFNp emVGb3JGb250KCkgZm9yIHN0ZXBwZXJzIGJlY2F1c2UgdGhlIHN0ZXBwZXIgaGVpZ2h0CisvLyBz aG91bGQgYmUgZXF1YWwgdG8gb3IgbGVzcyB0aGFuIHRoZSBjb3JyZXNwb25kaW5nIHRleHQgZmll bGQgaGVpZ2h0LAorc3RhdGljIE5TQ29udHJvbFNpemUgc3RlcHBlckNvbnRyb2xTaXplRm9yRm9u dChjb25zdCBGb250JiBmb250KQoreworICAgIGludCBmb250U2l6ZSA9IGZvbnQucGl4ZWxTaXpl KCk7CisgICAgaWYgKGZvbnRTaXplID49IDE4KQorICAgICAgICByZXR1cm4gTlNSZWd1bGFyQ29u dHJvbFNpemU7CisgICAgaWYgKGZvbnRTaXplID49IDEzKQorICAgICAgICByZXR1cm4gTlNTbWFs bENvbnRyb2xTaXplOworICAgIHJldHVybiBOU01pbmlDb250cm9sU2l6ZTsKK30KKworc3RhdGlj IHZvaWQgcGFpbnRTdGVwcGVyKENvbnRyb2xTdGF0ZXMgc3RhdGVzLCBHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHpvb21lZFJlY3QsIGZsb2F0IHpvb21GYWN0b3IsIFNj cm9sbFZpZXcqKQoreworICAgIC8vIFdlIGRvbid0IHVzZSBOU1N0ZXBwZXJDZWxsIGJlY2F1c2Ug dGhlcmUgYXJlIG5vIHdheXMgdG8gZHJhdyBhbgorICAgIC8vIE5TU3RlcHBlckNlbGwgd2l0aCB0 aGUgdXAgYnV0dG9uIGhpZ2hsaWdodGVkLgorCisgICAgSElUaGVtZUJ1dHRvbkRyYXdJbmZvIGRy YXdJbmZvOworICAgIGRyYXdJbmZvLnZlcnNpb24gPSAwOworICAgIGRyYXdJbmZvLnN0YXRlID0g Y29udmVydENvbnRyb2xTdGF0ZXNUb1RoZW1lRHJhd1N0YXRlKGtUaGVtZUluY0RlY0J1dHRvbiwg c3RhdGVzKTsKKyAgICBkcmF3SW5mby5hZG9ybm1lbnQgPSBrVGhlbWVBZG9ybm1lbnREZWZhdWx0 OworICAgIENvbnRyb2xTaXplIGNvbnRyb2xTaXplID0gY29udHJvbFNpemVGcm9tUGl4ZWxTaXpl KHN0ZXBwZXJTaXplcygpLCB6b29tZWRSZWN0LnNpemUoKSwgem9vbUZhY3Rvcik7CisgICAgaWYg KGNvbnRyb2xTaXplID09IE5TU21hbGxDb250cm9sU2l6ZSkKKyAgICAgICAgZHJhd0luZm8ua2lu ZCA9IGtUaGVtZUluY0RlY0J1dHRvblNtYWxsOworICAgIGVsc2UgaWYgKGNvbnRyb2xTaXplID09 IE5TTWluaUNvbnRyb2xTaXplKQorICAgICAgICBkcmF3SW5mby5raW5kID0ga1RoZW1lSW5jRGVj QnV0dG9uTWluaTsKKyAgICBlbHNlCisgICAgICAgIGRyYXdJbmZvLmtpbmQgPSBrVGhlbWVJbmNE ZWNCdXR0b247CisKKyAgICBJbnRSZWN0IHJlY3Qoem9vbWVkUmVjdCk7CisgICAgY29udGV4dC0+ c2F2ZSgpOworICAgIGlmICh6b29tRmFjdG9yICE9IDEuMGYpIHsKKyAgICAgICAgcmVjdC5zZXRX aWR0aChyZWN0LndpZHRoKCkgLyB6b29tRmFjdG9yKTsKKyAgICAgICAgcmVjdC5zZXRIZWlnaHQo cmVjdC5oZWlnaHQoKSAvIHpvb21GYWN0b3IpOworICAgICAgICBjb250ZXh0LT50cmFuc2xhdGUo cmVjdC54KCksIHJlY3QueSgpKTsKKyAgICAgICAgY29udGV4dC0+c2NhbGUoRmxvYXRTaXplKHpv b21GYWN0b3IsIHpvb21GYWN0b3IpKTsKKyAgICAgICAgY29udGV4dC0+dHJhbnNsYXRlKC1yZWN0 LngoKSwgLXJlY3QueSgpKTsKKyAgICB9CisgICAgQ0dSZWN0IGJvdW5kcyhyZWN0KTsKKyAgICAv LyBBZGp1c3QgJ2JvdW5kcycgc28gdGhhdCBISVRoZW1lRHJhd0J1dHRvbihib3VuZHMsLi4uKSBk cmF3cyBleGFjdGx5IG9uICdyZWN0Jy4KKyAgICBDR1JlY3QgYmFja2dyb3VuZEJvdW5kczsKKyAg ICBISVRoZW1lR2V0QnV0dG9uQmFja2dyb3VuZEJvdW5kcygmYm91bmRzLCAmZHJhd0luZm8sICZi YWNrZ3JvdW5kQm91bmRzKTsKKyAgICBpZiAoYm91bmRzLm9yaWdpbi54ICE9IGJhY2tncm91bmRC b3VuZHMub3JpZ2luLngpCisgICAgICAgIGJvdW5kcy5vcmlnaW4ueCArPSBib3VuZHMub3JpZ2lu LnggLSBiYWNrZ3JvdW5kQm91bmRzLm9yaWdpbi54OworICAgIGlmIChib3VuZHMub3JpZ2luLnkg IT0gYmFja2dyb3VuZEJvdW5kcy5vcmlnaW4ueSkKKyAgICAgICAgYm91bmRzLm9yaWdpbi55ICs9 IGJvdW5kcy5vcmlnaW4ueSAtIGJhY2tncm91bmRCb3VuZHMub3JpZ2luLnk7CisgICAgSElUaGVt ZURyYXdCdXR0b24oJmJvdW5kcywgJmRyYXdJbmZvLCBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQo KSwga0hJVGhlbWVPcmllbnRhdGlvbk5vcm1hbCwgMCk7CisgICAgY29udGV4dC0+cmVzdG9yZSgp OworfQorCiAvLyBUaGVtZSBvdmVycmlkZXMKIAogaW50IFRoZW1lQ2hyb21pdW1NYWM6OmJhc2Vs aW5lUG9zaXRpb25BZGp1c3RtZW50KENvbnRyb2xQYXJ0IHBhcnQpIGNvbnN0CkBAIC02MTMsNiAr Njk2LDEzIEBAIExlbmd0aFNpemUgVGhlbWVDaHJvbWl1bU1hYzo6Y29udHJvbFNpemUoQ29udHJv bFBhcnQgcGFydCwgY29uc3QgRm9udCYgZm9udCwgY29uCiAgICAgICAgIGNhc2UgTGlzdEJ1dHRv blBhcnQ6CiAgICAgICAgICAgICByZXR1cm4gc2l6ZUZyb21Gb250KGZvbnQsIExlbmd0aFNpemUo em9vbWVkU2l6ZS53aWR0aCgpLCBMZW5ndGgoKSksIHpvb21GYWN0b3IsIGxpc3RCdXR0b25TaXpl cygpKTsKICNlbmRpZgorICAgICAgICBjYXNlIElubmVyU3BpbkJ1dHRvblBhcnQ6CisgICAgICAg ICAgICAvLyBXZSBkb24ndCB1c2UgaW5uZXIgc3BpbiBidXR0b25zIG9uIE1hYy4KKyAgICAgICAg ICAgIHJldHVybiBMZW5ndGhTaXplKExlbmd0aChGaXhlZCksIExlbmd0aChGaXhlZCkpOworICAg ICAgICBjYXNlIE91dGVyU3BpbkJ1dHRvblBhcnQ6CisgICAgICAgICAgICBpZiAoIXpvb21lZFNp emUud2lkdGgoKS5pc0ludHJpbnNpY09yQXV0bygpICYmICF6b29tZWRTaXplLmhlaWdodCgpLmlz SW50cmluc2ljT3JBdXRvKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHpvb21lZFNpemU7Cisg ICAgICAgICAgICByZXR1cm4gc2l6ZUZyb21OU0NvbnRyb2xTaXplKHN0ZXBwZXJDb250cm9sU2l6 ZUZvckZvbnQoZm9udCksIHpvb21lZFNpemUsIHpvb21GYWN0b3IsIHN0ZXBwZXJTaXplcygpKTsK ICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIHJldHVybiB6b29tZWRTaXplOwogICAgIH0K QEAgLTYyNiw2ICs3MTYsMTQgQEAgTGVuZ3RoU2l6ZSBUaGVtZUNocm9taXVtTWFjOjptaW5pbXVt Q29udHJvbFNpemUoQ29udHJvbFBhcnQgcGFydCwgY29uc3QgRm9udCYgZm8KICAgICAgICAgY2Fz ZSBCdXR0b25QYXJ0OgogICAgICAgICBjYXNlIExpc3RCdXR0b25QYXJ0OgogICAgICAgICAgICAg cmV0dXJuIExlbmd0aFNpemUoTGVuZ3RoKDAsIEZpeGVkKSwgTGVuZ3RoKHN0YXRpY19jYXN0PGlu dD4oMTUgKiB6b29tRmFjdG9yKSwgRml4ZWQpKTsKKyAgICAgICAgY2FzZSBJbm5lclNwaW5CdXR0 b25QYXJ0OgorICAgICAgICAgICAgLy8gV2UgZG9uJ3QgdXNlIGlubmVyIHNwaW4gYnV0dG9ucyBv biBNYWMuCisgICAgICAgICAgICByZXR1cm4gTGVuZ3RoU2l6ZShMZW5ndGgoRml4ZWQpLCBMZW5n dGgoRml4ZWQpKTsKKyAgICAgICAgY2FzZSBPdXRlclNwaW5CdXR0b25QYXJ0OiB7CisgICAgICAg ICAgICBJbnRTaXplIGJhc2UgPSBzdGVwcGVyU2l6ZXMoKVtOU01pbmlDb250cm9sU2l6ZV07Cisg ICAgICAgICAgICByZXR1cm4gTGVuZ3RoU2l6ZShMZW5ndGgoc3RhdGljX2Nhc3Q8aW50PihiYXNl LndpZHRoKCkgKiB6b29tRmFjdG9yKSwgRml4ZWQpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgTGVuZ3RoKHN0YXRpY19jYXN0PGludD4oYmFzZS5oZWlnaHQoKSAqIHpvb21GYWN0b3Ip LCBGaXhlZCkpOworICAgICAgICB9CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1 cm4gVGhlbWU6Om1pbmltdW1Db250cm9sU2l6ZShwYXJ0LCBmb250LCB6b29tRmFjdG9yKTsKICAg ICB9CkBAIC03MDIsNiArODAwLDE1IEBAIHZvaWQgVGhlbWVDaHJvbWl1bU1hYzo6aW5mbGF0ZUNv bnRyb2xQYWludFJlY3QoQ29udHJvbFBhcnQgcGFydCwgQ29udHJvbFN0YXRlcyBzCiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorICAgICAgICBjYXNlIE91dGVy U3BpbkJ1dHRvblBhcnQ6IHsKKyAgICAgICAgICAgIHN0YXRpYyBjb25zdCBpbnQgc3RlcHBlck1h cmdpbls0XSA9IHsgMCwgMCwgMCwgMH07CisgICAgICAgICAgICBDb250cm9sU2l6ZSBjb250cm9s U2l6ZSA9IGNvbnRyb2xTaXplRnJvbVBpeGVsU2l6ZShzdGVwcGVyU2l6ZXMoKSwgem9vbWVkUmVj dC5zaXplKCksIHpvb21GYWN0b3IpOworICAgICAgICAgICAgSW50U2l6ZSB6b29tZWRTaXplID0g c3RlcHBlclNpemVzKClbY29udHJvbFNpemVdOworICAgICAgICAgICAgem9vbWVkU2l6ZS5zZXRI ZWlnaHQoem9vbWVkU2l6ZS5oZWlnaHQoKSAqIHpvb21GYWN0b3IpOworICAgICAgICAgICAgem9v bWVkU2l6ZS5zZXRXaWR0aCh6b29tZWRTaXplLndpZHRoKCkgKiB6b29tRmFjdG9yKTsKKyAgICAg ICAgICAgIHpvb21lZFJlY3QgPSBpbmZsYXRlUmVjdCh6b29tZWRSZWN0LCB6b29tZWRTaXplLCBz dGVwcGVyTWFyZ2luLCB6b29tRmFjdG9yKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9 CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBicmVhazsKICAgICB9CkBAIC03MjQsNiAr ODMxLDkgQEAgdm9pZCBUaGVtZUNocm9taXVtTWFjOjpwYWludChDb250cm9sUGFydCBwYXJ0LCBD b250cm9sU3RhdGVzIHN0YXRlcywgR3JhcGhpY3NDb24KICAgICAgICAgY2FzZSBMaXN0QnV0dG9u UGFydDoKICAgICAgICAgICAgIHBhaW50QnV0dG9uKHBhcnQsIHN0YXRlcywgY29udGV4dCwgem9v bWVkUmVjdCwgem9vbUZhY3Rvciwgc2Nyb2xsVmlldyk7CiAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBPdXRlclNwaW5CdXR0b25QYXJ0OgorICAgICAgICAgICAgcGFpbnRTdGVwcGVy KHN0YXRlcywgY29udGV4dCwgem9vbWVkUmVjdCwgem9vbUZhY3Rvciwgc2Nyb2xsVmlldyk7Cisg ICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIGJyZWFrOwog ICAgIH0K