132612 2014-05-06 09:54:15 -0700 "Flash of content without image" when pasting a raw image from the pasteboard 2014-05-06 13:10:33 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson ap commit-queue sam thorton oldest_to_newest 1006981 0 beidson 2014-05-06 09:54:15 -0700 "Flash of content without image" when pasting a raw image from the pasteboard The sequence of events goes like this: -EditorMac has an ArchiveResource for the raw image and puts it in the document loader. -Editor inserts the new document fragment with the <img> element for the raw image -CachedResourceLoader is asked for the CachedImage for the new image -Because a CachedImage doesn't exist yet, a "substitute resource delivery" is scheduled, where the ArchiveResource will be loaded after a zero-delay -But before it is loaded, a layout and paint happens with the image resource missing, causing a radical change in layout and a "flash of content without image" that is quite noticeable. I have a simple patch which lets certain flagged ArchiveResources load into a CachedResource synchronously. It's a little deficient in that the load does not go through ResourceLoader and therefore doesn't get load callbacks. In this case (pasting a raw image from the pasteboard that has a webkit-fake-url: url) the tradeoff seems fine... but going forward we really need a better solution for this type of problem. <rdar://problem/16826199> 1006988 1 230916 beidson 2014-05-06 10:15:13 -0700 Created attachment 230916 Patch v1 1007011 2 thorton 2014-05-06 10:56:45 -0700 It would be good if alexey or someone could peek at this too. 1007012 3 thorton 2014-05-06 10:57:43 -0700 r- because this affects more than just the single image case as discussed on IRC 1007033 4 230922 beidson 2014-05-06 12:02:59 -0700 Created attachment 230922 Patch v2 - Only in the "paste a single raw image" case 1007056 5 230922 commit-queue 2014-05-06 13:10:30 -0700 Comment on attachment 230922 Patch v2 - Only in the "paste a single raw image" case Clearing flags on attachment: 230922 Committed r168376: <http://trac.webkit.org/changeset/168376> 1007057 6 commit-queue 2014-05-06 13:10:33 -0700 All reviewed patches have been landed. Closing bug. 230916 2014-05-06 10:15:13 -0700 2014-05-06 12:02:59 -0700 Patch v1 patch text/plain 5389 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2M2JhOWNiLi5kYmJhZDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMDUtMDYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgICJGbGFzaCBvZiBjb250ZW50IHdpdGhvdXQgaW1hZ2UiIHdoZW4gcGFzdGluZyBhIHJhdyBp bWFnZSBmcm9tIHRoZSBwYXN0ZWJvYXJkCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjgyNjE5 OT4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI2MTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQgYW4gQXJj aGl2ZVJlc291cmNlIGJlIGZsYWdnZWQgYXMgInNob3VsZCBsb2FkIGltbWVkaWF0ZWx5IjoKKyAg ICAgICAgKiBsb2FkZXIvYXJjaGl2ZS9BcmNoaXZlUmVzb3VyY2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QXJjaGl2ZVJlc291cmNlOjpBcmNoaXZlUmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRl ci9hcmNoaXZlL0FyY2hpdmVSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXJjaGl2ZVJl c291cmNlOjpzZXRTaG91bGRMb2FkSW1tZWRpYXRlbHkpOgorICAgICAgICAoV2ViQ29yZTo6QXJj aGl2ZVJlc291cmNlOjpzaG91bGRMb2FkSW1tZWRpYXRlbHkpOgorCisgICAgICAgIFNldCB0aGF0 IGZsYWcgb24gdGhlIEFyY2hpdmVSZXNvdXJjZSBmb3IgdGhlIGltYWdlOgorICAgICAgICAqIGVk aXRpbmcvbWFjL0VkaXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Y3JlYXRl RnJhZ21lbnRGb3JJbWFnZVJlc291cmNlQW5kQWRkUmVzb3VyY2UpOgorCisgICAgICAgIFdoZW4g Y3JlYXRpbmcgYSBuZXcgQ2FjaGVkUmVzb3VyY2UsIGlmIHRoZXJlIGlzIGFuIEFyY2hpdmVSZXNv dXJjZSB0aGF0IGlzIHNldCB0bworICAgICAgICBsb2FkIGltbWVkaWF0ZWx5LCBwb3B1bGF0ZSB0 aGUgQ2FjaGVkUmVzb3VyY2UgaW1tZWRpYXRlbHkgaW5zdGVhZCBvZiBzY2hlZHVsaW5nIGEgbG9h ZDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZSk6CisK IDIwMTQtMDUtMDYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAg ICAgICBBWDogVm9pY2VPdmVyIGRvZXMgbm90IGFubm91bmNlIHRleHQgY2hhbmdlcyBmb3IgY29u dGVudCBlZGl0YWJsZSByZWdpb25zIGluIFNhZmFyaQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMv RWRpdG9yTWFjLm1tCmluZGV4IGVhMjUwNjcuLjJjNDAxNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL21hYy9FZGl0b3JNYWMubW0KQEAgLTU4OCw2ICs1ODgsOCBAQCBQYXNzUmVmUHRyPERvY3Vt ZW50RnJhZ21lbnQ+IEVkaXRvcjo6Y3JlYXRlRnJhZ21lbnRGb3JJbWFnZVJlc291cmNlQW5kQWRk UmVzb3VyYwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisg ICAgcmVzb3VyY2UtPnNldFNob3VsZExvYWRJbW1lZGlhdGVseSh0cnVlKTsKKwogICAgIC8vIEZJ WE1FOiBUaGUgY29kZSBpbiBjcmVhdGVGcmFnbWVudEFuZEFkZFJlc291cmNlcyBjYWxscyBzZXRE ZWZlcnNMb2FkaW5nKHRydWUpLiBEb24ndCB3ZSBuZWVkIHRoYXQgaGVyZT8KICAgICBpZiAoRG9j dW1lbnRMb2FkZXIqIGxvYWRlciA9IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSkK ICAgICAgICAgbG9hZGVyLT5hZGRBcmNoaXZlUmVzb3VyY2UocmVzb3VyY2UuZ2V0KCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2ZVJlc291cmNlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0FyY2hpdmVSZXNvdXJjZS5jcHAKaW5k ZXggM2Q1YzYyYy4uODc4ZTBkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Fy Y2hpdmUvQXJjaGl2ZVJlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJj aGl2ZS9BcmNoaXZlUmVzb3VyY2UuY3BwCkBAIC0zOSw2ICszOSw3IEBAIGlubGluZSBBcmNoaXZl UmVzb3VyY2U6OkFyY2hpdmVSZXNvdXJjZShQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZGF0YSwg Y29uc3QgVVJMCiAgICAgLCBtX3RleHRFbmNvZGluZyh0ZXh0RW5jb2RpbmcpCiAgICAgLCBtX2Zy YW1lTmFtZShmcmFtZU5hbWUpCiAgICAgLCBtX3Nob3VsZElnbm9yZVdoZW5VbmFyY2hpdmluZyhm YWxzZSkKKyAgICAsIG1fc2hvdWxkTG9hZEltbWVkaWF0ZWx5KGZhbHNlKQogewogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlUmVzb3VyY2UuaCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0FyY2hpdmVSZXNvdXJjZS5oCmluZGV4IDJl ZjA0MDQuLjhiYjUzODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZl L0FyY2hpdmVSZXNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0Fy Y2hpdmVSZXNvdXJjZS5oCkBAIC00Nyw2ICs0Nyw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGlnbm9y ZVdoZW5VbmFyY2hpdmluZygpIHsgbV9zaG91bGRJZ25vcmVXaGVuVW5hcmNoaXZpbmcgPSB0cnVl OyB9CiAgICAgYm9vbCBzaG91bGRJZ25vcmVXaGVuVW5hcmNoaXZpbmcoKSBjb25zdCB7IHJldHVy biBtX3Nob3VsZElnbm9yZVdoZW5VbmFyY2hpdmluZzsgfQogCisgICAgdm9pZCBzZXRTaG91bGRM b2FkSW1tZWRpYXRlbHkoYm9vbCBzaG91bGRMb2FkSW1tZWRpYXRlbHkpIHsgbV9zaG91bGRMb2Fk SW1tZWRpYXRlbHkgPSBzaG91bGRMb2FkSW1tZWRpYXRlbHk7IH0KKyAgICBib29sIHNob3VsZExv YWRJbW1lZGlhdGVseSgpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkTG9hZEltbWVkaWF0ZWx5OyB9 CisKIHByaXZhdGU6CiAgICAgQXJjaGl2ZVJlc291cmNlKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVy PiwgY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3RyaW5nJiB0ZXh0 RW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNl Jik7CiAKQEAgLTU1LDYgKzU4LDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV9mcmFtZU5hbWU7 CiAKICAgICBib29sIG1fc2hvdWxkSWdub3JlV2hlblVuYXJjaGl2aW5nOworICAgIGJvb2wgbV9z aG91bGRMb2FkSW1tZWRpYXRlbHk7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCA0OTQ3NDVhLi45ZmRl OTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJDYWNoZWRSZXNvdXJjZUxvYWRlci5oIgogCisjaW5jbHVkZSAiQXJjaGl2ZVJlc291 cmNlLmgiCiAjaW5jbHVkZSAiQ2FjaGVkQ1NTU3R5bGVTaGVldC5oIgogI2luY2x1ZGUgIkNhY2hl ZFNWR0RvY3VtZW50LmgiCiAjaW5jbHVkZSAiQ2FjaGVkRm9udC5oIgpAQCAtNTEsNiArNTIsNyBA QAogI2luY2x1ZGUgIlBpbmdMb2FkZXIuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmF0ZWdpZXMu aCIKICNpbmNsdWRlICJSZW5kZXJFbGVtZW50LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VCdWZmZXIu aCIKICNpbmNsdWRlICJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaCIKICNpbmNsdWRlICJTY3JpcHRD b250cm9sbGVyLmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKQEAgLTQ2Nyw5ICs0Njks MTcgQEAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UoQ2FjaGUKICAgICAgICAgcmVzb3VyY2UtPnNldExvYWRQ cmlvcml0eShyZXF1ZXN0LnByaW9yaXR5KCkpOwogCiAgICAgaWYgKChwb2xpY3kgIT0gVXNlIHx8 IHJlc291cmNlLT5zdGlsbE5lZWRzTG9hZCgpKSAmJiBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6Ok5v RGVmZXIgPT0gcmVxdWVzdC5kZWZlcigpKSB7Ci0gICAgICAgIHJlc291cmNlLT5sb2FkKHRoaXMs IHJlcXVlc3Qub3B0aW9ucygpKTsKKyAgICAgICAgQXJjaGl2ZVJlc291cmNlKiBhcmNoaXZlUmVz b3VyY2UgPSBtX2RvY3VtZW50TG9hZGVyID8gbV9kb2N1bWVudExvYWRlci0+YXJjaGl2ZVJlc291 cmNlRm9yVVJMKHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkudXJsKCkpIDogbnVsbHB0cjsKIAot ICAgICAgICAvLyBXZSBkb24ndCBzdXBwb3J0IGltbWVkaWF0ZSBsb2FkcywgYnV0IHdlIGRvIHN1 cHBvcnQgaW1tZWRpYXRlIGZhaWx1cmUuCisgICAgICAgIGlmIChhcmNoaXZlUmVzb3VyY2UgJiYg YXJjaGl2ZVJlc291cmNlLT5zaG91bGRMb2FkSW1tZWRpYXRlbHkoKSkgeworICAgICAgICAgICAg cmVzb3VyY2UtPnJlc3BvbnNlUmVjZWl2ZWQocmVzb3VyY2UtPnJlc3BvbnNlKCkpOworICAgICAg ICAgICAgUmVmUHRyPFJlc291cmNlQnVmZmVyPiBidWZmZXIgPSBSZXNvdXJjZUJ1ZmZlcjo6YWRv cHRTaGFyZWRCdWZmZXIoYXJjaGl2ZVJlc291cmNlLT5kYXRhKCkpOworICAgICAgICAgICAgcmVz b3VyY2UtPmZpbmlzaExvYWRpbmcoYnVmZmVyLmdldCgpKTsKKyAgICAgICAgICAgIHJlc291cmNl LT5maW5pc2goKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICByZXNvdXJjZS0+bG9hZCh0 aGlzLCByZXF1ZXN0Lm9wdGlvbnMoKSk7CisKKyAgICAgICAgLy8gV2Ugb25seSBzb21ldGltZXMg c3VwcG9ydCBpbW1lZGlhdGUgbG9hZHMsIGJ1dCB3ZSBhbHdheXMgc3VwcG9ydCBpbW1lZGlhdGUg ZmFpbHVyZS4KICAgICAgICAgaWYgKHJlc291cmNlLT5lcnJvck9jY3VycmVkKCkpIHsKICAgICAg ICAgICAgIGlmIChyZXNvdXJjZS0+aW5DYWNoZSgpKQogICAgICAgICAgICAgICAgIG1lbW9yeUNh Y2hlKCktPnJlbW92ZShyZXNvdXJjZS5nZXQoKSk7Cg== 230922 2014-05-06 12:02:59 -0700 2014-05-06 13:10:29 -0700 Patch v2 - Only in the "paste a single raw image" case patch text/plain 5877 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2M2JhOWNiLi41OGE5NWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTQtMDUtMDYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgICJGbGFzaCBvZiBjb250ZW50IHdpdGhvdXQgaW1hZ2UiIHdoZW4gcGFzdGluZyBhIHJhdyBp bWFnZSBmcm9tIHRoZSBwYXN0ZWJvYXJkCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjgyNjE5 OT4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI2MTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQgYW4gQXJj aGl2ZVJlc291cmNlIGJlIGZsYWdnZWQgYXMgInNob3VsZCBsb2FkIGltbWVkaWF0ZWx5IjoKKyAg ICAgICAgKiBsb2FkZXIvYXJjaGl2ZS9BcmNoaXZlUmVzb3VyY2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QXJjaGl2ZVJlc291cmNlOjpBcmNoaXZlUmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRl ci9hcmNoaXZlL0FyY2hpdmVSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXJjaGl2ZVJl c291cmNlOjpzZXRTaG91bGRMb2FkSW1tZWRpYXRlbHkpOgorICAgICAgICAoV2ViQ29yZTo6QXJj aGl2ZVJlc291cmNlOjpzaG91bGRMb2FkSW1tZWRpYXRlbHkpOgorCisgICAgICAgIFNldCB0aGF0 IGZsYWcgb24gdGhlIEFyY2hpdmVSZXNvdXJjZSBmb3IgdGhlIGltYWdlLgorICAgICAgICBOb3Rl IHdlIHF1aXRlIGV4cGxpY2l0bHkgZG8gdGhpcyBvbmx5IGluIHRoZSAicmVhZCBhIHNpbmdsZSBp bWFnZSIgZnJvbSB0aGUgcGFzdGVib2FyZAorICAgICAgICBjYXNlLCBiZWNhdXNlIHdlIGRvbid0 IHdhbnQgdG8gZG8gdGhpcyBzeW5jaHJvbm91cyBzdGVwIGZvciBtdWx0aXBsZSBpbWFnZXMgYXQg b25jZQorICAgICAgICBzdWNoIGFzIHdoZW4gcGFzdGluZyBhIFdlYkFyY2hpdmU6CisgICAgICAg ICogZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpX ZWJDb250ZW50UmVhZGVyOjpyZWFkSW1hZ2UpOgorCisgICAgICAgIFdoZW4gY3JlYXRpbmcgYSBu ZXcgQ2FjaGVkUmVzb3VyY2UsIGlmIHRoZXJlIGlzIGFuIEFyY2hpdmVSZXNvdXJjZSB0aGF0IGlz IHNldCB0bworICAgICAgICBsb2FkIGltbWVkaWF0ZWx5LCBwb3B1bGF0ZSB0aGUgQ2FjaGVkUmVz b3VyY2UgaW1tZWRpYXRlbHkgaW5zdGVhZCBvZiBzY2hlZHVsaW5nIGEgbG9hZDoKKyAgICAgICAg KiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZSk6CisKIDIwMTQtMDUtMDYg IENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogVm9p Y2VPdmVyIGRvZXMgbm90IGFubm91bmNlIHRleHQgY2hhbmdlcyBmb3IgY29udGVudCBlZGl0YWJs ZSByZWdpb25zIGluIFNhZmFyaQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9t YWMvRWRpdG9yTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1t CmluZGV4IGVhMjUwNjcuLmM5NmI4YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvbWFjL0VkaXRvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0 b3JNYWMubW0KQEAgLTU0Miw3ICs1NDIsMTAgQEAgYm9vbCBFZGl0b3I6OldlYkNvbnRlbnRSZWFk ZXI6OnJlYWRJbWFnZShQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyLCBjb25zdAogICAg IHR5cGVBc0ZpbGVuYW1lV2l0aEV4dGVuc2lvbi5yZXBsYWNlKCcvJywgJy4nKTsKICAgICBVUkwg aW1hZ2VVUkwgPSBVUkw6OmZha2VVUkxXaXRoUmVsYXRpdmVQYXJ0KHR5cGVBc0ZpbGVuYW1lV2l0 aEV4dGVuc2lvbik7CiAKLSAgICBmcmFnbWVudCA9IGZyYW1lLmVkaXRvcigpLmNyZWF0ZUZyYWdt ZW50Rm9ySW1hZ2VSZXNvdXJjZUFuZEFkZFJlc291cmNlKEFyY2hpdmVSZXNvdXJjZTo6Y3JlYXRl KGJ1ZmZlciwgaW1hZ2VVUkwsIHR5cGUsIGVtcHR5U3RyaW5nKCksIGVtcHR5U3RyaW5nKCkpKTsK KyAgICBSZWZQdHI8QXJjaGl2ZVJlc291cmNlPiBhcmNoaXZlUmVzb3VyY2UgPSBBcmNoaXZlUmVz b3VyY2U6OmNyZWF0ZShidWZmZXIsIGltYWdlVVJMLCB0eXBlLCBlbXB0eVN0cmluZygpLCBlbXB0 eVN0cmluZygpKTsKKyAgICBhcmNoaXZlUmVzb3VyY2UtPnNldFNob3VsZExvYWRJbW1lZGlhdGVs eSh0cnVlKTsKKworICAgIGZyYWdtZW50ID0gZnJhbWUuZWRpdG9yKCkuY3JlYXRlRnJhZ21lbnRG b3JJbWFnZVJlc291cmNlQW5kQWRkUmVzb3VyY2UoYXJjaGl2ZVJlc291cmNlLnJlbGVhc2UoKSk7 CiAgICAgcmV0dXJuIGZyYWdtZW50OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvYXJjaGl2ZS9BcmNoaXZlUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2FyY2hpdmUvQXJjaGl2ZVJlc291cmNlLmNwcAppbmRleCAzZDVjNjJjLi44NzhlMGQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlUmVzb3VyY2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0FyY2hpdmVSZXNvdXJjZS5jcHAK QEAgLTM5LDYgKzM5LDcgQEAgaW5saW5lIEFyY2hpdmVSZXNvdXJjZTo6QXJjaGl2ZVJlc291cmNl KFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRhLCBjb25zdCBVUkwKICAgICAsIG1fdGV4dEVu Y29kaW5nKHRleHRFbmNvZGluZykKICAgICAsIG1fZnJhbWVOYW1lKGZyYW1lTmFtZSkKICAgICAs IG1fc2hvdWxkSWdub3JlV2hlblVuYXJjaGl2aW5nKGZhbHNlKQorICAgICwgbV9zaG91bGRMb2Fk SW1tZWRpYXRlbHkoZmFsc2UpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9hcmNoaXZlL0FyY2hpdmVSZXNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Fy Y2hpdmUvQXJjaGl2ZVJlc291cmNlLmgKaW5kZXggMmVmMDQwNC4uOGJiNTM4NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2ZVJlc291cmNlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2ZVJlc291cmNlLmgKQEAgLTQ3LDYg KzQ3LDkgQEAgcHVibGljOgogICAgIHZvaWQgaWdub3JlV2hlblVuYXJjaGl2aW5nKCkgeyBtX3No b3VsZElnbm9yZVdoZW5VbmFyY2hpdmluZyA9IHRydWU7IH0KICAgICBib29sIHNob3VsZElnbm9y ZVdoZW5VbmFyY2hpdmluZygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkSWdub3JlV2hlblVuYXJj aGl2aW5nOyB9CiAKKyAgICB2b2lkIHNldFNob3VsZExvYWRJbW1lZGlhdGVseShib29sIHNob3Vs ZExvYWRJbW1lZGlhdGVseSkgeyBtX3Nob3VsZExvYWRJbW1lZGlhdGVseSA9IHNob3VsZExvYWRJ bW1lZGlhdGVseTsgfQorICAgIGJvb2wgc2hvdWxkTG9hZEltbWVkaWF0ZWx5KCkgY29uc3QgeyBy ZXR1cm4gbV9zaG91bGRMb2FkSW1tZWRpYXRlbHk7IH0KKwogcHJpdmF0ZToKICAgICBBcmNoaXZl UmVzb3VyY2UoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBjb25zdCBVUkwmLCBjb25zdCBTdHJp bmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZywgY29uc3QgU3RyaW5nJiBm cmFtZU5hbWUsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKIApAQCAtNTUsNiArNTgsNyBAQCBw cml2YXRlOgogICAgIFN0cmluZyBtX2ZyYW1lTmFtZTsKIAogICAgIGJvb2wgbV9zaG91bGRJZ25v cmVXaGVuVW5hcmNoaXZpbmc7CisgICAgYm9vbCBtX3Nob3VsZExvYWRJbW1lZGlhdGVseTsKIH07 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCmluZGV4IDQ5NDc0NWEuLjlmZGU5MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtMjcsNiAr MjcsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlTG9h ZGVyLmgiCiAKKyNpbmNsdWRlICJBcmNoaXZlUmVzb3VyY2UuaCIKICNpbmNsdWRlICJDYWNoZWRD U1NTdHlsZVNoZWV0LmgiCiAjaW5jbHVkZSAiQ2FjaGVkU1ZHRG9jdW1lbnQuaCIKICNpbmNsdWRl ICJDYWNoZWRGb250LmgiCkBAIC01MSw2ICs1Miw3IEBACiAjaW5jbHVkZSAiUGluZ0xvYWRlci5o IgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyYXRlZ2llcy5oIgogI2luY2x1ZGUgIlJlbmRlckVsZW1l bnQuaCIKKyNpbmNsdWRlICJSZXNvdXJjZUJ1ZmZlci5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9h ZFNjaGVkdWxlci5oIgogI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJT ZWN1cml0eU9yaWdpbi5oIgpAQCAtNDY3LDkgKzQ2OSwxNyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRs ZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZShD YWNoZQogICAgICAgICByZXNvdXJjZS0+c2V0TG9hZFByaW9yaXR5KHJlcXVlc3QucHJpb3JpdHko KSk7CiAKICAgICBpZiAoKHBvbGljeSAhPSBVc2UgfHwgcmVzb3VyY2UtPnN0aWxsTmVlZHNMb2Fk KCkpICYmIENhY2hlZFJlc291cmNlUmVxdWVzdDo6Tm9EZWZlciA9PSByZXF1ZXN0LmRlZmVyKCkp IHsKLSAgICAgICAgcmVzb3VyY2UtPmxvYWQodGhpcywgcmVxdWVzdC5vcHRpb25zKCkpOworICAg ICAgICBBcmNoaXZlUmVzb3VyY2UqIGFyY2hpdmVSZXNvdXJjZSA9IG1fZG9jdW1lbnRMb2FkZXIg PyBtX2RvY3VtZW50TG9hZGVyLT5hcmNoaXZlUmVzb3VyY2VGb3JVUkwocmVxdWVzdC5yZXNvdXJj ZVJlcXVlc3QoKS51cmwoKSkgOiBudWxscHRyOwogCi0gICAgICAgIC8vIFdlIGRvbid0IHN1cHBv cnQgaW1tZWRpYXRlIGxvYWRzLCBidXQgd2UgZG8gc3VwcG9ydCBpbW1lZGlhdGUgZmFpbHVyZS4K KyAgICAgICAgaWYgKGFyY2hpdmVSZXNvdXJjZSAmJiBhcmNoaXZlUmVzb3VyY2UtPnNob3VsZExv YWRJbW1lZGlhdGVseSgpKSB7CisgICAgICAgICAgICByZXNvdXJjZS0+cmVzcG9uc2VSZWNlaXZl ZChyZXNvdXJjZS0+cmVzcG9uc2UoKSk7CisgICAgICAgICAgICBSZWZQdHI8UmVzb3VyY2VCdWZm ZXI+IGJ1ZmZlciA9IFJlc291cmNlQnVmZmVyOjphZG9wdFNoYXJlZEJ1ZmZlcihhcmNoaXZlUmVz b3VyY2UtPmRhdGEoKSk7CisgICAgICAgICAgICByZXNvdXJjZS0+ZmluaXNoTG9hZGluZyhidWZm ZXIuZ2V0KCkpOworICAgICAgICAgICAgcmVzb3VyY2UtPmZpbmlzaCgpOworICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgIHJlc291cmNlLT5sb2FkKHRoaXMsIHJlcXVlc3Qub3B0aW9ucygpKTsK KworICAgICAgICAvLyBXZSBvbmx5IHNvbWV0aW1lcyBzdXBwb3J0IGltbWVkaWF0ZSBsb2Fkcywg YnV0IHdlIGFsd2F5cyBzdXBwb3J0IGltbWVkaWF0ZSBmYWlsdXJlLgogICAgICAgICBpZiAocmVz b3VyY2UtPmVycm9yT2NjdXJyZWQoKSkgewogICAgICAgICAgICAgaWYgKHJlc291cmNlLT5pbkNh Y2hlKCkpCiAgICAgICAgICAgICAgICAgbWVtb3J5Q2FjaGUoKS0+cmVtb3ZlKHJlc291cmNlLmdl dCgpKTsK