102960 2012-11-21 10:20:25 -0800 [chromium] Remove WebLayerTreeView API to set font atlas 2012-12-05 14:39:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 egraether webkit-unassigned abarth dglazkov egraether fishd jamesr nduca peter+ews tkent+wkapi webkit.review.bot oldest_to_newest 773084 0 egraether 2012-11-21 10:20:25 -0800 [chromium] make compositor request the font atlas #3 773092 1 175477 egraether 2012-11-21 10:22:27 -0800 Created attachment 175477 Patch 773097 2 webkit.review.bot 2012-11-21 10:27:27 -0800 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. 773101 3 egraether 2012-11-21 10:30:22 -0800 commit order: https://bugs.webkit.org/show_bug.cgi?id=102958 https://codereview.chromium.org/11413123 https://bugs.webkit.org/show_bug.cgi?id=102960 773107 4 175477 webkit.review.bot 2012-11-21 10:40:04 -0800 Comment on attachment 175477 Patch Attachment 175477 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14968030 773389 5 175477 peter+ews 2012-11-21 16:18:35 -0800 Comment on attachment 175477 Patch Attachment 175477 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/14965136 778236 6 175477 jamesr 2012-11-28 12:56:07 -0800 Comment on attachment 175477 Patch This won't compile yet, but R=me when it does. 781588 7 177281 egraether 2012-12-03 10:18:53 -0800 Created attachment 177281 Patch 781599 8 177281 webkit.review.bot 2012-12-03 10:25:36 -0800 Comment on attachment 177281 Patch Attachment 177281 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15106544 781606 9 177281 peter+ews 2012-12-03 10:31:39 -0800 Comment on attachment 177281 Patch Attachment 177281 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/15117443 783198 10 177632 egraether 2012-12-04 18:04:13 -0800 Created attachment 177632 Patch 784128 11 177632 webkit.review.bot 2012-12-05 14:39:44 -0800 Comment on attachment 177632 Patch Clearing flags on attachment: 177632 Committed r136763: <http://trac.webkit.org/changeset/136763> 784129 12 webkit.review.bot 2012-12-05 14:39:48 -0800 All reviewed patches have been landed. Closing bug. 175477 2012-11-21 10:22:27 -0800 2012-12-03 10:18:51 -0800 Patch bug-102960-20121121102013.patch text/plain 5725 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA1YzE4MGZiNjVlNzhh MWMzNDI4MzBjY2M5ZmY4YTZhNjA5YWJkZGM5Li4xMGYyZGVkZGQwZGFhYmQyMGE5ZjFlNzVkOGQ4 OTVkMTU3YWUxN2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0xMS0yMSAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hy b21pdW1dIG1ha2UgY29tcG9zaXRvciByZXF1ZXN0IHRoZSBmb250IGF0bGFzICMzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI5NjAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVzIG9sZCBmb250 IGF0bGFzIGNyZWF0aW9uIGZyb20gV2ViVmlld0ltcGwuCisKKyAgICAgICAgKiBjaHJvbWl1bS9w dWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oOgorCiAyMDEyLTExLTIxICBIYXJhbGQgQWx2ZXN0cmFu ZCAgPGh0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYk1lZGlhU3RyZWFtQ29tcG9uZW50OiBB ZGQgYXNzaWdubWVudCBhbmQgY29weSBvcGVyYXRvcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK aW5kZXggNTcxODUwOTJkMTI0ZDQ5OTlmYjZlMzQ2Y2EyM2ZhNDAxNzNmOTFlMy4uMGIwY2MzMmIw ZDNhMjE2M2Y0NmViY2Y5YWQwMTJjNmY0ZGIzOGZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0xMS0yMSAgRWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3Jh ZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIG1ha2UgY29tcG9zaXRvciBy ZXF1ZXN0IHRoZSBmb250IGF0bGFzICMzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDI5NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZW1vdmVzIG9sZCBmb250IGF0bGFzIGNyZWF0aW9uIGZyb20gV2Vi Vmlld0ltcGwuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6c2V0U2hvd0ZQU0NvdW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKToKKyAgICAgICAgKFdlYktpdCk6Cisg ICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTItMTEtMjEgIERhbiBDYXJuZXkgIDxk Y2FybmV5QGdvb2dsZS5jb20+CiAKICAgICAgICAgSURCUmVxdWVzdFRlc3QgbmVlZHMgYSB2OCBj b250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxh eWVyVHJlZVZpZXcuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJU cmVlVmlldy5oCmluZGV4IDdjM2IxMTM5NWI5MTg4YzE0YzA0NTE0YjQ3ZmRlZDliOTM5NTk5Y2Iu LmI4ZjgzYTM4MzRjZWM5OWQwYWFhZDBjYTU4NjA3YTEwMzAyNDAxYWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oCisrKyBiL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oCkBAIC0zMyw4 ICszMyw2IEBACiAjaW5jbHVkZSAiV2ViUHJpdmF0ZU93blB0ci5oIgogI2luY2x1ZGUgIldlYlNp emUuaCIKIAotY2xhc3MgU2tCaXRtYXA7Ci0KIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2Vi R3JhcGhpY3NDb250ZXh0M0Q7CiBjbGFzcyBXZWJMYXllcjsKQEAgLTE4MiwxMCArMTgwLDYgQEAg cHVibGljOgogICAgIC8vIFRvZ2dsZXMgdGhlIEZQUyBjb3VudGVyIGluIHRoZSBIVUQgbGF5ZXIK ICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd0ZQU0NvdW50ZXIoYm9vbCkgeyB9CiAKLSAgICAvLyBQ cm92aWRlcyBhIGZvbnQgYXRsYXMgdG8gdXNlIGZvciBkZWJ1ZyB2aXN1YWxpemF0aW9ucy4gVGhl IGF0bGFzIG11c3QgYmUgYSBiaXRtYXAgY29udGFpbmluZyBnbHlwaCBkYXRhLCBhIHRhYmxlIG9m Ci0gICAgLy8gQVNDSUkgY2hhcmFjdGVyIHZhbHVlcyB0byBhIHN1YnJlY3RhbmdsZSBvZiB0aGUg YXRsYXMgcmVwcmVzZW50aW5nIHRoZSBjb3JyZXNwb25kaW5nIGdseXBoLCBhbmQgdGhlIGdseXBo IGhlaWdodC4KLSAgICB2aXJ0dWFsIHZvaWQgc2V0Rm9udEF0bGFzKFdlYlJlY3QgYXNjaWlUb1Jl Y3RUYWJsZVsxMjhdLCBjb25zdCBTa0JpdG1hcCYsIGludCBmb250SGVpZ2h0KSB7IH0KLQogICAg IC8vIFNpbXVsYXRlcyBhIGxvc3QgY29udGV4dC4gRm9yIHRlc3Rpbmcgb25seS4KICAgICB2aXJ0 dWFsIHZvaWQgbG9zZUNvbXBvc2l0b3JDb250ZXh0KGludCBudW1UaW1lcykgPSAwOwogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBlNmI5MjFjMWM2 M2E4YjlhMWVlMzc1YWJkYjc0MTA1NDUxODQ0Mzg4Li44MTFiZGRiYWUzZjQ5MzUwZWFjMjUxYjZl MDI2NTllMWFjZDhiNmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCkBAIC00MzEsNyArNDMxLDYgQEAgV2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKFdlYlZp ZXdDbGllbnQqIGNsaWVudCkKICAgICAsIG1fY29tcG9zaXRvclN1cmZhY2VSZWFkeShmYWxzZSkK ICAgICAsIG1fZGV2aWNlU2NhbGVJbkNvbXBvc2l0b3IoMSkKICAgICAsIG1faW5wdXRIYW5kbGVy SWRlbnRpZmllcigtMSkKLSAgICAsIG1faXNGb250QXRsYXNMb2FkZWQoZmFsc2UpCiAjZW5kaWYK ICNpZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQogICAgICwgbV9zcGVlY2hJbnB1dENsaWVudChTcGVl Y2hJbnB1dENsaWVudEltcGw6OmNyZWF0ZShjbGllbnQpKQpAQCAtODQwLDkgKzgzOSw2IEBAIHZv aWQgV2ViVmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyKGJvb2wgc2hvdykKIHsKICAgICBpZiAo aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpIHsKICAgICAgICAgVFJBQ0VfRVZFTlQw KCJ3ZWJraXQiLCAiV2ViVmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyIik7Ci0jaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBsb2FkRm9udEF0bGFzSWZOZWNlc3Nhcnko KTsKLSNlbmRpZgogICAgICAgICBtX2xheWVyVHJlZVZpZXctPnNldFNob3dGUFNDb3VudGVyKHNo b3cpOwogICAgIH0KICAgICBzZXR0aW5nc0ltcGwoKS0+c2V0U2hvd0ZQU0NvdW50ZXIoc2hvdyk7 CkBAIC00MDI1LDEzICs0MDIxLDkgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogICAgICAgICAgICAgbV9jbGllbnQtPmRp ZEFjdGl2YXRlQ29tcG9zaXRvcihtX2lucHV0SGFuZGxlcklkZW50aWZpZXIpOwogICAgICAgICAg ICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUgPSB0cnVlOwogICAgICAgICAgICAg bV9jb21wb3NpdG9yQ3JlYXRpb25GYWlsZWQgPSBmYWxzZTsKLSAgICAgICAgICAgIG1faXNGb250 QXRsYXNMb2FkZWQgPSBmYWxzZTsKICAgICAgICAgICAgIGlmIChtX3BhZ2VPdmVybGF5cykKICAg ICAgICAgICAgICAgICBtX3BhZ2VPdmVybGF5cy0+dXBkYXRlKCk7CiAKLSAgICAgICAgICAgIGlm IChsYXllclRyZWVWaWV3U2V0dGluZ3Muc2hvd1BsYXRmb3JtTGF5ZXJUcmVlKQotICAgICAgICAg ICAgICAgIGxvYWRGb250QXRsYXNJZk5lY2Vzc2FyeSgpOwotCiAgICAgICAgICAgICBpZiAoc2V0 dGluZ3NJbXBsKCktPnNob3dGUFNDb3VudGVyKCkpCiAgICAgICAgICAgICAgICAgc2V0U2hvd0ZQ U0NvdW50ZXIodHJ1ZSk7CiAgICAgICAgIH0gZWxzZSB7CkBAIC00MDQ1LDIxICs0MDM3LDYgQEAg dm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wg YWN0aXZlKQogICAgICAgICBwYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCktPnNldENsaXBzUmVw YWludHMoIW1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKTsKIH0KIAotdm9pZCBXZWJW aWV3SW1wbDo6bG9hZEZvbnRBdGxhc0lmTmVjZXNzYXJ5KCkKLXsKLSAgICBBU1NFUlQobV9sYXll clRyZWVWaWV3KTsKLQotICAgIGlmIChtX2lzRm9udEF0bGFzTG9hZGVkKQotICAgICAgICByZXR1 cm47Ci0KLSAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJWaWV3SW1wbDo6bG9hZEZvbnRB dGxhcyIpOwotICAgIFdlYlJlY3QgYXNjaWlUb1JlY3RUYWJsZVsxMjhdOwotICAgIGludCBmb250 SGVpZ2h0OwotICAgIFNrQml0bWFwIGJpdG1hcCA9IFdlYkNvcmU6OkNvbXBvc2l0b3JIVURGb250 QXRsYXM6OmdlbmVyYXRlRm9udEF0bGFzKGFzY2lpVG9SZWN0VGFibGUsIGZvbnRIZWlnaHQpOwot ICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0Rm9udEF0bGFzKGFzY2lpVG9SZWN0VGFibGUsIGJpdG1h cCwgZm9udEhlaWdodCk7Ci0gICAgbV9pc0ZvbnRBdGxhc0xvYWRlZCA9IHRydWU7Ci19Ci0KICNl bmRpZgogCiBuYW1lc3BhY2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmgKaW5kZXggNTljMzIwNmU1OGI1ZjNmM2Y2ZGI4YzM3NDkwZjc5ZjE5N2U3YWQ1Yy4uMmVmMzUw MzFiNDdmNzU2YmY4OGE0NzQ4NDI3NDIzMGVmNWJkNGQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC02NTAsNyArNjUwLDYgQEAgcHJpdmF0ZToKIAogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICB2b2lkIHNldElzQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0FjdGl2ZShib29sKTsKLSAgICB2b2lkIGxvYWRGb250QXRsYXNJZk5lY2Vzc2Fy eSgpOwogICAgIHZvaWQgZG9Db21wb3NpdGUoKTsKICAgICB2b2lkIGRvUGl4ZWxSZWFkYmFja1Rv Q2FudmFzKFdlYkNhbnZhcyosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2b2lkIHJl YWxsb2NhdGVSZW5kZXJlcigpOwpAQCAtODQ3LDcgKzg0Niw2IEBAIHByaXZhdGU6CiAgICAgYm9v bCBtX2NvbXBvc2l0b3JTdXJmYWNlUmVhZHk7CiAgICAgZmxvYXQgbV9kZXZpY2VTY2FsZUluQ29t cG9zaXRvcjsKICAgICBpbnQgbV9pbnB1dEhhbmRsZXJJZGVudGlmaWVyOwotICAgIGJvb2wgbV9p c0ZvbnRBdGxhc0xvYWRlZDsKICNlbmRpZgogICAgIHN0YXRpYyBjb25zdCBXZWJJbnB1dEV2ZW50 KiBtX2N1cnJlbnRJbnB1dEV2ZW50OwogCg== 177281 2012-12-03 10:18:53 -0800 2012-12-04 18:04:09 -0800 Patch bug-102960-20121203101620.patch text/plain 5791 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3NmJhNDZjMDA4NGZm NDhlY2ZkYjFmYjYzM2Y3NWRiMzBkMjNmOTdhLi43OGVmNzA1Njc5ZWZiMmYxYzkyZWQzNDY5ZTY0 MmVmODg4ZDkyOTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0xMi0wMyAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hy b21pdW1dIFJlbW92ZSBXZWJMYXllclRyZWVWaWV3IEFQSSB0byBzZXQgZm9udCBhdGxhcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTYwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlcyBvbGQg Zm9udCBhdGxhcyBjcmVhdGlvbiBmcm9tIFdlYlZpZXdJbXBsLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaDoKKwogMjAxMi0xMS0yOCAgVG9tbXkgV2lkZW5m bHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBBZGQgYmFzaWMgaW1wbGVtZW50 YXRpb24gZm9yIE1lZGlhU3RyZWFtQXVkaW9EZXN0aW5hdGlvbk5vZGUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggYzRkODliZTNhODExZWUwY2ZhMWFjMDIzMDA3OTMxMTBhMDdkY2YzZi4u ZTlkODlkMDg5MDdkNGEwZTgxYmRiYzVlYzI5ZjJlYmMxMmFjZTExNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0xMi0wMyAgRWJlcmhhcmQgR3JhZXRo ZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBX ZWJMYXllclRyZWVWaWV3IEFQSSB0byBzZXQgZm9udCBhdGxhcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTYwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlcyBvbGQgZm9udCBhdGxhcyBjcmVh dGlvbiBmcm9tIFdlYlZpZXdJbXBsLgorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSk6CisgICAgICAg IChXZWJLaXQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEyLTEyLTAzICBU b21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgogCiAgICAgICAgIFNwZWVjaCBS ZWNvZ25pdGlvbiBBUEk6IFVwZGF0ZSBTcGVlY2hSZWNvZ25pdGlvbkV2ZW50IHRvIG1hdGNoIHRo ZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVi bGljL1dlYkxheWVyVHJlZVZpZXcuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMv V2ViTGF5ZXJUcmVlVmlldy5oCmluZGV4IDM4YjY0NDlhYWNlZTM3MmQ3ZDFhNmJiMDEzZTJhYWFj Y2M5ZGIyODIuLjI0MWU5ZGEwYTJmNDJkODBjOWE3NjNmYzk1MjUwMzc3MmQ3ODYyMDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5o CisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5o CkBAIC0zMyw4ICszMyw2IEBACiAjaW5jbHVkZSAiV2ViUHJpdmF0ZU93blB0ci5oIgogI2luY2x1 ZGUgIldlYlNpemUuaCIKIAotY2xhc3MgU2tCaXRtYXA7Ci0KIG5hbWVzcGFjZSBXZWJLaXQgewog Y2xhc3MgV2ViR3JhcGhpY3NDb250ZXh0M0Q7CiBjbGFzcyBXZWJMYXllcjsKQEAgLTE4NSwxMCAr MTgzLDYgQEAgcHVibGljOgogICAgIC8vIFRvZ2dsZXMgdGhlIHBhaW50IHJlY3RzIGluIHRoZSBI VUQgbGF5ZXIKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd1BhaW50UmVjdHMoYm9vbCkgeyB9CiAK LSAgICAvLyBQcm92aWRlcyBhIGZvbnQgYXRsYXMgdG8gdXNlIGZvciBkZWJ1ZyB2aXN1YWxpemF0 aW9ucy4gVGhlIGF0bGFzIG11c3QgYmUgYSBiaXRtYXAgY29udGFpbmluZyBnbHlwaCBkYXRhLCBh IHRhYmxlIG9mCi0gICAgLy8gQVNDSUkgY2hhcmFjdGVyIHZhbHVlcyB0byBhIHN1YnJlY3Rhbmds ZSBvZiB0aGUgYXRsYXMgcmVwcmVzZW50aW5nIHRoZSBjb3JyZXNwb25kaW5nIGdseXBoLCBhbmQg dGhlIGdseXBoIGhlaWdodC4KLSAgICB2aXJ0dWFsIHZvaWQgc2V0Rm9udEF0bGFzKFdlYlJlY3Qg YXNjaWlUb1JlY3RUYWJsZVsxMjhdLCBjb25zdCBTa0JpdG1hcCYsIGludCBmb250SGVpZ2h0KSB7 IH0KLQogICAgIC8vIFNpbXVsYXRlcyBhIGxvc3QgY29udGV4dC4gRm9yIHRlc3Rpbmcgb25seS4K ICAgICB2aXJ0dWFsIHZvaWQgbG9zZUNvbXBvc2l0b3JDb250ZXh0KGludCBudW1UaW1lcykgPSAw OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBm NjZhZTQ4YzQ4ZDhhMzhlZWUyMGQ3NGZmYzc0NTM3MWU3MGIxMDA4Li4wNmY1NDM5NGQ0NTUwMGUw OTFlMWJkODgwYjgxMjBlMmNjNGJmZjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwCkBAIC00MzEsNyArNDMxLDYgQEAgV2ViVmlld0ltcGw6OldlYlZpZXdJ bXBsKFdlYlZpZXdDbGllbnQqIGNsaWVudCkKICAgICAsIG1fY29tcG9zaXRvclN1cmZhY2VSZWFk eShmYWxzZSkKICAgICAsIG1fZGV2aWNlU2NhbGVJbkNvbXBvc2l0b3IoMSkKICAgICAsIG1faW5w dXRIYW5kbGVySWRlbnRpZmllcigtMSkKLSAgICAsIG1faXNGb250QXRsYXNMb2FkZWQoZmFsc2Up CiAjZW5kaWYKICNpZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQogICAgICwgbV9zcGVlY2hJbnB1dENs aWVudChTcGVlY2hJbnB1dENsaWVudEltcGw6OmNyZWF0ZShjbGllbnQpKQpAQCAtODQwLDkgKzgz OSw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyKGJvb2wgc2hvdykKIHsK ICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpIHsKICAgICAgICAgVFJB Q0VfRVZFTlQwKCJ3ZWJraXQiLCAiV2ViVmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyIik7Ci0j aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBsb2FkRm9udEF0bGFzSWZO ZWNlc3NhcnkoKTsKLSNlbmRpZgogICAgICAgICBtX2xheWVyVHJlZVZpZXctPnNldFNob3dGUFND b3VudGVyKHNob3cpOwogICAgIH0KICAgICBzZXR0aW5nc0ltcGwoKS0+c2V0U2hvd0ZQU0NvdW50 ZXIoc2hvdyk7CkBAIC00MDM5LDEzICs0MDM1LDkgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogICAgICAgICAgICAgbV9j bGllbnQtPmRpZEFjdGl2YXRlQ29tcG9zaXRvcihtX2lucHV0SGFuZGxlcklkZW50aWZpZXIpOwog ICAgICAgICAgICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUgPSB0cnVlOwogICAg ICAgICAgICAgbV9jb21wb3NpdG9yQ3JlYXRpb25GYWlsZWQgPSBmYWxzZTsKLSAgICAgICAgICAg IG1faXNGb250QXRsYXNMb2FkZWQgPSBmYWxzZTsKICAgICAgICAgICAgIGlmIChtX3BhZ2VPdmVy bGF5cykKICAgICAgICAgICAgICAgICBtX3BhZ2VPdmVybGF5cy0+dXBkYXRlKCk7CiAKLSAgICAg ICAgICAgIGlmIChsYXllclRyZWVWaWV3U2V0dGluZ3Muc2hvd1BsYXRmb3JtTGF5ZXJUcmVlKQot ICAgICAgICAgICAgICAgIGxvYWRGb250QXRsYXNJZk5lY2Vzc2FyeSgpOwotCiAgICAgICAgICAg ICBpZiAoc2V0dGluZ3NJbXBsKCktPnNob3dGUFNDb3VudGVyKCkpCiAgICAgICAgICAgICAgICAg c2V0U2hvd0ZQU0NvdW50ZXIodHJ1ZSk7CiAgICAgICAgIH0gZWxzZSB7CkBAIC00MDU5LDIxICs0 MDUxLDYgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0 aXZlKGJvb2wgYWN0aXZlKQogICAgICAgICBwYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCktPnNl dENsaXBzUmVwYWludHMoIW1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKTsKIH0KIAot dm9pZCBXZWJWaWV3SW1wbDo6bG9hZEZvbnRBdGxhc0lmTmVjZXNzYXJ5KCkKLXsKLSAgICBBU1NF UlQobV9sYXllclRyZWVWaWV3KTsKLQotICAgIGlmIChtX2lzRm9udEF0bGFzTG9hZGVkKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJWaWV3SW1wbDo6 bG9hZEZvbnRBdGxhcyIpOwotICAgIFdlYlJlY3QgYXNjaWlUb1JlY3RUYWJsZVsxMjhdOwotICAg IGludCBmb250SGVpZ2h0OwotICAgIFNrQml0bWFwIGJpdG1hcCA9IFdlYkNvcmU6OkNvbXBvc2l0 b3JIVURGb250QXRsYXM6OmdlbmVyYXRlRm9udEF0bGFzKGFzY2lpVG9SZWN0VGFibGUsIGZvbnRI ZWlnaHQpOwotICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0Rm9udEF0bGFzKGFzY2lpVG9SZWN0VGFi bGUsIGJpdG1hcCwgZm9udEhlaWdodCk7Ci0gICAgbV9pc0ZvbnRBdGxhc0xvYWRlZCA9IHRydWU7 Ci19Ci0KICNlbmRpZgogCiBuYW1lc3BhY2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmgKaW5kZXggNjI0NmNhYjBlOTU4YWEzYjgyNjU4NzcxZmJiOWIxYjYzMzQxZjMw Yy4uYWZmY2E3NTdjMTlhZWRjOWUzZGNiM2NmNmJiY2NmYzkyNjFlY2EwMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC02NTMsNyArNjUzLDYgQEAgcHJpdmF0 ZToKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICB2b2lkIHNldElzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShib29sKTsKLSAgICB2b2lkIGxvYWRGb250QXRsYXNJ Zk5lY2Vzc2FyeSgpOwogICAgIHZvaWQgZG9Db21wb3NpdGUoKTsKICAgICB2b2lkIGRvUGl4ZWxS ZWFkYmFja1RvQ2FudmFzKFdlYkNhbnZhcyosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAg ICB2b2lkIHJlYWxsb2NhdGVSZW5kZXJlcigpOwpAQCAtODQ4LDcgKzg0Nyw2IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX2NvbXBvc2l0b3JTdXJmYWNlUmVhZHk7CiAgICAgZmxvYXQgbV9kZXZpY2VT Y2FsZUluQ29tcG9zaXRvcjsKICAgICBpbnQgbV9pbnB1dEhhbmRsZXJJZGVudGlmaWVyOwotICAg IGJvb2wgbV9pc0ZvbnRBdGxhc0xvYWRlZDsKICNlbmRpZgogICAgIHN0YXRpYyBjb25zdCBXZWJJ bnB1dEV2ZW50KiBtX2N1cnJlbnRJbnB1dEV2ZW50OwogCg== 177632 2012-12-04 18:04:13 -0800 2012-12-05 14:39:44 -0800 Patch bug-102960-20121204180139.patch text/plain 5771 egraether U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBkMDZjMzMxZGQ2YmM2 OTE2MDMyNDk0ODcwMjM3ODMwYWU0MDRlODY0Li5jMmY0YjY1ZmFiMWY2MDNhN2IyODE1ZWMzZmVh MjE1YTdiMzMwNGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0xMi0wNCAg RWJlcmhhcmQgR3JhZXRoZXIgIDxlZ3JhZXRoZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hy b21pdW1dIFJlbW92ZSBXZWJMYXllclRyZWVWaWV3IEFQSSB0byBzZXQgZm9udCBhdGxhcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTYwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlcyBvbGQg Zm9udCBhdGxhcyBjcmVhdGlvbiBmcm9tIFdlYlZpZXdJbXBsLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaDoKKwogMjAxMi0xMi0wNCAgR2xlbm4gSGFydG1h bm4gIDxoYXJ0bWFubmdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEd1dCBXZWJSZW5kZXJpbmdT dGF0cyBzaW5jZSB3ZSBubyBsb25nZXIgdXNlIGl0cyBtZW1iZXIgdmFyaWFibGVzLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwppbmRleCBlMTMxN2QxOWFlMjA5ZGRmZGVhZTVmMTI2ZjExZGM0MzBk MDYxZGU2Li45ZDIwNjNkYTIyMTVkYWQwZTUwNTc5ZWU2N2Y0NjQ3NjkzNzBmNTVmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTA0ICBFYmVyaGFy ZCBHcmFldGhlciAgPGVncmFldGhlckBnb29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0g UmVtb3ZlIFdlYkxheWVyVHJlZVZpZXcgQVBJIHRvIHNldCBmb250IGF0bGFzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI5NjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVzIG9sZCBmb250IGF0 bGFzIGNyZWF0aW9uIGZyb20gV2ViVmlld0ltcGwuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0lt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwpOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0U2hvd0ZQU0NvdW50ZXIpOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKToK KyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTIt MTItMDQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbVjhdIENs ZWFudXAgc3R5bGUgaW4gVjhET01XcmFwcGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJv bWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oCmluZGV4IDM4YjY0NDlhYWNlZTM3MmQ3ZDFh NmJiMDEzZTJhYWFjY2M5ZGIyODIuLjI0MWU5ZGEwYTJmNDJkODBjOWE3NjNmYzk1MjUwMzc3MmQ3 ODYyMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5 ZXJUcmVlVmlldy5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5 ZXJUcmVlVmlldy5oCkBAIC0zMyw4ICszMyw2IEBACiAjaW5jbHVkZSAiV2ViUHJpdmF0ZU93blB0 ci5oIgogI2luY2x1ZGUgIldlYlNpemUuaCIKIAotY2xhc3MgU2tCaXRtYXA7Ci0KIG5hbWVzcGFj ZSBXZWJLaXQgewogY2xhc3MgV2ViR3JhcGhpY3NDb250ZXh0M0Q7CiBjbGFzcyBXZWJMYXllcjsK QEAgLTE4NSwxMCArMTgzLDYgQEAgcHVibGljOgogICAgIC8vIFRvZ2dsZXMgdGhlIHBhaW50IHJl Y3RzIGluIHRoZSBIVUQgbGF5ZXIKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd1BhaW50UmVjdHMo Ym9vbCkgeyB9CiAKLSAgICAvLyBQcm92aWRlcyBhIGZvbnQgYXRsYXMgdG8gdXNlIGZvciBkZWJ1 ZyB2aXN1YWxpemF0aW9ucy4gVGhlIGF0bGFzIG11c3QgYmUgYSBiaXRtYXAgY29udGFpbmluZyBn bHlwaCBkYXRhLCBhIHRhYmxlIG9mCi0gICAgLy8gQVNDSUkgY2hhcmFjdGVyIHZhbHVlcyB0byBh IHN1YnJlY3RhbmdsZSBvZiB0aGUgYXRsYXMgcmVwcmVzZW50aW5nIHRoZSBjb3JyZXNwb25kaW5n IGdseXBoLCBhbmQgdGhlIGdseXBoIGhlaWdodC4KLSAgICB2aXJ0dWFsIHZvaWQgc2V0Rm9udEF0 bGFzKFdlYlJlY3QgYXNjaWlUb1JlY3RUYWJsZVsxMjhdLCBjb25zdCBTa0JpdG1hcCYsIGludCBm b250SGVpZ2h0KSB7IH0KLQogICAgIC8vIFNpbXVsYXRlcyBhIGxvc3QgY29udGV4dC4gRm9yIHRl c3Rpbmcgb25seS4KICAgICB2aXJ0dWFsIHZvaWQgbG9zZUNvbXBvc2l0b3JDb250ZXh0KGludCBu dW1UaW1lcykgPSAwOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAppbmRleCA2ZGYzZGEyMDgwYTI3ZGY0ZGJkYWUwYTk2Y2M4NDI3OTE3NzI1YjU1Li41MDdm Njg4ZTIzZGJiNmU0MWQ2NDk4NjhiZGJjMGQzNzRiYWZhOTZiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC00MzEsNyArNDMxLDYgQEAgV2ViVmlld0lt cGw6OldlYlZpZXdJbXBsKFdlYlZpZXdDbGllbnQqIGNsaWVudCkKICAgICAsIG1fY29tcG9zaXRv clN1cmZhY2VSZWFkeShmYWxzZSkKICAgICAsIG1fZGV2aWNlU2NhbGVJbkNvbXBvc2l0b3IoMSkK ICAgICAsIG1faW5wdXRIYW5kbGVySWRlbnRpZmllcigtMSkKLSAgICAsIG1faXNGb250QXRsYXNM b2FkZWQoZmFsc2UpCiAjZW5kaWYKICNpZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQogICAgICwgbV9z cGVlY2hJbnB1dENsaWVudChTcGVlY2hJbnB1dENsaWVudEltcGw6OmNyZWF0ZShjbGllbnQpKQpA QCAtODQyLDkgKzg0MSw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldFNob3dGUFNDb3VudGVyKGJv b2wgc2hvdykKIHsKICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpIHsK ICAgICAgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiV2ViVmlld0ltcGw6OnNldFNob3dGUFND b3VudGVyIik7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBsb2Fk Rm9udEF0bGFzSWZOZWNlc3NhcnkoKTsKLSNlbmRpZgogICAgICAgICBtX2xheWVyVHJlZVZpZXct PnNldFNob3dGUFNDb3VudGVyKHNob3cpOwogICAgIH0KICAgICBtX3Nob3dGUFNDb3VudGVyID0g c2hvdzsKQEAgLTQwNDEsMTMgKzQwMzcsOCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiAgICAgICAgICAgICBtX2NsaWVu dC0+ZGlkQWN0aXZhdGVDb21wb3NpdG9yKG1faW5wdXRIYW5kbGVySWRlbnRpZmllcik7CiAgICAg ICAgICAgICBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSA9IHRydWU7CiAgICAgICAg ICAgICBtX2NvbXBvc2l0b3JDcmVhdGlvbkZhaWxlZCA9IGZhbHNlOwotICAgICAgICAgICAgbV9p c0ZvbnRBdGxhc0xvYWRlZCA9IGZhbHNlOwogICAgICAgICAgICAgaWYgKG1fcGFnZU92ZXJsYXlz KQogICAgICAgICAgICAgICAgIG1fcGFnZU92ZXJsYXlzLT51cGRhdGUoKTsKLQotICAgICAgICAg ICAgaWYgKGxheWVyVHJlZVZpZXdTZXR0aW5ncy5zaG93UGxhdGZvcm1MYXllclRyZWUpCi0gICAg ICAgICAgICAgICAgbG9hZEZvbnRBdGxhc0lmTmVjZXNzYXJ5KCk7Ci0KICAgICAgICAgICAgIG1f bGF5ZXJUcmVlVmlldy0+c2V0U2hvd0ZQU0NvdW50ZXIobV9zaG93RlBTQ291bnRlcik7CiAgICAg ICAgICAgICBtX2xheWVyVHJlZVZpZXctPnNldFNob3dQYWludFJlY3RzKG1fc2hvd1BhaW50UmVj dHMpOwogICAgICAgICB9IGVsc2UgewpAQCAtNDA2MSwyMSArNDA1Miw2IEBAIHZvaWQgV2ViVmll d0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShib29sIGFjdGl2ZSkKICAg ICAgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpLT5zZXRDbGlwc1JlcGFpbnRzKCFtX2lz QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSk7CiB9CiAKLXZvaWQgV2ViVmlld0ltcGw6Omxv YWRGb250QXRsYXNJZk5lY2Vzc2FyeSgpCi17Ci0gICAgQVNTRVJUKG1fbGF5ZXJUcmVlVmlldyk7 Ci0KLSAgICBpZiAobV9pc0ZvbnRBdGxhc0xvYWRlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg VFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiV2ViVmlld0ltcGw6OmxvYWRGb250QXRsYXMiKTsKLSAg ICBXZWJSZWN0IGFzY2lpVG9SZWN0VGFibGVbMTI4XTsKLSAgICBpbnQgZm9udEhlaWdodDsKLSAg ICBTa0JpdG1hcCBiaXRtYXAgPSBXZWJDb3JlOjpDb21wb3NpdG9ySFVERm9udEF0bGFzOjpnZW5l cmF0ZUZvbnRBdGxhcyhhc2NpaVRvUmVjdFRhYmxlLCBmb250SGVpZ2h0KTsKLSAgICBtX2xheWVy VHJlZVZpZXctPnNldEZvbnRBdGxhcyhhc2NpaVRvUmVjdFRhYmxlLCBiaXRtYXAsIGZvbnRIZWln aHQpOwotICAgIG1faXNGb250QXRsYXNMb2FkZWQgPSB0cnVlOwotfQotCiAjZW5kaWYKIAogbmFt ZXNwYWNlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDNh OWY5MjMzMTNkYjU0ZDM2NTVlNjNhZWU3YzM1OTVhYjNiZDk3MzQuLjg2ZjU2OTQxMDljYzVhOWM1 YmY5NDU4OGUyMzYxZTI1YjljZjRjOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaApAQCAtNjUzLDcgKzY1Myw2IEBAIHByaXZhdGU6CiAKICNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCiAgICAgdm9pZCBzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdB Y3RpdmUoYm9vbCk7Ci0gICAgdm9pZCBsb2FkRm9udEF0bGFzSWZOZWNlc3NhcnkoKTsKICAgICB2 b2lkIGRvQ29tcG9zaXRlKCk7CiAgICAgdm9pZCBkb1BpeGVsUmVhZGJhY2tUb0NhbnZhcyhXZWJD YW52YXMqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdm9pZCByZWFsbG9jYXRlUmVu ZGVyZXIoKTsKQEAgLTg0OCw3ICs4NDcsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9jb21wb3Np dG9yU3VyZmFjZVJlYWR5OwogICAgIGZsb2F0IG1fZGV2aWNlU2NhbGVJbkNvbXBvc2l0b3I7CiAg ICAgaW50IG1faW5wdXRIYW5kbGVySWRlbnRpZmllcjsKLSAgICBib29sIG1faXNGb250QXRsYXNM b2FkZWQ7CiAjZW5kaWYKICAgICBzdGF0aWMgY29uc3QgV2ViSW5wdXRFdmVudCogbV9jdXJyZW50 SW5wdXRFdmVudDsKIAo=