43960 2010-08-13 02:28:29 -0700 [Chromium] styled scroll bar on the window is painted badly 2010-08-30 00:45:04 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 morrita webkit-unassigned dglazkov hyatt oldest_to_newest 264257 0 morrita 2010-08-13 02:28:29 -0700 Scrollbars for the outermost frme are painted badly when it has incomplete CSS style. Precicely, - if it has CSS style that doesn't have background-* properties, then - The scrollbars are NOT painted, that causes visual artifact (old paint result lasts there.) Note that Safari doesn't suffer from this problem because it doesn't allow to customize the outermost scrollbars. Originally from http://code.google.com/p/chromium/issues/detail?id=47946. 264262 1 64317 morrita 2010-08-13 02:54:12 -0700 Created attachment 64317 Patch 264406 2 64317 dglazkov 2010-08-13 09:33:18 -0700 Comment on attachment 64317 Patch I am not sure if this is a good patch (not yet that knowledgeable about the mechanics here :), but here are a few nits: WebCore/ChangeLog:15 + (WebCore::RenderObject::hasBackground): Please use this template to outline the changes you made. For instance: "Moved most of this logic to blah". WebCore/rendering/RenderScrollbar.cpp:144 + void RenderScrollbar::adjustStyle(RenderStyle* style) const Why a separate method for this? It's only being used in one place and it's short enough to inline, I think? WebCore/rendering/RenderScrollbar.cpp:149 + // causes visual artifact like non-repainted durty region. "painted" and "dirty". 264932 3 64464 morrita 2010-08-15 22:05:12 -0700 Created attachment 64464 Patch 264933 4 morrita 2010-08-15 22:06:41 -0700 Hi Dimitri, thank you for reviewing! I updated the patch. > WebCore/ChangeLog:15 > + (WebCore::RenderObject::hasBackground): > Please use this template to outline the changes you made. For instance: "Moved most of this logic to blah". OK, added some explanation. Thank you for pointing this out. > > WebCore/rendering/RenderScrollbar.cpp:144 > + void RenderScrollbar::adjustStyle(RenderStyle* style) const > Why a separate method for this? It's only being used in one place and it's short enough to inline, I think? > Agreed and inlined. > WebCore/rendering/RenderScrollbar.cpp:149 > + // causes visual artifact like non-repainted durty region. > "painted" and "dirty". Oops. Fixed. 269762 5 64464 tkent 2010-08-26 00:43:12 -0700 Comment on attachment 64464 Patch The patch looks reasonable. I'll set r+ tomorrow if no one objects. 271337 6 morrita 2010-08-30 00:45:04 -0700 Committed r66372: <http://trac.webkit.org/changeset/66372> 64317 2010-08-13 02:54:12 -0700 2010-08-15 22:05:07 -0700 Patch bug-43960-20100813185410.patch text/plain 9535 morrita ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZWM2MDM2NTk4M2M2ZmZkYjFhYjBkNGNlODM1Y2VjMTllYzZhZDczLi5mMmYwODhl ODk4ZWFhMjc4NmU4YjUzOTNmZDQwYTViMWNmMDQyNmZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDgtMTMgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzOTYwCisgICAgICAgIFtDaHJvbWl1bV0gc3R5bGVk IHNjcm9sbCBiYXIgb24gdGhlIHdpbmRvdyBpcyBwYWludGVkIGJhZGx5LgorICAgICAgICAKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6IFNraXBzIGF0 IHRoaXMgdGltZSBhbmQgd2lsbCByZWJhc2VsaW5lIHNob3J0bHkuCisgICAgICAgICogcGxhdGZv cm0vbWFjL1NraXBwZWQ6IE1hYyBkb2Vzbid0IHN1ZmZlciBmcm9tIHRoZSBwcm9ibGVtLgorICAg ICAgICAqIHNjcm9sbGJhcnMvY3VzdG9tLXNjcm9sbGJhci13aXRoLWluY29tcGxldGUtc3R5bGUu aHRtbDogQWRkZWQuCisKIDIwMTAtMDgtMTIgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAppbmRleCBjZDk3 ZGI5MjE1OGE4MGY1YjQ3NmJmZGMwODQxOGVhMGY4MDllMzRiLi42ZGM4YWMyMjQ0YjIzMjc4ZDYz ZjhlMWJjZjFhNWM4Yzg0N2NmMTRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CkBAIC0zMjE0LDQgKzMyMTQsNSBAQCBCVUc1 MjAxNCBXSU4gREVCVUcgOiBlZGl0aW5nL3Bhc3RlYm9hcmQvc21hcnQtcGFzdGUtMDA0Lmh0bWwg PSBQQVNTIENSQVNICiAvLyBUaW1lcyBvdXQgZnJlcXVlbnRseSBzaW5jZSB0aGUgdGVzdCB3YXMg YWRkZWQKIEJVRzUyMDE3IE1BQyBMSU5VWCA6IGh0dHAvdGVzdHMvbWlzYy9pc2luZGV4LXdpdGgt bm8tZm9ybS5odG1sID0gUEFTUyBUSU1FT1VUCiAKLQorLy8ganVzdCBuZWVkIHJlYmFzbGluZSB0 byBwaWNrIHRoZSByZXN1bHRzLgorQlVHNDc5NDYgV0lOIExJTlVYIE1BQyA6IHNjcm9sbGJhcnMv Y3VzdG9tLXNjcm9sbGJhci13aXRoLWluY29tcGxldGUtc3R5bGUuaHRtbCA9IE1JU1NJTkcKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL1NraXBwZWQKaW5kZXggMTI3MTkzZDUyNjg1Mjg4Zjk1MThmNGEwNzJkM2Mx NWQ0MTg0N2I0MC4uNzkyMDkyNWVhY2VjZDg2ZWFmYTRkOWQzMWQ5MjFmMzhjYjkxYTYyZiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKQEAgLTI4NSwzICsyODUsNyBAQCBodHRwL3Rlc3RzL21p c2Mvd2VidGltaW5nLXR3by1yZWRpcmVjdHMucGhwCiAjIE1hYy1MZW9wYXJkIGFmdGVyIHI2Mzg2 Mi4gIFNraXBwaW5nIGZvciBub3cuCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MjgyMQogYW5pbWF0aW9ucy9wbGF5LXN0YXRlLmh0bWwKKworIyBTYWZhcmkgZG9l c24ndCBhbGxvdyB0byBjdXN0b21pemUgb3V0ZXJtb3N0IHNjcm9sbGJhcnMuCisjIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzk2MAorc2Nyb2xsYmFycy9jdXN0b20t c2Nyb2xsYmFyLXdpdGgtaW5jb21wbGV0ZS1zdHlsZS5odG1sClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc2Nyb2xsYmFycy9jdXN0b20tc2Nyb2xs YmFyLXdpdGgtaW5jb21wbGV0ZS1zdHlsZS5odG1sIGIvTGF5b3V0VGVzdHMvc2Nyb2xsYmFycy9j dXN0b20tc2Nyb2xsYmFyLXdpdGgtaW5jb21wbGV0ZS1zdHlsZS5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQx NjY5MGI1ZGEwZWI2NDQwZTc5NjEyMmM0MzNkYWY1NTZjYjk3ZDQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9zY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0aC1pbmNvbXBsZXRl LXN0eWxlLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5JbmNv bXBsZXRlIHNjcm9sbGJhcjwvdGl0bGU+Cis8c3R5bGU+CisvKiBUdXJuIG9uIGEgMTN4MTMgc2Ny b2xsYmFyIHdpdGggbm8gYmFja2dyb3VuZCBzcGVjaWZpY2F0aW9uLiAqLworOjotd2Via2l0LXNj cm9sbGJhciB7CisgICAgd2lkdGg6IDEzcHg7CisgICAgaGVpZ2h0OiAxM3B4OworfQorCitwcmUg eyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsgfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5Pgor PGgyPkl0J3MgT0sgaWYgbm90aGluZyBkcmF3biBmb3IgYSBzY3JvbGxiYXIgKGZvciBhbiBvdXRl cm1vc3QgZnJhbWUgYW5kIGFuIGVsZW1lbnQgd2l0aCBvdmVybG93KTwvaDI+Cis8cD5Ob3RlIHRo YXQgU2FmYXJpIGRvZXNuJ3QgYWxsb3cgdG8gY3VzdG9taXplIHRoZSBvdXRlcm1vc3Qgc2Nkcm9s bGJhcnMgYW5kIGp1c3Qgc2hvdyBDb2NvYSdzLjwvcD4KKzxwcmUgc3R5bGU9ImhlaWdodDogMTAw cHg7IHdpZHRoOjEwMHB4OyBvdmVyZmxvdzphdXRvOyI+CitUaGUgcXVpY2sgYnJvd24gZm94IGp1 bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhl IGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBU aGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLgorVGhlIHF1aWNrIGJy b3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1w cyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBs YXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4KK1Ro ZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93 biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMg b3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6 eSBkb2cuCitUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUg cXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24g Zm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92 ZXIgdGhlIGxhenkgZG9nLgorVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5 IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1 aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZv eCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4KK1RoZSBxdWljayBicm93biBmb3gganVtcHMgb3Zl ciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBk b2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWlj ayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuCitUaGUgcXVpY2sgYnJvd24gZm94 IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIg dGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9n LiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLgorPC9wcmU+Cis8 cHJlIHN0eWxlPSJoZWlnaHQ6MjAwJTsiPjwvcHJlPgorPHByZSBzdHlsZT0id2lkdGg6MjAwJTsi PjwvcHJlPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNGFmZGIxMmIyMGRiMDM0N2JiYTg0YmQwZmM5OTFi MzY5MTg5NWI0Li5lNTdhZWUwYWZhYzFhMWI4OTNkODM5NzNkNGNkZWYxNDE0NWI1MGVkIDEwMDY0 NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI1IEBACisyMDEwLTA4LTEzICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzk2MAorICAgICAgICBbQ2hyb21p dW1dIHN0eWxlZCBzY3JvbGwgYmFyIG9uIHRoZSB3aW5kb3cgaXMgcGFpbnRlZCBiYWRseS4KKwor ICAgICAgICBXZWJLaXQgYXNzdW1lcyBvdXRlcm1vc3Qgc2Nyb2xsYmFyIGFsd2F5cyBwYWludGVk LiAKKyAgICAgICAgU28gZm9yY2UgdGhlaXIgc3R5bGUgdG8gaGF2ZSB0aGUgIGJhY2tncm91bmQg Y29sb3IgaWYgaXQgaXNuJ3QgCisgICAgICAgIGdpdmVuIGJ5IHRoZSBzdHlsZXNoZWV0LgorICAg ICAgICAKKyAgICAgICAgVGVzdDogc2Nyb2xsYmFycy9jdXN0b20tc2Nyb2xsYmFyLXdpdGgtaW5j b21wbGV0ZS1zdHlsZS5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6Omhhc0JhY2tncm91bmQpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyU2Nyb2xsYmFyOjphZGp1c3RTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3Jv bGxiYXI6OmdldFNjcm9sbGJhclBzZXVkb1N0eWxlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyU2Nyb2xsYmFyLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6 CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6aGFzQmFja2dyb3VuZCk6CisKIDIw MTAtMDgtMTMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgK aW5kZXggZDIwNDZjZmQ1MTdiNTMwYzI2NzRkM2NmM2IwYWUzZjYxNzZkMWMyYy4uMzRlYmE2ZDhm NDg3ZTRlODQwNzQ1YWVlMzM1MDdlZjMxNzZlNDQ2YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmgKQEAgLTM4MywxNCArMzgzLDcgQEAgcHVibGljOgogICAgIAogICAgIGJvb2wgaGFzQm94RGVj b3JhdGlvbnMoKSBjb25zdCB7IHJldHVybiBtX3BhaW50QmFja2dyb3VuZDsgfQogICAgIGJvb2wg bXVzdFJlcGFpbnRCYWNrZ3JvdW5kT3JCb3JkZXIoKSBjb25zdDsKLSAgICBib29sIGhhc0JhY2tn cm91bmQoKSBjb25zdAotICAgIHsKLSAgICAgICAgQ29sb3IgY29sb3IgPSBzdHlsZSgpLT52aXNp dGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwotICAgICAgICBp ZiAoY29sb3IuaXNWYWxpZCgpICYmIGNvbG9yLmFscGhhKCkgPiAwKQotICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgICAgIHJldHVybiBzdHlsZSgpLT5oYXNCYWNrZ3JvdW5kSW1hZ2UoKTsK LSAgICB9Ci0KKyAgICBib29sIGhhc0JhY2tncm91bmQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgp LT5oYXNCYWNrZ3JvdW5kKCk7IH0KICAgICBib29sIG5lZWRzTGF5b3V0KCkgY29uc3QgeyByZXR1 cm4gbV9uZWVkc0xheW91dCB8fCBtX25vcm1hbENoaWxkTmVlZHNMYXlvdXQgfHwgbV9wb3NDaGls ZE5lZWRzTGF5b3V0IHx8IG1fbmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQ7IH0KICAgICBi b29sIHNlbGZOZWVkc0xheW91dCgpIGNvbnN0IHsgcmV0dXJuIG1fbmVlZHNMYXlvdXQ7IH0KICAg ICBib29sIG5lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV9u ZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dDsgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9s bGJhci5jcHAKaW5kZXggNzM3ODA1NjFhNDQwNjk2ODhjZDY0M2U3YWI3YzQyNzZmYWMyNzFjNS4u YjY5MDFkOGZkYTQ0NzViNDE4OGRmNmQyMjIwMTlhNTZkNTAzZGNlNiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJTY3JvbGxiYXIuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiUmVuZGVy U2Nyb2xsYmFyLmgiCiAKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkZyYW1lVmlldy5o IgogI2luY2x1ZGUgIlJlbmRlclBhcnQuaCIKICNpbmNsdWRlICJSZW5kZXJTY3JvbGxiYXJQYXJ0 LmgiCiAjaW5jbHVkZSAiUmVuZGVyU2Nyb2xsYmFyVGhlbWUuaCIKQEAgLTE0MCw2ICsxNDEsMTYg QEAgU2Nyb2xsYmFyUGFydCBSZW5kZXJTY3JvbGxiYXI6OnBhcnRGb3JTdHlsZVJlc29sdmUoKQog ICAgIHJldHVybiBzX3N0eWxlUmVzb2x2ZVBhcnQ7CiB9CiAKK3ZvaWQgUmVuZGVyU2Nyb2xsYmFy OjphZGp1c3RTdHlsZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0Cit7CisgICAgLy8gU2Nyb2xs YmFycyBmb3Igcm9vdCBmcmFtZXMgc2hvdWxkIGFsd2F5cyBoYXZlIGJhY2tncm91bmQgY29sb3Ig CisgICAgLy8gdW5sZXNzIGV4cGxpY2l0bHkgc3BlY2lmaWVkIGFzIHRyYW5zcGFyZW50LiBTbyB3 ZSBmb3JjZSBpdC4KKyAgICAvLyBUaGlzIGlzIGJlY2F1c2UgV2ViS2l0IGFzc3VtZXMgc2Nyb2xs YmFyIHRvIGJlIGFsd2F5cyBwYWlubnRlZCBhbmQgbWlzc2luZyBiYWNrZ3JvdW5kCisgICAgLy8g Y2F1c2VzIHZpc3VhbCBhcnRpZmFjdCBsaWtlIG5vbi1yZXBhaW50ZWQgZHVydHkgcmVnaW9uLgor ICAgIGlmIChzdHlsZSAmJiBtX293bmluZ0ZyYW1lICYmIG1fb3duaW5nRnJhbWUtPnZpZXcoKSAm JiAhbV9vd25pbmdGcmFtZS0+dmlldygpLT5pc1RyYW5zcGFyZW50KCkgJiYgIXN0eWxlLT5oYXNC YWNrZ3JvdW5kKCkpCisgICAgICAgIHN0eWxlLT5zZXRCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6Ondo aXRlKTsKK30KKwogUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gUmVuZGVyU2Nyb2xsYmFyOjpnZXRT Y3JvbGxiYXJQc2V1ZG9TdHlsZShTY3JvbGxiYXJQYXJ0IHBhcnRUeXBlLCBQc2V1ZG9JZCBwc2V1 ZG9JZCkKIHsKICAgICBpZiAoIW1fb3duZXIpCkBAIC0xNTAsNiArMTYxLDggQEAgUGFzc1JlZlB0 cjxSZW5kZXJTdHlsZT4gUmVuZGVyU2Nyb2xsYmFyOjpnZXRTY3JvbGxiYXJQc2V1ZG9TdHlsZShT Y3JvbGxiYXJQYXJ0IHAKICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJlc3VsdCA9IG93bmluZ1Jl bmRlcmVyKCktPmdldFVuY2FjaGVkUHNldWRvU3R5bGUocHNldWRvSWQsIG93bmluZ1JlbmRlcmVy KCktPnN0eWxlKCkpOwogICAgIHNfc3R5bGVSZXNvbHZlUGFydCA9IE5vUGFydDsKICAgICBzX3N0 eWxlUmVzb2x2ZVNjcm9sbGJhciA9IDA7CisKKyAgICBhZGp1c3RTdHlsZShyZXN1bHQuZ2V0KCkp OwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclNjcm9sbGJhci5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmgK aW5kZXggZGU3MDYyNDU3OGNjZTIzZDAxNDJjZDczOTA1ZjJmYTJlZjkzZmMwZS4uZGM3YjZkMDQ5 ZDI3ODAxZThmZmM1MGZiZWVkMzliMjgwMTE3YWEzZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Ny b2xsYmFyLmgKQEAgLTc3LDYgKzc3LDcgQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8UmVu ZGVyU3R5bGU+IGdldFNjcm9sbGJhclBzZXVkb1N0eWxlKFNjcm9sbGJhclBhcnQsIFBzZXVkb0lk KTsKICAgICB2b2lkIHVwZGF0ZVNjcm9sbGJhclBhcnQoU2Nyb2xsYmFyUGFydCwgYm9vbCBkZXN0 cm95ID0gZmFsc2UpOworICAgIHZvaWQgYWRqdXN0U3R5bGUoUmVuZGVyU3R5bGUqKSBjb25zdDsK IAogICAgIFJlbmRlckJveCogbV9vd25lcjsKICAgICBGcmFtZSogbV9vd25pbmdGcmFtZTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCmluZGV4IGRmMWIzNDEwMjE5YWYzOTNhNDIz MDZiOTY0OWExOWY5MGZhM2Q5MGIuLjQyNDk3NWE5NTgxM2E4MWQwNzgzOGU2ZTQ3Y2VhOTY2YTY2 YjQ4MWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgK KysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMzUyLDYgKzM1 MiwxNCBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNGaXhlZEJhY2tncm91bmRJbWFnZSgpIGNvbnN0 IHsgcmV0dXJuIG1fYmFja2dyb3VuZC0+YmFja2dyb3VuZCgpLmhhc0ZpeGVkSW1hZ2UoKTsgfQog ICAgIGJvb2wgaGFzQXBwZWFyYW5jZSgpIGNvbnN0IHsgcmV0dXJuIGFwcGVhcmFuY2UoKSAhPSBO b0NvbnRyb2xQYXJ0OyB9CiAKKyAgICBib29sIGhhc0JhY2tncm91bmQoKSBjb25zdAorICAgIHsK KyAgICAgICAgQ29sb3IgY29sb3IgPSB2aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlC YWNrZ3JvdW5kQ29sb3IpOworICAgICAgICBpZiAoY29sb3IuaXNWYWxpZCgpICYmIGNvbG9yLmFs cGhhKCkgPiAwKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBoYXNC YWNrZ3JvdW5kSW1hZ2UoKTsKKyAgICB9CisKICAgICBib29sIHZpc3VhbGx5T3JkZXJlZCgpIGNv bnN0IHsgcmV0dXJuIGluaGVyaXRlZF9mbGFncy5fdmlzdWFsbHlPcmRlcmVkOyB9CiAgICAgdm9p ZCBzZXRWaXN1YWxseU9yZGVyZWQoYm9vbCBiKSB7IGluaGVyaXRlZF9mbGFncy5fdmlzdWFsbHlP cmRlcmVkID0gYjsgfQogCg== 64464 2010-08-15 22:05:12 -0700 2010-08-27 06:03:03 -0700 Patch bug-43960-20100816140510.patch text/plain 8716 morrita ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNWM0ODBiYmM2N2U1M2VmM2EwY2NmMjIwOTg4MTY1ZjRhODk5N2NiLi44MWUwZWJk ZDVmMWJlMGZiY2NlNDRjYTc1MTcyMGU4MzlmYzc3YmUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDgtMTMgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzOTYwCisgICAgICAgIFtDaHJvbWl1bV0gc3R5bGVk IHNjcm9sbCBiYXIgb24gdGhlIHdpbmRvdyBpcyBwYWludGVkIGJhZGx5LgorICAgICAgICAKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6IFNraXBzIGF0 IHRoaXMgdGltZSBhbmQgd2lsbCByZWJhc2VsaW5lIHNob3J0bHkuCisgICAgICAgICogcGxhdGZv cm0vbWFjL1NraXBwZWQ6IE1hYyBkb2Vzbid0IHN1ZmZlciBmcm9tIHRoZSBwcm9ibGVtLgorICAg ICAgICAqIHNjcm9sbGJhcnMvY3VzdG9tLXNjcm9sbGJhci13aXRoLWluY29tcGxldGUtc3R5bGUu aHRtbDogQWRkZWQuCisKIDIwMTAtMDgtMTUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAppbmRleCA2OTgyMzI3 OTkyMWIwNmIyODQyNmM3YzI3NmNlZWNkYjdlMzZkYTBjLi42NzE3Yjk5M2MzY2YxOTIwMDMxOWYw Njg5OTVmZDM0MTdlMGI5YzVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hy b21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CkBAIC0zMjA4LDMgKzMyMDgsNiBAQCBCVUc1MjAx NyBNQUMgTElOVVggOiBodHRwL3Rlc3RzL21pc2MvaXNpbmRleC13aXRoLW5vLWZvcm0uaHRtbCA9 IFBBU1MgVElNRU9VVAogLy8gUHJvYmFibHkgZHVlIHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcv Y2hhbmdlc2V0LzY1Mjc5LwogQlVHSkFQSEVUIE1BQyA6IGZhc3QvY2FudmFzL3dlYmdsL3RleHR1 cmUtbnBvdC5odG1sID0gVEVYVAogCisvLyBOZWVkIHJlYmFzbGluZSB0byBwaWNrIHRoZSByZXN1 bHRzLgorQlVHNDc5NDYgV0lOIExJTlVYIE1BQyA6IHNjcm9sbGJhcnMvY3VzdG9tLXNjcm9sbGJh ci13aXRoLWluY29tcGxldGUtc3R5bGUuaHRtbCA9IE1JU1NJTkcKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv U2tpcHBlZAppbmRleCAxMjcxOTNkNTI2ODUyODhmOTUxOGY0YTA3MmQzYzE1ZDQxODQ3YjQwLi43 OTIwOTI1ZWFjZWNkODZlYWZhNGQ5ZDMxZDkyMWYzOGNiOTFhNjJmIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvU2tpcHBlZApAQCAtMjg1LDMgKzI4NSw3IEBAIGh0dHAvdGVzdHMvbWlzYy93ZWJ0aW1pbmct dHdvLXJlZGlyZWN0cy5waHAKICMgTWFjLUxlb3BhcmQgYWZ0ZXIgcjYzODYyLiAgU2tpcHBpbmcg Zm9yIG5vdy4KICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyODIx CiBhbmltYXRpb25zL3BsYXktc3RhdGUuaHRtbAorCisjIFNhZmFyaSBkb2Vzbid0IGFsbG93IHRv IGN1c3RvbWl6ZSBvdXRlcm1vc3Qgc2Nyb2xsYmFycy4KKyMgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQzOTYwCitzY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0 aC1pbmNvbXBsZXRlLXN0eWxlLmh0bWwKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9zY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0aC1pbmNv bXBsZXRlLXN0eWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9zY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxi YXItd2l0aC1pbmNvbXBsZXRlLXN0eWxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDE2NjkwYjVkYTBlYjY0 NDBlNzk2MTIyYzQzM2RhZjU1NmNiOTdkNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L3Njcm9sbGJhcnMvY3VzdG9tLXNjcm9sbGJhci13aXRoLWluY29tcGxldGUtc3R5bGUuaHRtbApA QCAtMCwwICsxLDI5IEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPkluY29tcGxldGUgc2Nyb2xs YmFyPC90aXRsZT4KKzxzdHlsZT4KKy8qIFR1cm4gb24gYSAxM3gxMyBzY3JvbGxiYXIgd2l0aCBu byBiYWNrZ3JvdW5kIHNwZWNpZmljYXRpb24uICovCis6Oi13ZWJraXQtc2Nyb2xsYmFyIHsKKyAg ICB3aWR0aDogMTNweDsKKyAgICBoZWlnaHQ6IDEzcHg7Cit9CisKK3ByZSB7IGJhY2tncm91bmQt Y29sb3I6IGdyZWVuOyB9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8aDI+SXQncyBPSyBp ZiBub3RoaW5nIGRyYXduIGZvciBhIHNjcm9sbGJhciAoZm9yIGFuIG91dGVybW9zdCBmcmFtZSBh bmQgYW4gZWxlbWVudCB3aXRoIG92ZXJsb3cpPC9oMj4KKzxwPk5vdGUgdGhhdCBTYWZhcmkgZG9l c24ndCBhbGxvdyB0byBjdXN0b21pemUgdGhlIG91dGVybW9zdCBzY2Ryb2xsYmFycyBhbmQganVz dCBzaG93IENvY29hJ3MuPC9wPgorPHByZSBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgd2lkdGg6MTAw cHg7IG92ZXJmbG93OmF1dG87Ij4KK1RoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUg bGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRo ZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93 biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuCitUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBz IG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxh enkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUg cXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLgorVGhlIHF1aWNrIGJyb3du IGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBv dmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5 IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4KK1RoZSBx dWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBm b3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3Zl ciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBk b2cuCitUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVp Y2sgYnJvd24gZm94IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94 IGp1bXBzIG92ZXIgdGhlIGxhenkgZG9nLiBUaGUgcXVpY2sgYnJvd24gZm94IGp1bXBzIG92ZXIg dGhlIGxhenkgZG9nLgorVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRv Zy4gVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNr IGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4gVGhlIHF1aWNrIGJyb3duIGZveCBq dW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4KK1RoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0 aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cu IFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBi cm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuCis8L3ByZT4KKzxwcmUgc3R5bGU9Imhl aWdodDoyMDAlOyI+PC9wcmU+Cis8cHJlIHN0eWxlPSJ3aWR0aDoyMDAlOyI+PC9wcmU+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDMzODNlNjI0MDg1MGQ4MGIwNTU0NmE1ZDVjM2Q1NGM3N2Q4Y2VkNzkuLjQz NzkyY2RiY2NmNDU5NzQ0MDY4MjE5OGQ1ZGIyNzhhMzIzODI0YWQgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIw MTAtMDgtMTMgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQzOTYwCisgICAgICAgIFtDaHJvbWl1bV0gc3R5bGVkIHNj cm9sbCBiYXIgb24gdGhlIHdpbmRvdyBpcyBwYWludGVkIGJhZGx5LgorCisgICAgICAgIFdlYktp dCBhc3N1bWVzIG91dGVybW9zdCBzY3JvbGxiYXIgYWx3YXlzIHBhaW50ZWQuIAorICAgICAgICBT byBmb3JjZSB0aGVpciBzdHlsZSB0byBoYXZlIHRoZSAgYmFja2dyb3VuZCBjb2xvciBpZiBpdCBp c24ndCAKKyAgICAgICAgZ2l2ZW4gYnkgdGhlIHN0eWxlc2hlZXQuCisgICAgICAgIAorICAgICAg ICBUZXN0OiBzY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0aC1pbmNvbXBsZXRlLXN0eWxl Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlck9iamVjdDo6aGFzQmFja2dyb3VuZCk6IEV4dHJhY3RlZCBib2R5IHRvIFJl bmRlclN0eWxlIGZvciBzaGFyaW5nLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTY3JvbGxi YXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyOjpnZXRTY3JvbGxiYXJQ c2V1ZG9TdHlsZSk6IEFkZGVkIHRoZSB3b3JrYXJvdW5kIGFzIG1lbnRpb25lZCBhYm92ZS4KKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmg6CisgICAgICAgICogcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6 aGFzQmFja2dyb3VuZCk6IEV4dHJhY3RlZCBmcm9tIFJlbmRlck9iamVjdC4KKwogMjAxMC0wOC0x NSAgS2V2aW4gT2xsaXZpZXIgIDxrZXZpbm9AdGhlb2xsaXZpZXJzLmNvbT4KIAogICAgICAgICBb d3hdIEJ1aWxkIGZpeCwgYWRkIG1pc3NpbmcgaGVhZGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3Qu aAppbmRleCBkMjA0NmNmZDUxN2I1MzBjMjY3NGQzY2YzYjBhZTNmNjE3NmQxYzJjLi4zNGViYTZk OGY0ODdlNGU4NDA3NDVhZWUzMzUwN2VmMzE3NmU0NDZjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuaApAQCAtMzgzLDE0ICszODMsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgYm9vbCBoYXNCb3hE ZWNvcmF0aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1fcGFpbnRCYWNrZ3JvdW5kOyB9CiAgICAgYm9v bCBtdXN0UmVwYWludEJhY2tncm91bmRPckJvcmRlcigpIGNvbnN0OwotICAgIGJvb2wgaGFzQmFj a2dyb3VuZCgpIGNvbnN0Ci0gICAgewotICAgICAgICBDb2xvciBjb2xvciA9IHN0eWxlKCktPnZp c2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcik7Ci0gICAgICAg IGlmIChjb2xvci5pc1ZhbGlkKCkgJiYgY29sb3IuYWxwaGEoKSA+IDApCi0gICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICAgICAgcmV0dXJuIHN0eWxlKCktPmhhc0JhY2tncm91bmRJbWFnZSgp OwotICAgIH0KLQorICAgIGJvb2wgaGFzQmFja2dyb3VuZCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxl KCktPmhhc0JhY2tncm91bmQoKTsgfQogICAgIGJvb2wgbmVlZHNMYXlvdXQoKSBjb25zdCB7IHJl dHVybiBtX25lZWRzTGF5b3V0IHx8IG1fbm9ybWFsQ2hpbGROZWVkc0xheW91dCB8fCBtX3Bvc0No aWxkTmVlZHNMYXlvdXQgfHwgbV9uZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dDsgfQogICAg IGJvb2wgc2VsZk5lZWRzTGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV9uZWVkc0xheW91dDsgfQog ICAgIGJvb2wgbmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQoKSBjb25zdCB7IHJldHVybiBt X25lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0OyB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Ny b2xsYmFyLmNwcAppbmRleCA3Mzc4MDU2MWE0NDA2OTY4OGNkNjQzZTdhYjdjNDI3NmZhYzI3MWM1 Li5lN2E3MGE0MmYzN2FjOGE4ZWM2YzNjOTE0NzkzYTU3ZjkzMTA5YWIyIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclNjcm9sbGJhci5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJSZW5k ZXJTY3JvbGxiYXIuaCIKIAogI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVWaWV3 LmgiCiAjaW5jbHVkZSAiUmVuZGVyUGFydC5oIgogI2luY2x1ZGUgIlJlbmRlclNjcm9sbGJhclBh cnQuaCIKICNpbmNsdWRlICJSZW5kZXJTY3JvbGxiYXJUaGVtZS5oIgpAQCAtMTUwLDYgKzE1MSwx NCBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJTY3JvbGxiYXI6OmdldFNjcm9sbGJh clBzZXVkb1N0eWxlKFNjcm9sbGJhclBhcnQgcAogICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcmVz dWx0ID0gb3duaW5nUmVuZGVyZXIoKS0+Z2V0VW5jYWNoZWRQc2V1ZG9TdHlsZShwc2V1ZG9JZCwg b3duaW5nUmVuZGVyZXIoKS0+c3R5bGUoKSk7CiAgICAgc19zdHlsZVJlc29sdmVQYXJ0ID0gTm9Q YXJ0OwogICAgIHNfc3R5bGVSZXNvbHZlU2Nyb2xsYmFyID0gMDsKKworICAgIC8vIFNjcm9sbGJh cnMgZm9yIHJvb3QgZnJhbWVzIHNob3VsZCBhbHdheXMgaGF2ZSBiYWNrZ3JvdW5kIGNvbG9yIAor ICAgIC8vIHVubGVzcyBleHBsaWNpdGx5IHNwZWNpZmllZCBhcyB0cmFuc3BhcmVudC4gU28gd2Ug Zm9yY2UgaXQuCisgICAgLy8gVGhpcyBpcyBiZWNhdXNlIFdlYktpdCBhc3N1bWVzIHNjcm9sbGJh ciB0byBiZSBhbHdheXMgcGFpbnRlZCBhbmQgbWlzc2luZyBiYWNrZ3JvdW5kCisgICAgLy8gY2F1 c2VzIHZpc3VhbCBhcnRpZmFjdCBsaWtlIG5vbi1yZXBhaW50ZWQgZGlydHkgcmVnaW9uLgorICAg IGlmIChyZXN1bHQgJiYgbV9vd25pbmdGcmFtZSAmJiBtX293bmluZ0ZyYW1lLT52aWV3KCkgJiYg IW1fb3duaW5nRnJhbWUtPnZpZXcoKS0+aXNUcmFuc3BhcmVudCgpICYmICFyZXN1bHQtPmhhc0Jh Y2tncm91bmQoKSkKKyAgICAgICAgcmVzdWx0LT5zZXRCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6Ondo aXRlKTsKKwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCmluZGV4IGRmMWIzNDEwMjE5YWYzOTNhNDIzMDZiOTY0OWExOWY5MGZhM2Q5MGIu LjQyNDk3NWE5NTgxM2E4MWQwNzgzOGU2ZTQ3Y2VhOTY2YTY2YjQ4MWYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMzUyLDYgKzM1MiwxNCBAQCBwdWJsaWM6CiAgICAg Ym9vbCBoYXNGaXhlZEJhY2tncm91bmRJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFja2dyb3Vu ZC0+YmFja2dyb3VuZCgpLmhhc0ZpeGVkSW1hZ2UoKTsgfQogICAgIGJvb2wgaGFzQXBwZWFyYW5j ZSgpIGNvbnN0IHsgcmV0dXJuIGFwcGVhcmFuY2UoKSAhPSBOb0NvbnRyb2xQYXJ0OyB9CiAKKyAg ICBib29sIGhhc0JhY2tncm91bmQoKSBjb25zdAorICAgIHsKKyAgICAgICAgQ29sb3IgY29sb3Ig PSB2aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOworICAg ICAgICBpZiAoY29sb3IuaXNWYWxpZCgpICYmIGNvbG9yLmFscGhhKCkgPiAwKQorICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBoYXNCYWNrZ3JvdW5kSW1hZ2UoKTsKKyAg ICB9CisKICAgICBib29sIHZpc3VhbGx5T3JkZXJlZCgpIGNvbnN0IHsgcmV0dXJuIGluaGVyaXRl ZF9mbGFncy5fdmlzdWFsbHlPcmRlcmVkOyB9CiAgICAgdm9pZCBzZXRWaXN1YWxseU9yZGVyZWQo Ym9vbCBiKSB7IGluaGVyaXRlZF9mbGFncy5fdmlzdWFsbHlPcmRlcmVkID0gYjsgfQogCg==