42568 2010-07-19 08:04:07 -0700 [Chromium] Fix style errors of RenderThemeChromiumWin.cpp 2010-07-19 21:34:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other Windows XP RESOLVED FIXED P2 Normal --- 1 tkent tkent fishd hamaji webkit.review.bot oldest_to_newest 253206 0 tkent 2010-07-19 08:04:07 -0700 [Chromium] Fix style errors of RenderThemeChromiumWin.cpp 253208 1 61954 tkent 2010-07-19 08:04:26 -0700 Created attachment 61954 Patch 253209 2 webkit.review.bot 2010-07-19 08:05:20 -0700 Attachment 61954 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/rendering/RenderThemeChromiumWin.cpp:192: Use 0 instead of NULL. [readability/null] [4] Total errors found: 1 in 1 files If any of these errors are false positives, please file a bug against check-webkit-style. 253214 3 61955 tkent 2010-07-19 08:08:25 -0700 Created attachment 61955 Patch 253215 4 webkit.review.bot 2010-07-19 08:10:13 -0700 Attachment 61955 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/rendering/RenderThemeChromiumWin.cpp:192: Use 0 instead of NULL. [readability/null] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 253242 5 61955 hamaji 2010-07-19 08:47:48 -0700 Comment on attachment 61955 Patch Looks good. We need to fix Bug 34605 though. 253544 6 61955 tkent 2010-07-19 21:33:59 -0700 Comment on attachment 61955 Patch Clearing flags on attachment: 61955 Committed r63718: <http://trac.webkit.org/changeset/63718> 253545 7 tkent 2010-07-19 21:34:08 -0700 All reviewed patches have been landed. Closing bug. 61954 2010-07-19 08:04:26 -0700 2010-07-19 08:08:20 -0700 Patch bug-42568-20100720000424.patch text/plain 9400 tkent ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3Bw IGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKaW5kZXggNzMy NGZmZmFlZDk1NDMxYTk2MGIwYjZjNzdiZTczZjAyZjM5MTE2MS4uMzAyMzc5OGE3NDc2N2NkYTkw MzY4MDcwNjYzOGNhM2YxN2YyM2E0ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVDaHJvbWl1bVdpbi5jcHAKQEAgLTI5LDggKzI5LDggQEAKICNpbmNsdWRlIDx1eHRoZW1lLmg+ CiAjaW5jbHVkZSA8dnNzeW0zMi5oPgogCi0jaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2UuaCIKICNp bmNsdWRlICJDU1NWYWx1ZUtleXdvcmRzLmgiCisjaW5jbHVkZSAiQ2hyb21pdW1CcmlkZ2UuaCIK ICNpbmNsdWRlICJDdXJyZW50VGltZS5oIgogI2luY2x1ZGUgIkZvbnRTZWxlY3Rvci5oIgogI2lu Y2x1ZGUgIkZvbnRVdGlsc0Nocm9taXVtV2luLmgiCkBAIC05MCwzOCArOTAsMzggQEAgcHJpdmF0 ZToKICAgICBzdGF0aWMgYm9vbCBjYW52YXNIYXNNdWx0aXBsZUxheWVycyhjb25zdCBTa0NhbnZh cyogY2FudmFzKQogICAgIHsKICAgICAgICAgU2tDYW52YXM6OkxheWVySXRlciBpdGVyKGNvbnN0 X2Nhc3Q8U2tDYW52YXMqPihjYW52YXMpLCBmYWxzZSk7Ci0gICAgICAgIGl0ZXIubmV4dCgpOyAg Ly8gVGhlcmUgaXMgYWx3YXlzIGF0IGxlYXN0IG9uZSBsYXllci4KLSAgICAgICAgcmV0dXJuICFp dGVyLmRvbmUoKTsgIC8vIFRoZXJlIGlzID4gMSBsYXllciBpZiB0aGUgdGhlIGl0ZXJhdG9yIGNh biBzdGlsIGFkdmFuY2UuCisgICAgICAgIGl0ZXIubmV4dCgpOyAvLyBUaGVyZSBpcyBhbHdheXMg YXQgbGVhc3Qgb25lIGxheWVyLgorICAgICAgICByZXR1cm4gIWl0ZXIuZG9uZSgpOyAvLyBUaGVy ZSBpcyA+IDEgbGF5ZXIgaWYgdGhlIHRoZSBpdGVyYXRvciBjYW4gc3RpbCBhZHZhbmNlLgogICAg IH0KIAogICAgIHN0YXRpYyBUcmFuc3BhcmVuY3lXaW46OkxheWVyTW9kZSBnZXRMYXllck1vZGUo R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBUcmFuc3BhcmVuY3lXaW46OlRyYW5zZm9ybU1vZGUg dHJhbnNmb3JtTW9kZSkKICAgICB7Ci0gICAgICAgIGlmIChjb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKS0+aXNEcmF3aW5nVG9JbWFnZUJ1ZmZlcigpKSAgLy8gTWlnaHQgaGF2ZSB0cmFuc3BhcmVu dCBiYWNrZ3JvdW5kLgorICAgICAgICBpZiAoY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPmlz RHJhd2luZ1RvSW1hZ2VCdWZmZXIoKSkgLy8gTWlnaHQgaGF2ZSB0cmFuc3BhcmVudCBiYWNrZ3Jv dW5kLgogICAgICAgICAgICAgcmV0dXJuIFRyYW5zcGFyZW5jeVdpbjo6V2hpdGVMYXllcjsKLSAg ICAgICAgZWxzZSBpZiAoY2FudmFzSGFzTXVsdGlwbGVMYXllcnMoY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCktPmNhbnZhcygpKSkgIC8vIE5lZWRzIGFudGlhbGlhc2luZyBoZWxwLgorICAgICAg ICBpZiAoY2FudmFzSGFzTXVsdGlwbGVMYXllcnMoY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCkt PmNhbnZhcygpKSkgLy8gTmVlZHMgYW50aWFsaWFzaW5nIGhlbHAuCiAgICAgICAgICAgICByZXR1 cm4gVHJhbnNwYXJlbmN5V2luOjpPcGFxdWVDb21wb3NpdGVMYXllcjsKLSAgICAgICAgZWxzZSAg Ly8gTm90aGluZyBpbnRlcmVzdGluZy4KLSAgICAgICAgICAgIHJldHVybiB0cmFuc2Zvcm1Nb2Rl ID09IFRyYW5zcGFyZW5jeVdpbjo6S2VlcFRyYW5zZm9ybSA/IFRyYW5zcGFyZW5jeVdpbjo6Tm9M YXllciA6IFRyYW5zcGFyZW5jeVdpbjo6T3BhcXVlQ29tcG9zaXRlTGF5ZXI7CisgICAgICAgIC8v IE5vdGhpbmcgaW50ZXJlc3RpbmcuCisgICAgICAgIHJldHVybiB0cmFuc2Zvcm1Nb2RlID09IFRy YW5zcGFyZW5jeVdpbjo6S2VlcFRyYW5zZm9ybSA/IFRyYW5zcGFyZW5jeVdpbjo6Tm9MYXllciA6 IFRyYW5zcGFyZW5jeVdpbjo6T3BhcXVlQ29tcG9zaXRlTGF5ZXI7CiAgICAgfQogCiAgICAgc3Rh dGljIFRyYW5zcGFyZW5jeVdpbjo6VHJhbnNmb3JtTW9kZSBnZXRUcmFuc2Zvcm1Nb2RlKGNvbnN0 IEFmZmluZVRyYW5zZm9ybSYgbWF0cml4KQogICAgIHsKLSAgICAgICAgaWYgKG1hdHJpeC5iKCkg IT0gMCB8fCBtYXRyaXguYygpICE9IDApICAvLyBTa2V3LgorICAgICAgICBpZiAobWF0cml4LmIo KSB8fCBtYXRyaXguYygpKSAvLyBTa2V3LgogICAgICAgICAgICAgcmV0dXJuIFRyYW5zcGFyZW5j eVdpbjo6VW50cmFuc2Zvcm07Ci0gICAgICAgIGVsc2UgaWYgKG1hdHJpeC5hKCkgIT0gMS4wIHx8 IG1hdHJpeC5kKCkgIT0gMS4wKSAgLy8gU2NhbGUuCisgICAgICAgIGlmIChtYXRyaXguYSgpICE9 IDEuMCB8fCBtYXRyaXguZCgpICE9IDEuMCkgLy8gU2NhbGUuCiAgICAgICAgICAgICByZXR1cm4g VHJhbnNwYXJlbmN5V2luOjpTY2FsZVRyYW5zZm9ybTsKLSAgICAgICAgZWxzZSAgLy8gTm90aGlu ZyBpbnRlcmVzdGluZy4KLSAgICAgICAgICAgIHJldHVybiBUcmFuc3BhcmVuY3lXaW46OktlZXBU cmFuc2Zvcm07CisgICAgICAgIC8vIE5vdGhpbmcgaW50ZXJlc3RpbmcuCisgICAgICAgIHJldHVy biBUcmFuc3BhcmVuY3lXaW46OktlZXBUcmFuc2Zvcm07CiAgICAgfQogCiAgICAgVHJhbnNwYXJl bmN5V2luIG1faGVscGVyOwogfTsKIAotfSAgLy8gbmFtZXNwYWNlCit9IC8vIG5hbWVzcGFjZQog CiBzdGF0aWMgdm9pZCBnZXROb25DbGllbnRNZXRyaWNzKE5PTkNMSUVOVE1FVFJJQ1MqIG1ldHJp Y3MpCiB7Ci0gICAgc3RhdGljIFVJTlQgc2l6ZSA9IFdlYkNvcmU6OmlzVmlzdGFPck5ld2VyKCkg PworICAgIHN0YXRpYyBVSU5UIHNpemUgPSBpc1Zpc3RhT3JOZXdlcigpID8KICAgICAgICAgc2l6 ZW9mKE5PTkNMSUVOVE1FVFJJQ1MpIDogTk9OQ0xJRU5UTUVUUklDU19TSVpFX1BSRV9WSVNUQTsK ICAgICBtZXRyaWNzLT5jYlNpemUgPSBzaXplOwogICAgIGJvb2wgc3VjY2VzcyA9ICEhU3lzdGVt UGFyYW1ldGVyc0luZm8oU1BJX0dFVE5PTkNMSUVOVE1FVFJJQ1MsIHNpemUsIG1ldHJpY3MsIDAp OwpAQCAtMTU3LDcgKzE1Nyw3IEBAIHN0YXRpYyBmbG9hdCBzeXN0ZW1Gb250U2l6ZShjb25zdCBM T0dGT05UJiBmb250KQogICAgIGlmIChzaXplIDwgMCkgewogICAgICAgICBIRk9OVCBoRm9udCA9 IENyZWF0ZUZvbnRJbmRpcmVjdCgmZm9udCk7CiAgICAgICAgIGlmIChoRm9udCkgewotICAgICAg ICAgICAgSERDIGhkYyA9IEdldERDKDApOyAgLy8gV2hhdCBhYm91dCBwcmludGluZz8gIElzIHRo aXMgdGhlIHJpZ2h0IERDPworICAgICAgICAgICAgSERDIGhkYyA9IEdldERDKDApOyAvLyBXaGF0 IGFib3V0IHByaW50aW5nPyAgSXMgdGhpcyB0aGUgcmlnaHQgREM/CiAgICAgICAgICAgICBpZiAo aGRjKSB7CiAgICAgICAgICAgICAgICAgSEdESU9CSiBoT2JqZWN0ID0gU2VsZWN0T2JqZWN0KGhk YywgaEZvbnQpOwogICAgICAgICAgICAgICAgIFRFWFRNRVRSSUMgdG07CkBAIC0xODgsOCArMTg4 LDggQEAgc3RhdGljIGZsb2F0IHBvaW50c1RvUGl4ZWxzKGZsb2F0IHBvaW50cykKIHsKICAgICBz dGF0aWMgZmxvYXQgcGl4ZWxzUGVySW5jaCA9IDAuMGY7CiAgICAgaWYgKCFwaXhlbHNQZXJJbmNo KSB7Ci0gICAgICAgIEhEQyBoZGMgPSBHZXREQygwKTsgIC8vIFdoYXQgYWJvdXQgcHJpbnRpbmc/ ICBJcyB0aGlzIHRoZSByaWdodCBEQz8KLSAgICAgICAgaWYgKGhkYykgeyAgLy8gQ2FuIHRoaXMg ZXZlciBhY3R1YWxseSBiZSBOVUxMPworICAgICAgICBIREMgaGRjID0gR2V0REMoMCk7IC8vIFdo YXQgYWJvdXQgcHJpbnRpbmc/ICBJcyB0aGlzIHRoZSByaWdodCBEQz8KKyAgICAgICAgaWYgKGhk YykgeyAvLyBDYW4gdGhpcyBldmVyIGFjdHVhbGx5IGJlIE5VTEw/CiAgICAgICAgICAgICBwaXhl bHNQZXJJbmNoID0gR2V0RGV2aWNlQ2FwcyhoZGMsIExPR1BJWEVMU1kpOwogICAgICAgICAgICAg UmVsZWFzZURDKDAsIGhkYyk7CiAgICAgICAgIH0gZWxzZSB7CkBAIC0yMDQsNyArMjA0LDcgQEAg c3RhdGljIGZsb2F0IHBvaW50c1RvUGl4ZWxzKGZsb2F0IHBvaW50cykKIHN0YXRpYyBkb3VibGUg cXVlcnlTeXN0ZW1CbGlua0ludGVydmFsKGRvdWJsZSBkZWZhdWx0SW50ZXJ2YWwpCiB7CiAgICAg VUlOVCBibGlua1RpbWUgPSBHZXRDYXJldEJsaW5rVGltZSgpOwotICAgIGlmIChibGlua1RpbWUg PT0gMCkKKyAgICBpZiAoIWJsaW5rVGltZSkKICAgICAgICAgcmV0dXJuIGRlZmF1bHRJbnRlcnZh bDsKICAgICBpZiAoYmxpbmtUaW1lID09IElORklOSVRFKQogICAgICAgICByZXR1cm4gMDsKQEAg LTIzNCw3ICsyMzQsNyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OnN1cHBvcnRzRm9j dXNSaW5nKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKIENvbG9yIFJlbmRlclRoZW1l Q2hyb21pdW1XaW46OnBsYXRmb3JtQWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29u c3QKIHsKICAgICBpZiAoQ2hyb21pdW1CcmlkZ2U6OmxheW91dFRlc3RNb2RlKCkpCi0gICAgICAg IHJldHVybiBDb2xvcigweDAwLCAweDAwLCAweGZmKTsgIC8vIFJveWFsIGJsdWUuCisgICAgICAg IHJldHVybiBDb2xvcigweDAwLCAweDAwLCAweGZmKTsgLy8gUm95YWwgYmx1ZS4KICAgICBDT0xP UlJFRiBjb2xvciA9IEdldFN5c0NvbG9yKENPTE9SX0hJR0hMSUdIVCk7CiAgICAgcmV0dXJuIENv bG9yKEdldFJWYWx1ZShjb2xvciksIEdldEdWYWx1ZShjb2xvciksIEdldEJWYWx1ZShjb2xvciks IDB4ZmYpOwogfQpAQCAtMjQyLDcgKzI0Miw3IEBAIENvbG9yIFJlbmRlclRoZW1lQ2hyb21pdW1X aW46OnBsYXRmb3JtQWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3QKIENvbG9y IFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OnBsYXRmb3JtSW5hY3RpdmVTZWxlY3Rpb25CYWNrZ3Jv dW5kQ29sb3IoKSBjb25zdAogewogICAgIGlmIChDaHJvbWl1bUJyaWRnZTo6bGF5b3V0VGVzdE1v ZGUoKSkKLSAgICAgICAgcmV0dXJuIENvbG9yKDB4OTksIDB4OTksIDB4OTkpOyAgLy8gTWVkaXVt IGdyYXkuCisgICAgICAgIHJldHVybiBDb2xvcigweDk5LCAweDk5LCAweDk5KTsgLy8gTWVkaXVt IGdyYXkuCiAgICAgQ09MT1JSRUYgY29sb3IgPSBHZXRTeXNDb2xvcihDT0xPUl9HUkFZVEVYVCk7 CiAgICAgcmV0dXJuIENvbG9yKEdldFJWYWx1ZShjb2xvciksIEdldEdWYWx1ZShjb2xvciksIEdl dEJWYWx1ZShjb2xvciksIDB4ZmYpOwogfQpAQCAtMjUwLDcgKzI1MCw3IEBAIENvbG9yIFJlbmRl clRoZW1lQ2hyb21pdW1XaW46OnBsYXRmb3JtSW5hY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29s b3IoKSBjb25zdAogQ29sb3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1BY3RpdmVT ZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3IoKSBjb25zdAogewogICAgIGlmIChDaHJvbWl1bUJyaWRn ZTo6bGF5b3V0VGVzdE1vZGUoKSkKLSAgICAgICAgcmV0dXJuIENvbG9yKDB4ZmYsIDB4ZmYsIDB4 Y2MpOyAgLy8gUGFsZSB5ZWxsb3cuCisgICAgICAgIHJldHVybiBDb2xvcigweGZmLCAweGZmLCAw eGNjKTsgLy8gUGFsZSB5ZWxsb3cuCiAgICAgQ09MT1JSRUYgY29sb3IgPSBHZXRTeXNDb2xvcihD T0xPUl9ISUdITElHSFRURVhUKTsKICAgICByZXR1cm4gQ29sb3IoR2V0UlZhbHVlKGNvbG9yKSwg R2V0R1ZhbHVlKGNvbG9yKSwgR2V0QlZhbHVlKGNvbG9yKSwgMHhmZik7CiB9CkBAIC0yNjIsNyAr MjYyLDcgQEAgQ29sb3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1JbmFjdGl2ZVNl bGVjdGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0CiAKIENvbG9yIFJlbmRlclRoZW1lQ2hyb21p dW1XaW46OnBsYXRmb3JtQWN0aXZlVGV4dFNlYXJjaEhpZ2hsaWdodENvbG9yKCkgY29uc3QKIHsK LSAgICByZXR1cm4gQ29sb3IoMHhmZiwgMHg5NiwgMHgzMik7ICAvLyBPcmFuZ2UuCisgICAgcmV0 dXJuIENvbG9yKDB4ZmYsIDB4OTYsIDB4MzIpOyAvLyBPcmFuZ2UuCiB9CiAKIENvbG9yIFJlbmRl clRoZW1lQ2hyb21pdW1XaW46OnBsYXRmb3JtSW5hY3RpdmVUZXh0U2VhcmNoSGlnaGxpZ2h0Q29s b3IoKSBjb25zdApAQCAtNDA1LDcgKzQwNSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdp bjo6cGFpbnRCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIGksIGNvCiB7 CiAgICAgY29uc3QgVGhlbWVEYXRhJiB0aGVtZURhdGEgPSBnZXRUaGVtZURhdGEobyk7CiAKLSAg ICBXZWJDb3JlOjpUaGVtZVBhaW50ZXIgcGFpbnRlcihpLmNvbnRleHQsIHIpOworICAgIFRoZW1l UGFpbnRlciBwYWludGVyKGkuY29udGV4dCwgcik7CiAgICAgQ2hyb21pdW1CcmlkZ2U6OnBhaW50 QnV0dG9uKHBhaW50ZXIuY29udGV4dCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0aGVtZURhdGEubV9wYXJ0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGVt ZURhdGEubV9zdGF0ZSwKQEAgLTQyMyw3ICs0MjMsNyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21p dW1XaW46OnBhaW50U2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8m CiB7CiAgICAgY29uc3QgVGhlbWVEYXRhJiB0aGVtZURhdGEgPSBnZXRUaGVtZURhdGEobyk7CiAK LSAgICBXZWJDb3JlOjpUaGVtZVBhaW50ZXIgcGFpbnRlcihpLmNvbnRleHQsIHIpOworICAgIFRo ZW1lUGFpbnRlciBwYWludGVyKGkuY29udGV4dCwgcik7CiAgICAgQ2hyb21pdW1CcmlkZ2U6OnBh aW50VHJhY2tiYXIocGFpbnRlci5jb250ZXh0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdGhlbWVEYXRhLm1fcGFydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0aGVtZURhdGEubV9zdGF0ZSwKQEAgLTQ1NCw3ICs0NTQsNyBAQCBib29sIFJlbmRlclRo ZW1lQ2hyb21pdW1XaW46OnBhaW50TWVudUxpc3QoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWlu dEluZm8mIGksCiAgICAgLy8gZHJhdyBpbmRpdmlkdWFsIGJvcmRlcnMgYW5kIHRoZW4gcGFzcyB0 aGF0IHRvIHNraWEgc28gd2UgY2FuIGF2b2lkCiAgICAgLy8gZHJhd2luZyBhbnkgYm9yZGVycyB0 aGF0IGFyZSBzZXQgdG8gMC4gRm9yIG5vbi16ZXJvIGJvcmRlcnMsIHdlIGRyYXcgdGhlCiAgICAg Ly8gYm9yZGVyLCBidXQgd2Via2l0IGp1c3QgZHJhd3Mgb3ZlciBpdC4KLSAgICBib29sIGRyYXdF ZGdlcyA9ICEoYm9yZGVyUmlnaHQgPT0gMCAmJiBib3JkZXJMZWZ0ID09IDAgJiYgYm9yZGVyVG9w ID09IDAgJiYgYm9yZGVyQm90dG9tID09IDApOworICAgIGJvb2wgZHJhd0VkZ2VzID0gISghYm9y ZGVyUmlnaHQgJiYgIWJvcmRlckxlZnQgJiYgIWJvcmRlclRvcCAmJiAhYm9yZGVyQm90dG9tKTsK IAogICAgIHBhaW50VGV4dEZpZWxkSW50ZXJuYWwobywgaSwgciwgZHJhd0VkZ2VzKTsKIApAQCAt NDgwLDcgKzQ4MCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGFpbnRNZW51TGlz dChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgaSwKICAgICAgICAgICAgICAgICAg ci5oZWlnaHQoKSAtIChzcGFjaW5nVG9wICsgc3BhY2luZ0JvdHRvbSkpOwogCiAgICAgLy8gR2V0 IHRoZSBjb3JyZWN0IHRoZW1lIGRhdGEgZm9yIGEgdGV4dGZpZWxkIGFuZCBwYWludCB0aGUgbWVu dS4KLSAgICBXZWJDb3JlOjpUaGVtZVBhaW50ZXIgcGFpbnRlcihpLmNvbnRleHQsIHJlY3QpOwor ICAgIFRoZW1lUGFpbnRlciBwYWludGVyKGkuY29udGV4dCwgcmVjdCk7CiAgICAgQ2hyb21pdW1C cmlkZ2U6OnBhaW50TWVudUxpc3QocGFpbnRlci5jb250ZXh0KCksCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgQ1BfRFJPUERPV05CVVRUT04sCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZGV0ZXJtaW5lU3RhdGUobyksCkBAIC02NzEsNyArNjcxLDcgQEAgYm9v bCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpwYWludFRleHRGaWVsZEludGVybmFsKFJlbmRlck9i amVjdCogbywKICAgICB9CiAgICAgewogICAgICAgICBjb25zdCBUaGVtZURhdGEmIHRoZW1lRGF0 YSA9IGdldFRoZW1lRGF0YShvKTsKLSAgICAgICAgV2ViQ29yZTo6VGhlbWVQYWludGVyIHBhaW50 ZXIoaS5jb250ZXh0LCByKTsKKyAgICAgICAgVGhlbWVQYWludGVyIHBhaW50ZXIoaS5jb250ZXh0 LCByKTsKICAgICAgICAgQ2hyb21pdW1CcmlkZ2U6OnBhaW50VGV4dEZpZWxkKHBhaW50ZXIuY29u dGV4dCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhlbWVEYXRh Lm1fcGFydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoZW1lRGF0 YS5tX3N0YXRlLApAQCAtNzAwLDcgKzcwMCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdp bjo6cGFpbnRJbm5lclNwaW5CdXR0b24oUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhCiAK ICAgICBoYWxmLnNldEhlaWdodChyZWN0LmhlaWdodCgpIC8gMik7CiAgICAgY29uc3QgVGhlbWVE YXRhJiB1cFRoZW1lRGF0YSA9IGdldFRoZW1lRGF0YShvYmplY3QsIFNwaW5CdXR0b25VcCk7Ci0g ICAgV2ViQ29yZTo6VGhlbWVQYWludGVyIHVwUGFpbnRlcihpbmZvLmNvbnRleHQsIGhhbGYpOwor ICAgIFRoZW1lUGFpbnRlciB1cFBhaW50ZXIoaW5mby5jb250ZXh0LCBoYWxmKTsKICAgICBDaHJv bWl1bUJyaWRnZTo6cGFpbnRTcGluQnV0dG9uKHVwUGFpbnRlci5jb250ZXh0KCksCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cFRoZW1lRGF0YS5tX3BhcnQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1cFRoZW1lRGF0YS5tX3N0YXRlLApAQCAtNzA5 LDcgKzcwOSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGFpbnRJbm5lclNwaW5C dXR0b24oUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhCiAKICAgICBoYWxmLnNldFkocmVj dC55KCkgKyByZWN0LmhlaWdodCgpIC8gMik7CiAgICAgY29uc3QgVGhlbWVEYXRhJiBkb3duVGhl bWVEYXRhID0gZ2V0VGhlbWVEYXRhKG9iamVjdCwgU3BpbkJ1dHRvbkRvd24pOwotICAgIFdlYkNv cmU6OlRoZW1lUGFpbnRlciBkb3duUGFpbnRlcihpbmZvLmNvbnRleHQsIGhhbGYpOworICAgIFRo ZW1lUGFpbnRlciBkb3duUGFpbnRlcihpbmZvLmNvbnRleHQsIGhhbGYpOwogICAgIENocm9taXVt QnJpZGdlOjpwYWludFNwaW5CdXR0b24oZG93blBhaW50ZXIuY29udGV4dCgpLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZG93blRoZW1lRGF0YS5tX3BhcnQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3duVGhlbWVEYXRhLm1fc3RhdGUsCg== 61955 2010-07-19 08:08:25 -0700 2010-07-19 21:33:59 -0700 Patch bug-42568-20100720000823.patch text/plain 10788 tkent ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTM1Y2QwYzQ1ZmVmMDgyYTI5NTg0ZjUzYWU5MWU3MTliYTIyY2ZhZC4uNjc2ZDNhODdmNTI1NTNi MGVmYzIwOWQ4NDQ4MjVkNDQ0ZmIzM2I5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wNy0xOSAgS2Vu dCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBGaXggc3R5bGUgZXJyb3JzIG9mIFJl bmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MjU2OAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1XaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAgICAgKFdlYkNvcmU6 OmdldE5vbkNsaWVudE1ldHJpY3MpOgorICAgICAgICAoV2ViQ29yZTo6c3lzdGVtRm9udFNpemUp OgorICAgICAgICAoV2ViQ29yZTo6cG9pbnRzVG9QaXhlbHMpOgorICAgICAgICAoV2ViQ29yZTo6 cXVlcnlTeXN0ZW1CbGlua0ludGVydmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Q2hyb21pdW1XaW46OnBsYXRmb3JtQWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1XaW46OnBsYXRmb3JtSW5hY3RpdmVT ZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVD aHJvbWl1bVdpbjo6cGxhdGZvcm1BY3RpdmVTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3IpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1BY3RpdmVUZXh0 U2VhcmNoSGlnaGxpZ2h0Q29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJv bWl1bVdpbjo6cGFpbnRCdXR0b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJv bWl1bVdpbjo6cGFpbnRTbGlkZXJUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZUNocm9taXVtV2luOjpwYWludE1lbnVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo ZW1lQ2hyb21pdW1XaW46OnBhaW50VGV4dEZpZWxkSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGFpbnRJbm5lclNwaW5CdXR0b24pOgorCiAyMDEw LTA3LTE3ICBOaWtpdGEgVmFzaWx5ZXYgIDxtZUBlbHYxcy5ydT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVDaHJvbWl1bVdpbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9t aXVtV2luLmNwcAppbmRleCA3MzI0ZmZmYWVkOTU0MzFhOTYwYjBiNmM3N2JlNzNmMDJmMzkxMTYx Li4zMDIzNzk4YTc0NzY3Y2RhOTAzNjgwNzA2NjM4Y2EzZjE3ZjIzYTRlIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcAorKysgYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcApAQCAtMjksOCArMjksOCBAQAog I2luY2x1ZGUgPHV4dGhlbWUuaD4KICNpbmNsdWRlIDx2c3N5bTMyLmg+CiAKLSNpbmNsdWRlICJD aHJvbWl1bUJyaWRnZS5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlS2V5d29yZHMuaCIKKyNpbmNsdWRl ICJDaHJvbWl1bUJyaWRnZS5oIgogI2luY2x1ZGUgIkN1cnJlbnRUaW1lLmgiCiAjaW5jbHVkZSAi Rm9udFNlbGVjdG9yLmgiCiAjaW5jbHVkZSAiRm9udFV0aWxzQ2hyb21pdW1XaW4uaCIKQEAgLTkw LDM4ICs5MCwzOCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBib29sIGNhbnZhc0hhc011bHRpcGxl TGF5ZXJzKGNvbnN0IFNrQ2FudmFzKiBjYW52YXMpCiAgICAgewogICAgICAgICBTa0NhbnZhczo6 TGF5ZXJJdGVyIGl0ZXIoY29uc3RfY2FzdDxTa0NhbnZhcyo+KGNhbnZhcyksIGZhbHNlKTsKLSAg ICAgICAgaXRlci5uZXh0KCk7ICAvLyBUaGVyZSBpcyBhbHdheXMgYXQgbGVhc3Qgb25lIGxheWVy LgotICAgICAgICByZXR1cm4gIWl0ZXIuZG9uZSgpOyAgLy8gVGhlcmUgaXMgPiAxIGxheWVyIGlm IHRoZSB0aGUgaXRlcmF0b3IgY2FuIHN0aWwgYWR2YW5jZS4KKyAgICAgICAgaXRlci5uZXh0KCk7 IC8vIFRoZXJlIGlzIGFsd2F5cyBhdCBsZWFzdCBvbmUgbGF5ZXIuCisgICAgICAgIHJldHVybiAh aXRlci5kb25lKCk7IC8vIFRoZXJlIGlzID4gMSBsYXllciBpZiB0aGUgdGhlIGl0ZXJhdG9yIGNh biBzdGlsIGFkdmFuY2UuCiAgICAgfQogCiAgICAgc3RhdGljIFRyYW5zcGFyZW5jeVdpbjo6TGF5 ZXJNb2RlIGdldExheWVyTW9kZShHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFRyYW5zcGFyZW5j eVdpbjo6VHJhbnNmb3JtTW9kZSB0cmFuc2Zvcm1Nb2RlKQogICAgIHsKLSAgICAgICAgaWYgKGNv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5pc0RyYXdpbmdUb0ltYWdlQnVmZmVyKCkpICAvLyBN aWdodCBoYXZlIHRyYW5zcGFyZW50IGJhY2tncm91bmQuCisgICAgICAgIGlmIChjb250ZXh0LT5w bGF0Zm9ybUNvbnRleHQoKS0+aXNEcmF3aW5nVG9JbWFnZUJ1ZmZlcigpKSAvLyBNaWdodCBoYXZl IHRyYW5zcGFyZW50IGJhY2tncm91bmQuCiAgICAgICAgICAgICByZXR1cm4gVHJhbnNwYXJlbmN5 V2luOjpXaGl0ZUxheWVyOwotICAgICAgICBlbHNlIGlmIChjYW52YXNIYXNNdWx0aXBsZUxheWVy cyhjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCkpKSAgLy8gTmVlZHMgYW50aWFs aWFzaW5nIGhlbHAuCisgICAgICAgIGlmIChjYW52YXNIYXNNdWx0aXBsZUxheWVycyhjb250ZXh0 LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCkpKSAvLyBOZWVkcyBhbnRpYWxpYXNpbmcgaGVs cC4KICAgICAgICAgICAgIHJldHVybiBUcmFuc3BhcmVuY3lXaW46Ok9wYXF1ZUNvbXBvc2l0ZUxh eWVyOwotICAgICAgICBlbHNlICAvLyBOb3RoaW5nIGludGVyZXN0aW5nLgotICAgICAgICAgICAg cmV0dXJuIHRyYW5zZm9ybU1vZGUgPT0gVHJhbnNwYXJlbmN5V2luOjpLZWVwVHJhbnNmb3JtID8g VHJhbnNwYXJlbmN5V2luOjpOb0xheWVyIDogVHJhbnNwYXJlbmN5V2luOjpPcGFxdWVDb21wb3Np dGVMYXllcjsKKyAgICAgICAgLy8gTm90aGluZyBpbnRlcmVzdGluZy4KKyAgICAgICAgcmV0dXJu IHRyYW5zZm9ybU1vZGUgPT0gVHJhbnNwYXJlbmN5V2luOjpLZWVwVHJhbnNmb3JtID8gVHJhbnNw YXJlbmN5V2luOjpOb0xheWVyIDogVHJhbnNwYXJlbmN5V2luOjpPcGFxdWVDb21wb3NpdGVMYXll cjsKICAgICB9CiAKICAgICBzdGF0aWMgVHJhbnNwYXJlbmN5V2luOjpUcmFuc2Zvcm1Nb2RlIGdl dFRyYW5zZm9ybU1vZGUoY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBtYXRyaXgpCiAgICAgewotICAg ICAgICBpZiAobWF0cml4LmIoKSAhPSAwIHx8IG1hdHJpeC5jKCkgIT0gMCkgIC8vIFNrZXcuCisg ICAgICAgIGlmIChtYXRyaXguYigpIHx8IG1hdHJpeC5jKCkpIC8vIFNrZXcuCiAgICAgICAgICAg ICByZXR1cm4gVHJhbnNwYXJlbmN5V2luOjpVbnRyYW5zZm9ybTsKLSAgICAgICAgZWxzZSBpZiAo bWF0cml4LmEoKSAhPSAxLjAgfHwgbWF0cml4LmQoKSAhPSAxLjApICAvLyBTY2FsZS4KKyAgICAg ICAgaWYgKG1hdHJpeC5hKCkgIT0gMS4wIHx8IG1hdHJpeC5kKCkgIT0gMS4wKSAvLyBTY2FsZS4K ICAgICAgICAgICAgIHJldHVybiBUcmFuc3BhcmVuY3lXaW46OlNjYWxlVHJhbnNmb3JtOwotICAg ICAgICBlbHNlICAvLyBOb3RoaW5nIGludGVyZXN0aW5nLgotICAgICAgICAgICAgcmV0dXJuIFRy YW5zcGFyZW5jeVdpbjo6S2VlcFRyYW5zZm9ybTsKKyAgICAgICAgLy8gTm90aGluZyBpbnRlcmVz dGluZy4KKyAgICAgICAgcmV0dXJuIFRyYW5zcGFyZW5jeVdpbjo6S2VlcFRyYW5zZm9ybTsKICAg ICB9CiAKICAgICBUcmFuc3BhcmVuY3lXaW4gbV9oZWxwZXI7CiB9OwogCi19ICAvLyBuYW1lc3Bh Y2UKK30gLy8gbmFtZXNwYWNlCiAKIHN0YXRpYyB2b2lkIGdldE5vbkNsaWVudE1ldHJpY3MoTk9O Q0xJRU5UTUVUUklDUyogbWV0cmljcykKIHsKLSAgICBzdGF0aWMgVUlOVCBzaXplID0gV2ViQ29y ZTo6aXNWaXN0YU9yTmV3ZXIoKSA/CisgICAgc3RhdGljIFVJTlQgc2l6ZSA9IGlzVmlzdGFPck5l d2VyKCkgPwogICAgICAgICBzaXplb2YoTk9OQ0xJRU5UTUVUUklDUykgOiBOT05DTElFTlRNRVRS SUNTX1NJWkVfUFJFX1ZJU1RBOwogICAgIG1ldHJpY3MtPmNiU2l6ZSA9IHNpemU7CiAgICAgYm9v bCBzdWNjZXNzID0gISFTeXN0ZW1QYXJhbWV0ZXJzSW5mbyhTUElfR0VUTk9OQ0xJRU5UTUVUUklD Uywgc2l6ZSwgbWV0cmljcywgMCk7CkBAIC0xNTcsNyArMTU3LDcgQEAgc3RhdGljIGZsb2F0IHN5 c3RlbUZvbnRTaXplKGNvbnN0IExPR0ZPTlQmIGZvbnQpCiAgICAgaWYgKHNpemUgPCAwKSB7CiAg ICAgICAgIEhGT05UIGhGb250ID0gQ3JlYXRlRm9udEluZGlyZWN0KCZmb250KTsKICAgICAgICAg aWYgKGhGb250KSB7Ci0gICAgICAgICAgICBIREMgaGRjID0gR2V0REMoMCk7ICAvLyBXaGF0IGFi b3V0IHByaW50aW5nPyAgSXMgdGhpcyB0aGUgcmlnaHQgREM/CisgICAgICAgICAgICBIREMgaGRj ID0gR2V0REMoMCk7IC8vIFdoYXQgYWJvdXQgcHJpbnRpbmc/ICBJcyB0aGlzIHRoZSByaWdodCBE Qz8KICAgICAgICAgICAgIGlmIChoZGMpIHsKICAgICAgICAgICAgICAgICBIR0RJT0JKIGhPYmpl Y3QgPSBTZWxlY3RPYmplY3QoaGRjLCBoRm9udCk7CiAgICAgICAgICAgICAgICAgVEVYVE1FVFJJ QyB0bTsKQEAgLTE4OCw4ICsxODgsOCBAQCBzdGF0aWMgZmxvYXQgcG9pbnRzVG9QaXhlbHMoZmxv YXQgcG9pbnRzKQogewogICAgIHN0YXRpYyBmbG9hdCBwaXhlbHNQZXJJbmNoID0gMC4wZjsKICAg ICBpZiAoIXBpeGVsc1BlckluY2gpIHsKLSAgICAgICAgSERDIGhkYyA9IEdldERDKDApOyAgLy8g V2hhdCBhYm91dCBwcmludGluZz8gIElzIHRoaXMgdGhlIHJpZ2h0IERDPwotICAgICAgICBpZiAo aGRjKSB7ICAvLyBDYW4gdGhpcyBldmVyIGFjdHVhbGx5IGJlIE5VTEw/CisgICAgICAgIEhEQyBo ZGMgPSBHZXREQygwKTsgLy8gV2hhdCBhYm91dCBwcmludGluZz8gIElzIHRoaXMgdGhlIHJpZ2h0 IERDPworICAgICAgICBpZiAoaGRjKSB7IC8vIENhbiB0aGlzIGV2ZXIgYWN0dWFsbHkgYmUgTlVM TD8KICAgICAgICAgICAgIHBpeGVsc1BlckluY2ggPSBHZXREZXZpY2VDYXBzKGhkYywgTE9HUElY RUxTWSk7CiAgICAgICAgICAgICBSZWxlYXNlREMoMCwgaGRjKTsKICAgICAgICAgfSBlbHNlIHsK QEAgLTIwNCw3ICsyMDQsNyBAQCBzdGF0aWMgZmxvYXQgcG9pbnRzVG9QaXhlbHMoZmxvYXQgcG9p bnRzKQogc3RhdGljIGRvdWJsZSBxdWVyeVN5c3RlbUJsaW5rSW50ZXJ2YWwoZG91YmxlIGRlZmF1 bHRJbnRlcnZhbCkKIHsKICAgICBVSU5UIGJsaW5rVGltZSA9IEdldENhcmV0QmxpbmtUaW1lKCk7 Ci0gICAgaWYgKGJsaW5rVGltZSA9PSAwKQorICAgIGlmICghYmxpbmtUaW1lKQogICAgICAgICBy ZXR1cm4gZGVmYXVsdEludGVydmFsOwogICAgIGlmIChibGlua1RpbWUgPT0gSU5GSU5JVEUpCiAg ICAgICAgIHJldHVybiAwOwpAQCAtMjM0LDcgKzIzNCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJv bWl1bVdpbjo6c3VwcG9ydHNGb2N1c1JpbmcoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25z dAogQ29sb3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1BY3RpdmVTZWxlY3Rpb25C YWNrZ3JvdW5kQ29sb3IoKSBjb25zdAogewogICAgIGlmIChDaHJvbWl1bUJyaWRnZTo6bGF5b3V0 VGVzdE1vZGUoKSkKLSAgICAgICAgcmV0dXJuIENvbG9yKDB4MDAsIDB4MDAsIDB4ZmYpOyAgLy8g Um95YWwgYmx1ZS4KKyAgICAgICAgcmV0dXJuIENvbG9yKDB4MDAsIDB4MDAsIDB4ZmYpOyAvLyBS b3lhbCBibHVlLgogICAgIENPTE9SUkVGIGNvbG9yID0gR2V0U3lzQ29sb3IoQ09MT1JfSElHSExJ R0hUKTsKICAgICByZXR1cm4gQ29sb3IoR2V0UlZhbHVlKGNvbG9yKSwgR2V0R1ZhbHVlKGNvbG9y KSwgR2V0QlZhbHVlKGNvbG9yKSwgMHhmZik7CiB9CkBAIC0yNDIsNyArMjQyLDcgQEAgQ29sb3Ig UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1BY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5k Q29sb3IoKSBjb25zdAogQ29sb3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1JbmFj dGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0CiB7CiAgICAgaWYgKENocm9taXVt QnJpZGdlOjpsYXlvdXRUZXN0TW9kZSgpKQotICAgICAgICByZXR1cm4gQ29sb3IoMHg5OSwgMHg5 OSwgMHg5OSk7ICAvLyBNZWRpdW0gZ3JheS4KKyAgICAgICAgcmV0dXJuIENvbG9yKDB4OTksIDB4 OTksIDB4OTkpOyAvLyBNZWRpdW0gZ3JheS4KICAgICBDT0xPUlJFRiBjb2xvciA9IEdldFN5c0Nv bG9yKENPTE9SX0dSQVlURVhUKTsKICAgICByZXR1cm4gQ29sb3IoR2V0UlZhbHVlKGNvbG9yKSwg R2V0R1ZhbHVlKGNvbG9yKSwgR2V0QlZhbHVlKGNvbG9yKSwgMHhmZik7CiB9CkBAIC0yNTAsNyAr MjUwLDcgQEAgQ29sb3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1JbmFjdGl2ZVNl bGVjdGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0CiBDb2xvciBSZW5kZXJUaGVtZUNocm9taXVt V2luOjpwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0CiB7CiAg ICAgaWYgKENocm9taXVtQnJpZGdlOjpsYXlvdXRUZXN0TW9kZSgpKQotICAgICAgICByZXR1cm4g Q29sb3IoMHhmZiwgMHhmZiwgMHhjYyk7ICAvLyBQYWxlIHllbGxvdy4KKyAgICAgICAgcmV0dXJu IENvbG9yKDB4ZmYsIDB4ZmYsIDB4Y2MpOyAvLyBQYWxlIHllbGxvdy4KICAgICBDT0xPUlJFRiBj b2xvciA9IEdldFN5c0NvbG9yKENPTE9SX0hJR0hMSUdIVFRFWFQpOwogICAgIHJldHVybiBDb2xv cihHZXRSVmFsdWUoY29sb3IpLCBHZXRHVmFsdWUoY29sb3IpLCBHZXRCVmFsdWUoY29sb3IpLCAw eGZmKTsKIH0KQEAgLTI2Miw3ICsyNjIsNyBAQCBDb2xvciBSZW5kZXJUaGVtZUNocm9taXVtV2lu OjpwbGF0Zm9ybUluYWN0aXZlU2VsZWN0aW9uRm9yZWdyb3VuZENvbG9yKCkgY29uc3QKIAogQ29s b3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1BY3RpdmVUZXh0U2VhcmNoSGlnaGxp Z2h0Q29sb3IoKSBjb25zdAogewotICAgIHJldHVybiBDb2xvcigweGZmLCAweDk2LCAweDMyKTsg IC8vIE9yYW5nZS4KKyAgICByZXR1cm4gQ29sb3IoMHhmZiwgMHg5NiwgMHgzMik7IC8vIE9yYW5n ZS4KIH0KIAogQ29sb3IgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGxhdGZvcm1JbmFjdGl2ZVRl eHRTZWFyY2hIaWdobGlnaHRDb2xvcigpIGNvbnN0CkBAIC00MDUsNyArNDA1LDcgQEAgYm9vbCBS ZW5kZXJUaGVtZUNocm9taXVtV2luOjpwYWludEJ1dHRvbihSZW5kZXJPYmplY3QqIG8sIGNvbnN0 IFBhaW50SW5mbyYgaSwgY28KIHsKICAgICBjb25zdCBUaGVtZURhdGEmIHRoZW1lRGF0YSA9IGdl dFRoZW1lRGF0YShvKTsKIAotICAgIFdlYkNvcmU6OlRoZW1lUGFpbnRlciBwYWludGVyKGkuY29u dGV4dCwgcik7CisgICAgVGhlbWVQYWludGVyIHBhaW50ZXIoaS5jb250ZXh0LCByKTsKICAgICBD aHJvbWl1bUJyaWRnZTo6cGFpbnRCdXR0b24ocGFpbnRlci5jb250ZXh0KCksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHRoZW1lRGF0YS5tX3BhcnQsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRoZW1lRGF0YS5tX3N0YXRlLApAQCAtNDIzLDcgKzQyMyw3IEBAIGJv b2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJPYmplY3Qq IG8sIGNvbnN0IFBhaW50SW5mbyYKIHsKICAgICBjb25zdCBUaGVtZURhdGEmIHRoZW1lRGF0YSA9 IGdldFRoZW1lRGF0YShvKTsKIAotICAgIFdlYkNvcmU6OlRoZW1lUGFpbnRlciBwYWludGVyKGku Y29udGV4dCwgcik7CisgICAgVGhlbWVQYWludGVyIHBhaW50ZXIoaS5jb250ZXh0LCByKTsKICAg ICBDaHJvbWl1bUJyaWRnZTo6cGFpbnRUcmFja2JhcihwYWludGVyLmNvbnRleHQoKSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGVtZURhdGEubV9wYXJ0LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHRoZW1lRGF0YS5tX3N0YXRlLApAQCAtNDU0LDcgKzQ1 NCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGFpbnRNZW51TGlzdChSZW5kZXJP YmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgaSwKICAgICAvLyBkcmF3IGluZGl2aWR1YWwgYm9y ZGVycyBhbmQgdGhlbiBwYXNzIHRoYXQgdG8gc2tpYSBzbyB3ZSBjYW4gYXZvaWQKICAgICAvLyBk cmF3aW5nIGFueSBib3JkZXJzIHRoYXQgYXJlIHNldCB0byAwLiBGb3Igbm9uLXplcm8gYm9yZGVy cywgd2UgZHJhdyB0aGUKICAgICAvLyBib3JkZXIsIGJ1dCB3ZWJraXQganVzdCBkcmF3cyBvdmVy IGl0LgotICAgIGJvb2wgZHJhd0VkZ2VzID0gIShib3JkZXJSaWdodCA9PSAwICYmIGJvcmRlckxl ZnQgPT0gMCAmJiBib3JkZXJUb3AgPT0gMCAmJiBib3JkZXJCb3R0b20gPT0gMCk7CisgICAgYm9v bCBkcmF3RWRnZXMgPSAhKCFib3JkZXJSaWdodCAmJiAhYm9yZGVyTGVmdCAmJiAhYm9yZGVyVG9w ICYmICFib3JkZXJCb3R0b20pOwogCiAgICAgcGFpbnRUZXh0RmllbGRJbnRlcm5hbChvLCBpLCBy LCBkcmF3RWRnZXMpOwogCkBAIC00ODAsNyArNDgwLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9t aXVtV2luOjpwYWludE1lbnVMaXN0KFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBp LAogICAgICAgICAgICAgICAgICByLmhlaWdodCgpIC0gKHNwYWNpbmdUb3AgKyBzcGFjaW5nQm90 dG9tKSk7CiAKICAgICAvLyBHZXQgdGhlIGNvcnJlY3QgdGhlbWUgZGF0YSBmb3IgYSB0ZXh0Zmll bGQgYW5kIHBhaW50IHRoZSBtZW51LgotICAgIFdlYkNvcmU6OlRoZW1lUGFpbnRlciBwYWludGVy KGkuY29udGV4dCwgcmVjdCk7CisgICAgVGhlbWVQYWludGVyIHBhaW50ZXIoaS5jb250ZXh0LCBy ZWN0KTsKICAgICBDaHJvbWl1bUJyaWRnZTo6cGFpbnRNZW51TGlzdChwYWludGVyLmNvbnRleHQo KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDUF9EUk9QRE9XTkJVVFRPTiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXRlcm1pbmVTdGF0ZShvKSwKQEAg LTY3MSw3ICs2NzEsNyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OnBhaW50VGV4dEZp ZWxkSW50ZXJuYWwoUmVuZGVyT2JqZWN0KiBvLAogICAgIH0KICAgICB7CiAgICAgICAgIGNvbnN0 IFRoZW1lRGF0YSYgdGhlbWVEYXRhID0gZ2V0VGhlbWVEYXRhKG8pOwotICAgICAgICBXZWJDb3Jl OjpUaGVtZVBhaW50ZXIgcGFpbnRlcihpLmNvbnRleHQsIHIpOworICAgICAgICBUaGVtZVBhaW50 ZXIgcGFpbnRlcihpLmNvbnRleHQsIHIpOwogICAgICAgICBDaHJvbWl1bUJyaWRnZTo6cGFpbnRU ZXh0RmllbGQocGFpbnRlci5jb250ZXh0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB0aGVtZURhdGEubV9wYXJ0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdGhlbWVEYXRhLm1fc3RhdGUsCkBAIC03MDAsNyArNzAwLDcgQEAgYm9vbCBS ZW5kZXJUaGVtZUNocm9taXVtV2luOjpwYWludElubmVyU3BpbkJ1dHRvbihSZW5kZXJPYmplY3Qq IG9iamVjdCwgY29uc3QgUGEKIAogICAgIGhhbGYuc2V0SGVpZ2h0KHJlY3QuaGVpZ2h0KCkgLyAy KTsKICAgICBjb25zdCBUaGVtZURhdGEmIHVwVGhlbWVEYXRhID0gZ2V0VGhlbWVEYXRhKG9iamVj dCwgU3BpbkJ1dHRvblVwKTsKLSAgICBXZWJDb3JlOjpUaGVtZVBhaW50ZXIgdXBQYWludGVyKGlu Zm8uY29udGV4dCwgaGFsZik7CisgICAgVGhlbWVQYWludGVyIHVwUGFpbnRlcihpbmZvLmNvbnRl eHQsIGhhbGYpOwogICAgIENocm9taXVtQnJpZGdlOjpwYWludFNwaW5CdXR0b24odXBQYWludGVy LmNvbnRleHQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVwVGhlbWVE YXRhLm1fcGFydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVwVGhlbWVE YXRhLm1fc3RhdGUsCkBAIC03MDksNyArNzA5LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVt V2luOjpwYWludElubmVyU3BpbkJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGEK IAogICAgIGhhbGYuc2V0WShyZWN0LnkoKSArIHJlY3QuaGVpZ2h0KCkgLyAyKTsKICAgICBjb25z dCBUaGVtZURhdGEmIGRvd25UaGVtZURhdGEgPSBnZXRUaGVtZURhdGEob2JqZWN0LCBTcGluQnV0 dG9uRG93bik7Ci0gICAgV2ViQ29yZTo6VGhlbWVQYWludGVyIGRvd25QYWludGVyKGluZm8uY29u dGV4dCwgaGFsZik7CisgICAgVGhlbWVQYWludGVyIGRvd25QYWludGVyKGluZm8uY29udGV4dCwg aGFsZik7CiAgICAgQ2hyb21pdW1CcmlkZ2U6OnBhaW50U3BpbkJ1dHRvbihkb3duUGFpbnRlci5j b250ZXh0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3duVGhlbWVE YXRhLm1fcGFydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvd25UaGVt ZURhdGEubV9zdGF0ZSwK