59020 2011-04-20 13:22:24 -0700 [chromium] Fix incorrect scissor rect for layers that render into a rendersurface 2011-05-06 12:22:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 enne enne cmarrin enne eric jamesr vangelis oldest_to_newest 389466 0 enne 2011-04-20 13:22:24 -0700 [chromium] Fix incorrect scissor rect for layers that render into a rendersurface 389480 1 90399 enne 2011-04-20 13:33:05 -0700 Created attachment 90399 Patch 389489 2 enne 2011-04-20 13:37:57 -0700 I will point out that those few lines of code are essentially the same as what's in ContentLayerChromium::visibleLayerRect. However, given that bug 58840 is going to need to refactor this same code again, I saw no reason to try to do surgery and add a common code path for this calculation. This comes with a test though, so we'll know when we break it next time. :) 391097 3 enne 2011-04-22 14:53:16 -0700 Oops, I never CC'd anybody on this bug. No wonder it didn't get a review. Vangelis needs this commit for some of the layer sorting work. 391125 4 90399 jamesr 2011-04-22 15:12:34 -0700 Comment on attachment 90399 Patch The test looks like a good candidate for layoutTestController.dumpAsText(true); 391129 5 enne 2011-04-22 15:14:22 -0700 It's the scissor rect for drawing that's the problem, not the bounds on the layer itself. Unless I'm mistaken, that doesn't get dumped? 391130 6 jamesr 2011-04-22 15:15:34 -0700 I meant using dumpAsText(true) to avoid creating a render tree dump, since that's irrelevant to the test. The only useful output from this test is the pixel output. 391133 7 enne 2011-04-22 15:18:05 -0700 Oh, my mistake. How does that work for ports that don't do pixel tests? Would this test just be skipped? 391135 8 jamesr 2011-04-22 15:21:03 -0700 There's still text output, it's just the dumpAsText() output. For this test it'd probably be empty and the test would pass (trivially) on platforms that don't run pixel tests. 391186 9 90790 enne 2011-04-22 16:06:49 -0700 Created attachment 90790 Patch 391187 10 enne 2011-04-22 16:07:32 -0700 (In reply to comment #9) > Created an attachment (id=90790) [details] > Patch Oh, great. Thanks for the suggestion. :) 393148 11 90790 kbr 2011-04-26 17:11:36 -0700 Comment on attachment 90790 Patch Looks fine assuming it's been tested. 393742 12 enne 2011-04-27 13:21:20 -0700 Committed r85075: <http://trac.webkit.org/changeset/85075> 393852 13 enne 2011-04-27 14:53:51 -0700 Committed r85100: <http://trac.webkit.org/changeset/85100> 393853 14 enne 2011-04-27 14:54:19 -0700 This breaks deeply-nested-reflections. Will investigate and reland. 397102 15 enne 2011-05-03 08:41:55 -0700 (In reply to comment #14) > This breaks deeply-nested-reflections. Will investigate and reland. Ah, I see what the trouble is. Before my patch and with my patch it was trying to use the layer bounds as a scissor rect but it really needs to be scissoring to the render surface bounds instead. Of course, the render surface bounds aren't known until we've iterated through the layer tree and unioned all the layer bounds that are going into that render surface. However, the scissor rect for each layer is stored on that layer itself, rather than inherited from some higher level. So, some refactoring is needed to not have to do a "scissor rect update" pass or to only store/set the scissor rect where it's really needed (on clipping layers). 398465 16 92353 enne 2011-05-04 18:27:17 -0700 Created attachment 92353 Patch 398473 17 92353 kbr 2011-05-04 18:38:31 -0700 Comment on attachment 92353 Patch Vangelis should do the unofficial review of this patch, but my only comment is to make sure the new test doesn't turn any of the other platforms' bots red. 398474 18 enne 2011-05-04 18:43:02 -0700 Ok, here's another try. updatePropertiesEtcEtcEtc is kind of entangled and hard to follow, so it took me a while to sort out how best to fix this. I have some refactoring ideas though that can wait until after this patch. Here's a quick summary of this change. Prior to this bug, the scissor rect for some layers was being set incorrectly. It just happened to work out that in the majority of cases the scissor was large enough to not clip anything accidentally, but in some cases it did, which is demonstrated by the new test case. Setting the scissor rect based on the layer bounds as both the previous patch and the code before that patch tried to do is incorrect as the bounds of a layer don't contain its sublayers. Instead, it really needs to be set to the render surface size. However, this size is unfortunately not calculated until after we're done with the whole recursive updatePropertiesEtcEtcEtc call. So instead, when rendering into a render surface, the scissor rect for the layer subtree that's going into that render surface gets cleared, because it no longer applies. An empty scissor implies no scissor at all. The fallout from that is a number of places where we need to check for empty scissor rects and use the render surface size as the visible portion of the layer instead. 398475 19 enne 2011-05-04 18:44:34 -0700 (In reply to comment #17) > (From update of attachment 92353 [details]) > Vangelis should do the unofficial review of this patch, but my only comment is to make sure the new test doesn't turn any of the other platforms' bots red. As Chromium is the only port that does pixel tests and there's no text output from this test, this should work. I ran it on OSX with Safari a while back and it ran cleanly. It also didn't break anything but Chromium tests when it landed before, so I'm reasonably confident about it. 398843 20 92353 vangelis 2011-05-05 11:07:16 -0700 Comment on attachment 92353 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92353&action=review One small comment from me, otherwise LG. Thanks for fixing this up. > LayoutTests/platform/chromium/test_expectations.txt:3984 > +BUGENNE GPU : compositing/flat-with-transformed-child.html = FAIL MISSING Since you are adding a baseline for linux, shouldn't the be PASS FAIL MISSING or maybe better use MAC WINDOWS qualifiers > Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:912 > + bool isLayerVisible = layer->scissorRect().isEmpty() || layer->scissorRect().intersects(layerRect); Don't we need to check against the renderSurface's contentRect if the scissorRect is empty? 399101 21 92353 jamesr 2011-05-05 15:27:50 -0700 Comment on attachment 92353 Patch R=me - please address Vangelis' comments before landing. 399623 22 enne 2011-05-06 10:41:56 -0700 Committed r85959: <http://trac.webkit.org/changeset/85959> 399721 23 enne 2011-05-06 12:22:36 -0700 Committed r85970: <http://trac.webkit.org/changeset/85970> 90399 2011-04-20 13:33:05 -0700 2011-04-22 16:06:46 -0700 Patch bug-59020-20110420133304.patch text/plain 8277 enne U3VidmVyc2lvbiBSZXZpc2lvbjogODQ0MTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMDE2MWIyOGRlN2Y1MTFjYmVlYTc4 MWU1ZTRhYzk3ZTJmZDU4ZTRjLi4xODdkZjg3NTNlYmZiY2EyYjhhMzIzNDI0N2U0NDJiZjcyZjIw M2FmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMjAgIEFkcmllbm5lIFdhbGtlciAg PGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbY2hyb21pdW1dIEZpeCBpbmNvcnJlY3Qgc2Npc3NvciByZWN0IGZvciBsYXll cnMgdGhhdCByZW5kZXIgaW50byBhIHJlbmRlcnN1cmZhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MDIwCisKKyAgICAgICAgKiBjb21wb3NpdGlu Zy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBjb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQuaHRtbDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQt d2l0aC10cmFuc2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5jaGVja3N1bTogQWRkZWQuCisgICAgICAg ICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQtd2l0aC10cmFu c2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5wbmc6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2No cm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoKKwogMjAxMS0wMy0wNyAgVmljdG9yaWEgS2ly c3QgIDx2cmtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNaWhhaSBQYXJwYXJp dGEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNm b3JtZWQtY2hpbGQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZmxhdC13 aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jM2JlMTVkNzY3 NDFmZWQzZWE2OTdkZTFjMTZlMzQ0NjQ3OGZmNjUxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDExIEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVy VmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAor ICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAgUmVuZGVyQm9k eSB7Qk9EWX0gYXQgKDgsODApIHNpemUgNzg0eDQ0MAorbGF5ZXIgYXQgKDExNSwxMjApIHNpemUg MjB4MjAwCisgIFJlbmRlckJsb2NrIChwb3NpdGlvbmVkKSB7RElWfSBhdCAoMTE1LDEyMCkgc2l6 ZSAyMHgyMDAgW2JnY29sb3I9I0ZGMDAwMF0KK2xheWVyIGF0ICg4LDgwKSBzaXplIDMwMHgzMDAK KyAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSAzMDB4MzAwCitsYXllciBhdCAoOCw4 MCkgc2l6ZSAyODB4MjgwCisgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNpemUgMjgweDI4 MCBbYmdjb2xvcj0jMDA4MDAwXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv ZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGlu Zy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mM2RkMDA2OGVj OGU0ODNjYjk2NDc2YWUxNzU5ZTdjMGYyNWJiMmRkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLmh0bWwKQEAgLTAs MCArMSw0NiBAQAorPGh0bWw+Cis8aGVhZD4KKyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAg ICAjY29udGFpbmVyIHsKKyAgICAgIG1hcmdpbjogODBweCAwcHg7CisgICAgICBoZWlnaHQ6IDMw MHB4OworICAgICAgd2lkdGg6IDMwMHB4OworICAgICAgLXdlYmtpdC1wZXJzcGVjdGl2ZTogNTAw OworICAgIH0KKworICAgICNwYXJlbnQgeworICAgICAgd2lkdGg6IDI4MHB4OworICAgICAgaGVp Z2h0OiAyODBweDsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgICAgb3BhY2l0 eTogMC45OTk5OworICAgICAgLXdlYmtpdC10cmFuc2Zvcm0tc3R5bGU6IGZsYXQ7CisgICAgICAt d2Via2l0LXRyYW5zZm9ybTogcm90YXRlWSg4MGRlZyk7CisgICAgfQorCisgICAgI2NoaWxkIHsK KyAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgICAgLXdlYmtpdC10cmFuc2Zvcm06 IHRyYW5zbGF0ZVooMCk7CisgICAgfQorCisgICAgI2JhZCB7CisgICAgICBwb3NpdGlvbjogYWJz b2x1dGU7CisgICAgICB0b3A6IDEyMHB4OworICAgICAgbGVmdDogMTE1cHg7CisgICAgICB3aWR0 aDogMjBweDsKKyAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy ZWQ7CisgICAgfQorCisgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPCEtLSBUaGlzIGRp diBzaG91bGQgYmUgY292ZXJlZCB1cCAtLT4KKyAgPGRpdiBpZD0iYmFkIj48L2Rpdj4KKworICA8 ZGl2IGlkPSJjb250YWluZXIiPgorICAgIDxkaXYgaWQ9InBhcmVudCI+CisgICAgICA8ZGl2IGlk PSJjaGlsZCI+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBv c2l0aW5nL2ZsYXQtd2l0aC10cmFuc2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5jaGVja3N1bSBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdp dGgtdHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQuY2hlY2tzdW0KbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDJmYjhj MzJkMDc3ODM4NTkyZGYyYWVmZWYyMDcxZTQ3OTU5ZWQ5MgotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdp dGgtdHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQuY2hlY2tzdW0KQEAgLTAsMCArMSBAQAorYzA0 ZDk5YTMyZDRmYjcwNzQwYjJjODkzMGJjYzBkN2MKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS1ncHUtbGludXgvY29t cG9zaXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnBuZyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgt dHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVmZjU0OTI0NmJhZTg0 ZjA5NTBkMzBhNWFmMmQwNDg0NGMxM2QzMWEKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDMyMDAK emNtZUhLP0B2PV82aDNgem13TiNQV2JLRSNrJUZ8PHczLWdlcGhYYntXTmNXUjhva0RoKWZQOStS cCl8V2dJQH5oCnoxYEVUWFZ5WGY1IV84QFN0KjxkfHEkcyhZIylaazRpRWM1UEVHKElyPl5sQUF7 TCQ2enluWHY4PW9peVpfc3U9JAp6SW5RJlJ6VzFFOFhRaSloV2A7UWYwQXwqfFI8akNWaDZSOH4w PkwtTjdtYXAmJS0+bG4/Rj8/LTZxSCs5dz9XWTUKelp1V1JLbUp+Tzstd0JrdCVHfEMlYWpASnw7 dEIrVnVJOTRmckhPZ3AwQSRVc3VVV2IjSDJDLVJAcVReWFoyazhgCnpuX2VQNiYxc05zPChfIUdX NjZxdD8+JmVvdkxRVkEtPnooYyRhMjM5RjZ2RUMpJGp9dDE1Y2hMWlo2aXJefk5PMAp6K0tDPG0y K0hzITY4PSRpTE83eTYtamtPSk8qVDZBI2M3eVlQY3AkYHFtX1NOQjtoaHFkMmZwb0xaN0d2eDwl eXwKejU1YE4wWjF+cyFqa3l4UUQ7O09NNSZDLXAxcWN4Tld4RUwkRSVQdDwzZXlheyUtV1dLUDdN KXgyMTNxb3dpXzNhCnp6ZWBsTXhsUGJ1PHchZHNkeUQ5K1MwIS1tPDdBMEpKb2w+SlBTamI/RWdK ZChrd0hQfStVJGhMKHF1RWd0IUhVcgp6KSFUPEBII3ZjfkEybWc3YlFhVW0jQzEmRyFnayhCI2dB Wm9kbEJgMGpkM3JKRlB5Xm9zR3c5fT41Kj0oS3JZOSkKemlEKSk2bWFgOzxZUTtWJGx6KnptXzk1 S2BVTXt2RCVsVHx7SkVOMFE8KSpQKmlLdldqIVNzfVM4Z3RLMFdQKD1JCnphcmE3QEBza0J+YGlj WlFnYm9BYjxWaTt2dERjdVJfQ0M3VE1xfj5AYzV9OFA8TEpSMFE4fHQ3LTZgYm02e0NBdwp6MytN O3Y5diRZfEFFN05ZcVA4PmwyRHAzWW5SfU43PHdJO3lzXjshKFV9PDVzb3c7fDQ2U09uO0R5PWwx d050QCQKenV3T1RNRTdBeDJHfTAhZE8/YUxAaHk0NVQrdSFYYiZ9KmVsVXEpZVNIUEprT1d4eUR9 PkRxJDM0dj96K2kpLUd9CnpzYi09WEY/NUtKdWx4RTNNb14wQV55K25OKnFEOG8oYXhRKndZO3JV Tys8Rks4VVYtWTtjR19OVEV3VDcxd25WTAp6Xndec1M4ZEEtKjJvbXsoYHVVR0I2MFIxTTA/Wnop X09KTDEjbXdYTnFQSD0wUlp2RHhJTV9ncU1QaDhlQ2J3NT8KekFmNXF6UnZLbTZufjdHNTAlekcl O35LVElhb3ZPSTRuZEtSSjc4b2xwTzYoSnIobWooWGF2Km03VUQ4TWJaUXkmCnpPKFBsMypjSyFr SWpETE1CMDRwR3o1UGdyeVFTfGFybmVFemlSYyR7bEI9KmEyT0ZFUFB+WWNLQE1tP2o+YXEwJAp6 Znw5Xnl2Z1kjRU9JWEhTK099I1B4Yn58em1TZ0t7Y3peJXdLKT9MQkNsUGM7UkRNTkpGWWlIfmtE emxeeyojT2AKem0mbSE4YWdRXmU/TDt4ZGd8dzFzRkQyUnI2cUM8Zyl+ZDFkJjtqLUZOMnZXPlFF OX1eTHgqfGkhLSZlYSgqUn5hCnpqM0BMdXMyY0F8dHslM34ofSVQUGRDQntuejZucHxDZDlLaEk9 KiNZJk9DVkB8NThBR3QqPDchJS17SnhzWlo2UwoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMu dHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0 CmluZGV4IDFjMjAwYzY5YjYzNmZmYzJmYTgwNzMyOTQzYTI5MzQzY2ZiNmIyNDguLmM0ZDgwMTIz NjdjM2VlODY2ODdkNDgyNmZjMmJjZDRlMDNmMDRjOWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKQEAgLTM3NjAsMyArMzc2 MCw2IEBAIEJVR0NSODAwMTEgV0lOIExJTlVYIERFQlVHIDogZmFzdC9iYWNrZ3JvdW5kcy9zb2xp ZC1jb2xvci1jb250ZXh0LXJlc3RvcmUuaHRtbCA9CiBCVUdDUjgwMDExIFdJTiBMSU5VWCBERUJV RyA6IGZhc3QvY3NzL2FjaWQyLXBpeGVsLmh0bWwgPSBDUkFTSAogQlVHQ1I4MDAxMSBXSU4gTElO VVggREVCVUcgOiBmYXN0L2ZyYW1lcy9jb250ZW50LW9wYWNpdHktMS5odG1sID0gQ1JBU0gKIEJV R0NSODAwMTEgV0lOIExJTlVYIERFQlVHIDogZmFzdC9mcmFtZXMvY29udGVudC1vcGFjaXR5LTIu aHRtbCA9IENSQVNICisKKy8vIE5lZWRzIGJhc2VsaW5lcyBldmVyeXdoZXJlCitCVUdFTk5FIDog Y29tcG9zaXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLmh0bWwgPSBGQUlMCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggYjMzZjMyZjNhOTJiMTU5YmViZDk5ZDdkZDg1Y2JiNzExNGUyMWJjOS4uYzI4NWUx NGYwMGU0ZWVjNTBlMWQ3YmQ2NThiODZiYWYxYzliN2Q3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDExLTA0LTIwICBBZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVt XSBGaXggaW5jb3JyZWN0IHNjaXNzb3IgcmVjdCBmb3IgbGF5ZXJzIHRoYXQgcmVuZGVyIGludG8g YSByZW5kZXJzdXJmYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01OTAyMAorCisgICAgICAgIG1hcFJlY3QgaXMgdGhlIGluY29ycmVjdCB0cmFuc2Zv cm0gaGVyZS4gIFRoZSBwYXJlbnQgc2Npc3NvciByZWN0CisgICAgICAgIG5lZWRzIHRvIGJlIHBy b2plY3RlZCBpbnRvIGxheWVyIHNwYWNlIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDogY29tcG9z aXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLmh0bWwKKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVByb3BlcnRpZXNBbmRSZW5k ZXJTdXJmYWNlcyk6CisKIDIwMTEtMDQtMjAgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21p dW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJS ZW5kZXJlckNocm9taXVtLmNwcAppbmRleCAyN2E2N2U5MDI4OTY1NjdjMzQ5M2FmZjQ5OWE3NDY5 NjU1ZTcwM2JmLi5iOTdlMTNlMGExZThlZDJlY2RmODg1YjM1NmVlN2MxMmJmNzVjMTZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJl bmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTU4Nyw5ICs1ODcsMTMgQEAg dm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVByb3BlcnRpZXNBbmRSZW5kZXJTdXJm YWNlcyhMYXllckNocm9taXVtKiBsYXkKICAgICAgICAgbGF5ZXJPcmlnaW5UcmFuc2Zvcm0udHJh bnNsYXRlM2QoLTAuNSAqIGJvdW5kcy53aWR0aCgpLCAtMC41ICogYm91bmRzLmhlaWdodCgpLCAw KTsKICAgICAgICAgcmVuZGVyU3VyZmFjZS0+bV9vcmlnaW5UcmFuc2Zvcm0gPSBsYXllck9yaWdp blRyYW5zZm9ybTsKICAgICAgICAgaWYgKGxheWVyT3JpZ2luVHJhbnNmb3JtLmlzSW52ZXJ0aWJs ZSgpICYmIGRyYXdMYXllci0+c3VwZXJsYXllcigpKSB7CisgICAgICAgICAgICAvLyBUcmFuc2Zv cm0gcGFyZW50IHNjaXNzb3IgcmVjdCBpbnRvIHRoZSBzcGFjZSBvZiB0aGUgbGF5ZXIuCisgICAg ICAgICAgICBJbnRSZWN0IHBhcmVudFNjaXNzb3IgPSBkcmF3TGF5ZXItPnN1cGVybGF5ZXIoKS0+ c2Npc3NvclJlY3QoKTsKKyAgICAgICAgICAgIHBhcmVudFNjaXNzb3IuaW50ZXJzZWN0KGxheWVy T3JpZ2luVHJhbnNmb3JtLm1hcFJlY3QodHJhbnNmb3JtZWRMYXllclJlY3QpKTsKICAgICAgICAg ICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHBhcmVudFRvTGF5ZXIgPSBsYXllck9yaWdpblRyYW5z Zm9ybS5pbnZlcnNlKCk7Ci0KLSAgICAgICAgICAgIGRyYXdMYXllci0+c2V0U2Npc3NvclJlY3Qo cGFyZW50VG9MYXllci5tYXBSZWN0KGRyYXdMYXllci0+c3VwZXJsYXllcigpLT5zY2lzc29yUmVj dCgpKSk7CisgICAgICAgICAgICBJbnRSZWN0IHNjaXNzb3IgPSBwYXJlbnRUb0xheWVyLnByb2pl Y3RRdWFkKEZsb2F0UXVhZChGbG9hdFJlY3QocGFyZW50U2Npc3NvcikpKS5lbmNsb3NpbmdCb3Vu ZGluZ0JveCgpOworICAgICAgICAgICAgc2Npc3Nvci5pbnRlcnNlY3QodHJhbnNmb3JtZWRMYXll clJlY3QpOworICAgICAgICAgICAgZHJhd0xheWVyLT5zZXRTY2lzc29yUmVjdChzY2lzc29yKTsK ICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBkcmF3TGF5ZXItPnNldFNjaXNzb3JSZWN0KElu dFJlY3QoKSk7CiAK 90790 2011-04-22 16:06:49 -0700 2011-05-04 18:27:14 -0700 Patch bug-59020-20110422160648.patch text/plain 7827 enne U3VidmVyc2lvbiBSZXZpc2lvbjogODQ2OTgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhNmFiOTkzMTMwNDc2MzhiZjk5ZWI4 YmQ2M2FhYzQ1NGYxMjE1Njg0Li4xYWJhZjcyYmQ0NDZmZTJjZGM0MzRkNGYzZTQ3NmJhZTNjZWM1 MjRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMjAgIEFkcmllbm5lIFdhbGtlciAg PGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbY2hyb21pdW1dIEZpeCBpbmNvcnJlY3Qgc2Npc3NvciByZWN0IGZvciBsYXll cnMgdGhhdCByZW5kZXIgaW50byBhIHJlbmRlcnN1cmZhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MDIwCisKKyAgICAgICAgKiBjb21wb3NpdGlu Zy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBjb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQuaHRtbDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQt d2l0aC10cmFuc2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5jaGVja3N1bTogQWRkZWQuCisgICAgICAg ICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQtd2l0aC10cmFu c2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5wbmc6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2No cm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoKKwogMjAxMS0wNC0yMiAgWGlhb21laSBKaSAg PHhqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmViYXNlbGluZSBhZnRlciByODQ2NTkuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQt Y2hpbGQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZmxhdC13aXRoLXRy YW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5MWZlOTY5 MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv Y29tcG9zaXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxIEBACisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2ZsYXQtd2l0 aC10cmFuc2Zvcm1lZC1jaGlsZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZmxhdC13 aXRoLXRyYW5zZm9ybWVkLWNoaWxkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODY1YzkyNDFjZDc2MjNkMmM2 MTNmZGY2Yjg0MDRiYjYyMGMxMTE5YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL2ZsYXQtd2l0aC10cmFuc2Zvcm1lZC1jaGlsZC5odG1sCkBAIC0wLDAgKzEsNDkg QEAKKzxodG1sPgorPGhlYWQ+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgI2NvbnRh aW5lciB7CisgICAgICBtYXJnaW46IDgwcHggMHB4OworICAgICAgaGVpZ2h0OiAzMDBweDsKKyAg ICAgIHdpZHRoOiAzMDBweDsKKyAgICAgIC13ZWJraXQtcGVyc3BlY3RpdmU6IDUwMDsKKyAgICB9 CisKKyAgICAjcGFyZW50IHsKKyAgICAgIHdpZHRoOiAyODBweDsKKyAgICAgIGhlaWdodDogMjgw cHg7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgIG9wYWNpdHk6IDAuOTk5 OTsKKyAgICAgIC13ZWJraXQtdHJhbnNmb3JtLXN0eWxlOiBmbGF0OworICAgICAgLXdlYmtpdC10 cmFuc2Zvcm06IHJvdGF0ZVkoODBkZWcpOworICAgIH0KKworICAgICNjaGlsZCB7CisgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xh dGVaKDApOworICAgIH0KKworICAgICNiYWQgeworICAgICAgcG9zaXRpb246IGFic29sdXRlOwor ICAgICAgdG9wOiAxMjBweDsKKyAgICAgIGxlZnQ6IDExNXB4OworICAgICAgd2lkdGg6IDIwcHg7 CisgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAg IH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250 cm9sbGVyKQorICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCh0cnVlKTsKKyAg PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPCEtLSBUaGlzIGRpdiBzaG91bGQgYmUgY292 ZXJlZCB1cCAtLT4KKyAgPGRpdiBpZD0iYmFkIj48L2Rpdj4KKworICA8ZGl2IGlkPSJjb250YWlu ZXIiPgorICAgIDxkaXYgaWQ9InBhcmVudCI+CisgICAgICA8ZGl2IGlkPSJjaGlsZCI+PC9kaXY+ CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQtd2l0 aC10cmFuc2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5jaGVja3N1bSBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQt Y2hpbGQtZXhwZWN0ZWQuY2hlY2tzdW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDJmYjhjMzJkMDc3ODM4NTkyZGYy YWVmZWYyMDcxZTQ3OTU5ZWQ5MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQt Y2hpbGQtZXhwZWN0ZWQuY2hlY2tzdW0KQEAgLTAsMCArMSBAQAorYzA0ZDk5YTMyZDRmYjcwNzQw YjJjODkzMGJjYzBkN2MKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS1ncHUtbGludXgvY29tcG9zaXRpbmcvZmxhdC13 aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnBuZyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hp bGQtZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVmZjU0OTI0NmJhZTg0ZjA5NTBkMzBhNWFmMmQw NDg0NGMxM2QzMWEKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDMyMDAKemNtZUhLP0B2PV82aDNg em13TiNQV2JLRSNrJUZ8PHczLWdlcGhYYntXTmNXUjhva0RoKWZQOStScCl8V2dJQH5oCnoxYEVU WFZ5WGY1IV84QFN0KjxkfHEkcyhZIylaazRpRWM1UEVHKElyPl5sQUF7TCQ2enluWHY4PW9peVpf c3U9JAp6SW5RJlJ6VzFFOFhRaSloV2A7UWYwQXwqfFI8akNWaDZSOH4wPkwtTjdtYXAmJS0+bG4/ Rj8/LTZxSCs5dz9XWTUKelp1V1JLbUp+Tzstd0JrdCVHfEMlYWpASnw7dEIrVnVJOTRmckhPZ3Aw QSRVc3VVV2IjSDJDLVJAcVReWFoyazhgCnpuX2VQNiYxc05zPChfIUdXNjZxdD8+JmVvdkxRVkEt PnooYyRhMjM5RjZ2RUMpJGp9dDE1Y2hMWlo2aXJefk5PMAp6K0tDPG0yK0hzITY4PSRpTE83eTYt amtPSk8qVDZBI2M3eVlQY3AkYHFtX1NOQjtoaHFkMmZwb0xaN0d2eDwleXwKejU1YE4wWjF+cyFq a3l4UUQ7O09NNSZDLXAxcWN4Tld4RUwkRSVQdDwzZXlheyUtV1dLUDdNKXgyMTNxb3dpXzNhCnp6 ZWBsTXhsUGJ1PHchZHNkeUQ5K1MwIS1tPDdBMEpKb2w+SlBTamI/RWdKZChrd0hQfStVJGhMKHF1 RWd0IUhVcgp6KSFUPEBII3ZjfkEybWc3YlFhVW0jQzEmRyFnayhCI2dBWm9kbEJgMGpkM3JKRlB5 Xm9zR3c5fT41Kj0oS3JZOSkKemlEKSk2bWFgOzxZUTtWJGx6KnptXzk1S2BVTXt2RCVsVHx7SkVO MFE8KSpQKmlLdldqIVNzfVM4Z3RLMFdQKD1JCnphcmE3QEBza0J+YGljWlFnYm9BYjxWaTt2dERj dVJfQ0M3VE1xfj5AYzV9OFA8TEpSMFE4fHQ3LTZgYm02e0NBdwp6MytNO3Y5diRZfEFFN05ZcVA4 PmwyRHAzWW5SfU43PHdJO3lzXjshKFV9PDVzb3c7fDQ2U09uO0R5PWwxd050QCQKenV3T1RNRTdB eDJHfTAhZE8/YUxAaHk0NVQrdSFYYiZ9KmVsVXEpZVNIUEprT1d4eUR9PkRxJDM0dj96K2kpLUd9 CnpzYi09WEY/NUtKdWx4RTNNb14wQV55K25OKnFEOG8oYXhRKndZO3JVTys8Rks4VVYtWTtjR19O VEV3VDcxd25WTAp6Xndec1M4ZEEtKjJvbXsoYHVVR0I2MFIxTTA/WnopX09KTDEjbXdYTnFQSD0w Ulp2RHhJTV9ncU1QaDhlQ2J3NT8KekFmNXF6UnZLbTZufjdHNTAlekclO35LVElhb3ZPSTRuZEtS Sjc4b2xwTzYoSnIobWooWGF2Km03VUQ4TWJaUXkmCnpPKFBsMypjSyFrSWpETE1CMDRwR3o1UGdy eVFTfGFybmVFemlSYyR7bEI9KmEyT0ZFUFB+WWNLQE1tP2o+YXEwJAp6Znw5Xnl2Z1kjRU9JWEhT K099I1B4Yn58em1TZ0t7Y3peJXdLKT9MQkNsUGM7UkRNTkpGWWlIfmtEemxeeyojT2AKem0mbSE4 YWdRXmU/TDt4ZGd8dzFzRkQyUnI2cUM8Zyl+ZDFkJjtqLUZOMnZXPlFFOX1eTHgqfGkhLSZlYSgq Un5hCnpqM0BMdXMyY0F8dHslM34ofSVQUGRDQntuejZucHxDZDlLaEk9KiNZJk9DVkB8NThBR3Qq PDchJS17SnhzWlo2UwoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CmluZGV4IGMxMWQ0MDBk YmQ4NjI1ZmE3ZDBjZGJkOWZjNDEyNjdiMTRhZTJiZmUuLjkyODE3OTEwYmU1M2QyMjlkZjI1MDY2 ZDBmYWI1MDY2NzYwNTMyYzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9t aXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKQEAgLTM5MDksMyArMzkwOSw2IEBAIEJVR1dLNTkx NzIgOiBmYXN0L2h0bWwvZGV0YWlscy1yZW1vdmUtc3VtbWFyeS02Lmh0bWwgPSBJTUFHRStURVhU CiBCVUdXSzU5MTcyIDogZmFzdC9odG1sL2RldGFpbHMtd3JpdGluZy1tb2RlLmh0bWwgPSBJTUFH RStURVhUCiAKIEJVR0NSODAzMDEgTUFDIDogZmFzdC9jYW52YXMvY2FudmFzLWxhcmdlZHJhd3Mu aHRtbCA9IFRJTUVPVVQKKworLy8gTmVlZHMgYmFzZWxpbmVzIGV2ZXJ5d2hlcmUKK0JVR0VOTkUg OiBjb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQuaHRtbCA9IEZBSUwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCBmY2ZkZGQwYWJiZmI1MDU4YmVhMzJjZDQxY2YxOGNhYmYxZGFlOGM3Li41ZWVj MjU2N2IwNTdmYjgzZTJjOWUxMGE1YjExODVmN2JlYzhjYmYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMTEtMDQtMjAgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21p dW1dIEZpeCBpbmNvcnJlY3Qgc2Npc3NvciByZWN0IGZvciBsYXllcnMgdGhhdCByZW5kZXIgaW50 byBhIHJlbmRlcnN1cmZhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU5MDIwCisKKyAgICAgICAgbWFwUmVjdCBpcyB0aGUgaW5jb3JyZWN0IHRyYW5z Zm9ybSBoZXJlLiAgVGhlIHBhcmVudCBzY2lzc29yIHJlY3QKKyAgICAgICAgbmVlZHMgdG8gYmUg cHJvamVjdGVkIGludG8gbGF5ZXIgc3BhY2UgaW5zdGVhZC4KKworICAgICAgICBUZXN0OiBjb21w b3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUHJvcGVydGllc0FuZFJl bmRlclN1cmZhY2VzKToKKwogMjAxMS0wNC0yMiAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVy Q2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v TGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBlNjJiNjc0MWE5M2I4Y2MxN2ViNGUxZjgx MmNhN2U5ZGY1NTE1OGJlLi4xYjRmNmFmNjZhN2MwOWJiMDlhYmM4ZDU2NjlkOTEwZWMyZTk1OTc5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTYyOCw5ICs2Mjgs MTMgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVByb3BlcnRpZXNBbmRSZW5k ZXJTdXJmYWNlcyhMYXllckNocm9taXVtKiBsYXkKICAgICAgICAgbGF5ZXJPcmlnaW5UcmFuc2Zv cm0udHJhbnNsYXRlM2QoLTAuNSAqIGJvdW5kcy53aWR0aCgpLCAtMC41ICogYm91bmRzLmhlaWdo dCgpLCAwKTsKICAgICAgICAgcmVuZGVyU3VyZmFjZS0+bV9vcmlnaW5UcmFuc2Zvcm0gPSBsYXll ck9yaWdpblRyYW5zZm9ybTsKICAgICAgICAgaWYgKGxheWVyT3JpZ2luVHJhbnNmb3JtLmlzSW52 ZXJ0aWJsZSgpICYmIGRyYXdMYXllci0+c3VwZXJsYXllcigpKSB7CisgICAgICAgICAgICAvLyBU cmFuc2Zvcm0gcGFyZW50IHNjaXNzb3IgcmVjdCBpbnRvIHRoZSBzcGFjZSBvZiB0aGUgbGF5ZXIu CisgICAgICAgICAgICBJbnRSZWN0IHBhcmVudFNjaXNzb3IgPSBkcmF3TGF5ZXItPnN1cGVybGF5 ZXIoKS0+c2Npc3NvclJlY3QoKTsKKyAgICAgICAgICAgIHBhcmVudFNjaXNzb3IuaW50ZXJzZWN0 KGxheWVyT3JpZ2luVHJhbnNmb3JtLm1hcFJlY3QodHJhbnNmb3JtZWRMYXllclJlY3QpKTsKICAg ICAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHBhcmVudFRvTGF5ZXIgPSBsYXllck9yaWdp blRyYW5zZm9ybS5pbnZlcnNlKCk7Ci0KLSAgICAgICAgICAgIGRyYXdMYXllci0+c2V0U2Npc3Nv clJlY3QocGFyZW50VG9MYXllci5tYXBSZWN0KGRyYXdMYXllci0+c3VwZXJsYXllcigpLT5zY2lz c29yUmVjdCgpKSk7CisgICAgICAgICAgICBJbnRSZWN0IHNjaXNzb3IgPSBwYXJlbnRUb0xheWVy LnByb2plY3RRdWFkKEZsb2F0UXVhZChGbG9hdFJlY3QocGFyZW50U2Npc3NvcikpKS5lbmNsb3Np bmdCb3VuZGluZ0JveCgpOworICAgICAgICAgICAgc2Npc3Nvci5pbnRlcnNlY3QodHJhbnNmb3Jt ZWRMYXllclJlY3QpOworICAgICAgICAgICAgZHJhd0xheWVyLT5zZXRTY2lzc29yUmVjdChzY2lz c29yKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBkcmF3TGF5ZXItPnNldFNjaXNzb3JS ZWN0KEludFJlY3QoKSk7CiAK 92353 2011-05-04 18:27:17 -0700 2011-05-05 15:27:50 -0700 Patch bug-59020-20110504182716.patch text/plain 11928 enne U3VidmVyc2lvbiBSZXZpc2lvbjogODU4MTcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3ZWIzYzZkY2JiYzE0MDM1Njc0Mzdj ZjllNzNkYTJiNWY1MmQzMDY1Li5iNmViMzFkNTk5M2M0NzE3YjVkM2ZiNDEzOTFmNDliOTMzZTAx MjUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDUtMDQgIEFkcmllbm5lIFdhbGtlciAg PGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbY2hyb21pdW1dIEZpeCBpbmNvcnJlY3Qgc2Npc3NvciByZWN0IGZvciBsYXll cnMgdGhhdCByZW5kZXIgaW50byBhIHJlbmRlcnN1cmZhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MDIwCisKKyAgICAgICAgKiBjb21wb3NpdGlu Zy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBjb21wb3NpdGluZy9mbGF0LXdpdGgtdHJhbnNmb3JtZWQtY2hpbGQuaHRtbDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQt d2l0aC10cmFuc2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5jaGVja3N1bTogQWRkZWQuCisgICAgICAg ICogcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0aW5nL2ZsYXQtd2l0aC10cmFu c2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5wbmc6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2No cm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoKKwogMjAxMS0wNS0wNCAgTU9SSVRBIEhhamlt ZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIG1hcmtpbmcgZmxh a3kgdGVzdHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9mbGF0LXdpdGgt dHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv ZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEz Nzg5MTc5MWZlOTY5MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxIEBACisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL2ZsYXQtd2l0aC10cmFuc2Zvcm1lZC1jaGlsZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODY1Yzky NDFjZDc2MjNkMmM2MTNmZGY2Yjg0MDRiYjYyMGMxMTE5YgotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2NvbXBvc2l0aW5nL2ZsYXQtd2l0aC10cmFuc2Zvcm1lZC1jaGlsZC5odG1sCkBA IC0wLDAgKzEsNDkgQEAKKzxodG1sPgorPGhlYWQ+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+ CisgICAgI2NvbnRhaW5lciB7CisgICAgICBtYXJnaW46IDgwcHggMHB4OworICAgICAgaGVpZ2h0 OiAzMDBweDsKKyAgICAgIHdpZHRoOiAzMDBweDsKKyAgICAgIC13ZWJraXQtcGVyc3BlY3RpdmU6 IDUwMDsKKyAgICB9CisKKyAgICAjcGFyZW50IHsKKyAgICAgIHdpZHRoOiAyODBweDsKKyAgICAg IGhlaWdodDogMjgwcHg7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgIG9w YWNpdHk6IDAuOTk5OTsKKyAgICAgIC13ZWJraXQtdHJhbnNmb3JtLXN0eWxlOiBmbGF0OworICAg ICAgLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZVkoODBkZWcpOworICAgIH0KKworICAgICNjaGls ZCB7CisgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgIC13ZWJraXQtdHJhbnNm b3JtOiB0cmFuc2xhdGVaKDApOworICAgIH0KKworICAgICNiYWQgeworICAgICAgcG9zaXRpb246 IGFic29sdXRlOworICAgICAgdG9wOiAxMjBweDsKKyAgICAgIGxlZnQ6IDExNXB4OworICAgICAg d2lkdGg6IDIwcHg7CisgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgYmFja2dyb3VuZC1jb2xv cjogcmVkOworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdD4KKyAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKQorICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4 dCh0cnVlKTsKKyAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPCEtLSBUaGlzIGRpdiBz aG91bGQgYmUgY292ZXJlZCB1cCAtLT4KKyAgPGRpdiBpZD0iYmFkIj48L2Rpdj4KKworICA8ZGl2 IGlkPSJjb250YWluZXIiPgorICAgIDxkaXYgaWQ9InBhcmVudCI+CisgICAgICA8ZGl2IGlkPSJj aGlsZCI+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tZ3B1LWxpbnV4L2NvbXBvc2l0 aW5nL2ZsYXQtd2l0aC10cmFuc2Zvcm1lZC1jaGlsZC1leHBlY3RlZC5jaGVja3N1bSBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgt dHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQuY2hlY2tzdW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDJmYjhjMzJk MDc3ODM4NTkyZGYyYWVmZWYyMDcxZTQ3OTU5ZWQ5MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgt dHJhbnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQuY2hlY2tzdW0KQEAgLTAsMCArMSBAQAorYzA0ZDk5 YTMyZDRmYjcwNzQwYjJjODkzMGJjYzBkN2MKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS1ncHUtbGludXgvY29tcG9z aXRpbmcvZmxhdC13aXRoLXRyYW5zZm9ybWVkLWNoaWxkLWV4cGVjdGVkLnBuZyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2Nocm9taXVtLWdwdS1saW51eC9jb21wb3NpdGluZy9mbGF0LXdpdGgtdHJh bnNmb3JtZWQtY2hpbGQtZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVmZjU0OTI0NmJhZTg0ZjA5 NTBkMzBhNWFmMmQwNDg0NGMxM2QzMWEKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDMyMDAKemNt ZUhLP0B2PV82aDNgem13TiNQV2JLRSNrJUZ8PHczLWdlcGhYYntXTmNXUjhva0RoKWZQOStScCl8 V2dJQH5oCnoxYEVUWFZ5WGY1IV84QFN0KjxkfHEkcyhZIylaazRpRWM1UEVHKElyPl5sQUF7TCQ2 enluWHY4PW9peVpfc3U9JAp6SW5RJlJ6VzFFOFhRaSloV2A7UWYwQXwqfFI8akNWaDZSOH4wPkwt TjdtYXAmJS0+bG4/Rj8/LTZxSCs5dz9XWTUKelp1V1JLbUp+Tzstd0JrdCVHfEMlYWpASnw7dEIr VnVJOTRmckhPZ3AwQSRVc3VVV2IjSDJDLVJAcVReWFoyazhgCnpuX2VQNiYxc05zPChfIUdXNjZx dD8+JmVvdkxRVkEtPnooYyRhMjM5RjZ2RUMpJGp9dDE1Y2hMWlo2aXJefk5PMAp6K0tDPG0yK0hz ITY4PSRpTE83eTYtamtPSk8qVDZBI2M3eVlQY3AkYHFtX1NOQjtoaHFkMmZwb0xaN0d2eDwleXwK ejU1YE4wWjF+cyFqa3l4UUQ7O09NNSZDLXAxcWN4Tld4RUwkRSVQdDwzZXlheyUtV1dLUDdNKXgy MTNxb3dpXzNhCnp6ZWBsTXhsUGJ1PHchZHNkeUQ5K1MwIS1tPDdBMEpKb2w+SlBTamI/RWdKZChr d0hQfStVJGhMKHF1RWd0IUhVcgp6KSFUPEBII3ZjfkEybWc3YlFhVW0jQzEmRyFnayhCI2dBWm9k bEJgMGpkM3JKRlB5Xm9zR3c5fT41Kj0oS3JZOSkKemlEKSk2bWFgOzxZUTtWJGx6KnptXzk1S2BV TXt2RCVsVHx7SkVOMFE8KSpQKmlLdldqIVNzfVM4Z3RLMFdQKD1JCnphcmE3QEBza0J+YGljWlFn Ym9BYjxWaTt2dERjdVJfQ0M3VE1xfj5AYzV9OFA8TEpSMFE4fHQ3LTZgYm02e0NBdwp6MytNO3Y5 diRZfEFFN05ZcVA4PmwyRHAzWW5SfU43PHdJO3lzXjshKFV9PDVzb3c7fDQ2U09uO0R5PWwxd050 QCQKenV3T1RNRTdBeDJHfTAhZE8/YUxAaHk0NVQrdSFYYiZ9KmVsVXEpZVNIUEprT1d4eUR9PkRx JDM0dj96K2kpLUd9CnpzYi09WEY/NUtKdWx4RTNNb14wQV55K25OKnFEOG8oYXhRKndZO3JVTys8 Rks4VVYtWTtjR19OVEV3VDcxd25WTAp6Xndec1M4ZEEtKjJvbXsoYHVVR0I2MFIxTTA/WnopX09K TDEjbXdYTnFQSD0wUlp2RHhJTV9ncU1QaDhlQ2J3NT8KekFmNXF6UnZLbTZufjdHNTAlekclO35L VElhb3ZPSTRuZEtSSjc4b2xwTzYoSnIobWooWGF2Km03VUQ4TWJaUXkmCnpPKFBsMypjSyFrSWpE TE1CMDRwR3o1UGdyeVFTfGFybmVFemlSYyR7bEI9KmEyT0ZFUFB+WWNLQE1tP2o+YXEwJAp6Znw5 Xnl2Z1kjRU9JWEhTK099I1B4Yn58em1TZ0t7Y3peJXdLKT9MQkNsUGM7UkRNTkpGWWlIfmtEemxe eyojT2AKem0mbSE4YWdRXmU/TDt4ZGd8dzFzRkQyUnI2cUM8Zyl+ZDFkJjtqLUZOMnZXPlFFOX1e THgqfGkhLSZlYSgqUn5hCnpqM0BMdXMyY0F8dHslM34ofSVQUGRDQntuejZucHxDZDlLaEk9KiNZ Jk9DVkB8NThBR3QqPDchJS17SnhzWlo2UwoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0 IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0Cmlu ZGV4IDI2Y2FkOTdmMzA2NWQyMDg4NTVlNGNkNDc2YTY1ZmRjYzM5ODBjYWQuLmI3ODUyODMwOWE0 NDNjNWRjYzcyMTQzYzc0YzVjMDEyNGRlZjAxMWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKQEAgLTM5NzksMyArMzk3OSw2 IEBAIEJVR19IQ0xBTSA6IGZhc3QvdXJsL2lwdjYuaHRtbCA9IFRFWFQKIEJVR19IQ0xBTSBHUFUg OiBjb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci1pbWcuaHRtbCA9IEZBSUwKIAogQlVHV0s2 MDA3OSBMSU5VWCA6IHBsYXRmb3JtL2Nocm9taXVtLWxpbnV4L2Zhc3QvdGV4dC9pbnRlcm5hdGlv bmFsL2NvbXBsZXgtam9pbmluZy11c2luZy1ncG9zLmh0bWwgPSBJTUFHRQorCisvLyBOZWVkcyBi YXNlbGluZXMgZXZlcnl3aGVyZQorQlVHRU5ORSBHUFUgOiBjb21wb3NpdGluZy9mbGF0LXdpdGgt dHJhbnNmb3JtZWQtY2hpbGQuaHRtbCA9IEZBSUwgTUlTU0lORwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDIxNjNh NmFlOGYxMGM0ZWY2ZTBmZWRmMzlhYWNlZWE0NzRmYTQ3MDUuLjhmNGMzZmQ1ZGFmYjdiOTA3Njdk ZDQ2MGJlZjU4Y2ZkN2ZhNjgyOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMS0w NS0wNCAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRml4IGluY29ycmVj dCBzY2lzc29yIHJlY3QgZm9yIGxheWVycyB0aGF0IHJlbmRlciBpbnRvIGEgcmVuZGVyc3VyZmFj ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwMjAK KworICAgICAgICBBbGxvdyBmb3IgZW1wdHkgc2Npc3NvciByZWN0cywgd2hpY2ggaW1wbGllcyBz Y2lzc29yaW5nIHRvIHRoZSByZW5kZXIKKyAgICAgICAgc3VyZmFjZS4gVGhlIHByZXZpb3VzIGNv ZGUgYW5kIHByZXZpb3VzIHBhdGNoIG9uIHRoaXMgYnVnIGJvdGggZGlkbid0CisgICAgICAgIHRh a2UgaW50byBhY2NvdW50IHRoYXQgdGhlIHNjaXNzb3IgcmVjdCBzaG91bGQgYmUgdGhlIHJlbmRl ciBzdXJmYWNlCisgICAgICAgIGFuZCBub3QgdGhlIHByb2plY3Rpb24gb2YgdGhlIGxheWVyIGl0 c2VsZiwgYmVjYXVzZSBjaGlsZCBsYXllcnMKKyAgICAgICAgYXJlbid0IG5lY2Vzc2FyaWx5IGNv bnRhaW5lZCB3aXRoaW4gdGhlIGJvdW5kcyBvZiB0aGVpciBzdXBlcmxheWVyLgorCisgICAgICAg IFRlc3Q6IGNvbXBvc2l0aW5nL2ZsYXQtd2l0aC10cmFuc2Zvcm1lZC1jaGlsZC5odG1sCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpwYWludExheWVy Q29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRh dGVQcm9wZXJ0aWVzQW5kUmVuZGVyU3VyZmFjZXMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJS ZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5k ZXJlckNocm9taXVtOjpzZXRTY2lzc29yVG9SZWN0KToKKwogMjAxMS0wNS0wNCAgRnJpZHJpY2gg U3RyYmEgIDxmcmlkcmljaC5zdHJiYUBibHVld2luLmNoPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmlu ZGV4IDRlZmQ0MGQ4YjcyZjY2YjVhYjE0ZTM2NjZhMDA1MTM0ZmY5YjkyZDAuLjFmMTMxZGZhNDU2 ZTcxMjk3MDFlZjEyN2Q1NjMxM2MwZDMyZjA0ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJl ckNocm9taXVtLmNwcApAQCAtMzY1LDcgKzM2NSwxMCBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJv bWl1bTo6cGFpbnRMYXllckNvbnRlbnRzKGNvbnN0IExheWVyTGlzdCYgcmVuZGVyU3VyZmFjZUxh eQogICAgICAgICAgICAgaWYgKGxheWVyLT5ib3VuZHMoKS5pc0VtcHR5KCkpCiAgICAgICAgICAg ICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgIGNvbnN0IEludFJlY3QgdGFyZ2V0U3VyZmFj ZVJlY3QgPSBsYXllci0+Y2NMYXllckltcGwoKS0+c2Npc3NvclJlY3QoKTsKKyAgICAgICAgICAg IEludFJlY3QgdGFyZ2V0U3VyZmFjZVJlY3QgPSBjY0xheWVySW1wbC0+dGFyZ2V0UmVuZGVyU3Vy ZmFjZSgpID8gY2NMYXllckltcGwtPnRhcmdldFJlbmRlclN1cmZhY2UoKS0+Y29udGVudFJlY3Qo KSA6IG1fZGVmYXVsdFJlbmRlclN1cmZhY2UtPmNvbnRlbnRSZWN0KCk7CisgICAgICAgICAgICBJ bnRSZWN0IHNjaXNzb3JSZWN0ID0gbGF5ZXItPmNjTGF5ZXJJbXBsKCktPnNjaXNzb3JSZWN0KCk7 CisgICAgICAgICAgICBpZiAoIXNjaXNzb3JSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAg ICB0YXJnZXRTdXJmYWNlUmVjdC5pbnRlcnNlY3Qoc2Npc3NvclJlY3QpOwogCiAgICAgICAgICAg ICBpZiAobGF5ZXItPmRyYXdzQ29udGVudCgpKQogICAgICAgICAgICAgICAgIGxheWVyLT5wYWlu dENvbnRlbnRzSWZEaXJ0eSh0YXJnZXRTdXJmYWNlUmVjdCk7CkBAIC02MzksMTIgKzY0Miw3IEBA IHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVQcm9wZXJ0aWVzQW5kUmVuZGVyU3Vy ZmFjZXMoTGF5ZXJDaHJvbWl1bSogbGF5CiAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IGxh eWVyT3JpZ2luVHJhbnNmb3JtID0gY29tYmluZWRUcmFuc2Zvcm07CiAgICAgICAgIGxheWVyT3Jp Z2luVHJhbnNmb3JtLnRyYW5zbGF0ZTNkKC0wLjUgKiBib3VuZHMud2lkdGgoKSwgLTAuNSAqIGJv dW5kcy5oZWlnaHQoKSwgMCk7CiAgICAgICAgIHJlbmRlclN1cmZhY2UtPm1fb3JpZ2luVHJhbnNm b3JtID0gbGF5ZXJPcmlnaW5UcmFuc2Zvcm07Ci0gICAgICAgIGlmIChsYXllck9yaWdpblRyYW5z Zm9ybS5pc0ludmVydGlibGUoKSAmJiBkcmF3TGF5ZXItPnN1cGVybGF5ZXIoKSkgewotICAgICAg ICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggcGFyZW50VG9MYXllciA9IGxheWVyT3JpZ2luVHJh bnNmb3JtLmludmVyc2UoKTsKLQotICAgICAgICAgICAgZHJhd0xheWVyLT5zZXRTY2lzc29yUmVj dChwYXJlbnRUb0xheWVyLm1hcFJlY3QoZHJhd0xheWVyLT5zdXBlcmxheWVyKCktPnNjaXNzb3JS ZWN0KCkpKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBkcmF3TGF5ZXItPnNldFNjaXNz b3JSZWN0KEludFJlY3QoKSk7CisgICAgICAgIGRyYXdMYXllci0+c2V0U2Npc3NvclJlY3QoSW50 UmVjdCgpKTsKIAogICAgICAgICAvLyBUaGUgcmVuZGVyIHN1cmZhY2Ugc2Npc3NvciByZWN0IGlz IHRoZSBzY2lzc29yIHJlY3QgdGhhdCBuZWVkcyB0bwogICAgICAgICAvLyBiZSBhcHBsaWVkIGJl Zm9yZSBkcmF3aW5nIHRoZSByZW5kZXIgc3VyZmFjZSBvbnRvIGl0cyBjb250YWluaW5nCkBAIC02 ODQsOCArNjgyLDkgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVByb3BlcnRp ZXNBbmRSZW5kZXJTdXJmYWNlcyhMYXllckNocm9taXVtKiBsYXkKICAgICAgICAgICAgIGRyYXdM YXllci0+Y2xlYXJSZW5kZXJTdXJmYWNlKCk7CiAKICAgICAgICAgaWYgKGRyYXdMYXllci0+bWFz a3NUb0JvdW5kcygpKSB7Ci0gICAgICAgICAgICBJbnRSZWN0IHNjaXNzb3IgPSBkcmF3TGF5ZXIt PnNjaXNzb3JSZWN0KCk7Ci0gICAgICAgICAgICBzY2lzc29yLmludGVyc2VjdCh0cmFuc2Zvcm1l ZExheWVyUmVjdCk7CisgICAgICAgICAgICBJbnRSZWN0IHNjaXNzb3IgPSB0cmFuc2Zvcm1lZExh eWVyUmVjdDsKKyAgICAgICAgICAgIGlmICghZHJhd0xheWVyLT5zY2lzc29yUmVjdCgpLmlzRW1w dHkoKSkKKyAgICAgICAgICAgICAgICBzY2lzc29yLmludGVyc2VjdChkcmF3TGF5ZXItPnNjaXNz b3JSZWN0KCkpOwogICAgICAgICAgICAgZHJhd0xheWVyLT5zZXRTY2lzc29yUmVjdChzY2lzc29y KTsKICAgICAgICAgfQogICAgIH0KQEAgLTc2NSw3ICs3NjQsOCBAQCB2b2lkIExheWVyUmVuZGVy ZXJDaHJvbWl1bTo6dXBkYXRlUHJvcGVydGllc0FuZFJlbmRlclN1cmZhY2VzKExheWVyQ2hyb21p dW0qIGxheQogICAgICAgICAvLyBEb24ndCBjbGlwIGlmIHRoZSBsYXllciBpcyByZWZsZWN0ZWQg YXMgdGhlIHJlZmxlY3Rpb24gc2hvdWxkbid0IGJlCiAgICAgICAgIC8vIGNsaXBwZWQuCiAgICAg ICAgIGlmICghZHJhd0xheWVyLT5yZXBsaWNhTGF5ZXIoKSkgewotICAgICAgICAgICAgcmVuZGVy U3VyZmFjZS0+bV9jb250ZW50UmVjdC5pbnRlcnNlY3QoZHJhd0xheWVyLT5zY2lzc29yUmVjdCgp KTsKKyAgICAgICAgICAgIGlmICghZHJhd0xheWVyLT5zY2lzc29yUmVjdCgpLmlzRW1wdHkoKSkK KyAgICAgICAgICAgICAgICByZW5kZXJTdXJmYWNlLT5tX2NvbnRlbnRSZWN0LmludGVyc2VjdChk cmF3TGF5ZXItPnNjaXNzb3JSZWN0KCkpOwogICAgICAgICAgICAgRmxvYXRQb2ludCBjbGlwcGVk U3VyZmFjZUNlbnRlciA9IHJlbmRlclN1cmZhY2UtPmNvbnRlbnRSZWN0Q2VudGVyKCk7CiAgICAg ICAgICAgICBjZW50ZXJPZmZzZXREdWVUb0NsaXBwaW5nID0gY2xpcHBlZFN1cmZhY2VDZW50ZXIg LSBzdXJmYWNlQ2VudGVyOwogICAgICAgICB9CkBAIC05MDksNyArOTA5LDcgQEAgdm9pZCBMYXll clJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcihDQ0xheWVySW1wbCogbGF5ZXIsIFJlbmRlclN1 cmZhY2VDaHJvbWl1bSoKIAogICAgIC8vIENoZWNrIGlmIHRoZSBsYXllciBmYWxscyB3aXRoaW4g dGhlIHZpc2libGUgYm91bmRzIG9mIHRoZSBwYWdlLgogICAgIEludFJlY3QgbGF5ZXJSZWN0ID0g bGF5ZXItPmdldERyYXdSZWN0KCk7Ci0gICAgYm9vbCBpc0xheWVyVmlzaWJsZSA9IGxheWVyLT5z Y2lzc29yUmVjdCgpLmludGVyc2VjdHMobGF5ZXJSZWN0KTsKKyAgICBib29sIGlzTGF5ZXJWaXNp YmxlID0gbGF5ZXItPnNjaXNzb3JSZWN0KCkuaXNFbXB0eSgpIHx8IGxheWVyLT5zY2lzc29yUmVj dCgpLmludGVyc2VjdHMobGF5ZXJSZWN0KTsKICAgICBpZiAoIWlzTGF5ZXJWaXNpYmxlKSB7CiAg ICAgICAgIGxheWVyLT51bnJlc2VydmVDb250ZW50c1RleHR1cmUoKTsKICAgICAgICAgcmV0dXJu OwpAQCAtOTMzLDcgKzkzMywxMiBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xh eWVyKENDTGF5ZXJJbXBsKiBsYXllciwgUmVuZGVyU3VyZmFjZUNocm9taXVtKgogICAgICAgICB9 CiAgICAgfQogCi0gICAgbGF5ZXItPmRyYXcobGF5ZXItPnNjaXNzb3JSZWN0KCkpOworICAgIElu dFJlY3QgdGFyZ2V0U3VyZmFjZVJlY3QgPSBtX2N1cnJlbnRSZW5kZXJTdXJmYWNlID8gbV9jdXJy ZW50UmVuZGVyU3VyZmFjZS0+Y29udGVudFJlY3QoKSA6IG1fZGVmYXVsdFJlbmRlclN1cmZhY2Ut PmNvbnRlbnRSZWN0KCk7CisgICAgSW50UmVjdCBzY2lzc29yUmVjdCA9IGxheWVyLT5zY2lzc29y UmVjdCgpOworICAgIGlmICghc2Npc3NvclJlY3QuaXNFbXB0eSgpKQorICAgICAgICB0YXJnZXRT dXJmYWNlUmVjdC5pbnRlcnNlY3Qoc2Npc3NvclJlY3QpOworCisgICAgbGF5ZXItPmRyYXcodGFy Z2V0U3VyZmFjZVJlY3QpOwogCiAgICAgLy8gRHJhdyB0aGUgZGVidWcgYm9yZGVyIGlmIHRoZXJl IGlzIG9uZS4KICAgICBsYXllci0+ZHJhd0RlYnVnQm9yZGVyKCk7CkBAIC05NDEsMTAgKzk0Niwx MiBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVyKENDTGF5ZXJJbXBsKiBs YXllciwgUmVuZGVyU3VyZmFjZUNocm9taXVtKgogCiAvLyBTZXRzIHRoZSBzY2lzc29yIHJlZ2lv biB0byB0aGUgZ2l2ZW4gcmVjdGFuZ2xlLiBUaGUgY29vcmRpbmF0ZSBzeXN0ZW0gZm9yIHRoZQog Ly8gc2Npc3NvclJlY3QgaGFzIGl0cyBvcmlnaW4gYXQgdGhlIHRvcCBsZWZ0IGNvcm5lciBvZiB0 aGUgY3VycmVudCB2aXNpYmxlIHJlY3QuCi12b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6c2V0 U2Npc3NvclRvUmVjdChjb25zdCBJbnRSZWN0JiBzY2lzc29yUmVjdCkKK3ZvaWQgTGF5ZXJSZW5k ZXJlckNocm9taXVtOjpzZXRTY2lzc29yVG9SZWN0KGNvbnN0IEludFJlY3QmIHJlcXVlc3RlZFNj aXNzb3IpCiB7CiAgICAgSW50UmVjdCBjb250ZW50UmVjdCA9IChtX2N1cnJlbnRSZW5kZXJTdXJm YWNlID8gbV9jdXJyZW50UmVuZGVyU3VyZmFjZS0+bV9jb250ZW50UmVjdCA6IG1fZGVmYXVsdFJl bmRlclN1cmZhY2UtPm1fY29udGVudFJlY3QpOwogCisgICAgY29uc3QgSW50UmVjdCBzY2lzc29y UmVjdCA9IHJlcXVlc3RlZFNjaXNzb3IuaXNFbXB0eSgpID8gY29udGVudFJlY3QgOiByZXF1ZXN0 ZWRTY2lzc29yOworCiAgICAgLy8gVGhlIHNjaXNzb3IgY29vcmRpbmF0ZXMgbXVzdCBiZSBzdXBw bGllZCBpbiB2aWV3cG9ydCBzcGFjZSBzbyB3ZSBuZWVkIHRvIG9mZnNldAogICAgIC8vIGJ5IHRo ZSByZWxhdGl2ZSBwb3NpdGlvbiBvZiB0aGUgdG9wIGxlZnQgY29ybmVyIG9mIHRoZSBjdXJyZW50 IHJlbmRlciBzdXJmYWNlLgogICAgIGludCBzY2lzc29yWCA9IHNjaXNzb3JSZWN0LngoKSAtIGNv bnRlbnRSZWN0LngoKTsK