81529 2012-03-19 11:25:30 -0700 [chromium] Invalidate/update evicted tiles during commit 2012-03-19 14:37:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 81552 1 danakj danakj backer cc-bugs enne jamesr piman reveman shawnsingh webkit.review.bot oldest_to_newest 581969 0 danakj 2012-03-19 11:25:30 -0700 [chromium] Invalidate/update evicted tiles during commit 581970 1 132614 danakj 2012-03-19 11:27:44 -0700 Created attachment 132614 Patch 581979 2 webkit.review.bot 2012-03-19 11:31:16 -0700 Attachment 132614 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:12: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 581991 3 132617 danakj 2012-03-19 11:37:11 -0700 Created attachment 132617 Patch 582095 4 132617 enne 2012-03-19 13:05:15 -0700 Comment on attachment 132617 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132617&action=review Sorry for not catching this issue the first time through review. > Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp:370 > + EXPECT_TRUE(layerImpl->hasTileAt(0, 0)); > + EXPECT_FALSE(layerImpl->hasTileAt(0, 1)); Can you also verify after a pushPropertiesTo that neither tile is there? I don't think we have any test related to that. 582097 5 enne 2012-03-19 13:05:54 -0700 (In reply to comment #4) > (From update of attachment 132617 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=132617&action=review > > Sorry for not catching this issue the first time through review. > > > Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp:370 > > + EXPECT_TRUE(layerImpl->hasTileAt(0, 0)); > > + EXPECT_FALSE(layerImpl->hasTileAt(0, 1)); > > Can you also verify after a pushPropertiesTo that neither tile is there? I don't think we have any test related to that. ...before doing any painting, I mean. 582131 6 132644 danakj 2012-03-19 13:21:10 -0700 Created attachment 132644 Patch Thanks! Done! 582263 7 132644 webkit.review.bot 2012-03-19 14:37:16 -0700 Comment on attachment 132644 Patch Clearing flags on attachment: 132644 Committed r111253: <http://trac.webkit.org/changeset/111253> 582264 8 webkit.review.bot 2012-03-19 14:37:20 -0700 All reviewed patches have been landed. Closing bug. 132614 2012-03-19 11:27:44 -0700 2012-03-19 11:37:07 -0700 Patch bug-81529-20120319142743.patch text/plain 4580 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTE1YTBmMGRhMmU3MzZl NDI3YzYyZjRhYWJhMjAzYTVkYzg2YmIzMy4uMTI3NDU3OTc3NWIwYTNlNGY2ZmM4ODlhYTczNDA3 OTUzZGIxNTI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTE5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gSW52 YWxpZGF0ZS91cGRhdGUgZXZpY3RlZCB0aWxlcyBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUyOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgcHJldmlvdXMgY2hhbmdlIGNhdXNl ZCBhIHJlZ3Jlc3Npb24gd2hlcmUgZXZpY3RlZCAoaW52YWxpZCkgdGlsZXMKKyAgICAgICAgd2Vy ZSBubyBsb25nZXIgbWFya2VkIGFzIGRpcnR5IGFuZCB1cGRhdGVkLiBUaGUgcmVncmVzcyB3YXMg Y2F1c2VkCisgICAgICAgIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MTE3NSBhbmQgaXMgZml4ZWQgaGVyZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BT ISkKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJv bWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVcGRhdGFibGVUaWxlOjpjb3B5QW5kQ2xlYXJE aXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1Vw ZGF0ZVRpbGVzKToKKwogMjAxMi0wMy0xOSAgTGVvIFlhbmcgIDxsZW8ueWFuZ0B0b3JjaG1vYmls ZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEFkZCBQbGF0Zm9ybU1lZGlhRW5naW5l Q2xhc3NOYW1lIGZvciBibGFja2JlcnJ5IGluIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vVGlsZWRMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggZjdhNDAwODYyMWJhNDZm NmU4NGEyZDc5OGUxYTI4NzQ4ZTQxYzkzZS4uN2I4NjQ0NGZiNTVmNzkyMGMzMDQ0MjJkNWNjYmZh MGZlZGRiMWMxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwCkBAIC02Myw2ICs2 MywxMSBAQCBwdWJsaWM6CiAgICAgTWFuYWdlZFRleHR1cmUqIG1hbmFnZWRUZXh0dXJlKCkgeyBy ZXR1cm4gbV90ZXh0dXJlLT50ZXh0dXJlKCk7IH0KIAogICAgIGJvb2wgaXNEaXJ0eSgpIGNvbnN0 IHsgcmV0dXJuICFtX2RpcnR5UmVjdC5pc0VtcHR5KCk7IH0KKyAgICB2b2lkIGNvcHlBbmRDbGVh ckRpcnR5KCkKKyAgICB7CisgICAgICAgIG1fdXBkYXRlUmVjdCA9IG1fZGlydHlSZWN0OworICAg ICAgICBtX2RpcnR5UmVjdCA9IEludFJlY3QoKTsKKyAgICB9CiAgICAgLy8gUmV0dXJucyB3aGV0 aGVyIHRoZSBsYXllciB3YXMgZGlydHkgYW5kIG5vdCB1cGRhdGVkIGluIHRoZSBjdXJyZW50IGZy YW1lLiBGb3IgdGlsZXMgdGhhdCB3ZXJlIG5vdCBjdWxsZWQsIHRoZQogICAgIC8vIHVwZGF0ZVJl Y3QgaG9sZHMgdGhlIGFyZWEgb2YgdGhlIHRpbGUgdGhhdCB3YXMgdXBkYXRlZC4gT3RoZXJ3aXNl LCB0aGUgYXJlYSB0aGF0IHdvdWxkIGhhdmUgYmVlbiB1cGRhdGVkLgogICAgIGJvb2wgaXNEaXJ0 eUZvckN1cnJlbnRGcmFtZSgpIHsgcmV0dXJuICFtX2RpcnR5UmVjdC5pc0VtcHR5KCkgJiYgKG1f dXBkYXRlUmVjdC5pc0VtcHR5KCkgfHwgbV91cGRhdGVDdWxsZWQpOyB9CkBAIC00MTQsOCArNDE5 LDEwIEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpwcmVwYXJlVG9VcGRhdGVUaWxlcyhib29s IGlkbGUsIGludCBsZWZ0LCBpbnQgdG9wLCBpbnQKICAgICAgICAgICAgIGlmICghdGlsZSkKICAg ICAgICAgICAgICAgICB0aWxlID0gY3JlYXRlVGlsZShpLCBqKTsKIAotICAgICAgICAgICAgLy8g U2F2ZSB0aGUgZGlydHkgcmVjdCBzaW5jZSBXZWJLaXQgY2FuIGNoYW5nZSB0aGUgdGlsZSdzIGRp cnR5IHJlY3QgZHVyaW5nIHBhaW50aW5nLgotICAgICAgICAgICAgdGlsZS0+bV91cGRhdGVSZWN0 ID0gdGlsZS0+bV9kaXJ0eVJlY3Q7CisgICAgICAgICAgICBpZiAoIXRpbGUtPm1hbmFnZWRUZXh0 dXJlKCktPmlzVmFsaWQobV90aWxlci0+dGlsZVNpemUoKSwgbV90ZXh0dXJlRm9ybWF0KSkgewor ICAgICAgICAgICAgICAgIC8vIFNldHMgdGhlIGRpcnR5IHJlY3QgdG8gYSBmdWxsLXNpemVkIHRp bGUgd2l0aCBib3JkZXIgdGV4ZWxzLgorICAgICAgICAgICAgICAgIHRpbGUtPm1fZGlydHlSZWN0 ID0gbV90aWxlci0+dGlsZVJlY3QodGlsZSk7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IC8vIFdoZW4gbm90IGlkbGUgcGFpbnRpbmcsIGlmIHRoZSB2aXNpYmxlIHJlZ2lvbiBvZiB0aGUg dGlsZSBpcyBvY2NsdWRlZCwgZG9uJ3QgcmVzZXJ2ZSBhIHRleHR1cmUgb3IgdXBkYXRlIHRoZSB0 aWxlLgogICAgICAgICAgICAgLy8gSWYgYW55IHBhcnQgb2YgdGhlIHRpbGUgaXMgdmlzaWJsZSwg dGhlbiB3ZSBuZWVkIHRvIHVwZGF0ZSBpdCBzbyB0aGUgdGlsZSBpcyBwdXNoZWQgdG8gdGhlIGlt cGwgdGhyZWFkLgpAQCAtNDIzLDYgKzQzMCw4IEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpw cmVwYXJlVG9VcGRhdGVUaWxlcyhib29sIGlkbGUsIGludCBsZWZ0LCBpbnQgdG9wLCBpbnQKICAg ICAgICAgICAgICAgICBJbnRSZWN0IHZpc2libGVUaWxlUmVjdCA9IGludGVyc2VjdGlvbihtX3Rp bGVyLT50aWxlQm91bmRzKGksIGopLCB2aXNpYmxlTGF5ZXJSZWN0KCkpOwogICAgICAgICAgICAg ICAgIGlmIChvY2NsdXNpb24tPm9jY2x1ZGVkKHRoaXMsIHZpc2libGVUaWxlUmVjdCkpIHsKICAg ICAgICAgICAgICAgICAgICAgdGlsZS0+bV91cGRhdGVDdWxsZWQgPSB0cnVlOworICAgICAgICAg ICAgICAgICAgICAvLyBTYXZlIHRoZSBhcmVhIHdlIGN1bGxlZCBmb3IgcmVjb3JkaW5nIG1ldHJp Y3MuCisgICAgICAgICAgICAgICAgICAgIHRpbGUtPm1fdXBkYXRlUmVjdCA9IHRpbGUtPm1fZGly dHlSZWN0OwogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CkBAIC00MzEsMTAgKzQ0MCw4IEBAIHZvaWQgVGlsZWRMYXllckNocm9t aXVtOjpwcmVwYXJlVG9VcGRhdGVUaWxlcyhib29sIGlkbGUsIGludCBsZWZ0LCBpbnQgdG9wLCBp bnQKICAgICAgICAgICAgIC8vIG9mIHVwZGF0ZS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc3Mzc2CiAgICAgICAgICAgICBpZiAodGlsZU9ubHlOZWVkc1BhcnRpYWxV cGRhdGUodGlsZSkgJiYgbGF5ZXJUcmVlSG9zdCgpICYmIGxheWVyVHJlZUhvc3QoKS0+cmVxdWVz dFBhcnRpYWxUZXh0dXJlVXBkYXRlKCkpCiAgICAgICAgICAgICAgICAgdGlsZS0+bV9wYXJ0aWFs VXBkYXRlID0gdHJ1ZTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHRpbGVOZWVkc0J1ZmZlcmVkVXBk YXRlKHRpbGUpICYmIGxheWVyVHJlZUhvc3QoKSkKKyAgICAgICAgICAgIGVsc2UgaWYgKHRpbGVO ZWVkc0J1ZmZlcmVkVXBkYXRlKHRpbGUpICYmIGxheWVyVHJlZUhvc3QoKSkgewogICAgICAgICAg ICAgICAgIGxheWVyVHJlZUhvc3QoKS0+ZGVsZXRlVGV4dHVyZUFmdGVyQ29tbWl0KHRpbGUtPm1h bmFnZWRUZXh0dXJlKCktPnN0ZWFsKCkpOwotCi0gICAgICAgICAgICBpZiAoIXRpbGUtPm1hbmFn ZWRUZXh0dXJlKCktPmlzVmFsaWQobV90aWxlci0+dGlsZVNpemUoKSwgbV90ZXh0dXJlRm9ybWF0 KSkgewogICAgICAgICAgICAgICAgIC8vIFNldHMgdGhlIGRpcnR5IHJlY3QgdG8gYSBmdWxsLXNp emVkIHRpbGUgd2l0aCBib3JkZXIgdGV4ZWxzLgogICAgICAgICAgICAgICAgIHRpbGUtPm1fZGly dHlSZWN0ID0gbV90aWxlci0+dGlsZVJlY3QodGlsZSk7CiAgICAgICAgICAgICB9CkBAIC00NTQs OCArNDYxLDcgQEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVz KGJvb2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3AsIGludAogICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICBkaXJ0eUxheWVyUmVjdC51bml0ZSh0aWxlLT5tX2RpcnR5UmVjdCk7Ci0gICAgICAg ICAgICAvLyBDbGVhciB0aGUgZGlydHkgcmVjdC4KLSAgICAgICAgICAgIHRpbGUtPm1fZGlydHlS ZWN0ID0gSW50UmVjdCgpOworICAgICAgICAgICAgdGlsZS0+Y29weUFuZENsZWFyRGlydHkoKTsK ICAgICAgICAgfQogICAgIH0KIAo= 132617 2012-03-19 11:37:11 -0700 2012-03-19 13:21:06 -0700 Patch bug-81529-20120319143710.patch text/plain 6799 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTE1YTBmMGRhMmU3MzZl NDI3YzYyZjRhYWJhMjAzYTVkYzg2YmIzMy4uODIyZTNiYjI2ZGU3NGJkNzJjZGFkMTVmMTc3ZDQz OTUyMzlmNGFmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTE5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gSW52 YWxpZGF0ZS91cGRhdGUgZXZpY3RlZCB0aWxlcyBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUyOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgcHJldmlvdXMgY2hhbmdlIGNhdXNl ZCBhIHJlZ3Jlc3Npb24gd2hlcmUgZXZpY3RlZCAoaW52YWxpZCkgdGlsZXMKKyAgICAgICAgd2Vy ZSBubyBsb25nZXIgbWFya2VkIGFzIGRpcnR5IGFuZCB1cGRhdGVkLiBUaGUgcmVncmVzcyB3YXMg Y2F1c2VkCisgICAgICAgIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MTE3NSBhbmQgaXMgZml4ZWQgaGVyZS4KKworICAgICAgICBVbml0IHRlc3Q6IFRpbGVkTGF5 ZXJDaHJvbWl1bVRlc3QucHVzaERlbGV0ZWRUaWxlcworCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlVwZGF0YWJsZVRpbGU6OmNvcHlBbmRDbGVhckRpcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OlRp bGVkTGF5ZXJDaHJvbWl1bTo6cHJlcGFyZVRvVXBkYXRlVGlsZXMpOgorCiAyMDEyLTAzLTE5ICBM ZW8gWWFuZyAgPGxlby55YW5nQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tC ZXJyeV0gQWRkIFBsYXRmb3JtTWVkaWFFbmdpbmVDbGFzc05hbWUgZm9yIGJsYWNrYmVycnkgaW4g cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9t aXVtLmNwcAppbmRleCBmN2E0MDA4NjIxYmE0NmY2ZTg0YTJkNzk4ZTFhMjg3NDhlNDFjOTNlLi43 Yjg2NDQ0ZmI1NWY3OTIwYzMwNDQyMmQ1Y2NiZmEwZmVkZGIxYzE2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVk TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTYzLDYgKzYzLDExIEBAIHB1YmxpYzoKICAgICBNYW5hZ2Vk VGV4dHVyZSogbWFuYWdlZFRleHR1cmUoKSB7IHJldHVybiBtX3RleHR1cmUtPnRleHR1cmUoKTsg fQogCiAgICAgYm9vbCBpc0RpcnR5KCkgY29uc3QgeyByZXR1cm4gIW1fZGlydHlSZWN0LmlzRW1w dHkoKTsgfQorICAgIHZvaWQgY29weUFuZENsZWFyRGlydHkoKQorICAgIHsKKyAgICAgICAgbV91 cGRhdGVSZWN0ID0gbV9kaXJ0eVJlY3Q7CisgICAgICAgIG1fZGlydHlSZWN0ID0gSW50UmVjdCgp OworICAgIH0KICAgICAvLyBSZXR1cm5zIHdoZXRoZXIgdGhlIGxheWVyIHdhcyBkaXJ0eSBhbmQg bm90IHVwZGF0ZWQgaW4gdGhlIGN1cnJlbnQgZnJhbWUuIEZvciB0aWxlcyB0aGF0IHdlcmUgbm90 IGN1bGxlZCwgdGhlCiAgICAgLy8gdXBkYXRlUmVjdCBob2xkcyB0aGUgYXJlYSBvZiB0aGUgdGls ZSB0aGF0IHdhcyB1cGRhdGVkLiBPdGhlcndpc2UsIHRoZSBhcmVhIHRoYXQgd291bGQgaGF2ZSBi ZWVuIHVwZGF0ZWQuCiAgICAgYm9vbCBpc0RpcnR5Rm9yQ3VycmVudEZyYW1lKCkgeyByZXR1cm4g IW1fZGlydHlSZWN0LmlzRW1wdHkoKSAmJiAobV91cGRhdGVSZWN0LmlzRW1wdHkoKSB8fCBtX3Vw ZGF0ZUN1bGxlZCk7IH0KQEAgLTQxNCw4ICs0MTksMTAgQEAgdm9pZCBUaWxlZExheWVyQ2hyb21p dW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3AsIGlu dAogICAgICAgICAgICAgaWYgKCF0aWxlKQogICAgICAgICAgICAgICAgIHRpbGUgPSBjcmVhdGVU aWxlKGksIGopOwogCi0gICAgICAgICAgICAvLyBTYXZlIHRoZSBkaXJ0eSByZWN0IHNpbmNlIFdl YktpdCBjYW4gY2hhbmdlIHRoZSB0aWxlJ3MgZGlydHkgcmVjdCBkdXJpbmcgcGFpbnRpbmcuCi0g ICAgICAgICAgICB0aWxlLT5tX3VwZGF0ZVJlY3QgPSB0aWxlLT5tX2RpcnR5UmVjdDsKKyAgICAg ICAgICAgIGlmICghdGlsZS0+bWFuYWdlZFRleHR1cmUoKS0+aXNWYWxpZChtX3RpbGVyLT50aWxl U2l6ZSgpLCBtX3RleHR1cmVGb3JtYXQpKSB7CisgICAgICAgICAgICAgICAgLy8gU2V0cyB0aGUg ZGlydHkgcmVjdCB0byBhIGZ1bGwtc2l6ZWQgdGlsZSB3aXRoIGJvcmRlciB0ZXhlbHMuCisgICAg ICAgICAgICAgICAgdGlsZS0+bV9kaXJ0eVJlY3QgPSBtX3RpbGVyLT50aWxlUmVjdCh0aWxlKTsK KyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gV2hlbiBub3QgaWRsZSBwYWludGluZywg aWYgdGhlIHZpc2libGUgcmVnaW9uIG9mIHRoZSB0aWxlIGlzIG9jY2x1ZGVkLCBkb24ndCByZXNl cnZlIGEgdGV4dHVyZSBvciB1cGRhdGUgdGhlIHRpbGUuCiAgICAgICAgICAgICAvLyBJZiBhbnkg cGFydCBvZiB0aGUgdGlsZSBpcyB2aXNpYmxlLCB0aGVuIHdlIG5lZWQgdG8gdXBkYXRlIGl0IHNv IHRoZSB0aWxlIGlzIHB1c2hlZCB0byB0aGUgaW1wbCB0aHJlYWQuCkBAIC00MjMsNiArNDMwLDgg QEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRs ZSwgaW50IGxlZnQsIGludCB0b3AsIGludAogICAgICAgICAgICAgICAgIEludFJlY3QgdmlzaWJs ZVRpbGVSZWN0ID0gaW50ZXJzZWN0aW9uKG1fdGlsZXItPnRpbGVCb3VuZHMoaSwgaiksIHZpc2li bGVMYXllclJlY3QoKSk7CiAgICAgICAgICAgICAgICAgaWYgKG9jY2x1c2lvbi0+b2NjbHVkZWQo dGhpcywgdmlzaWJsZVRpbGVSZWN0KSkgewogICAgICAgICAgICAgICAgICAgICB0aWxlLT5tX3Vw ZGF0ZUN1bGxlZCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIC8vIFNhdmUgdGhlIGFyZWEg d2UgY3VsbGVkIGZvciByZWNvcmRpbmcgbWV0cmljcy4KKyAgICAgICAgICAgICAgICAgICAgdGls ZS0+bV91cGRhdGVSZWN0ID0gdGlsZS0+bV9kaXJ0eVJlY3Q7CiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTQzMSwxMCAr NDQwLDggQEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJv b2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3AsIGludAogICAgICAgICAgICAgLy8gb2YgdXBkYXRl LiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzczNzYKICAgICAgICAg ICAgIGlmICh0aWxlT25seU5lZWRzUGFydGlhbFVwZGF0ZSh0aWxlKSAmJiBsYXllclRyZWVIb3N0 KCkgJiYgbGF5ZXJUcmVlSG9zdCgpLT5yZXF1ZXN0UGFydGlhbFRleHR1cmVVcGRhdGUoKSkKICAg ICAgICAgICAgICAgICB0aWxlLT5tX3BhcnRpYWxVcGRhdGUgPSB0cnVlOwotICAgICAgICAgICAg ZWxzZSBpZiAodGlsZU5lZWRzQnVmZmVyZWRVcGRhdGUodGlsZSkgJiYgbGF5ZXJUcmVlSG9zdCgp KQorICAgICAgICAgICAgZWxzZSBpZiAodGlsZU5lZWRzQnVmZmVyZWRVcGRhdGUodGlsZSkgJiYg bGF5ZXJUcmVlSG9zdCgpKSB7CiAgICAgICAgICAgICAgICAgbGF5ZXJUcmVlSG9zdCgpLT5kZWxl dGVUZXh0dXJlQWZ0ZXJDb21taXQodGlsZS0+bWFuYWdlZFRleHR1cmUoKS0+c3RlYWwoKSk7Ci0K LSAgICAgICAgICAgIGlmICghdGlsZS0+bWFuYWdlZFRleHR1cmUoKS0+aXNWYWxpZChtX3RpbGVy LT50aWxlU2l6ZSgpLCBtX3RleHR1cmVGb3JtYXQpKSB7CiAgICAgICAgICAgICAgICAgLy8gU2V0 cyB0aGUgZGlydHkgcmVjdCB0byBhIGZ1bGwtc2l6ZWQgdGlsZSB3aXRoIGJvcmRlciB0ZXhlbHMu CiAgICAgICAgICAgICAgICAgdGlsZS0+bV9kaXJ0eVJlY3QgPSBtX3RpbGVyLT50aWxlUmVjdCh0 aWxlKTsKICAgICAgICAgICAgIH0KQEAgLTQ1NCw4ICs0NjEsNyBAQCB2b2lkIFRpbGVkTGF5ZXJD aHJvbWl1bTo6cHJlcGFyZVRvVXBkYXRlVGlsZXMoYm9vbCBpZGxlLCBpbnQgbGVmdCwgaW50IHRv cCwgaW50CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGRpcnR5TGF5ZXJSZWN0LnVuaXRl KHRpbGUtPm1fZGlydHlSZWN0KTsKLSAgICAgICAgICAgIC8vIENsZWFyIHRoZSBkaXJ0eSByZWN0 LgotICAgICAgICAgICAgdGlsZS0+bV9kaXJ0eVJlY3QgPSBJbnRSZWN0KCk7CisgICAgICAgICAg ICB0aWxlLT5jb3B5QW5kQ2xlYXJEaXJ0eSgpOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9UaWxlZExheWVyQ2hyb21pdW1UZXN0 LmNwcAppbmRleCA3ZWViYjk3MTQ2ODZhZWUxMTNiZTAyZmFhZTg1NmU1MjBhNjVjMThiLi5kZDgx YWVjYzJlNjZkOTFjYjAxYjQ5MzU1NGQzNGNlNTE5OGUwMTFlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVGlsZWRMYXllckNocm9taXVtVGVzdC5jcHAKQEAg LTMzNSw2ICszMzUsNDEgQEAgVEVTVChUaWxlZExheWVyQ2hyb21pdW1UZXN0LCBwdXNoT2NjbHVk ZWREaXJ0eVRpbGVzKQogICAgIEVYUEVDVF9UUlVFKGxheWVySW1wbC0+aGFzVGlsZUF0KDAsIDEp KTsKIH0KIAorVEVTVChUaWxlZExheWVyQ2hyb21pdW1UZXN0LCBwdXNoRGVsZXRlZFRpbGVzKQor eworICAgIE93blB0cjxUZXh0dXJlTWFuYWdlcj4gdGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJlTWFu YWdlcjo6Y3JlYXRlKDQqMTAyNCoxMDI0LCAyKjEwMjQqMTAyNCwgMTAyNCk7CisgICAgUmVmUHRy PEZha2VUaWxlZExheWVyQ2hyb21pdW0+IGxheWVyID0gYWRvcHRSZWYobmV3IEZha2VUaWxlZExh eWVyQ2hyb21pdW0odGV4dHVyZU1hbmFnZXIuZ2V0KCkpKTsKKyAgICBEZWJ1Z1Njb3BlZFNldElt cGxUaHJlYWQgaW1wbFRocmVhZDsKKyAgICBPd25QdHI8RmFrZUNDVGlsZWRMYXllckltcGw+IGxh eWVySW1wbChhZG9wdFB0cihuZXcgRmFrZUNDVGlsZWRMYXllckltcGwoMCkpKTsKKworICAgIEZh a2VUZXh0dXJlQWxsb2NhdG9yIHRleHR1cmVBbGxvY2F0b3I7CisgICAgQ0NUZXh0dXJlVXBkYXRl ciB1cGRhdGVyKCZ0ZXh0dXJlQWxsb2NhdG9yKTsKKworICAgIC8vIFRoZSB0aWxlIHNpemUgaXMg MTAweDEwMCwgc28gdGhpcyBpbnZhbGlkYXRlcyBhbmQgdGhlbiBwYWludHMgdHdvIHRpbGVzLgor ICAgIGxheWVyLT5zZXRCb3VuZHMoSW50U2l6ZSgxMDAsIDIwMCkpOworICAgIGxheWVyLT5pbnZh bGlkYXRlUmVjdChJbnRSZWN0KDAsIDAsIDEwMCwgMjAwKSk7CisgICAgbGF5ZXItPnByZXBhcmVU b1VwZGF0ZShJbnRSZWN0KDAsIDAsIDEwMCwgMjAwKSwgMCk7CisgICAgbGF5ZXItPnVwZGF0ZUNv bXBvc2l0b3JSZXNvdXJjZXMoMCwgdXBkYXRlcik7CisgICAgbGF5ZXItPnB1c2hQcm9wZXJ0aWVz VG8obGF5ZXJJbXBsLmdldCgpKTsKKworICAgIC8vIFdlIHNob3VsZCBoYXZlIGJvdGggdGlsZXMg b24gdGhlIGltcGwgc2lkZS4KKyAgICBFWFBFQ1RfVFJVRShsYXllckltcGwtPmhhc1RpbGVBdCgw LCAwKSk7CisgICAgRVhQRUNUX1RSVUUobGF5ZXJJbXBsLT5oYXNUaWxlQXQoMCwgMSkpOworCisg ICAgdGV4dHVyZU1hbmFnZXItPmV2aWN0QW5kRGVsZXRlQWxsVGV4dHVyZXMoJnRleHR1cmVBbGxv Y2F0b3IpOworICAgIHRleHR1cmVNYW5hZ2VyLT5zZXRNYXhNZW1vcnlMaW1pdEJ5dGVzKDQqMTAy NCoxMDI0KTsKKyAgICB0ZXh0dXJlTWFuYWdlci0+c2V0UHJlZmVycmVkTWVtb3J5TGltaXRCeXRl cyg0KjEwMjQqMTAyNCk7CisKKyAgICAvLyBUaGlzIHNob3VsZCByZWNyZWF0ZSBhbmQgdXBkYXRl IHRoZSBkZWxldGVkIHRleHR1cmVzLgorICAgIGxheWVyLT5wcmVwYXJlVG9VcGRhdGUoSW50UmVj dCgwLCAwLCAxMDAsIDEwMCksIDApOworICAgIGxheWVyLT51cGRhdGVDb21wb3NpdG9yUmVzb3Vy Y2VzKDAsIHVwZGF0ZXIpOworICAgIGxheWVyLT5wdXNoUHJvcGVydGllc1RvKGxheWVySW1wbC5n ZXQoKSk7CisKKyAgICAvLyBXZSBzaG91bGQgb25seSBoYXZlIHRoZSBmaXJzdCB0aWxlIHNpbmNl IHRoZSBvdGhlciB0aWxlIHdhcyBpbnZhbGlkYXRlZCBidXQgbm90IHBhaW50ZWQuCisgICAgRVhQ RUNUX1RSVUUobGF5ZXJJbXBsLT5oYXNUaWxlQXQoMCwgMCkpOworICAgIEVYUEVDVF9GQUxTRShs YXllckltcGwtPmhhc1RpbGVBdCgwLCAxKSk7Cit9CisKIFRFU1QoVGlsZWRMYXllckNocm9taXVt VGVzdCwgcHVzaElkbGVQYWludFRpbGVzKQogewogICAgIE93blB0cjxUZXh0dXJlTWFuYWdlcj4g dGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJlTWFuYWdlcjo6Y3JlYXRlKDQqMTAyNCoxMDI0LCAyKjEw MjQqMTAyNCwgMTAyNCk7Cg== 132644 2012-03-19 13:21:10 -0700 2012-03-19 14:37:16 -0700 Patch bug-81529-20120319162109.patch text/plain 7835 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTE1YTBmMGRhMmU3MzZl NDI3YzYyZjRhYWJhMjAzYTVkYzg2YmIzMy4uNmQ5ZDM5N2M1ZGQyOTJkNThhNmEzZDYzOWIyNDM0 ZjZmZGM3NDc5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTE5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gSW52 YWxpZGF0ZS91cGRhdGUgZXZpY3RlZCB0aWxlcyBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUyOQorCisgICAgICAgIFJldmll d2VkIGJ5IEFkcmllbm5lIFdhbGtlci4KKworICAgICAgICBBIHByZXZpb3VzIGNoYW5nZSBjYXVz ZWQgYSByZWdyZXNzaW9uIHdoZXJlIGV2aWN0ZWQgKGludmFsaWQpIHRpbGVzCisgICAgICAgIHdl cmUgbm8gbG9uZ2VyIG1hcmtlZCBhcyBkaXJ0eSBhbmQgdXBkYXRlZC4gVGhlIHJlZ3Jlc3Mgd2Fz IGNhdXNlZAorICAgICAgICBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODExNzUgYW5kIGlzIGZpeGVkIGhlcmUuCisKKyAgICAgICAgVW5pdCB0ZXN0OiBUaWxlZExh eWVyQ2hyb21pdW1UZXN0LnB1c2hEZWxldGVkVGlsZXMKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpVcGRhdGFibGVUaWxlOjpjb3B5QW5kQ2xlYXJEaXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpU aWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKToKKwogMjAxMi0wMy0xOSAg TGVvIFlhbmcgIDxsZW8ueWFuZ0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNr QmVycnldIEFkZCBQbGF0Zm9ybU1lZGlhRW5naW5lQ2xhc3NOYW1lIGZvciBibGFja2JlcnJ5IGlu IHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwppbmRleCAzODUyOGE0ODdjOWI5ZWU0YzczYTc5ODU0M2M3OGY4NWUzNDY4ZmEzLi4yMmM2YjQw ZDVkMDUyYmVkNjI2M2NmOGJhMDJiZmFkY2NiN2U3ZTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEyLTAzLTE5ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pA Y2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1bV0gSW52YWxpZGF0ZS91cGRhdGUgZXZp Y3RlZCB0aWxlcyBkdXJpbmcgY29tbWl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MTUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IEFkcmllbm5lIFdh bGtlci4KKworICAgICAgICAqIHRlc3RzL1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3QuY3BwOgorICAg ICAgICAoV1RGOjpURVNUKToKKyAgICAgICAgKFdURik6CisKKzIwMTItMDMtMTkgIERhbmEgSmFu c2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW2Nocm9taXVtXSBVbml0IHRl c3QgZml4LCBzYXZlIHRoZSBzaGFyZWRRdWFkU3RhdGUgd2hpbGUgdGhlIHF1YWRzIGhvbGQgYSBw b2ludGVyIHRvIGl0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04MTQ3NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmNwcAppbmRleCBmN2E0MDA4 NjIxYmE0NmY2ZTg0YTJkNzk4ZTFhMjg3NDhlNDFjOTNlLi43Yjg2NDQ0ZmI1NWY3OTIwYzMwNDQy MmQ1Y2NiZmEwZmVkZGIxYzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAKQEAg LTYzLDYgKzYzLDExIEBAIHB1YmxpYzoKICAgICBNYW5hZ2VkVGV4dHVyZSogbWFuYWdlZFRleHR1 cmUoKSB7IHJldHVybiBtX3RleHR1cmUtPnRleHR1cmUoKTsgfQogCiAgICAgYm9vbCBpc0RpcnR5 KCkgY29uc3QgeyByZXR1cm4gIW1fZGlydHlSZWN0LmlzRW1wdHkoKTsgfQorICAgIHZvaWQgY29w eUFuZENsZWFyRGlydHkoKQorICAgIHsKKyAgICAgICAgbV91cGRhdGVSZWN0ID0gbV9kaXJ0eVJl Y3Q7CisgICAgICAgIG1fZGlydHlSZWN0ID0gSW50UmVjdCgpOworICAgIH0KICAgICAvLyBSZXR1 cm5zIHdoZXRoZXIgdGhlIGxheWVyIHdhcyBkaXJ0eSBhbmQgbm90IHVwZGF0ZWQgaW4gdGhlIGN1 cnJlbnQgZnJhbWUuIEZvciB0aWxlcyB0aGF0IHdlcmUgbm90IGN1bGxlZCwgdGhlCiAgICAgLy8g dXBkYXRlUmVjdCBob2xkcyB0aGUgYXJlYSBvZiB0aGUgdGlsZSB0aGF0IHdhcyB1cGRhdGVkLiBP dGhlcndpc2UsIHRoZSBhcmVhIHRoYXQgd291bGQgaGF2ZSBiZWVuIHVwZGF0ZWQuCiAgICAgYm9v bCBpc0RpcnR5Rm9yQ3VycmVudEZyYW1lKCkgeyByZXR1cm4gIW1fZGlydHlSZWN0LmlzRW1wdHko KSAmJiAobV91cGRhdGVSZWN0LmlzRW1wdHkoKSB8fCBtX3VwZGF0ZUN1bGxlZCk7IH0KQEAgLTQx NCw4ICs0MTksMTAgQEAgdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRp bGVzKGJvb2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3AsIGludAogICAgICAgICAgICAgaWYgKCF0 aWxlKQogICAgICAgICAgICAgICAgIHRpbGUgPSBjcmVhdGVUaWxlKGksIGopOwogCi0gICAgICAg ICAgICAvLyBTYXZlIHRoZSBkaXJ0eSByZWN0IHNpbmNlIFdlYktpdCBjYW4gY2hhbmdlIHRoZSB0 aWxlJ3MgZGlydHkgcmVjdCBkdXJpbmcgcGFpbnRpbmcuCi0gICAgICAgICAgICB0aWxlLT5tX3Vw ZGF0ZVJlY3QgPSB0aWxlLT5tX2RpcnR5UmVjdDsKKyAgICAgICAgICAgIGlmICghdGlsZS0+bWFu YWdlZFRleHR1cmUoKS0+aXNWYWxpZChtX3RpbGVyLT50aWxlU2l6ZSgpLCBtX3RleHR1cmVGb3Jt YXQpKSB7CisgICAgICAgICAgICAgICAgLy8gU2V0cyB0aGUgZGlydHkgcmVjdCB0byBhIGZ1bGwt c2l6ZWQgdGlsZSB3aXRoIGJvcmRlciB0ZXhlbHMuCisgICAgICAgICAgICAgICAgdGlsZS0+bV9k aXJ0eVJlY3QgPSBtX3RpbGVyLT50aWxlUmVjdCh0aWxlKTsKKyAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgLy8gV2hlbiBub3QgaWRsZSBwYWludGluZywgaWYgdGhlIHZpc2libGUgcmVnaW9u IG9mIHRoZSB0aWxlIGlzIG9jY2x1ZGVkLCBkb24ndCByZXNlcnZlIGEgdGV4dHVyZSBvciB1cGRh dGUgdGhlIHRpbGUuCiAgICAgICAgICAgICAvLyBJZiBhbnkgcGFydCBvZiB0aGUgdGlsZSBpcyB2 aXNpYmxlLCB0aGVuIHdlIG5lZWQgdG8gdXBkYXRlIGl0IHNvIHRoZSB0aWxlIGlzIHB1c2hlZCB0 byB0aGUgaW1wbCB0aHJlYWQuCkBAIC00MjMsNiArNDMwLDggQEAgdm9pZCBUaWxlZExheWVyQ2hy b21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRsZSwgaW50IGxlZnQsIGludCB0b3As IGludAogICAgICAgICAgICAgICAgIEludFJlY3QgdmlzaWJsZVRpbGVSZWN0ID0gaW50ZXJzZWN0 aW9uKG1fdGlsZXItPnRpbGVCb3VuZHMoaSwgaiksIHZpc2libGVMYXllclJlY3QoKSk7CiAgICAg ICAgICAgICAgICAgaWYgKG9jY2x1c2lvbi0+b2NjbHVkZWQodGhpcywgdmlzaWJsZVRpbGVSZWN0 KSkgewogICAgICAgICAgICAgICAgICAgICB0aWxlLT5tX3VwZGF0ZUN1bGxlZCA9IHRydWU7Cisg ICAgICAgICAgICAgICAgICAgIC8vIFNhdmUgdGhlIGFyZWEgd2UgY3VsbGVkIGZvciByZWNvcmRp bmcgbWV0cmljcy4KKyAgICAgICAgICAgICAgICAgICAgdGlsZS0+bV91cGRhdGVSZWN0ID0gdGls ZS0+bV9kaXJ0eVJlY3Q7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTQzMSwxMCArNDQwLDggQEAgdm9pZCBUaWxlZExh eWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZVRpbGVzKGJvb2wgaWRsZSwgaW50IGxlZnQsIGlu dCB0b3AsIGludAogICAgICAgICAgICAgLy8gb2YgdXBkYXRlLiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzczNzYKICAgICAgICAgICAgIGlmICh0aWxlT25seU5lZWRz UGFydGlhbFVwZGF0ZSh0aWxlKSAmJiBsYXllclRyZWVIb3N0KCkgJiYgbGF5ZXJUcmVlSG9zdCgp LT5yZXF1ZXN0UGFydGlhbFRleHR1cmVVcGRhdGUoKSkKICAgICAgICAgICAgICAgICB0aWxlLT5t X3BhcnRpYWxVcGRhdGUgPSB0cnVlOwotICAgICAgICAgICAgZWxzZSBpZiAodGlsZU5lZWRzQnVm ZmVyZWRVcGRhdGUodGlsZSkgJiYgbGF5ZXJUcmVlSG9zdCgpKQorICAgICAgICAgICAgZWxzZSBp ZiAodGlsZU5lZWRzQnVmZmVyZWRVcGRhdGUodGlsZSkgJiYgbGF5ZXJUcmVlSG9zdCgpKSB7CiAg ICAgICAgICAgICAgICAgbGF5ZXJUcmVlSG9zdCgpLT5kZWxldGVUZXh0dXJlQWZ0ZXJDb21taXQo dGlsZS0+bWFuYWdlZFRleHR1cmUoKS0+c3RlYWwoKSk7Ci0KLSAgICAgICAgICAgIGlmICghdGls ZS0+bWFuYWdlZFRleHR1cmUoKS0+aXNWYWxpZChtX3RpbGVyLT50aWxlU2l6ZSgpLCBtX3RleHR1 cmVGb3JtYXQpKSB7CiAgICAgICAgICAgICAgICAgLy8gU2V0cyB0aGUgZGlydHkgcmVjdCB0byBh IGZ1bGwtc2l6ZWQgdGlsZSB3aXRoIGJvcmRlciB0ZXhlbHMuCiAgICAgICAgICAgICAgICAgdGls ZS0+bV9kaXJ0eVJlY3QgPSBtX3RpbGVyLT50aWxlUmVjdCh0aWxlKTsKICAgICAgICAgICAgIH0K QEAgLTQ1NCw4ICs0NjEsNyBAQCB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6cHJlcGFyZVRvVXBk YXRlVGlsZXMoYm9vbCBpZGxlLCBpbnQgbGVmdCwgaW50IHRvcCwgaW50CiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIGRpcnR5TGF5ZXJSZWN0LnVuaXRlKHRpbGUtPm1fZGlydHlSZWN0KTsK LSAgICAgICAgICAgIC8vIENsZWFyIHRoZSBkaXJ0eSByZWN0LgotICAgICAgICAgICAgdGlsZS0+ bV9kaXJ0eVJlY3QgPSBJbnRSZWN0KCk7CisgICAgICAgICAgICB0aWxlLT5jb3B5QW5kQ2xlYXJE aXJ0eSgpOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9UaWxlZExheWVyQ2hyb21pdW1UZXN0LmNwcAppbmRleCA3ZWViYjk3MTQ2 ODZhZWUxMTNiZTAyZmFhZTg1NmU1MjBhNjVjMThiLi44MzYzYzMxZjJmZWY4ODRjZmRhYTM3M2Fh ODhmMGExMjI0NTQ2MDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1RpbGVkTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvVGlsZWRMYXllckNocm9taXVtVGVzdC5jcHAKQEAgLTMzNSw2ICszMzUsNDggQEAgVEVT VChUaWxlZExheWVyQ2hyb21pdW1UZXN0LCBwdXNoT2NjbHVkZWREaXJ0eVRpbGVzKQogICAgIEVY UEVDVF9UUlVFKGxheWVySW1wbC0+aGFzVGlsZUF0KDAsIDEpKTsKIH0KIAorVEVTVChUaWxlZExh eWVyQ2hyb21pdW1UZXN0LCBwdXNoRGVsZXRlZFRpbGVzKQoreworICAgIE93blB0cjxUZXh0dXJl TWFuYWdlcj4gdGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJlTWFuYWdlcjo6Y3JlYXRlKDQqMTAyNCox MDI0LCAyKjEwMjQqMTAyNCwgMTAyNCk7CisgICAgUmVmUHRyPEZha2VUaWxlZExheWVyQ2hyb21p dW0+IGxheWVyID0gYWRvcHRSZWYobmV3IEZha2VUaWxlZExheWVyQ2hyb21pdW0odGV4dHVyZU1h bmFnZXIuZ2V0KCkpKTsKKyAgICBEZWJ1Z1Njb3BlZFNldEltcGxUaHJlYWQgaW1wbFRocmVhZDsK KyAgICBPd25QdHI8RmFrZUNDVGlsZWRMYXllckltcGw+IGxheWVySW1wbChhZG9wdFB0cihuZXcg RmFrZUNDVGlsZWRMYXllckltcGwoMCkpKTsKKworICAgIEZha2VUZXh0dXJlQWxsb2NhdG9yIHRl eHR1cmVBbGxvY2F0b3I7CisgICAgQ0NUZXh0dXJlVXBkYXRlciB1cGRhdGVyKCZ0ZXh0dXJlQWxs b2NhdG9yKTsKKworICAgIC8vIFRoZSB0aWxlIHNpemUgaXMgMTAweDEwMCwgc28gdGhpcyBpbnZh bGlkYXRlcyBhbmQgdGhlbiBwYWludHMgdHdvIHRpbGVzLgorICAgIGxheWVyLT5zZXRCb3VuZHMo SW50U2l6ZSgxMDAsIDIwMCkpOworICAgIGxheWVyLT5pbnZhbGlkYXRlUmVjdChJbnRSZWN0KDAs IDAsIDEwMCwgMjAwKSk7CisgICAgbGF5ZXItPnByZXBhcmVUb1VwZGF0ZShJbnRSZWN0KDAsIDAs IDEwMCwgMjAwKSwgMCk7CisgICAgbGF5ZXItPnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoMCwg dXBkYXRlcik7CisgICAgbGF5ZXItPnB1c2hQcm9wZXJ0aWVzVG8obGF5ZXJJbXBsLmdldCgpKTsK KworICAgIC8vIFdlIHNob3VsZCBoYXZlIGJvdGggdGlsZXMgb24gdGhlIGltcGwgc2lkZS4KKyAg ICBFWFBFQ1RfVFJVRShsYXllckltcGwtPmhhc1RpbGVBdCgwLCAwKSk7CisgICAgRVhQRUNUX1RS VUUobGF5ZXJJbXBsLT5oYXNUaWxlQXQoMCwgMSkpOworCisgICAgdGV4dHVyZU1hbmFnZXItPmV2 aWN0QW5kRGVsZXRlQWxsVGV4dHVyZXMoJnRleHR1cmVBbGxvY2F0b3IpOworICAgIHRleHR1cmVN YW5hZ2VyLT5zZXRNYXhNZW1vcnlMaW1pdEJ5dGVzKDQqMTAyNCoxMDI0KTsKKyAgICB0ZXh0dXJl TWFuYWdlci0+c2V0UHJlZmVycmVkTWVtb3J5TGltaXRCeXRlcyg0KjEwMjQqMTAyNCk7CisKKyAg ICAvLyBUaGlzIHNob3VsZCBkcm9wIHRoZSB0aWxlcyBvbiB0aGUgaW1wbCB0aHJlYWQuCisgICAg bGF5ZXItPnB1c2hQcm9wZXJ0aWVzVG8obGF5ZXJJbXBsLmdldCgpKTsKKworICAgIC8vIFdlIHNo b3VsZCBub3cgaGF2ZSBubyB0ZXh0dXJlcyBvbiB0aGUgaW1wbCB0aHJlYWQuCisgICAgRVhQRUNU X0ZBTFNFKGxheWVySW1wbC0+aGFzVGlsZUF0KDAsIDApKTsKKyAgICBFWFBFQ1RfRkFMU0UobGF5 ZXJJbXBsLT5oYXNUaWxlQXQoMCwgMSkpOworCisgICAgLy8gVGhpcyBzaG91bGQgcmVjcmVhdGUg YW5kIHVwZGF0ZSB0aGUgZGVsZXRlZCB0ZXh0dXJlcy4KKyAgICBsYXllci0+cHJlcGFyZVRvVXBk YXRlKEludFJlY3QoMCwgMCwgMTAwLCAxMDApLCAwKTsKKyAgICBsYXllci0+dXBkYXRlQ29tcG9z aXRvclJlc291cmNlcygwLCB1cGRhdGVyKTsKKyAgICBsYXllci0+cHVzaFByb3BlcnRpZXNUbyhs YXllckltcGwuZ2V0KCkpOworCisgICAgLy8gV2Ugc2hvdWxkIG9ubHkgaGF2ZSB0aGUgZmlyc3Qg dGlsZSBzaW5jZSB0aGUgb3RoZXIgdGlsZSB3YXMgaW52YWxpZGF0ZWQgYnV0IG5vdCBwYWludGVk LgorICAgIEVYUEVDVF9UUlVFKGxheWVySW1wbC0+aGFzVGlsZUF0KDAsIDApKTsKKyAgICBFWFBF Q1RfRkFMU0UobGF5ZXJJbXBsLT5oYXNUaWxlQXQoMCwgMSkpOworfQorCiBURVNUKFRpbGVkTGF5 ZXJDaHJvbWl1bVRlc3QsIHB1c2hJZGxlUGFpbnRUaWxlcykKIHsKICAgICBPd25QdHI8VGV4dHVy ZU1hbmFnZXI+IHRleHR1cmVNYW5hZ2VyID0gVGV4dHVyZU1hbmFnZXI6OmNyZWF0ZSg0KjEwMjQq MTAyNCwgMioxMDI0KjEwMjQsIDEwMjQpOwo=