100458 2012-10-25 22:07:21 -0700 [chromium] Allow embedder to enter/leave force compositing mode 2012-10-27 11:02:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth dglazkov enne fishd roger_fong tkent+wkapi vangelis webkit.review.bot oldest_to_newest 751536 0 jamesr 2012-10-25 22:07:21 -0700 [chromium] Allow embedder to enter/leave force compositing mode 751537 1 170809 jamesr 2012-10-25 22:08:22 -0700 Created attachment 170809 work in progress 752317 2 170989 jamesr 2012-10-26 13:14:09 -0700 Created attachment 170989 Patch 752319 3 webkit.review.bot 2012-10-26 13:15:37 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 752320 4 jamesr 2012-10-26 13:16:53 -0700 After discussing with Enne I think the threaded mode solution will look a bit different and won't involve WebWidget interactions. This patch will still work fine for the single threaded path. 752325 5 170989 enne 2012-10-26 13:22:05 -0700 Comment on attachment 170989 Patch R=me. 752355 6 170997 jamesr 2012-10-26 13:57:05 -0700 Created attachment 170997 With more null checks so it can be called earlier 752477 7 170997 enne 2012-10-26 15:06:38 -0700 Comment on attachment 170997 With more null checks so it can be called earlier R=meagain. 752524 8 170997 webkit.review.bot 2012-10-26 16:03:42 -0700 Comment on attachment 170997 With more null checks so it can be called earlier Clearing flags on attachment: 170997 Committed r132708: <http://trac.webkit.org/changeset/132708> 752525 9 webkit.review.bot 2012-10-26 16:03:48 -0700 All reviewed patches have been landed. Closing bug. 752780 10 roger_fong 2012-10-27 09:23:15 -0700 There are about 15 crashes on each of the bots (Apple-Mac and Apple-Windows) that relate to compositing. http://build.webkit.org/builders/Apple%20Win%207%20Release%20%28Tests%29/builds/29310 It looks like within the regression range that this change is the most relevant. Do you think this could be causing the failures? 752796 11 abarth 2012-10-27 11:02:23 -0700 > Do you think this could be causing the failures? This code is not compiled for apple-mac or apple-win. 170809 2012-10-25 22:08:22 -0700 2012-10-26 13:14:07 -0700 work in progress bug-100458-20121025220654.patch text/plain 12444 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmVhNzFiNTIxMWE0YWU4 ZjBmZGJhMzY4OGNlMGFhODQ0ZTdmNGI1NC4uYjI2YzQwOWQ5YmViZTMwOGY0MjgwNDU5NDljYTk4 NjcxMzIyNjRhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTI1ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB bGxvdyBlbWJlZGRlciB0byBlbnRlci9sZWF2ZSBmb3JjZSBjb21wb3NpdGluZyBtb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA0NTgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRpdGlvbmFsIGlu Zm9ybWF0aW9uIG9mIHRoZSBjaGFuZ2Ugc3VjaCBhcyBhcHByb2FjaCwgcmF0aW9uYWxlLiBQbGVh c2UgYWRkIHBlci1mdW5jdGlvbiBkZXNjcmlwdGlvbnMgYmVsb3cgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRl clN0eWxlQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlQ29tcG9z aXRpbmdMYXllcnNBZnRlckxheW91dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJDaHJvbWl1bTo6c2V0RHJhd3NDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ2hpbGRMaXN0KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVH ZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRpZE1v dmVPbnNjcmVlbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVu c3VyZVJvb3RMYXllcik6CisKIDIwMTItMTAtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmll dy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzIy NjkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDkxZDlkNWU1ODM1YzUyNWE2ODkxNjhh Y2NlNDBlZGU0ZjE3ZTgzOGUuLmJmNDY4MzgwODAwODg3MjE1OGJiODBiYjVmM2YxNmNlMmE2NTE1 NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMTAt MjUgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hy b21pdW1dIEFsbG93IGVtYmVkZGVyIHRvIGVudGVyL2xlYXZlIGZvcmNlIGNvbXBvc2l0aW5nIG1v ZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDQ1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGl0 aW9uYWwgaW5mb3JtYXRpb24gb2YgdGhlIGNoYW5nZSBzdWNoIGFzIGFwcHJvYWNoLCByYXRpb25h bGUuIFBsZWFzZSBhZGQgcGVyLWZ1bmN0aW9uIGRlc2NyaXB0aW9ucyBiZWxvdyAoT09QUyEpLgor CisgICAgICAgICogcHVibGljL1dlYldpZGdldC5oOgorICAgICAgICAoV2ViV2lkZ2V0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViV2lkZ2V0OjplbnRlckZvcmNlQ29tcG9zaXRpbmdNb2RlKToKKyAg ICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJ bXBsOjpjb21taXREb2N1bWVudERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6 OmNyZWF0ZUZyYW1lVmlldyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmVudGVyRm9yY2VDb21wb3NpdGluZ01vZGUpOgorICAg ICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKyAgICAgICAgKFdl YlZpZXdJbXBsKToKKwogMjAxMi0xMC0yNSAgU2FtaSBLeW9zdGlsYSAgPHNreW9zdGlsQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBDb21wb3NpdGVkL0hXIGNvbnRlbnQgaGF2ZSB0aGUgcmVkIGFu ZCBibHVlIGNoYW5uZWxzIGludmVydGVkIGluIERSVCBvbiBDaHJvbWl1bSBBbmRyb2lkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggNjk1OWE4YzVjMGExMzE5ZDYzMzA2NzY0YTI0ZWU2 MmMwN2M3Y2UzZC4uNjU2ZWYwYTc2NzM4NzgxMDQ3ODY4OGNhNmZkMzExOGVmNTAxNDVhMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNjYsNiArNjYsNyBAQAogI2luY2x1ZGUgIlNj cm9sbGluZ0Nvb3JkaW5hdG9yLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJT dHlsZVJlc29sdmVyLmgiCisjaW5jbHVkZSAiVHJhY2VFdmVudC5oIgogI2luY2x1ZGUgIlRleHRS ZXNvdXJjZURlY29kZXIuaCIKIAogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgpAQCAtNzA2 LDYgKzcwNyw3IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVy U3R5bGVDaGFuZ2UoKQogICAgIGlmICghcm9vdCkKICAgICAgICAgcmV0dXJuOwogCisgICAgVFJB Q0VfRVZFTlQwKCJ3ZWJraXQiLCAiRnJhbWVWaWV3Ojp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0Fm dGVyU3R5bGVDaGFuZ2UiKTsKICAgICAvLyBUaGlzIGNhbGwgd2lsbCBtYWtlIHN1cmUgdGhlIGNh Y2hlZCBoYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nIGlzIHVwZGF0ZWQgZnJvbSB0aGUgcHJlZgog ICAgIHJvb3QtPmNvbXBvc2l0b3IoKS0+Y2FjaGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nRmxhZ3Mo KTsKICAgICByb290LT5jb21wb3NpdG9yKCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBv c2l0aW5nVXBkYXRlQWZ0ZXJTdHlsZUNoYW5nZSk7CkBAIC03MTcsNiArNzE5LDcgQEAgdm9pZCBG cmFtZVZpZXc6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJMYXlvdXQoKQogICAgIGlmICgh cm9vdCkKICAgICAgICAgcmV0dXJuOwogCisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiRnJh bWVWaWV3Ojp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyTGF5b3V0Iik7CiAgICAgLy8gVGhp cyBjYWxsIHdpbGwgbWFrZSBzdXJlIHRoZSBjYWNoZWQgaGFzQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZyBpcyB1cGRhdGVkIGZyb20gdGhlIHByZWYKICAgICByb290LT5jb21wb3NpdG9yKCktPmNhY2hl QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZsYWdzKCk7CiAgICAgcm9vdC0+Y29tcG9zaXRvcigpLT51 cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZUFmdGVyTGF5b3V0KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBo aWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IGE1OTVkZjI4ZGExNmE0MDVl NGZjNDgzNDY3NzMwYzcyZjVjZWE2ZWYuLjM4NGY0NjkyNWYxNjQ2NDViYmU1ZWY3Njc2MjY5YzIz MmM0OGMzYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcApAQCAtNTYs NiArNTYsNyBAQAogI2luY2x1ZGUgIlNjcm9sbGFibGVBcmVhLmgiCiAjaW5jbHVkZSAiU2tNYXRy aXg0NC5oIgogI2luY2x1ZGUgIlN5c3RlbVRpbWUuaCIKKyNpbmNsdWRlICJUcmFjZUV2ZW50Lmgi CiAjaW5jbHVkZSA8cHVibGljL1BsYXRmb3JtLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYkFuaW1h dGlvbi5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJDb21wb3NpdG9yU3VwcG9ydC5oPgpAQCAtMjY1 LDYgKzI2Niw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXREcmF3c0NvbnRlbnQo Ym9vbCBkcmF3c0NvbnRlbnQpCiAgICAgaWYgKGRyYXdzQ29udGVudCA9PSBtX2RyYXdzQ29udGVu dCkKICAgICAgICAgcmV0dXJuOwogCisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiR3JhcGhp Y3NMYXllckNocm9taXVtOjpzZXREcmF3c0NvbnRlbnQiKTsKICAgICBHcmFwaGljc0xheWVyOjpz ZXREcmF3c0NvbnRlbnQoZHJhd3NDb250ZW50KTsKICAgICB1cGRhdGVMYXllcklzRHJhd2FibGUo KTsKIH0KQEAgLTY0Nyw2ICs2NDksNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0 RGVidWdCb3JkZXIoY29uc3QgQ29sb3ImIGNvbG9yLCBmbG9hdCBib3JkZXJXaWR0aAogCiB2b2lk IEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ2hpbGRMaXN0KCkKIHsKKyAgICBUUkFDRV9F VkVOVDAoIndlYmtpdCIsICJHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0ZUNoaWxkTGlzdCIp OwogICAgIFdlYkxheWVyKiBjaGlsZEhvc3QgPSBtX3RyYW5zZm9ybUxheWVyID8gbV90cmFuc2Zv cm1MYXllci5nZXQoKSA6IG1fbGF5ZXItPmxheWVyKCk7CiAgICAgY2hpbGRIb3N0LT5yZW1vdmVB bGxDaGlsZHJlbigpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDk2ZGFhMDQ2OTUwYWU0YjRlODQ2OTlkYWI3MjIyYjFm NjhhOTA5MTIuLmZiMWUyYjA1Y2E3NjY4ZGRjYmExZDIyNTMzMDQxNGEzOTA1NzA3NTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw CkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSAiU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIKICNp bmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlRpbGVkQmFja2luZy5oIgorI2luY2x1ZGUg IlRyYWNlRXZlbnQuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1TdGF0ZS5oIgogCiAjaWYgRU5BQkxF KFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCkBAIC0zNjEsNiArMzYyLDcgQEAgYm9vbCBSZW5kZXJM YXllckNvbXBvc2l0b3I6Omhhc0FueUFkZGl0aW9uYWxDb21wb3NpdGVkTGF5ZXJzKGNvbnN0IFJl bmRlckxheWVyKgogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRp bmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZVR5cGUsIFJlbmRlckxheWVyKiB1 cGRhdGVSb290KQogeworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIlJlbmRlckxheWVyQ29t cG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMiKTsKICAgICBtX3VwZGF0ZUNvbXBvc2l0 aW5nTGF5ZXJzVGltZXIuc3RvcCgpOwogICAgIAogICAgIC8vIENvbXBvc2l0aW5nIGxheWVycyB3 aWxsIGJlIHVwZGF0ZWQgaW4gRG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UoKSBpZiBzdXBwcmVzc2Vk IGhlcmUuCkBAIC00NTAsNiArNDUyLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw ZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKIAogICAg ICAgICAvLyBIb3N0IHRoZSBkb2N1bWVudCBsYXllciBpbiB0aGUgUmVuZGVyVmlldydzIHJvb3Qg bGF5ZXIuCiAgICAgICAgIGlmIChpc0Z1bGxVcGRhdGUpIHsKKyAgICAgICAgICAgIFRSQUNFX0VW RU5UMCgid2Via2l0IiwgIlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdM YXllcnM6OnNldENoaWxkcmVuIik7CiAgICAgICAgICAgICAvLyBFdmVuIHdoZW4gY2hpbGRMaXN0 IGlzIGVtcHR5LCBkb24ndCBkcm9wIG91dCBvZiBjb21wb3NpdGluZyBtb2RlIGlmIHRoZXJlIGFy ZQogICAgICAgICAgICAgLy8gY29tcG9zaXRlZCBsYXllcnMgdGhhdCB3ZSBkaWRuJ3QgaGl0IGlu IG91ciB0cmF2ZXJzYWwgKGUuZy4gYmVjYXVzZSBvZiB2aXNpYmlsaXR5OmhpZGRlbikuCiAgICAg ICAgICAgICBpZiAoY2hpbGRMaXN0LmlzRW1wdHkoKSAmJiAhaGFzQW55QWRkaXRpb25hbENvbXBv c2l0ZWRMYXllcnModXBkYXRlUm9vdCkpCkBAIC05NzMsNiArOTc2LDcgQEAgYm9vbCBSZW5kZXJM YXllckNvbXBvc2l0b3I6OmNhbkFjY2VsZXJhdGVWaWRlb1JlbmRlcmluZyhSZW5kZXJWaWRlbyog bykgY29uc3QKIAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21wb3NpdGlu Z0xheWVyVHJlZShSZW5kZXJMYXllciogbGF5ZXIsIFZlY3RvcjxHcmFwaGljc0xheWVyKj4mIGNo aWxkTGF5ZXJzT2ZFbmNsb3NpbmdMYXllciwgaW50IGRlcHRoKQogeworICAgIFRSQUNFX0VWRU5U MCgid2Via2l0IiwgIlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVidWlsZENvbXBvc2l0aW5nTGF5 ZXJUcmVlIik7CiAgICAgLy8gTWFrZSB0aGUgbGF5ZXIgY29tcG9zaXRpbmcgaWYgbmVjZXNzYXJ5 LCBhbmQgc2V0IHVwIGNsaXBwaW5nIGFuZCBjb250ZW50IGxheWVycy4KICAgICAvLyBOb3RlIHRo YXQgd2UgY2FuIG9ubHkgZG8gd29yayBoZXJlIHRoYXQgaXMgaW5kZXBlbmRlbnQgb2Ygd2hldGhl ciB0aGUgZGVzY2VuZGFudCBsYXllcnMKICAgICAvLyBoYXZlIGJlZW4gcHJvY2Vzc2VkLiBjb21w dXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoKSB3aWxsIGFscmVhZHkgaGF2ZSBkb25lIHRoZSBy ZXBhaW50IGlmIG5lY2Vzc2FyeS4KQEAgLTExOTEsNiArMTE5NSw3IEBAIGJvb2wgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpwYXJlbnRGcmFtZUNvbnRlbnRMYXllcnMoUmVuZGVyUGFydCogcmVuZGVy ZXIpCiAvLyBUaGlzIGp1c3QgdXBkYXRlcyBsYXllciBnZW9tZXRyeSB3aXRob3V0IGNoYW5naW5n IHRoZSBoaWVyYXJjaHkuCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJU cmVlR2VvbWV0cnkoUmVuZGVyTGF5ZXIqIGxheWVyLCBpbnQgZGVwdGgpCiB7CisgICAgVFJBQ0Vf RVZFTlQwKCJ3ZWJraXQiLCAiUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVH ZW9tZXRyeSIpOwogICAgIGlmIChSZW5kZXJMYXllckJhY2tpbmcqIGxheWVyQmFja2luZyA9IGxh eWVyLT5iYWNraW5nKCkpIHsKICAgICAgICAgLy8gVGhlIGNvbXBvc2l0aW5nIHN0YXRlIG9mIGFs bCBvdXIgY2hpbGRyZW4gaGFzIGJlZW4gdXBkYXRlZCBhbHJlYWR5LCBzbyBub3cKICAgICAgICAg Ly8gd2UgY2FuIGNvbXB1dGUgYW5kIGNhY2hlIHRoZSBjb21wb3NpdGVkIGJvdW5kcyBmb3IgdGhp cyBsYXllci4KQEAgLTEzNzIsNiArMTM3Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y OjpkaWRNb3ZlT25zY3JlZW4oKQogICAgICAgICByZXR1cm47CiAKICAgICBSb290TGF5ZXJBdHRh Y2htZW50IGF0dGFjaG1lbnQgPSBzaG91bGRQcm9wYWdhdGVDb21wb3NpdGluZ1RvRW5jbG9zaW5n RnJhbWUoKSA/IFJvb3RMYXllckF0dGFjaGVkVmlhRW5jbG9zaW5nRnJhbWUgOiBSb290TGF5ZXJB dHRhY2hlZFZpYUNocm9tZUNsaWVudDsKKyAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJSZW5k ZXJMYXllckNvbXBvc2l0b3I6OmRpZE1vdmVPbnNjcmVlbiIpOwogICAgIGF0dGFjaFJvb3RMYXll cihhdHRhY2htZW50KTsKIH0KIApAQCAtMjIxOSw2ICsyMjI1LDcgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OnVwZGF0ZU92ZXJmbG93Q29udHJvbHNMYXllcnMoKQogCiB2b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6ZW5zdXJlUm9vdExheWVyKCkKIHsKKyAgICBUUkFDRV9FVkVOVDAo IndlYmtpdCIsICJSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVuc3VyZVJvb3RMYXllciIpOwogICAg IFJvb3RMYXllckF0dGFjaG1lbnQgZXhwZWN0ZWRBdHRhY2htZW50ID0gc2hvdWxkUHJvcGFnYXRl Q29tcG9zaXRpbmdUb0VuY2xvc2luZ0ZyYW1lKCkgPyBSb290TGF5ZXJBdHRhY2hlZFZpYUVuY2xv c2luZ0ZyYW1lIDogUm9vdExheWVyQXR0YWNoZWRWaWFDaHJvbWVDbGllbnQ7CiAgICAgaWYgKGV4 cGVjdGVkQXR0YWNobWVudCA9PSBtX3Jvb3RMYXllckF0dGFjaG1lbnQpCiAgICAgICAgICByZXR1 cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXQu aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldC5oCmluZGV4IGZhNDU2 MjM4YTNiZDE3OGE5ZTEyYTkyMzJlOGUxNzhhM2IxZjJiM2YuLmQwMDg0ZDkyYWQ4NWYzNTgzZTgy N2QzNDVlOGU5MjQ0YjI3ZmFhZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYldpZGdldC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YldpZGdldC5oCkBAIC05MSw2ICs5MSw4IEBAIHB1YmxpYzoKICAgICAvLyBhbmQgaXQgbWF5IHJl c3VsdCBpbiBjYWxscyB0byBXZWJXaWRnZXRDbGllbnQ6OmRpZEludmFsaWRhdGVSZWN0LgogICAg IHZpcnR1YWwgdm9pZCBsYXlvdXQoKSB7IH0KIAorICAgIHZpcnR1YWwgdm9pZCBlbnRlckZvcmNl Q29tcG9zaXRpbmdNb2RlKGJvb2wgZW50ZXIpIHsgfQorCiAgICAgZW51bSBQYWludE9wdGlvbnMg ewogICAgICAgICAvLyBBdHRlbXB0IHRvIGZ1bGZpbGwgdGhlIHBhaW50aW5nIHJlcXVlc3QgYnkg cmVhZGluZyBiYWNrIGZyb20gdGhlCiAgICAgICAgIC8vIGNvbXBvc2l0b3IsIGFzc3VtaW5nIHdl J3JlIHVzaW5nIGEgY29tcG9zaXRvciB0byByZW5kZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRleCA3ZWVmMjkzNDMxNTNmZTMxM2NhOTdkZWE4MDlm NTFhMTI5NTk1ZTc3Li4wZGRlYmNjOWU1MWFhODI0YjkwMTYzYmQ4MTI0NWM1ZWZiNjYzY2YyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTE0OCw2 ICsxNDgsNyBAQAogI2luY2x1ZGUgIlN1YnN0aXR1dGVEYXRhLmgiCiAjaW5jbHVkZSAiVGV4dEFm ZmluaXR5LmgiCiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCisjaW5jbHVkZSAiVHJhY2VFdmVu dC5oIgogI2luY2x1ZGUgIlVzZXJHZXN0dXJlSW5kaWNhdG9yLmgiCiAjaW5jbHVkZSAiVjhET01G aWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiVjhEaXJlY3RvcnlFbnRyeS5oIgpAQCAtMTExNCwxNSAr MTExNSw4IEBAIFdlYlVSTExvYWRlciogV2ViRnJhbWVJbXBsOjpjcmVhdGVBc3NvY2lhdGVkVVJM TG9hZGVyKGNvbnN0IFdlYlVSTExvYWRlck9wdGlvbnMmCiAKIHZvaWQgV2ViRnJhbWVJbXBsOjpj b21taXREb2N1bWVudERhdGEoY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGxlbmd0aCkKIHsKLSAg ICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IHZpZXdJbXBsKCk7Ci0gICAgYm9vbCBpc01haW5GcmFt ZSA9IHdlYlZpZXctPm1haW5GcmFtZUltcGwoKS0+ZnJhbWUoKSA9PSBmcmFtZSgpOwotICAgIGlm IChpc01haW5GcmFtZSkKLSAgICAgICAgd2ViVmlldy0+c3VwcHJlc3NJbnZhbGlkYXRpb25zKHRy dWUpOwotCisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiV2ViRnJhbWVJbXBsOjpjb21taXRE b2N1bWVudERhdGEiKTsKICAgICBmcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+ Y29tbWl0RGF0YShkYXRhLCBsZW5ndGgpOwotCi0gICAgaWYgKGlzTWFpbkZyYW1lKQotICAgICAg ICB3ZWJWaWV3LT5zdXBwcmVzc0ludmFsaWRhdGlvbnMoZmFsc2UpOwogfQogCiB1bnNpZ25lZCBX ZWJGcmFtZUltcGw6OnVubG9hZExpc3RlbmVyQ291bnQoKSBjb25zdApAQCAtMjI3NSw2ICsyMjY5 LDcgQEAgdm9pZCBXZWJGcmFtZUltcGw6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBJbnRT aXplJiBzaXplKQogCiB2b2lkIFdlYkZyYW1lSW1wbDo6Y3JlYXRlRnJhbWVWaWV3KCkKIHsKKyAg ICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJGcmFtZUltcGw6OmNyZWF0ZUZyYW1lVmlldyIp OwogICAgIEFTU0VSVChmcmFtZSgpKTsgLy8gSWYgZnJhbWUoKSBkb2Vzbid0IGV4aXN0LCB3ZSBw cm9iYWJseSBkaWRuJ3QgaW5pdCBwcm9wZXJseS4KIAogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3 ID0gdmlld0ltcGwoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cAppbmRleCBjNWM4MzUxN2Q3NzIyMDU4MTFhZGJhYjQ3ZTYwNmRhNDg2OWY2MjQzLi42MTg2NWJk NGY0Y2ZkMzRlZjI4YzFiMjFiNTM0NjA3NTgxMjQwMDM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0xNzYwLDYgKzE3NjAsMTQgQEAgdm9pZCBXZWJW aWV3SW1wbDo6bGF5b3V0KCkKICAgICAgICAgbV9saW5rSGlnaGxpZ2h0LT51cGRhdGVHZW9tZXRy eSgpOwogfQogCit2b2lkIFdlYlZpZXdJbXBsOjplbnRlckZvcmNlQ29tcG9zaXRpbmdNb2RlKGJv b2wgZW50ZXIpCit7CisgICAgIFRSQUNFX0VWRU5UMSgid2Via2l0IiwgIldlYlZpZXdJbXBsOjpl bnRlckZvcmNlQ29tcG9zaXRpbmdNb2RlIiwgImVudGVyIiwgZW50ZXIpOworICAgICBtX3dlYlNl dHRpbmdzLT5zZXRGb3JjZUNvbXBvc2l0aW5nTW9kZShlbnRlcik7CisgICAgIGlmIChlbnRlcikK KyAgICAgICAgIG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+dXBkYXRlQ29tcG9zaXRpbmdM YXllcnNBZnRlclN0eWxlQ2hhbmdlKCk7Cit9CisKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiB2b2lkIFdlYlZpZXdJbXBsOjpkb1BpeGVsUmVhZGJhY2tUb0NhbnZhcyhXZWJDYW52 YXMqIGNhbnZhcywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDQzOWUwZTZiMTc3MjNjNmQ5NDY2ZTMxOTZiZDY5OTlj ZmI5YmY5OWUuLmM2MzIzOTk3ZjJjZjJkZmZiMjUwZjFiZTkzOTJlYjhjNjU5YzI3MjkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMTQ1LDYgKzE0NSw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29tcG9zaXRvclN1cmZhY2VSZWFkeSgpOwog ICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlKGRvdWJsZSk7CiAgICAgdmlydHVhbCB2b2lkIGxheW91 dCgpOyAvLyBBbHNvIGltcGxlbWVudHMgV2ViTGF5ZXJUcmVlVmlld0NsaWVudDo6bGF5b3V0KCkK KyAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGb3JjZUNvbXBvc2l0aW5nTW9kZShib29sIGVuYWJsZSkg T1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHBhaW50KFdlYkNhbnZhcyosIGNvbnN0IFdlYlJl Y3QmLCBQYWludE9wdGlvbnMgPSBSZWFkYmFja0Zyb21Db21wb3NpdG9ySWZBdmFpbGFibGUpOwog ICAgIHZpcnR1YWwgdm9pZCB0aGVtZUNoYW5nZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgY29tcG9z aXRlKGJvb2wgZmluaXNoKTsK 170989 2012-10-26 13:14:09 -0700 2012-10-26 13:57:03 -0700 Patch bug-100458-20121026131240.patch text/plain 3796 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDU4ODg1YmU0NDJlZGZiYTFhNTA2ZjU3YjA0NDhjYmNkMTNmOWQ0MzcuLjFhYTM2MzM5NDk1MjE2 MmViZGM0NmU5N2E3MWM3Y2I4NDRkYTA3YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMTAtMjYgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFsbG93IGVtYmVkZGVyIHRvIGVudGVyL2xl YXZlIGZvcmNlIGNvbXBvc2l0aW5nIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwMDQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBBUEkgZm9yIHRoZSBlbWJlZGRlciB0byBkZWNp ZGUgd2hlbiB0byBlbnRlciBhbmQgbGVhdmUgZm9yY2UgY29tcG9zaXRpbmcgbW9kZSBzaW5jZSBp dCdzCisgICAgICAgIG1vcmUgZWZmaWNpZW50IHRvIG9ubHkgdG9nZ2xlIHRoaXMgc2V0dGluZyB3 aGVuIHRoZSBlbWJlZGRlciBpcyBhYm91dCB0byBwcm9kdWNlIGEgZnJhbWUuCisKKyAgICAgICAg KiBwdWJsaWMvV2ViV2lkZ2V0Lmg6CisgICAgICAgIChXZWJXaWRnZXQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJXaWRnZXQ6OmVudGVyRm9yY2VDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAqIHNy Yy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZW50ZXJG b3JjZUNvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNyYy9X ZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTEwLTI2ICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgogCiAgICAgICAg IEFkZCBmZWF0dXJlIGZsYWdzIGZvciBDU1MgRGV2aWNlIEFkYXB0YXRpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldC5oIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKaW5kZXggZmE0NTYyMzhhM2JkMTc4YTllMTJh OTIzMmU4ZTE3OGEzYjFmMmIzZi4uYzg0NjQwNjJkMjg1ZmQ1MWE0ZTZkYzI2MzdmZTgyMzc0ZTc3 ODIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0 LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKQEAgLTgz LDE0ICs4MywxNiBAQCBwdWJsaWM6CiAKICAgICAvLyBDYWxsZWQgdG8gdXBkYXRlIGltcGVyYXRp dmUgYW5pbWF0aW9uIHN0YXRlLiBUaGlzIHNob3VsZCBiZSBjYWxsZWQgYmVmb3JlCiAgICAgLy8g cGFpbnQsIGFsdGhvdWdoIHRoZSBjbGllbnQgY2FuIHJhdGUtbGltaXQgdGhlc2UgY2FsbHMuCi0g ICAgLy8KLSAgICAvLyBGSVhNRTogcmVtb3ZlIHRoaXMgZnVuY3Rpb24gZW50aXJlbHkgd2hlbiBp bnZlcnNpb24gcGF0Y2hlcyBsYW5kLgogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlKGRvdWJsZSBp Z25vcmVkKSB7IH0KIAogICAgIC8vIENhbGxlZCB0byBsYXlvdXQgdGhlIFdlYldpZGdldC4gVGhp cyBNVVNUIGJlIGNhbGxlZCBiZWZvcmUgUGFpbnQsCiAgICAgLy8gYW5kIGl0IG1heSByZXN1bHQg aW4gY2FsbHMgdG8gV2ViV2lkZ2V0Q2xpZW50OjpkaWRJbnZhbGlkYXRlUmVjdC4KICAgICB2aXJ0 dWFsIHZvaWQgbGF5b3V0KCkgeyB9CiAKKyAgICAvLyBDYWxsZWQgdG8gdG9nZ2xlIHRoZSBXZWJX aWRnZXQgaW4gb3Igb3V0IG9mIGZvcmNlIGNvbXBvc2l0aW5nIG1vZGUuIFRoaXMKKyAgICAvLyBz aG91bGQgYmUgY2FsbGVkIGJlZm9yZSBwYWludC4KKyAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGb3Jj ZUNvbXBvc2l0aW5nTW9kZShib29sIGVudGVyKSB7IH0KKwogICAgIGVudW0gUGFpbnRPcHRpb25z IHsKICAgICAgICAgLy8gQXR0ZW1wdCB0byBmdWxmaWxsIHRoZSBwYWludGluZyByZXF1ZXN0IGJ5 IHJlYWRpbmcgYmFjayBmcm9tIHRoZQogICAgICAgICAvLyBjb21wb3NpdG9yLCBhc3N1bWluZyB3 ZSdyZSB1c2luZyBhIGNvbXBvc2l0b3IgdG8gcmVuZGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGNkYjU0ZDhjNGY4YmY1MjQzZTE2ZTljZTg2NWQ0 MzhhMmU1MTM1ZDkuLjBiOTdmZmE2NTY2MTczZmYwMTkyYzhiMGI5MjIxZWE2ZWNmZDNmZTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE3NjAsNiAr MTc2MCwxNCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpsYXlvdXQoKQogICAgICAgICBtX2xpbmtIaWdo bGlnaHQtPnVwZGF0ZUdlb21ldHJ5KCk7CiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OmVudGVyRm9y Y2VDb21wb3NpdGluZ01vZGUoYm9vbCBlbnRlcikKK3sKKyAgICBUUkFDRV9FVkVOVDEoIndlYmtp dCIsICJXZWJWaWV3SW1wbDo6ZW50ZXJGb3JjZUNvbXBvc2l0aW5nTW9kZSIsICJlbnRlciIsIGVu dGVyKTsKKyAgICBtX3dlYlNldHRpbmdzLT5zZXRGb3JjZUNvbXBvc2l0aW5nTW9kZShlbnRlcik7 CisgICAgaWYgKGVudGVyKQorICAgICAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPnVw ZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTdHlsZUNoYW5nZSgpOworfQorCiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogdm9pZCBXZWJWaWV3SW1wbDo6ZG9QaXhlbFJlYWRiYWNr VG9DYW52YXMoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA0MzllMGU2YjE3NzIzYzZk OTQ2NmUzMTk2YmQ2OTk5Y2ZiOWJmOTllLi5jNjMyMzk5N2YyY2YyZGZmYjI1MGYxYmU5MzkyZWI4 YzY1OWMyNzI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAg LTE0NSw2ICsxNDUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldENvbXBvc2l0b3JT dXJmYWNlUmVhZHkoKTsKICAgICB2aXJ0dWFsIHZvaWQgYW5pbWF0ZShkb3VibGUpOwogICAgIHZp cnR1YWwgdm9pZCBsYXlvdXQoKTsgLy8gQWxzbyBpbXBsZW1lbnRzIFdlYkxheWVyVHJlZVZpZXdD bGllbnQ6OmxheW91dCgpCisgICAgdmlydHVhbCB2b2lkIGVudGVyRm9yY2VDb21wb3NpdGluZ01v ZGUoYm9vbCBlbmFibGUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBwYWludChXZWJDYW52 YXMqLCBjb25zdCBXZWJSZWN0JiwgUGFpbnRPcHRpb25zID0gUmVhZGJhY2tGcm9tQ29tcG9zaXRv cklmQXZhaWxhYmxlKTsKICAgICB2aXJ0dWFsIHZvaWQgdGhlbWVDaGFuZ2VkKCk7CiAgICAgdmly dHVhbCB2b2lkIGNvbXBvc2l0ZShib29sIGZpbmlzaCk7Cg== 170997 2012-10-26 13:57:05 -0700 2012-10-26 16:03:42 -0700 With more null checks so it can be called earlier bug-100458-20121026135536.patch text/plain 3934 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDU4ODg1YmU0NDJlZGZiYTFhNTA2ZjU3YjA0NDhjYmNkMTNmOWQ0MzcuLjFhYTM2MzM5NDk1MjE2 MmViZGM0NmU5N2E3MWM3Y2I4NDRkYTA3YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMTAtMjYgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFsbG93IGVtYmVkZGVyIHRvIGVudGVyL2xl YXZlIGZvcmNlIGNvbXBvc2l0aW5nIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwMDQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBBUEkgZm9yIHRoZSBlbWJlZGRlciB0byBkZWNp ZGUgd2hlbiB0byBlbnRlciBhbmQgbGVhdmUgZm9yY2UgY29tcG9zaXRpbmcgbW9kZSBzaW5jZSBp dCdzCisgICAgICAgIG1vcmUgZWZmaWNpZW50IHRvIG9ubHkgdG9nZ2xlIHRoaXMgc2V0dGluZyB3 aGVuIHRoZSBlbWJlZGRlciBpcyBhYm91dCB0byBwcm9kdWNlIGEgZnJhbWUuCisKKyAgICAgICAg KiBwdWJsaWMvV2ViV2lkZ2V0Lmg6CisgICAgICAgIChXZWJXaWRnZXQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJXaWRnZXQ6OmVudGVyRm9yY2VDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAqIHNy Yy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZW50ZXJG b3JjZUNvbXBvc2l0aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNyYy9X ZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTEwLTI2ICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgogCiAgICAgICAg IEFkZCBmZWF0dXJlIGZsYWdzIGZvciBDU1MgRGV2aWNlIEFkYXB0YXRpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldC5oIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKaW5kZXggZmE0NTYyMzhhM2JkMTc4YTllMTJh OTIzMmU4ZTE3OGEzYjFmMmIzZi4uYzg0NjQwNjJkMjg1ZmQ1MWE0ZTZkYzI2MzdmZTgyMzc0ZTc3 ODIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0 LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKQEAgLTgz LDE0ICs4MywxNiBAQCBwdWJsaWM6CiAKICAgICAvLyBDYWxsZWQgdG8gdXBkYXRlIGltcGVyYXRp dmUgYW5pbWF0aW9uIHN0YXRlLiBUaGlzIHNob3VsZCBiZSBjYWxsZWQgYmVmb3JlCiAgICAgLy8g cGFpbnQsIGFsdGhvdWdoIHRoZSBjbGllbnQgY2FuIHJhdGUtbGltaXQgdGhlc2UgY2FsbHMuCi0g ICAgLy8KLSAgICAvLyBGSVhNRTogcmVtb3ZlIHRoaXMgZnVuY3Rpb24gZW50aXJlbHkgd2hlbiBp bnZlcnNpb24gcGF0Y2hlcyBsYW5kLgogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlKGRvdWJsZSBp Z25vcmVkKSB7IH0KIAogICAgIC8vIENhbGxlZCB0byBsYXlvdXQgdGhlIFdlYldpZGdldC4gVGhp cyBNVVNUIGJlIGNhbGxlZCBiZWZvcmUgUGFpbnQsCiAgICAgLy8gYW5kIGl0IG1heSByZXN1bHQg aW4gY2FsbHMgdG8gV2ViV2lkZ2V0Q2xpZW50OjpkaWRJbnZhbGlkYXRlUmVjdC4KICAgICB2aXJ0 dWFsIHZvaWQgbGF5b3V0KCkgeyB9CiAKKyAgICAvLyBDYWxsZWQgdG8gdG9nZ2xlIHRoZSBXZWJX aWRnZXQgaW4gb3Igb3V0IG9mIGZvcmNlIGNvbXBvc2l0aW5nIG1vZGUuIFRoaXMKKyAgICAvLyBz aG91bGQgYmUgY2FsbGVkIGJlZm9yZSBwYWludC4KKyAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGb3Jj ZUNvbXBvc2l0aW5nTW9kZShib29sIGVudGVyKSB7IH0KKwogICAgIGVudW0gUGFpbnRPcHRpb25z IHsKICAgICAgICAgLy8gQXR0ZW1wdCB0byBmdWxmaWxsIHRoZSBwYWludGluZyByZXF1ZXN0IGJ5 IHJlYWRpbmcgYmFjayBmcm9tIHRoZQogICAgICAgICAvLyBjb21wb3NpdG9yLCBhc3N1bWluZyB3 ZSdyZSB1c2luZyBhIGNvbXBvc2l0b3IgdG8gcmVuZGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGNkYjU0ZDhjNGY4YmY1MjQzZTE2ZTljZTg2NWQ0 MzhhMmU1MTM1ZDkuLmQzNzc4NzFiYzcyNmJkNzk5Yjc1OTA4OGQ3MTBkMDU5MzJlODEyNWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE3NjAsNiAr MTc2MCwyMCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpsYXlvdXQoKQogICAgICAgICBtX2xpbmtIaWdo bGlnaHQtPnVwZGF0ZUdlb21ldHJ5KCk7CiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OmVudGVyRm9y Y2VDb21wb3NpdGluZ01vZGUoYm9vbCBlbnRlcikKK3sKKyAgICBUUkFDRV9FVkVOVDEoIndlYmtp dCIsICJXZWJWaWV3SW1wbDo6ZW50ZXJGb3JjZUNvbXBvc2l0aW5nTW9kZSIsICJlbnRlciIsIGVu dGVyKTsKKyAgICBzZXR0aW5nc0ltcGwoKS0+c2V0Rm9yY2VDb21wb3NpdGluZ01vZGUoZW50ZXIp OworICAgIGlmIChlbnRlcikgeworICAgICAgICBpZiAoIW1fcGFnZSkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgRnJhbWUqIG1haW5GcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7Cisg ICAgICAgIGlmICghbWFpbkZyYW1lKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBtYWlu RnJhbWUtPnZpZXcoKS0+dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclN0eWxlQ2hhbmdlKCk7 CisgICAgfQorfQorCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogdm9pZCBXZWJW aWV3SW1wbDo6ZG9QaXhlbFJlYWRiYWNrVG9DYW52YXMoV2ViQ2FudmFzKiBjYW52YXMsIGNvbnN0 IEludFJlY3QmIHJlY3QpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu aAppbmRleCA0MzllMGU2YjE3NzIzYzZkOTQ2NmUzMTk2YmQ2OTk5Y2ZiOWJmOTllLi5jNjMyMzk5 N2YyY2YyZGZmYjI1MGYxYmU5MzkyZWI4YzY1OWMyNzI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTE0NSw2ICsxNDUsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHNldENvbXBvc2l0b3JTdXJmYWNlUmVhZHkoKTsKICAgICB2aXJ0dWFsIHZvaWQg YW5pbWF0ZShkb3VibGUpOwogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKTsgLy8gQWxzbyBpbXBs ZW1lbnRzIFdlYkxheWVyVHJlZVZpZXdDbGllbnQ6OmxheW91dCgpCisgICAgdmlydHVhbCB2b2lk IGVudGVyRm9yY2VDb21wb3NpdGluZ01vZGUoYm9vbCBlbmFibGUpIE9WRVJSSURFOwogICAgIHZp cnR1YWwgdm9pZCBwYWludChXZWJDYW52YXMqLCBjb25zdCBXZWJSZWN0JiwgUGFpbnRPcHRpb25z ID0gUmVhZGJhY2tGcm9tQ29tcG9zaXRvcklmQXZhaWxhYmxlKTsKICAgICB2aXJ0dWFsIHZvaWQg dGhlbWVDaGFuZ2VkKCk7CiAgICAgdmlydHVhbCB2b2lkIGNvbXBvc2l0ZShib29sIGZpbmlzaCk7 Cg==