24048 2009-02-19 17:43:19 -0800 extra windows button padding doesn't apply when there's no appearance 2010-02-18 05:18:28 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 ojan ojan adele hamaji hyatt jouni mad oldest_to_newest 110333 0 ojan 2009-02-19 17:43:19 -0800 To match FF, we need to add non-overridable 3px padding-left/right and 1px padding-top/bottom. Currently we do so in RenderThemeWin via adjustButtonInnerStyle only if the button has an appearance. We should do this whether the button has an appearance or not. As per hyatt's suggestion, will replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom and get rid of the hasAppearance check. 110644 1 27894 ojan 2009-02-23 14:52:31 -0800 Created attachment 27894 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. WebCore/ChangeLog | 34 ++++++++++++++++++++++++++ WebCore/rendering/RenderButton.cpp | 7 ++++- WebCore/rendering/RenderTheme.cpp | 4 --- WebCore/rendering/RenderTheme.h | 8 ++++- WebCore/rendering/RenderThemeChromiumGtk.cpp | 23 +++++++++++++---- WebCore/rendering/RenderThemeChromiumGtk.h | 5 +++- WebCore/rendering/RenderThemeChromiumWin.cpp | 23 +++++++++++++---- WebCore/rendering/RenderThemeChromiumWin.h | 5 +++- WebCore/rendering/RenderThemeWin.cpp | 23 +++++++++++++---- WebCore/rendering/RenderThemeWin.h | 5 +++- 10 files changed, 108 insertions(+), 29 deletions(-) 111281 2 28032 ojan 2009-02-26 12:51:11 -0800 Created attachment 28032 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. WebCore/ChangeLog | 34 ++++++++++++++++++++++++++ WebCore/rendering/RenderButton.cpp | 7 ++++- WebCore/rendering/RenderTheme.cpp | 4 --- WebCore/rendering/RenderTheme.h | 8 ++++- WebCore/rendering/RenderThemeChromiumGtk.cpp | 23 +++++++++++++---- WebCore/rendering/RenderThemeChromiumGtk.h | 5 +++- WebCore/rendering/RenderThemeChromiumWin.cpp | 23 +++++++++++++---- WebCore/rendering/RenderThemeChromiumWin.h | 5 +++- WebCore/rendering/RenderThemeWin.cpp | 23 +++++++++++++---- WebCore/rendering/RenderThemeWin.h | 5 +++- 10 files changed, 108 insertions(+), 29 deletions(-) 111283 3 28033 ojan 2009-02-26 12:53:44 -0800 Created attachment 28033 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. WebCore/ChangeLog | 36 ++++++++++++++++++++++++++ WebCore/rendering/RenderButton.cpp | 7 +++- WebCore/rendering/RenderTheme.cpp | 4 --- WebCore/rendering/RenderTheme.h | 8 ++++- WebCore/rendering/RenderThemeChromiumGtk.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeChromiumGtk.h | 5 +++- WebCore/rendering/RenderThemeChromiumWin.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeChromiumWin.h | 5 +++- WebCore/rendering/RenderThemeWin.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeWin.h | 5 +++- 10 files changed, 110 insertions(+), 29 deletions(-) 111293 4 28035 ojan 2009-02-26 13:46:42 -0800 Created attachment 28035 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. WebCore/ChangeLog | 36 ++++++++++++++++++++++++++ WebCore/rendering/RenderButton.cpp | 7 +++- WebCore/rendering/RenderTheme.cpp | 4 --- WebCore/rendering/RenderTheme.h | 8 ++++- WebCore/rendering/RenderThemeChromiumGtk.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeChromiumGtk.h | 5 +++- WebCore/rendering/RenderThemeChromiumWin.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeChromiumWin.h | 5 +++- WebCore/rendering/RenderThemeWin.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeWin.h | 5 +++- 10 files changed, 110 insertions(+), 29 deletions(-) 111294 5 28036 ojan 2009-02-26 13:48:22 -0800 Created attachment 28036 Fixes missing "}" that snuck in on my last sync. WebCore/ChangeLog | 36 ++++++++++++++++++++++++++ WebCore/rendering/RenderButton.cpp | 7 +++- WebCore/rendering/RenderTheme.cpp | 4 --- WebCore/rendering/RenderTheme.h | 8 ++++- WebCore/rendering/RenderThemeChromiumGtk.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeChromiumGtk.h | 5 +++- WebCore/rendering/RenderThemeChromiumWin.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeChromiumWin.h | 5 +++- WebCore/rendering/RenderThemeWin.cpp | 23 ++++++++++++---- WebCore/rendering/RenderThemeWin.h | 5 +++- 10 files changed, 110 insertions(+), 29 deletions(-) 111861 6 levin 2009-03-02 11:17:45 -0800 Committed as r41362. 129498 7 jouni 2009-07-02 06:43:46 -0700 Hi, Is there still a way to prevent these additional paddings? If you're trying to mimic Firefox's behaviour, you should provide a way to remove the additional paddings as well. In Firefox they can be removed with the following CSS (the double colon is not a typo): button::-moz-focus-inner { border: none; padding: 0; } And why does this concern only the Windows version, and not the OS X version as well? Firefox adds the extra paddings on the OS X version as well. 133727 8 jouni 2009-07-22 01:37:50 -0700 Any other comments? Is this a dead issue? Should I open a new ticket? 191544 9 hamaji 2010-02-18 05:18:28 -0800 Belated response... > Is there still a way to prevent these additional paddings? I think there are no way, unfortunately. > If you're trying to mimic Firefox's behaviour, you should provide a way to > remove the additional paddings as well. In Firefox they can be removed with the > following CSS (the double colon is not a typo): > > button::-moz-focus-inner { > border: none; > padding: 0; > } I agree with you. I've just opened another bug and sent a patch to add -webkit-focus-inner for buttons. Please check Bug 35090 for detail. > And why does this concern only the Windows version, and not the OS X version as > well? Firefox adds the extra paddings on the OS X version as well. Agreed. This should be much easier to fix. I'll open another bug and try fixing this issue, too. 27894 2009-02-23 14:52:31 -0800 2009-02-26 12:51:32 -0800 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. Replace-adjustButtonInnerStyle-with-buttonInternalPaddingLeft-Right-Top-Bottom..patch text/plain 10378 ojan NzU5N2I2NDkzNTg0NDhkZjcxODgyZjAzMzUyNjk3ZjJkZTdlNGZmMQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OGZlYTE1Li43ZmY4MGZk IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM3IEBACisyMDA5LTAyLTIzICBPamFuIFZhZmFpICA8b2phbkBkaGNwLTE3Mi0x OS0xMTAtMjYubXR2LmNvcnAuZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIGFkanVzdEJ1dHRvbklubmVyU3R5bGUgd2l0 aCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0L1JpZ2h0L1RvcC9Cb3R0b20uCisKKyAgICAgICAg V0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQnV0dG9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJ1dHRvbjo6 c2V0dXBJbm5lclN0eWxlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWU6OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWU6OmJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lOjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0 b20pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmg6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5h bFBhZGRpbmdSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtV2lu OjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdp bjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaDoKKwogMjAwOS0wMi0yMyAgRGF2aWQgSHlhdHQgIDxo eWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBzdGFja2luZyBvcmRlciBmb3IgY29s dW1uIHJ1bGVzIGluIG11bHRpLWNvbHVtbiBsYXlvdXQuICBDb2x1bW4gcnVsZXMgc2hvdWxkIHBh aW50IGFzIHBhcnQgb2YgdGhlIGJhY2tncm91bmQgb2YgYW4gZWxlbWVudCwganVzdApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJ1dHRvbi5jcHAKaW5kZXggZTk3ZWY1Ni4uZDY0ZDdjMyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCdXR0b24uY3BwCkBAIC0xMDgsOCArMTA4LDExIEBAIHZvaWQgUmVuZGVyQnV0dG9u OjpzZXR1cElubmVyU3R5bGUoUmVuZGVyU3R5bGUqIGlubmVyU3R5bGUpCiAgICAgLy8gUmVuZGVy QmxvY2s6OmNyZWF0ZUFub255bW91c0Jsb2NrIGNyZWF0ZXMgYSBuZXcgUmVuZGVyU3R5bGUsIHNv IHRoaXMgaXMKICAgICAvLyBzYWZlIHRvIG1vZGlmeS4KICAgICBpbm5lclN0eWxlLT5zZXRCb3hG bGV4KDEuMGYpOwotICAgIGlmIChzdHlsZSgpLT5oYXNBcHBlYXJhbmNlKCkpCi0gICAgICAgIHRo ZW1lKCktPmFkanVzdEJ1dHRvbklubmVyU3R5bGUoaW5uZXJTdHlsZSk7CisKKyAgICBpbm5lclN0 eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCh0aGVtZSgpLT5idXR0b25JbnRlcm5hbFBhZGRpbmdU b3AoKSwgRml4ZWQpKTsKKyAgICBpbm5lclN0eWxlLT5zZXRQYWRkaW5nUmlnaHQoTGVuZ3RoKHRo ZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCksIEZpeGVkKSk7CisgICAgaW5uZXJT dHlsZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgodGhlbWUoKS0+YnV0dG9uSW50ZXJuYWxQYWRk aW5nQm90dG9tKCksIEZpeGVkKSk7CisgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ0xlZnQoTGVu Z3RoKHRoZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQoKSwgRml4ZWQpKTsKIH0KIAog dm9pZCBSZW5kZXJCdXR0b246OnVwZGF0ZUZyb21FbGVtZW50KCkKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lLmNwcAppbmRleCA1OTFkNTA0Li4zMjU3YWZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZS5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUu Y3BwCkBAIC03MzcsMTAgKzczNyw2IEBAIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdE1lbnVMaXN0 QnV0dG9uU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiwgRWxlCiB7CiB9CiAK LXZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqKSBj b25zdAotewotfQotCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTbGlkZXJUcmFja1N0eWxlKENT U1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdAogewogfQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmgKaW5kZXggYWYxZjY5NC4uM2M0ZWY5MiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZS5oCkBAIC0xMjgsMTQgKzEyOCwxOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGlu dCBtaW5pbXVtTWVudUxpc3RTaXplKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQog Ci0gICAgdmlydHVhbCB2b2lkIGFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqKSBj b25zdDsKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2xpZGVyVGh1bWJTaXplKFJlbmRlck9iamVj dCopIGNvbnN0OwogCiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdMZWZ0KFJl bmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50 ZXJuYWxQYWRkaW5nUmlnaHQoUmVuZGVyU3R5bGUqKSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAg dmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdUb3AoUmVuZGVyU3R5bGUqKSBjb25zdCB7 IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdCb3R0b20o UmVuZGVyU3R5bGUqKSBjb25zdCB7IHJldHVybiAwOyB9Ci0gICAgCisKKyAgICB2aXJ0dWFsIGlu dCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCkgY29uc3QgeyByZXR1cm4gMDsgfQorICAgIHZp cnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsg fQorICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgpIGNvbnN0IHsgcmV0 dXJuIDA7CisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29u c3QgeyByZXR1cm4gMDsgfQorCiAgICAgLy8gTWV0aG9kIGZvciBwYWludGluZyB0aGUgY2FwcyBs b2NrIGluZGljYXRvcgogICAgIHZpcnR1YWwgYm9vbCBwYWludENhcHNMb2NrSW5kaWNhdG9yKFJl bmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiwgY29uc3QgSW50UmVj dCYpIHsgcmV0dXJuIDA7IH07CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1HdGsuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJv bWl1bUd0ay5jcHAKaW5kZXggMjIwY2UwNy4uNGJmMzBjMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5jcHAKQEAgLTQzNCwxMyArNDM0LDI0IEBAIGludCBS ZW5kZXJUaGVtZUNocm9taXVtR3RrOjpwb3B1cEludGVybmFsUGFkZGluZ0JvdHRvbShSZW5kZXJT dHlsZSogc3R5bGUpIGNvbnN0CiAgICAgcmV0dXJuIG1lbnVMaXN0SW50ZXJuYWxQYWRkaW5nKHN0 eWxlLCBCb3R0b21QYWRkaW5nKTsKIH0KIAotdm9pZCBSZW5kZXJUaGVtZUNocm9taXVtR3RrOjph ZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKK2ludCBSZW5k ZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0CiB7Ci0gICAgLy8g VGhpcyBpbm5lciBwYWRkaW5nIG1hdGNoZXMgRmlyZWZveC4KLSAgICBzdHlsZS0+c2V0UGFkZGlu Z1RvcChMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0 aCgzLCBGaXhlZCkpOwotICAgIHN0eWxlLT5zZXRQYWRkaW5nQm90dG9tKExlbmd0aCgxLCBGaXhl ZCkpOwotICAgIHN0eWxlLT5zZXRQYWRkaW5nTGVmdChMZW5ndGgoMywgRml4ZWQpKTsKKyAgICBy ZXR1cm4gMzsKK30KKworaW50IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdS aWdodCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6 YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKK30KKwor aW50IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0b20oKSBjb25zdAor eworICAgIHJldHVybiAxOwogfQogCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1HdGs6OmNvbnRy b2xTdXBwb3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCogbykgY29uc3QKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsuaCBiL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsuaAppbmRleCA3N2Q5MjdmLi41OGYzODUyIDEw MDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmgKKysr IGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oCkBAIC0xMDAsNyAr MTAwLDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCBpbnQgcG9wdXBJ bnRlcm5hbFBhZGRpbmdUb3AoUmVuZGVyU3R5bGUqKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBp bnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqKSBjb25zdDsKIAotICAg ICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5 bGUpIGNvbnN0OworICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0 KCkgY29uc3Q7CisgICAgICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0 KCkgY29uc3Q7CisgICAgICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgp IGNvbnN0OworICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0b20o KSBjb25zdDsKIAogICAgICAgICAvLyBBIG1ldGhvZCBhc2tpbmcgaWYgdGhlIGNvbnRyb2wgY2hh bmdlcyBpdHMgdGludCB3aGVuIHRoZSB3aW5kb3cgaGFzIGZvY3VzIG9yIG5vdC4KICAgICAgICAg dmlydHVhbCBib29sIGNvbnRyb2xTdXBwb3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCopIGNv bnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdp bi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcAppbmRl eCA5ZTU5YWM5Li41MmI5Y2Y5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtV2luLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNo cm9taXVtV2luLmNwcApAQCAtNDgxLDEzICs0ODEsMjQgQEAgaW50IFJlbmRlclRoZW1lQ2hyb21p dW1XaW46OnBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKiBzdHlsZSkgY29u c3QKICAgICByZXR1cm4gbWVudUxpc3RJbnRlcm5hbFBhZGRpbmcoc3R5bGUsIEJvdHRvbVBhZGRp bmcpOwogfQogCi12b2lkIFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmFkanVzdEJ1dHRvbklubmVy U3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdAoraW50IFJlbmRlclRoZW1lQ2hyb21pdW1X aW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5u ZXIgcGFkZGluZyBtYXRjaGVzIEZpcmVmb3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVu Z3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4 ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAg ICBzdHlsZS0+c2V0UGFkZGluZ0xlZnQoTGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7 Cit9CisKK2ludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdS aWdodCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZUNocm9t aXVtV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdAoreworICAgIHJldHVybiAx OworfQorCitpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5n Qm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKIH0KIAogLy8gc3RhdGljCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmggYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmgKaW5kZXggMmQzMzVjMi4uMDg2NmNm ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5o CisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uaApAQCAtMTA0 LDcgKzEwNCwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgaW50IHBv cHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1 YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKikgY29uc3Q7CiAK LSAgICAgICAgdmlydHVhbCB2b2lkIGFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUq KSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgp IGNvbnN0OworICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgp IGNvbnN0OworICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBj b25zdDsKKyAgICAgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkg Y29uc3Q7CiAKICAgICAgICAgLy8gUHJvdmlkZSBhIHdheSB0byBwYXNzIHRoZSBkZWZhdWx0IGZv bnQgc2l6ZSBmcm9tIHRoZSBTZXR0aW5ncyBvYmplY3QKICAgICAgICAgLy8gdG8gdGhlIHJlbmRl ciB0aGVtZS4gIEZJWE1FOiBodHRwOi8vYi8xMTI5MTg2IEEgY2xlYW5lciB3YXkgd291bGQgYmUK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcCBiL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcAppbmRleCBlNDcxN2ExLi5lODgyNDMyIDEw MDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAKKysrIGIvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCkBAIC03MTIsMTMgKzcxMiwyNCBAQCB2 b2lkIFJlbmRlclRoZW1lV2luOjphZGp1c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyT2JqZWN0KiBv KSBjb25zdAogICAgIH0KIH0KIAotdm9pZCBSZW5kZXJUaGVtZVdpbjo6YWRqdXN0QnV0dG9uSW5u ZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFk ZGluZyBtYXRjaGVzIEZpcmVmb3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEs IEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsK LSAgICBzdHlsZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHls ZS0+c2V0UGFkZGluZ0xlZnQoTGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisK K2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAor eworICAgIHJldHVybiAzOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFs UGFkZGluZ1RvcCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIDE7Cit9CisKK2ludCBSZW5kZXJUaGVt ZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4g MTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRTZWFyY2hGaWVsZChSZW5kZXJPYmpl Y3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiBy KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaCBiL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgKaW5kZXggNWQ1YmQ0Yi4uMzJkNDExNCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaAorKysgYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5oCkBAIC05Miw3ICs5MiwxMCBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCBib29sIHBhaW50U2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBS ZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcik7CiAgICAgdmlydHVh bCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJPYmplY3QqKSBjb25zdDsKIAotICAg IHZpcnR1YWwgdm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7 CisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OworICAg IHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3Q7CisgICAgdmly dHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3Q7CisgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZv aWQgYWRqdXN0U2VhcmNoRmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUq LCBFbGVtZW50KikgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGQoUmVu ZGVyT2JqZWN0KiwgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mLCBjb25zdCBJbnRSZWN0 Jik7Cg== 28032 2009-02-26 12:51:11 -0800 2009-02-26 12:53:50 -0800 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. Replace-adjustButtonInnerStyle-with-buttonInternalPaddingLeft-Right-Top-Bottom..patch text/plain 10255 ojan MWM5OTdhZmExYzlhNmY5NDRlNWNlMDMyYjFkMTU1N2NiZDY1MGU0MQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMjFiNjc3Li42YTYxNDVi IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM3IEBACisyMDA5LTAyLTIzICBPamFuIFZhZmFpICA8b2phbkBkaGNwLTE3Mi0x OS0xMTAtMjYubXR2LmNvcnAuZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIGFkanVzdEJ1dHRvbklubmVyU3R5bGUgd2l0 aCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0L1JpZ2h0L1RvcC9Cb3R0b20uCisKKyAgICAgICAg V0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQnV0dG9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJ1dHRvbjo6 c2V0dXBJbm5lclN0eWxlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWU6OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWU6OmJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lOjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0 b20pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmg6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5h bFBhZGRpbmdSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtV2lu OjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdp bjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaDoKKwogMjAwOS0wMi0yNiAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcCBiL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAKaW5kZXggZTk3ZWY1Ni4uZDY0ZDdjMyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcAorKysgYi9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCdXR0b24uY3BwCkBAIC0xMDgsOCArMTA4LDExIEBAIHZvaWQgUmVuZGVy QnV0dG9uOjpzZXR1cElubmVyU3R5bGUoUmVuZGVyU3R5bGUqIGlubmVyU3R5bGUpCiAgICAgLy8g UmVuZGVyQmxvY2s6OmNyZWF0ZUFub255bW91c0Jsb2NrIGNyZWF0ZXMgYSBuZXcgUmVuZGVyU3R5 bGUsIHNvIHRoaXMgaXMKICAgICAvLyBzYWZlIHRvIG1vZGlmeS4KICAgICBpbm5lclN0eWxlLT5z ZXRCb3hGbGV4KDEuMGYpOwotICAgIGlmIChzdHlsZSgpLT5oYXNBcHBlYXJhbmNlKCkpCi0gICAg ICAgIHRoZW1lKCktPmFkanVzdEJ1dHRvbklubmVyU3R5bGUoaW5uZXJTdHlsZSk7CisKKyAgICBp bm5lclN0eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCh0aGVtZSgpLT5idXR0b25JbnRlcm5hbFBh ZGRpbmdUb3AoKSwgRml4ZWQpKTsKKyAgICBpbm5lclN0eWxlLT5zZXRQYWRkaW5nUmlnaHQoTGVu Z3RoKHRoZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCksIEZpeGVkKSk7CisgICAg aW5uZXJTdHlsZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgodGhlbWUoKS0+YnV0dG9uSW50ZXJu YWxQYWRkaW5nQm90dG9tKCksIEZpeGVkKSk7CisgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ0xl ZnQoTGVuZ3RoKHRoZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQoKSwgRml4ZWQpKTsK IH0KIAogdm9pZCBSZW5kZXJCdXR0b246OnVwZGF0ZUZyb21FbGVtZW50KCkKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lLmNwcAppbmRleCA1OTFkNTA0Li4zMjU3YWZlIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuY3BwCkBAIC03MzcsMTAgKzczNyw2IEBAIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdE1l bnVMaXN0QnV0dG9uU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiwgRWxlCiB7 CiB9CiAKLXZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5 bGUqKSBjb25zdAotewotfQotCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTbGlkZXJUcmFja1N0 eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdAogewog fQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaCBiL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKaW5kZXggMzUxMmIyMS4uMjRmNTAzNSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAorKysgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZS5oCkBAIC0xMjksMTQgKzEyOSwxOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIGludCBtaW5pbXVtTWVudUxpc3RTaXplKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4g MDsgfQogCi0gICAgdmlydHVhbCB2b2lkIGFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5 bGUqKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2xpZGVyVGh1bWJTaXplKFJlbmRl ck9iamVjdCopIGNvbnN0OwogCiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdM ZWZ0KFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgaW50IHBv cHVwSW50ZXJuYWxQYWRkaW5nUmlnaHQoUmVuZGVyU3R5bGUqKSBjb25zdCB7IHJldHVybiAwOyB9 CiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdUb3AoUmVuZGVyU3R5bGUqKSBj b25zdCB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdC b3R0b20oUmVuZGVyU3R5bGUqKSBjb25zdCB7IHJldHVybiAwOyB9Ci0gICAgCisKKyAgICB2aXJ0 dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCkgY29uc3QgeyByZXR1cm4gMDsgfQor ICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3QgeyByZXR1 cm4gMDsgfQorICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgpIGNvbnN0 IHsgcmV0dXJuIDA7CisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9t KCkgY29uc3QgeyByZXR1cm4gMDsgfQorCiAgICAgdmlydHVhbCBTY3JvbGxiYXJDb250cm9sU2l6 ZSBzY3JvbGxiYXJDb250cm9sU2l6ZUZvclBhcnQoQ29udHJvbFBhcnQpIHsgcmV0dXJuIFJlZ3Vs YXJTY3JvbGxiYXI7IH0KIAogICAgIC8vIE1ldGhvZCBmb3IgcGFpbnRpbmcgdGhlIGNhcHMgbG9j ayBpbmRpY2F0b3IKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hy b21pdW1HdGsuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5j cHAKaW5kZXggMjIwY2UwNy4uNGJmMzBjMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVDaHJvbWl1bUd0ay5jcHAKQEAgLTQzNCwxMyArNDM0LDI0IEBAIGludCBSZW5kZXJUaGVt ZUNocm9taXVtR3RrOjpwb3B1cEludGVybmFsUGFkZGluZ0JvdHRvbShSZW5kZXJTdHlsZSogc3R5 bGUpIGNvbnN0CiAgICAgcmV0dXJuIG1lbnVMaXN0SW50ZXJuYWxQYWRkaW5nKHN0eWxlLCBCb3R0 b21QYWRkaW5nKTsKIH0KIAotdm9pZCBSZW5kZXJUaGVtZUNocm9taXVtR3RrOjphZGp1c3RCdXR0 b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKK2ludCBSZW5kZXJUaGVtZVdp bjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0CiB7Ci0gICAgLy8gVGhpcyBpbm5l ciBwYWRkaW5nIG1hdGNoZXMgRmlyZWZveC4KLSAgICBzdHlsZS0+c2V0UGFkZGluZ1RvcChMZW5n dGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aCgzLCBGaXhl ZCkpOwotICAgIHN0eWxlLT5zZXRQYWRkaW5nQm90dG9tKExlbmd0aCgxLCBGaXhlZCkpOwotICAg IHN0eWxlLT5zZXRQYWRkaW5nTGVmdChMZW5ndGgoMywgRml4ZWQpKTsKKyAgICByZXR1cm4gMzsK K30KKworaW50IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNv bnN0Cit7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50 ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKK30KKworaW50IFJlbmRl clRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0b20oKSBjb25zdAoreworICAgIHJl dHVybiAxOwogfQogCiBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1HdGs6OmNvbnRyb2xTdXBwb3J0 c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCogbykgY29uc3QKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lQ2hyb21pdW1HdGsuaAppbmRleCA3N2Q5MjdmLi41OGYzODUyIDEwMDY0NAotLS0g YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmgKKysrIGIvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oCkBAIC0xMDAsNyArMTAwLDEwIEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBh ZGRpbmdUb3AoUmVuZGVyU3R5bGUqKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBpbnQgcG9wdXBJ bnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqKSBjb25zdDsKIAotICAgICAgICB2aXJ0 dWFsIHZvaWQgYWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0 OworICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCkgY29uc3Q7 CisgICAgICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3Q7 CisgICAgICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgpIGNvbnN0Owor ICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0b20oKSBjb25zdDsK IAogICAgICAgICAvLyBBIG1ldGhvZCBhc2tpbmcgaWYgdGhlIGNvbnRyb2wgY2hhbmdlcyBpdHMg dGludCB3aGVuIHRoZSB3aW5kb3cgaGFzIGZvY3VzIG9yIG5vdC4KICAgICAgICAgdmlydHVhbCBi b29sIGNvbnRyb2xTdXBwb3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCopIGNvbnN0OwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAgYi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcAppbmRleCA5ZTU5YWM5 Li41MmI5Y2Y5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9t aXVtV2luLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2lu LmNwcApAQCAtNDgxLDEzICs0ODEsMjQgQEAgaW50IFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OnBv cHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKICAgICBy ZXR1cm4gbWVudUxpc3RJbnRlcm5hbFBhZGRpbmcoc3R5bGUsIEJvdHRvbVBhZGRpbmcpOwogfQog Ci12b2lkIFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVu ZGVyU3R5bGUqIHN0eWxlKSBjb25zdAoraW50IFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmJ1dHRv bkludGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFkZGlu ZyBtYXRjaGVzIEZpcmVmb3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEsIEZp eGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsKLSAg ICBzdHlsZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+ c2V0UGFkZGluZ0xlZnQoTGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisKK2lu dCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNv bnN0Cit7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpi dXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdAoreworICAgIHJldHVybiAxOworfQorCitp bnQgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkg Y29uc3QKK3sKKyAgICByZXR1cm4gMTsKIH0KIAogLy8gc3RhdGljCmRpZmYgLS1naXQgYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmggYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmgKaW5kZXggMmQzMzVjMi4uMDg2NmNmZSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5oCisrKyBiL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uaApAQCAtMTA0LDcgKzEwNCwx MCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJu YWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgaW50IHBv cHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKikgY29uc3Q7CiAKLSAgICAgICAg dmlydHVhbCB2b2lkIGFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqKSBjb25zdDsK KyAgICAgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0Owor ICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0Owor ICAgICAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdDsKKyAg ICAgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3Q7CiAK ICAgICAgICAgLy8gUHJvdmlkZSBhIHdheSB0byBwYXNzIHRoZSBkZWZhdWx0IGZvbnQgc2l6ZSBm cm9tIHRoZSBTZXR0aW5ncyBvYmplY3QKICAgICAgICAgLy8gdG8gdGhlIHJlbmRlciB0aGVtZS4g IEZJWE1FOiBodHRwOi8vYi8xMTI5MTg2IEEgY2xlYW5lciB3YXkgd291bGQgYmUKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lV2luLmNwcAppbmRleCBlNDcxN2ExLi5lODgyNDMyIDEwMDY0NAotLS0g YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAKKysrIGIvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCkBAIC03MTIsMTMgKzcxMiwyNCBAQCB2b2lkIFJlbmRl clRoZW1lV2luOjphZGp1c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyT2JqZWN0KiBvKSBjb25zdAog ICAgIH0KIH0KIAotdm9pZCBSZW5kZXJUaGVtZVdpbjo6YWRqdXN0QnV0dG9uSW5uZXJTdHlsZShS ZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVy bmFsUGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFkZGluZyBtYXRj aGVzIEZpcmVmb3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEsIEZpeGVkKSk7 Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsKLSAgICBzdHls ZS0+c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFk ZGluZ0xlZnQoTGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5k ZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAoreworICAgIHJl dHVybiAzOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1Rv cCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIDE7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKIH0KIAog Ym9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRTZWFyY2hGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNv bnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiByKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lV2luLmgKaW5kZXggNWQ1YmQ0Yi4uMzJkNDExNCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaAorKysgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZVdpbi5oCkBAIC05Miw3ICs5MiwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBib29sIHBhaW50U2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmpl Y3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcik7CiAgICAgdmlydHVhbCB2b2lkIGFk anVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJPYmplY3QqKSBjb25zdDsKIAotICAgIHZpcnR1YWwg dm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CisgICAgdmly dHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OworICAgIHZpcnR1YWwg aW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQg YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgYnV0dG9u SW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0 U2VhcmNoRmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50 KikgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0 KiwgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7Cg== 28033 2009-02-26 12:53:44 -0800 2009-02-26 13:02:58 -0800 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. Replace-adjustButtonInnerStyle-with-buttonInternalPaddingLeft-Right-Top-Bottom..patch text/plain 10409 ojan ZDhlMWM0MzUyNWZiMjdlZmE2NTUzYWM3ZjI4N2RmMTVkNWExYTJkNwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMjFiNjc3Li5hMjZkYjY4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM5IEBACisyMDA5LTAyLTIzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVw bGFjZSBhZGp1c3RCdXR0b25Jbm5lclN0eWxlIHdpdGggYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVm dC9SaWdodC9Ub3AvQm90dG9tLgorCisgICAgICAgIE5vIHRlc3RzIGFkZGVkIGFzIGV4aXN0aW5n IHRlc3RzIGFscmVhZHkgY292ZXIgdGhpcyBiZWhhdmlvci4KKyAgICAgICAgQSBoYW5kZnVsIG9m IHdpbmRvd3MgdGVzdHMgd2lsbCBuZWVkIG5ldyBleHBlY3RlZCByZXN1bHRzLiBJJ2xsIGNvbW1p dAorICAgICAgICB0aGVtIGFmdGVyIHRoaXMgY2hhbmdlIGdvZXMgdGhyb3VnaCBhbmQgSSBjYW4g Z3JhYiB0aGVtIG9mZiB0aGUgYm90LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJ1dHRv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCdXR0b246OnNldHVwSW5uZXJTdHlsZSk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGhlbWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpidXR0b25J bnRlcm5hbFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpidXR0 b25JbnRlcm5hbFBhZGRpbmdSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6 YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhl bWVDaHJvbWl1bUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdp bjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Q2hyb21pdW1XaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQ YWRkaW5nVG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1XaW4uaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGlu Z0xlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFs UGFkZGluZ1JpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25J bnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lV2luLmg6CisKIDIwMDktMDItMjYgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC dXR0b24uY3BwCmluZGV4IGU5N2VmNTYuLmQ2NGQ3YzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0 dG9uLmNwcApAQCAtMTA4LDggKzEwOCwxMSBAQCB2b2lkIFJlbmRlckJ1dHRvbjo6c2V0dXBJbm5l clN0eWxlKFJlbmRlclN0eWxlKiBpbm5lclN0eWxlKQogICAgIC8vIFJlbmRlckJsb2NrOjpjcmVh dGVBbm9ueW1vdXNCbG9jayBjcmVhdGVzIGEgbmV3IFJlbmRlclN0eWxlLCBzbyB0aGlzIGlzCiAg ICAgLy8gc2FmZSB0byBtb2RpZnkuCiAgICAgaW5uZXJTdHlsZS0+c2V0Qm94RmxleCgxLjBmKTsK LSAgICBpZiAoc3R5bGUoKS0+aGFzQXBwZWFyYW5jZSgpKQotICAgICAgICB0aGVtZSgpLT5hZGp1 c3RCdXR0b25Jbm5lclN0eWxlKGlubmVyU3R5bGUpOworCisgICAgaW5uZXJTdHlsZS0+c2V0UGFk ZGluZ1RvcChMZW5ndGgodGhlbWUoKS0+YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCksIEZpeGVk KSk7CisgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aCh0aGVtZSgpLT5idXR0 b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpLCBGaXhlZCkpOworICAgIGlubmVyU3R5bGUtPnNldFBh ZGRpbmdCb3R0b20oTGVuZ3RoKHRoZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgp LCBGaXhlZCkpOworICAgIGlubmVyU3R5bGUtPnNldFBhZGRpbmdMZWZ0KExlbmd0aCh0aGVtZSgp LT5idXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCksIEZpeGVkKSk7CiB9CiAKIHZvaWQgUmVuZGVy QnV0dG9uOjp1cGRhdGVGcm9tRWxlbWVudCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKaW5k ZXggNTkxZDUwNC4uMzI1N2FmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcApAQCAtNzM3 LDEwICs3MzcsNiBAQCB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxl KENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZQogewogfQogCi12b2lkIFJlbmRl clRoZW1lOjphZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3QKLXsKLX0K LQogdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U2xpZGVyVHJhY2tTdHlsZShDU1NTdHlsZVNlbGVj dG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3QKIHsKIH0KZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZS5oCmluZGV4IDM1MTJiMjEuLjI0ZjUwMzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaApA QCAtMTI5LDE0ICsxMjksMTggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBpbnQgbWluaW11bU1l bnVMaXN0U2l6ZShSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAotICAgIHZpcnR1 YWwgdm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJPYmplY3QqKSBjb25zdDsK IAogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nTGVmdChSZW5kZXJTdHlsZSop IGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGlu Z1JpZ2h0KFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgaW50 IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsg fQogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxl KikgY29uc3QgeyByZXR1cm4gMDsgfQotICAgIAorCisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50 ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0dWFsIGludCBi dXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0 dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdCB7IHJldHVybiAwOworICAg IHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpIGNvbnN0IHsgcmV0dXJu IDA7IH0KKwogICAgIHZpcnR1YWwgU2Nyb2xsYmFyQ29udHJvbFNpemUgc2Nyb2xsYmFyQ29udHJv bFNpemVGb3JQYXJ0KENvbnRyb2xQYXJ0KSB7IHJldHVybiBSZWd1bGFyU2Nyb2xsYmFyOyB9CiAK ICAgICAvLyBNZXRob2QgZm9yIHBhaW50aW5nIHRoZSBjYXBzIGxvY2sgaW5kaWNhdG9yCmRpZmYg LS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmNwcCBiL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsuY3BwCmluZGV4IDIyMGNlMDcu LjRiZjMwYzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21p dW1HdGsuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsu Y3BwCkBAIC00MzQsMTMgKzQzNCwyNCBAQCBpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bUd0azo6cG9w dXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdAogICAgIHJl dHVybiBtZW51TGlzdEludGVybmFsUGFkZGluZyhzdHlsZSwgQm90dG9tUGFkZGluZyk7CiB9CiAK LXZvaWQgUmVuZGVyVGhlbWVDaHJvbWl1bUd0azo6YWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5k ZXJTdHlsZSogc3R5bGUpIGNvbnN0CitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFs UGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFkZGluZyBtYXRjaGVz IEZpcmVmb3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEsIEZpeGVkKSk7Ci0g ICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsKLSAgICBzdHlsZS0+ c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGlu Z0xlZnQoTGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJU aGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAoreworICAgIHJldHVy biAzOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgp IGNvbnN0Cit7CisgICAgcmV0dXJuIDE7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9u SW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKIH0KIAogYm9v bCBSZW5kZXJUaGVtZUNocm9taXVtR3RrOjpjb250cm9sU3VwcG9ydHNUaW50cyhjb25zdCBSZW5k ZXJPYmplY3QqIG8pIGNvbnN0CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtR3RrLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVt R3RrLmgKaW5kZXggNzdkOTI3Zi4uNThmMzg1MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1HdGsuaApAQCAtMTAwLDcgKzEwMCwxMCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0 eWxlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90 dG9tKFJlbmRlclN0eWxlKikgY29uc3Q7CiAKLSAgICAgICAgdmlydHVhbCB2b2lkIGFkanVzdEJ1 dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdDsKKyAgICAgICAgdmlydHVh bCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3Q7CiAKICAgICAgICAgLy8gQSBt ZXRob2QgYXNraW5nIGlmIHRoZSBjb250cm9sIGNoYW5nZXMgaXRzIHRpbnQgd2hlbiB0aGUgd2lu ZG93IGhhcyBmb2N1cyBvciBub3QuCiAgICAgICAgIHZpcnR1YWwgYm9vbCBjb250cm9sU3VwcG9y dHNUaW50cyhjb25zdCBSZW5kZXJPYmplY3QqKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKaW5kZXggOWU1OWFjOS4uNTJiOWNmOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKKysrIGIv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKQEAgLTQ4MSwxMyAr NDgxLDI0IEBAIGludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpwb3B1cEludGVybmFsUGFkZGlu Z0JvdHRvbShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CiAgICAgcmV0dXJuIG1lbnVMaXN0SW50 ZXJuYWxQYWRkaW5nKHN0eWxlLCBCb3R0b21QYWRkaW5nKTsKIH0KIAotdm9pZCBSZW5kZXJUaGVt ZUNocm9taXVtV2luOjphZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkg Y29uc3QKK2ludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdM ZWZ0KCkgY29uc3QKIHsKLSAgICAvLyBUaGlzIGlubmVyIHBhZGRpbmcgbWF0Y2hlcyBGaXJlZm94 LgotICAgIHN0eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCgxLCBGaXhlZCkpOwotICAgIHN0eWxl LT5zZXRQYWRkaW5nUmlnaHQoTGVuZ3RoKDMsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRp bmdCb3R0b20oTGVuZ3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdMZWZ0KExl bmd0aCgzLCBGaXhlZCkpOworICAgIHJldHVybiAzOworfQorCitpbnQgUmVuZGVyVGhlbWVDaHJv bWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAoreworICAgIHJldHVy biAzOworfQorCitpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRk aW5nVG9wKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKK30KKworaW50IFJlbmRlclRoZW1lQ2hy b21pdW1XaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIDE7CiB9CiAKIC8vIHN0YXRpYwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVDaHJvbWl1bVdpbi5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJv bWl1bVdpbi5oCmluZGV4IDJkMzM1YzIuLjA4NjZjZmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtV2luLmgKQEAgLTEwNCw3ICsxMDQsMTAgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGluZ1RvcChSZW5k ZXJTdHlsZSopIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGlu Z0JvdHRvbShSZW5kZXJTdHlsZSopIGNvbnN0OwogCi0gICAgICAgIHZpcnR1YWwgdm9pZCBhZGp1 c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CisgICAgICAgIHZpcnR1YWwg aW50IGJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3Q7CisgICAgICAgIHZpcnR1YWwgaW50 IGJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpIGNvbnN0OwogCiAgICAgICAgIC8vIFByb3Zp ZGUgYSB3YXkgdG8gcGFzcyB0aGUgZGVmYXVsdCBmb250IHNpemUgZnJvbSB0aGUgU2V0dGluZ3Mg b2JqZWN0CiAgICAgICAgIC8vIHRvIHRoZSByZW5kZXIgdGhlbWUuICBGSVhNRTogaHR0cDovL2Iv MTEyOTE4NiBBIGNsZWFuZXIgd2F5IHdvdWxkIGJlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZVdpbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5jcHAKaW5kZXggZTQ3MTdhMS4uZTg4MjQzMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVXaW4uY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l V2luLmNwcApAQCAtNzEyLDEzICs3MTIsMjQgQEAgdm9pZCBSZW5kZXJUaGVtZVdpbjo6YWRqdXN0 U2xpZGVyVGh1bWJTaXplKFJlbmRlck9iamVjdCogbykgY29uc3QKICAgICB9CiB9CiAKLXZvaWQg UmVuZGVyVGhlbWVXaW46OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxl KSBjb25zdAoraW50IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCkg Y29uc3QKIHsKLSAgICAvLyBUaGlzIGlubmVyIHBhZGRpbmcgbWF0Y2hlcyBGaXJlZm94LgotICAg IHN0eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCgxLCBGaXhlZCkpOwotICAgIHN0eWxlLT5zZXRQ YWRkaW5nUmlnaHQoTGVuZ3RoKDMsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdCb3R0 b20oTGVuZ3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdMZWZ0KExlbmd0aCgz LCBGaXhlZCkpOworICAgIHJldHVybiAzOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRv bkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gMzsKK30KKworaW50 IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdAoreworICAg IHJldHVybiAxOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGlu Z0JvdHRvbSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIDE7CiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVX aW46OnBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6 OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lV2luLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5oCmluZGV4IDVkNWJkNGIuLjMyZDQxMTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lV2luLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4u aApAQCAtOTIsNyArOTIsMTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBwYWludFNsaWRl clRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGks IGNvbnN0IEludFJlY3QmIHIpOwogICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTbGlkZXJUaHVtYlNp emUoUmVuZGVyT2JqZWN0KikgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0QnV0dG9u SW5uZXJTdHlsZShSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbklu dGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5h bFBhZGRpbmdSaWdodCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFk ZGluZ1RvcCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ0Jv dHRvbSgpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkU3R5bGUo Q1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwogICAgIHZp cnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxkKFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9i amVjdDo6UGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwo= 28035 2009-02-26 13:46:42 -0800 2009-02-26 13:48:33 -0800 Replace adjustButtonInnerStyle with buttonInternalPaddingLeft/Right/Top/Bottom. Replace-adjustButtonInnerStyle-with-buttonInternalPaddingLeft-Right-Top-Bottom..patch text/plain 10409 ojan ZDhlMWM0MzUyNWZiMjdlZmE2NTUzYWM3ZjI4N2RmMTVkNWExYTJkNwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMjFiNjc3Li5hMjZkYjY4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM5IEBACisyMDA5LTAyLTIzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVw bGFjZSBhZGp1c3RCdXR0b25Jbm5lclN0eWxlIHdpdGggYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVm dC9SaWdodC9Ub3AvQm90dG9tLgorCisgICAgICAgIE5vIHRlc3RzIGFkZGVkIGFzIGV4aXN0aW5n IHRlc3RzIGFscmVhZHkgY292ZXIgdGhpcyBiZWhhdmlvci4KKyAgICAgICAgQSBoYW5kZnVsIG9m IHdpbmRvd3MgdGVzdHMgd2lsbCBuZWVkIG5ldyBleHBlY3RlZCByZXN1bHRzLiBJJ2xsIGNvbW1p dAorICAgICAgICB0aGVtIGFmdGVyIHRoaXMgY2hhbmdlIGdvZXMgdGhyb3VnaCBhbmQgSSBjYW4g Z3JhYiB0aGVtIG9mZiB0aGUgYm90LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJ1dHRv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCdXR0b246OnNldHVwSW5uZXJTdHlsZSk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGhlbWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpidXR0b25J bnRlcm5hbFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpidXR0 b25JbnRlcm5hbFBhZGRpbmdSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6 YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhl bWVDaHJvbWl1bUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdp bjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Q2hyb21pdW1XaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQ YWRkaW5nVG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1XaW4uaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGlu Z0xlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFs UGFkZGluZ1JpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25J bnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lV2luLmg6CisKIDIwMDktMDItMjYgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC dXR0b24uY3BwCmluZGV4IGU5N2VmNTYuLmQ2NGQ3YzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0 dG9uLmNwcApAQCAtMTA4LDggKzEwOCwxMSBAQCB2b2lkIFJlbmRlckJ1dHRvbjo6c2V0dXBJbm5l clN0eWxlKFJlbmRlclN0eWxlKiBpbm5lclN0eWxlKQogICAgIC8vIFJlbmRlckJsb2NrOjpjcmVh dGVBbm9ueW1vdXNCbG9jayBjcmVhdGVzIGEgbmV3IFJlbmRlclN0eWxlLCBzbyB0aGlzIGlzCiAg ICAgLy8gc2FmZSB0byBtb2RpZnkuCiAgICAgaW5uZXJTdHlsZS0+c2V0Qm94RmxleCgxLjBmKTsK LSAgICBpZiAoc3R5bGUoKS0+aGFzQXBwZWFyYW5jZSgpKQotICAgICAgICB0aGVtZSgpLT5hZGp1 c3RCdXR0b25Jbm5lclN0eWxlKGlubmVyU3R5bGUpOworCisgICAgaW5uZXJTdHlsZS0+c2V0UGFk ZGluZ1RvcChMZW5ndGgodGhlbWUoKS0+YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCksIEZpeGVk KSk7CisgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aCh0aGVtZSgpLT5idXR0 b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpLCBGaXhlZCkpOworICAgIGlubmVyU3R5bGUtPnNldFBh ZGRpbmdCb3R0b20oTGVuZ3RoKHRoZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgp LCBGaXhlZCkpOworICAgIGlubmVyU3R5bGUtPnNldFBhZGRpbmdMZWZ0KExlbmd0aCh0aGVtZSgp LT5idXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCksIEZpeGVkKSk7CiB9CiAKIHZvaWQgUmVuZGVy QnV0dG9uOjp1cGRhdGVGcm9tRWxlbWVudCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKaW5k ZXggNTkxZDUwNC4uMzI1N2FmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcApAQCAtNzM3 LDEwICs3MzcsNiBAQCB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxl KENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZQogewogfQogCi12b2lkIFJlbmRl clRoZW1lOjphZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3QKLXsKLX0K LQogdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U2xpZGVyVHJhY2tTdHlsZShDU1NTdHlsZVNlbGVj dG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3QKIHsKIH0KZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZS5oCmluZGV4IDM1MTJiMjEuLjI0ZjUwMzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaApA QCAtMTI5LDE0ICsxMjksMTggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBpbnQgbWluaW11bU1l bnVMaXN0U2l6ZShSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAotICAgIHZpcnR1 YWwgdm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJPYmplY3QqKSBjb25zdDsK IAogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nTGVmdChSZW5kZXJTdHlsZSop IGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGlu Z1JpZ2h0KFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgaW50 IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsg fQogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxl KikgY29uc3QgeyByZXR1cm4gMDsgfQotICAgIAorCisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50 ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0dWFsIGludCBi dXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0 dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdCB7IHJldHVybiAwOworICAg IHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpIGNvbnN0IHsgcmV0dXJu IDA7IH0KKwogICAgIHZpcnR1YWwgU2Nyb2xsYmFyQ29udHJvbFNpemUgc2Nyb2xsYmFyQ29udHJv bFNpemVGb3JQYXJ0KENvbnRyb2xQYXJ0KSB7IHJldHVybiBSZWd1bGFyU2Nyb2xsYmFyOyB9CiAK ICAgICAvLyBNZXRob2QgZm9yIHBhaW50aW5nIHRoZSBjYXBzIGxvY2sgaW5kaWNhdG9yCmRpZmYg LS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmNwcCBiL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsuY3BwCmluZGV4IDIyMGNlMDcu LjRiZjMwYzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21p dW1HdGsuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsu Y3BwCkBAIC00MzQsMTMgKzQzNCwyNCBAQCBpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bUd0azo6cG9w dXBJbnRlcm5hbFBhZGRpbmdCb3R0b20oUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdAogICAgIHJl dHVybiBtZW51TGlzdEludGVybmFsUGFkZGluZyhzdHlsZSwgQm90dG9tUGFkZGluZyk7CiB9CiAK LXZvaWQgUmVuZGVyVGhlbWVDaHJvbWl1bUd0azo6YWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5k ZXJTdHlsZSogc3R5bGUpIGNvbnN0CitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFs UGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFkZGluZyBtYXRjaGVz IEZpcmVmb3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEsIEZpeGVkKSk7Ci0g ICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsKLSAgICBzdHlsZS0+ c2V0UGFkZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGlu Z0xlZnQoTGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJU aGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAoreworICAgIHJldHVy biAzOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgp IGNvbnN0Cit7CisgICAgcmV0dXJuIDE7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9u SW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKIH0KIAogYm9v bCBSZW5kZXJUaGVtZUNocm9taXVtR3RrOjpjb250cm9sU3VwcG9ydHNUaW50cyhjb25zdCBSZW5k ZXJPYmplY3QqIG8pIGNvbnN0CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtR3RrLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVt R3RrLmgKaW5kZXggNzdkOTI3Zi4uNThmMzg1MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1HdGsuaApAQCAtMTAwLDcgKzEwMCwxMCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0 eWxlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90 dG9tKFJlbmRlclN0eWxlKikgY29uc3Q7CiAKLSAgICAgICAgdmlydHVhbCB2b2lkIGFkanVzdEJ1 dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdDsKKyAgICAgICAgdmlydHVh bCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3Q7CiAKICAgICAgICAgLy8gQSBt ZXRob2QgYXNraW5nIGlmIHRoZSBjb250cm9sIGNoYW5nZXMgaXRzIHRpbnQgd2hlbiB0aGUgd2lu ZG93IGhhcyBmb2N1cyBvciBub3QuCiAgICAgICAgIHZpcnR1YWwgYm9vbCBjb250cm9sU3VwcG9y dHNUaW50cyhjb25zdCBSZW5kZXJPYmplY3QqKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKaW5kZXggOWU1OWFjOS4uNTJiOWNmOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKKysrIGIv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAKQEAgLTQ4MSwxMyAr NDgxLDI0IEBAIGludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpwb3B1cEludGVybmFsUGFkZGlu Z0JvdHRvbShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CiAgICAgcmV0dXJuIG1lbnVMaXN0SW50 ZXJuYWxQYWRkaW5nKHN0eWxlLCBCb3R0b21QYWRkaW5nKTsKIH0KIAotdm9pZCBSZW5kZXJUaGVt ZUNocm9taXVtV2luOjphZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkg Y29uc3QKK2ludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdM ZWZ0KCkgY29uc3QKIHsKLSAgICAvLyBUaGlzIGlubmVyIHBhZGRpbmcgbWF0Y2hlcyBGaXJlZm94 LgotICAgIHN0eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCgxLCBGaXhlZCkpOwotICAgIHN0eWxl LT5zZXRQYWRkaW5nUmlnaHQoTGVuZ3RoKDMsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRp bmdCb3R0b20oTGVuZ3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdMZWZ0KExl bmd0aCgzLCBGaXhlZCkpOworICAgIHJldHVybiAzOworfQorCitpbnQgUmVuZGVyVGhlbWVDaHJv bWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAoreworICAgIHJldHVy biAzOworfQorCitpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRk aW5nVG9wKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKK30KKworaW50IFJlbmRlclRoZW1lQ2hy b21pdW1XaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIDE7CiB9CiAKIC8vIHN0YXRpYwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVDaHJvbWl1bVdpbi5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJv bWl1bVdpbi5oCmluZGV4IDJkMzM1YzIuLjA4NjZjZmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtV2luLmgKQEAgLTEwNCw3ICsxMDQsMTAgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGluZ1RvcChSZW5k ZXJTdHlsZSopIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGlu Z0JvdHRvbShSZW5kZXJTdHlsZSopIGNvbnN0OwogCi0gICAgICAgIHZpcnR1YWwgdm9pZCBhZGp1 c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CisgICAgICAgIHZpcnR1YWwg aW50IGJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3Q7CisgICAgICAgIHZpcnR1YWwgaW50 IGJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpIGNvbnN0OwogCiAgICAgICAgIC8vIFByb3Zp ZGUgYSB3YXkgdG8gcGFzcyB0aGUgZGVmYXVsdCBmb250IHNpemUgZnJvbSB0aGUgU2V0dGluZ3Mg b2JqZWN0CiAgICAgICAgIC8vIHRvIHRoZSByZW5kZXIgdGhlbWUuICBGSVhNRTogaHR0cDovL2Iv MTEyOTE4NiBBIGNsZWFuZXIgd2F5IHdvdWxkIGJlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZVdpbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5jcHAKaW5kZXggZTQ3MTdhMS4uZTg4MjQzMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVXaW4uY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l V2luLmNwcApAQCAtNzEyLDEzICs3MTIsMjQgQEAgdm9pZCBSZW5kZXJUaGVtZVdpbjo6YWRqdXN0 U2xpZGVyVGh1bWJTaXplKFJlbmRlck9iamVjdCogbykgY29uc3QKICAgICB9CiB9CiAKLXZvaWQg UmVuZGVyVGhlbWVXaW46OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxl KSBjb25zdAoraW50IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCkg Y29uc3QKIHsKLSAgICAvLyBUaGlzIGlubmVyIHBhZGRpbmcgbWF0Y2hlcyBGaXJlZm94LgotICAg IHN0eWxlLT5zZXRQYWRkaW5nVG9wKExlbmd0aCgxLCBGaXhlZCkpOwotICAgIHN0eWxlLT5zZXRQ YWRkaW5nUmlnaHQoTGVuZ3RoKDMsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdCb3R0 b20oTGVuZ3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNldFBhZGRpbmdMZWZ0KExlbmd0aCgz LCBGaXhlZCkpOworICAgIHJldHVybiAzOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRv bkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gMzsKK30KKworaW50 IFJlbmRlclRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdAoreworICAg IHJldHVybiAxOworfQorCitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGlu Z0JvdHRvbSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIDE7CiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVX aW46OnBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6 OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lV2luLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5oCmluZGV4IDVkNWJkNGIuLjMyZDQxMTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lV2luLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4u aApAQCAtOTIsNyArOTIsMTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBwYWludFNsaWRl clRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGks IGNvbnN0IEludFJlY3QmIHIpOwogICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTbGlkZXJUaHVtYlNp emUoUmVuZGVyT2JqZWN0KikgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0QnV0dG9u SW5uZXJTdHlsZShSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbklu dGVybmFsUGFkZGluZ0xlZnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBidXR0b25JbnRlcm5h bFBhZGRpbmdSaWdodCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFk ZGluZ1RvcCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ0Jv dHRvbSgpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkU3R5bGUo Q1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwogICAgIHZp cnR1YWwgYm9vbCBwYWludFNlYXJjaEZpZWxkKFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9i amVjdDo6UGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwo= 28036 2009-02-26 13:48:22 -0800 2009-02-26 13:48:58 -0800 Fixes missing "}" that snuck in on my last sync. Replace-adjustButtonInnerStyle-with-buttonInternalPaddingLeft-Right-Top-Bottom..patch text/plain 10411 ojan NThjZjg3NjVlMzgxMzlmNzI0NWNhNWExYjAwMWEwNDFkMjcwOGRiYgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMjFiNjc3Li5hMjZkYjY4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM5IEBACisyMDA5LTAyLTIzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVw bGFjZSBhZGp1c3RCdXR0b25Jbm5lclN0eWxlIHdpdGggYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVm dC9SaWdodC9Ub3AvQm90dG9tLgorCisgICAgICAgIE5vIHRlc3RzIGFkZGVkIGFzIGV4aXN0aW5n IHRlc3RzIGFscmVhZHkgY292ZXIgdGhpcyBiZWhhdmlvci4KKyAgICAgICAgQSBoYW5kZnVsIG9m IHdpbmRvd3MgdGVzdHMgd2lsbCBuZWVkIG5ldyBleHBlY3RlZCByZXN1bHRzLiBJJ2xsIGNvbW1p dAorICAgICAgICB0aGVtIGFmdGVyIHRoaXMgY2hhbmdlIGdvZXMgdGhyb3VnaCBhbmQgSSBjYW4g Z3JhYiB0aGVtIG9mZiB0aGUgYm90LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJ1dHRv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCdXR0b246OnNldHVwSW5uZXJTdHlsZSk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGhlbWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpidXR0b25J bnRlcm5hbFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpidXR0 b25JbnRlcm5hbFBhZGRpbmdSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6 YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhl bWVDaHJvbWl1bUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdp bjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Q2hyb21pdW1XaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQ YWRkaW5nVG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1XaW4uaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGlu Z0xlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFs UGFkZGluZ1JpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpidXR0b25J bnRlcm5hbFBhZGRpbmdUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OmJ1 dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lV2luLmg6CisKIDIwMDktMDItMjYgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC dXR0b24uY3BwCmluZGV4IGU5N2VmNTYuLmQ2NGQ3YzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0 dG9uLmNwcApAQCAtMTA4LDggKzEwOCwxMSBAQCB2b2lkIFJlbmRlckJ1dHRvbjo6c2V0dXBJbm5l clN0eWxlKFJlbmRlclN0eWxlKiBpbm5lclN0eWxlKQogICAgIC8vIFJlbmRlckJsb2NrOjpjcmVh dGVBbm9ueW1vdXNCbG9jayBjcmVhdGVzIGEgbmV3IFJlbmRlclN0eWxlLCBzbyB0aGlzIGlzCiAg ICAgLy8gc2FmZSB0byBtb2RpZnkuCiAgICAgaW5uZXJTdHlsZS0+c2V0Qm94RmxleCgxLjBmKTsK LSAgICBpZiAoc3R5bGUoKS0+aGFzQXBwZWFyYW5jZSgpKQotICAgICAgICB0aGVtZSgpLT5hZGp1 c3RCdXR0b25Jbm5lclN0eWxlKGlubmVyU3R5bGUpOworCisgICAgaW5uZXJTdHlsZS0+c2V0UGFk ZGluZ1RvcChMZW5ndGgodGhlbWUoKS0+YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCksIEZpeGVk KSk7CisgICAgaW5uZXJTdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aCh0aGVtZSgpLT5idXR0 b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpLCBGaXhlZCkpOworICAgIGlubmVyU3R5bGUtPnNldFBh ZGRpbmdCb3R0b20oTGVuZ3RoKHRoZW1lKCktPmJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgp LCBGaXhlZCkpOworICAgIGlubmVyU3R5bGUtPnNldFBhZGRpbmdMZWZ0KExlbmd0aCh0aGVtZSgp LT5idXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCksIEZpeGVkKSk7CiB9CiAKIHZvaWQgUmVuZGVy QnV0dG9uOjp1cGRhdGVGcm9tRWxlbWVudCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKaW5k ZXggNTkxZDUwNC4uMzI1N2FmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcApAQCAtNzM3 LDEwICs3MzcsNiBAQCB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxl KENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZQogewogfQogCi12b2lkIFJlbmRl clRoZW1lOjphZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3QKLXsKLX0K LQogdm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U2xpZGVyVHJhY2tTdHlsZShDU1NTdHlsZVNlbGVj dG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3QKIHsKIH0KZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZS5oCmluZGV4IDM1MTJiMjEuLjk2Y2ViOWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaApA QCAtMTI5LDE0ICsxMjksMTggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBpbnQgbWluaW11bU1l bnVMaXN0U2l6ZShSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAotICAgIHZpcnR1 YWwgdm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJPYmplY3QqKSBjb25zdDsK IAogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nTGVmdChSZW5kZXJTdHlsZSop IGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFkZGlu Z1JpZ2h0KFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgaW50 IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsg fQogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxl KikgY29uc3QgeyByZXR1cm4gMDsgfQotICAgIAorCisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50 ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0dWFsIGludCBi dXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICB2aXJ0 dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdCB7IHJldHVybiAwOyB9Cisg ICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3QgeyByZXR1 cm4gMDsgfQorCiAgICAgdmlydHVhbCBTY3JvbGxiYXJDb250cm9sU2l6ZSBzY3JvbGxiYXJDb250 cm9sU2l6ZUZvclBhcnQoQ29udHJvbFBhcnQpIHsgcmV0dXJuIFJlZ3VsYXJTY3JvbGxiYXI7IH0K IAogICAgIC8vIE1ldGhvZCBmb3IgcGFpbnRpbmcgdGhlIGNhcHMgbG9jayBpbmRpY2F0b3IKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1HdGsuY3BwIGIv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0ay5jcHAKaW5kZXggMjIwY2Uw Ny4uNGJmMzBjMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJv bWl1bUd0ay5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUd0 ay5jcHAKQEAgLTQzNCwxMyArNDM0LDI0IEBAIGludCBSZW5kZXJUaGVtZUNocm9taXVtR3RrOjpw b3B1cEludGVybmFsUGFkZGluZ0JvdHRvbShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CiAgICAg cmV0dXJuIG1lbnVMaXN0SW50ZXJuYWxQYWRkaW5nKHN0eWxlLCBCb3R0b21QYWRkaW5nKTsKIH0K IAotdm9pZCBSZW5kZXJUaGVtZUNocm9taXVtR3RrOjphZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJl bmRlclN0eWxlKiBzdHlsZSkgY29uc3QKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJu YWxQYWRkaW5nTGVmdCgpIGNvbnN0CiB7Ci0gICAgLy8gVGhpcyBpbm5lciBwYWRkaW5nIG1hdGNo ZXMgRmlyZWZveC4KLSAgICBzdHlsZS0+c2V0UGFkZGluZ1RvcChMZW5ndGgoMSwgRml4ZWQpKTsK LSAgICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aCgzLCBGaXhlZCkpOwotICAgIHN0eWxl LT5zZXRQYWRkaW5nQm90dG9tKExlbmd0aCgxLCBGaXhlZCkpOwotICAgIHN0eWxlLT5zZXRQYWRk aW5nTGVmdChMZW5ndGgoMywgRml4ZWQpKTsKKyAgICByZXR1cm4gMzsKK30KKworaW50IFJlbmRl clRoZW1lV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9w KCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKK30KKworaW50IFJlbmRlclRoZW1lV2luOjpidXR0 b25JbnRlcm5hbFBhZGRpbmdCb3R0b20oKSBjb25zdAoreworICAgIHJldHVybiAxOwogfQogCiBi b29sIFJlbmRlclRoZW1lQ2hyb21pdW1HdGs6OmNvbnRyb2xTdXBwb3J0c1RpbnRzKGNvbnN0IFJl bmRlck9iamVjdCogbykgY29uc3QKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1HdGsuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21p dW1HdGsuaAppbmRleCA3N2Q5MjdmLi41OGYzODUyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtR3RrLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVDaHJvbWl1bUd0ay5oCkBAIC0xMDAsNyArMTAwLDEwIEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdUb3AoUmVuZGVy U3R5bGUqKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdC b3R0b20oUmVuZGVyU3R5bGUqKSBjb25zdDsKIAotICAgICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0 QnV0dG9uSW5uZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0OworICAgICAgICB2aXJ0 dWFsIGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0KCkgY29uc3Q7CisgICAgICAgIHZpcnR1 YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3Q7CisgICAgICAgIHZpcnR1 YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdCb3R0b20oKSBjb25zdDsKIAogICAgICAgICAvLyBB IG1ldGhvZCBhc2tpbmcgaWYgdGhlIGNvbnRyb2wgY2hhbmdlcyBpdHMgdGludCB3aGVuIHRoZSB3 aW5kb3cgaGFzIGZvY3VzIG9yIG5vdC4KICAgICAgICAgdmlydHVhbCBib29sIGNvbnRyb2xTdXBw b3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCopIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcAppbmRleCA5ZTU5YWM5Li41MmI5Y2Y5IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcAorKysg Yi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcApAQCAtNDgxLDEz ICs0ODEsMjQgQEAgaW50IFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OnBvcHVwSW50ZXJuYWxQYWRk aW5nQm90dG9tKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKICAgICByZXR1cm4gbWVudUxpc3RJ bnRlcm5hbFBhZGRpbmcoc3R5bGUsIEJvdHRvbVBhZGRpbmcpOwogfQogCi12b2lkIFJlbmRlclRo ZW1lQ2hyb21pdW1XaW46OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxl KSBjb25zdAoraW50IFJlbmRlclRoZW1lQ2hyb21pdW1XaW46OmJ1dHRvbkludGVybmFsUGFkZGlu Z0xlZnQoKSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFkZGluZyBtYXRjaGVzIEZpcmVm b3guCi0gICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5 bGUtPnNldFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFk ZGluZ0JvdHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ0xlZnQo TGVuZ3RoKDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZUNo cm9taXVtV2luOjpidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZUNocm9taXVtV2luOjpidXR0b25JbnRlcm5hbFBh ZGRpbmdUb3AoKSBjb25zdAoreworICAgIHJldHVybiAxOworfQorCitpbnQgUmVuZGVyVGhlbWVD aHJvbWl1bVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gMTsKIH0KIAogLy8gc3RhdGljCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtV2luLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNo cm9taXVtV2luLmgKaW5kZXggMmQzMzVjMi4uMDg2NmNmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uaApAQCAtMTA0LDcgKzEwNCwxMCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nVG9wKFJl bmRlclN0eWxlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRk aW5nQm90dG9tKFJlbmRlclN0eWxlKikgY29uc3Q7CiAKLSAgICAgICAgdmlydHVhbCB2b2lkIGFk anVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqKSBjb25zdDsKKyAgICAgICAgdmlydHVh bCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0OworICAgICAgICB2aXJ0dWFs IGludCBidXR0b25JbnRlcm5hbFBhZGRpbmdUb3AoKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nQm90dG9tKCkgY29uc3Q7CiAKICAgICAgICAgLy8gUHJv dmlkZSBhIHdheSB0byBwYXNzIHRoZSBkZWZhdWx0IGZvbnQgc2l6ZSBmcm9tIHRoZSBTZXR0aW5n cyBvYmplY3QKICAgICAgICAgLy8gdG8gdGhlIHJlbmRlciB0aGVtZS4gIEZJWE1FOiBodHRwOi8v Yi8xMTI5MTg2IEEgY2xlYW5lciB3YXkgd291bGQgYmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l V2luLmNwcAppbmRleCBlNDcxN2ExLi5lODgyNDMyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZVdpbi5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVXaW4uY3BwCkBAIC03MTIsMTMgKzcxMiwyNCBAQCB2b2lkIFJlbmRlclRoZW1lV2luOjphZGp1 c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyT2JqZWN0KiBvKSBjb25zdAogICAgIH0KIH0KIAotdm9p ZCBSZW5kZXJUaGVtZVdpbjo6YWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5 bGUpIGNvbnN0CitpbnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ0xlZnQo KSBjb25zdAogewotICAgIC8vIFRoaXMgaW5uZXIgcGFkZGluZyBtYXRjaGVzIEZpcmVmb3guCi0g ICAgc3R5bGUtPnNldFBhZGRpbmdUb3AoTGVuZ3RoKDEsIEZpeGVkKSk7Ci0gICAgc3R5bGUtPnNl dFBhZGRpbmdSaWdodChMZW5ndGgoMywgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ0Jv dHRvbShMZW5ndGgoMSwgRml4ZWQpKTsKLSAgICBzdHlsZS0+c2V0UGFkZGluZ0xlZnQoTGVuZ3Ro KDMsIEZpeGVkKSk7CisgICAgcmV0dXJuIDM7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0 dG9uSW50ZXJuYWxQYWRkaW5nUmlnaHQoKSBjb25zdAoreworICAgIHJldHVybiAzOworfQorCitp bnQgUmVuZGVyVGhlbWVXaW46OmJ1dHRvbkludGVybmFsUGFkZGluZ1RvcCgpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIDE7Cit9CisKK2ludCBSZW5kZXJUaGVtZVdpbjo6YnV0dG9uSW50ZXJuYWxQYWRk aW5nQm90dG9tKCkgY29uc3QKK3sKKyAgICByZXR1cm4gMTsKIH0KIAogYm9vbCBSZW5kZXJUaGVt ZVdpbjo6cGFpbnRTZWFyY2hGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVj dDo6UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiByKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l V2luLmgKaW5kZXggNWQ1YmQ0Yi4uMzJkNDExNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVXaW4uaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5oCkBAIC05Miw3ICs5MiwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHBhaW50U2xp ZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYg aSwgY29uc3QgSW50UmVjdCYgcik7CiAgICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1i U2l6ZShSZW5kZXJPYmplY3QqKSBjb25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RCdXR0 b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgYnV0dG9u SW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IGJ1dHRvbkludGVy bmFsUGFkZGluZ1JpZ2h0KCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQ YWRkaW5nVG9wKCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5n Qm90dG9tKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2VhcmNoRmllbGRTdHls ZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Q7CiAgICAg dmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiwgY29uc3QgUmVuZGVy T2JqZWN0OjpQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7Cg==