39142 2010-05-14 16:16:39 -0700 [chromium] Implement support for composited layers containing only an Image element 2010-05-15 13:04:04 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 vangelis webkit-unassigned commit-queue dglazkov fishd kbr oldest_to_newest 226047 0 vangelis 2010-05-14 16:16:39 -0700 Composited Layers that contain only an Image follow a special path that doesn't require allocating additional storage for keeping around the associated bitmap. That path hasn't been implemented in LayerChromium yet. 226051 1 56121 vangelis 2010-05-14 16:33:38 -0700 Created attachment 56121 Proposed patch 226055 2 56121 fishd 2010-05-14 16:51:23 -0700 Comment on attachment 56121 Proposed patch WebCore/ChangeLog:6 + an Image element. nit: please add a bug reference here. R=me with that fixed. 226061 3 56124 vangelis 2010-05-14 16:57:48 -0700 Created attachment 56124 Patch fixed. Added URL to bug in ChangeLog 226063 4 vangelis 2010-05-14 16:59:06 -0700 Uploaded the fix but I'm afraid that I might have inadvertently overwrite the r+ bit.. 226310 5 56124 commit-queue 2010-05-15 13:03:58 -0700 Comment on attachment 56124 Patch fixed. Added URL to bug in ChangeLog Clearing flags on attachment: 56124 Committed r59550: <http://trac.webkit.org/changeset/59550> 226311 6 commit-queue 2010-05-15 13:04:04 -0700 All reviewed patches have been landed. Closing bug. 56121 2010-05-14 16:33:38 -0700 2010-05-14 16:57:48 -0700 Proposed patch imageLayers39142.txt text/plain 5922 vangelis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTUwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDUtMTQgIFZhbmdlbGlzIEtva2tldmlzICA8dmFuZ2VsaXNA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZGluZyBjb2RlIHBhdGggZm9yIGNvbXBvc2l0ZWQgbGF5ZXJzIChMYXllckNocm9t aXVtKSBjb250YWluaW5nIG9ubHkKKyAgICAgICAgYW4gSW1hZ2UgZWxlbWVudC4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgdW5kZXIgdGhlIGV4aXN0aW5nIHRlc3RzIGZvciBjb21w b3NpdGVkIGxheWVycy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dy YXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy Q2hyb21pdW06OnNldENvbnRlbnRzVG9JbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyQ2hyb21pdW06OnVwZGF0ZUNvbnRlbnRzSW1hZ2UpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJDaHJvbWl1bTo6TGF5ZXJDaHJvbWl1bSk6CisgICAgICAgIChXZWJDb3JlOjpM YXllckNocm9taXVtOjpzZXRDb250ZW50cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1 bTo6Y29udGVudHMpOgorCiAyMDEwLTA1LTE0ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5 ZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDU5NDkyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMTEsNyArMzExLDIzIEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250ZW50 c1IKIAogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9JbWFnZShJbWFn ZSogaW1hZ2UpCiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudAorICAgIGJvb2wgY2hpbGRyZW5D aGFuZ2VkID0gZmFsc2U7CisgICAgaWYgKGltYWdlKSB7CisgICAgICAgIG1fcGVuZGluZ0NvbnRl bnRzSW1hZ2UgPSBpbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKKyAgICAgICAg bV9jb250ZW50c0xheWVyUHVycG9zZSA9IENvbnRlbnRzTGF5ZXJGb3JJbWFnZTsKKyAgICAgICAg aWYgKCFtX2NvbnRlbnRzTGF5ZXIpCisgICAgICAgICAgICBjaGlsZHJlbkNoYW5nZWQgPSB0cnVl OworICAgIH0gZWxzZSB7CisgICAgICAgIG1fcGVuZGluZ0NvbnRlbnRzSW1hZ2UgPSAwOworICAg ICAgICBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlID0gTm9Db250ZW50c0xheWVyOworICAgICAgICBp ZiAobV9jb250ZW50c0xheWVyKQorICAgICAgICAgICAgY2hpbGRyZW5DaGFuZ2VkID0gdHJ1ZTsK KyAgICB9CisKKyAgICB1cGRhdGVDb250ZW50c0ltYWdlKCk7CisKKyAgICBpZiAoY2hpbGRyZW5D aGFuZ2VkKQorICAgICAgICB1cGRhdGVTdWJsYXllckxpc3QoKTsKIH0KIAogdm9pZCBHcmFwaGlj c0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9WaWRlbyhQbGF0Zm9ybUxheWVyKiB2aWRlb0xh eWVyKQpAQCAtNDg5LDcgKzUwNSwyMiBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBk YXRlTGF5ZXJCCiAKIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjp1cGRhdGVDb250ZW50c0lt YWdlKCkKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50CisgICAgaWYgKG1fcGVuZGluZ0NvbnRl bnRzSW1hZ2UpIHsKKyAgICAgICAgaWYgKCFtX2NvbnRlbnRzTGF5ZXIuZ2V0KCkpIHsKKyAgICAg ICAgICAgIFJlZlB0cjxMYXllckNocm9taXVtPiBpbWFnZUxheWVyID0gTGF5ZXJDaHJvbWl1bTo6 Y3JlYXRlKExheWVyQ2hyb21pdW06OkxheWVyLCB0aGlzKTsKKworICAgICAgICAgICAgc2V0dXBD b250ZW50c0xheWVyKGltYWdlTGF5ZXIuZ2V0KCkpOworICAgICAgICAgICAgbV9jb250ZW50c0xh eWVyID0gaW1hZ2VMYXllcjsKKyAgICAgICAgICAgIC8vIG1fY29udGVudHNMYXllciB3aWxsIGJl IHBhcmVudGVkIGJ5IHVwZGF0ZVN1YmxheWVyTGlzdC4KKyAgICAgICAgfQorICAgICAgICBtX2Nv bnRlbnRzTGF5ZXItPnNldENvbnRlbnRzKG1fcGVuZGluZ0NvbnRlbnRzSW1hZ2UpOworICAgICAg ICBtX3BlbmRpbmdDb250ZW50c0ltYWdlID0gMDsKKworICAgICAgICB1cGRhdGVDb250ZW50c1Jl Y3QoKTsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyBObyBpbWFnZS4gbV9jb250ZW50c0xheWVy IHdpbGwgYmUgcmVtb3ZlZCB2aWEgdXBkYXRlU3VibGF5ZXJMaXN0LgorICAgICAgICBtX2NvbnRl bnRzTGF5ZXIgPSAwOworICAgIH0KIH0KIAogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVw ZGF0ZUNvbnRlbnRzVmlkZW8oKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oCShyZXZpc2lvbiA1 OTQ5MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXll ckNocm9taXVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0MCw2ICsxNDAsOCBAQCBwcml2YXRlOgog CiAgICAgQ29udGVudHNMYXllclB1cnBvc2UgbV9jb250ZW50c0xheWVyUHVycG9zZTsKICAgICBi b29sIG1fY29udGVudHNMYXllckhhc0JhY2tncm91bmRDb2xvciA6IDE7CisKKyAgICBOYXRpdmVJ bWFnZVB0ciBtX3BlbmRpbmdDb250ZW50c0ltYWdlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9t aXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA1OTQ5MikKKysrIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY5 LDYgKzY5LDcgQEAgTGF5ZXJDaHJvbWl1bTo6TGF5ZXJDaHJvbWl1bShMYXllclR5cGUgdAogICAg ICwgbV9za2lhQ29udGV4dCgwKQogICAgICwgbV9ncmFwaGljc0NvbnRleHQoMCkKICAgICAsIG1f Z2VvbWV0cnlGbGlwcGVkKGZhbHNlKQorICAgICwgbV9jb250ZW50cygwKQogewogICAgIHVwZGF0 ZUdyYXBoaWNzQ29udGV4dChtX2JhY2tpbmdTdG9yZVJlY3QpOwogfQpAQCAtMTIwLDYgKzEyMSwx NCBAQCB2b2lkIExheWVyQ2hyb21pdW06OmRyYXdEZWJ1Z0JvcmRlcigpCiAgICAgbV9ncmFwaGlj c0NvbnRleHQtPmRyYXdMaW5lKEludFBvaW50KDAsIG1fYm91bmRzLmhlaWdodCgpKSwgSW50UG9p bnQobV9ib3VuZHMud2lkdGgoKSwgbV9ib3VuZHMuaGVpZ2h0KCkpKTsKIH0KIAordm9pZCBMYXll ckNocm9taXVtOjpzZXRDb250ZW50cyhOYXRpdmVJbWFnZVB0ciBjb250ZW50cykKK3sKKyAgICAv LyBDaGVjayBpZiB0aGUgaW1hZ2UgaGFzIGNoYW5nZWQuCisgICAgaWYgKG1fY29udGVudHMgPT0g Y29udGVudHMpCisgICAgICAgIHJldHVybjsKKyAgICBtX2NvbnRlbnRzID0gY29udGVudHM7Cit9 CisKIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNDb21taXQoKQogewogICAgIC8vIENhbGwg bm90aWZ5U3luY1JlcXVpcmVkKCksIHdoaWNoIGluIHRoaXMgaW1wbGVtZW50YXRpb24gcGx1bWJz IHRocm91Z2ggdG8KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJDaHJvbWl1bS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5oCShyZXZpc2lvbiA1OTQ5MikKKysrIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCSh3b3JraW5nIGNvcHkpCkBAIC0x NTIsNiArMTUyLDkgQEAgcHVibGljOgogCiAgICAgdm9pZCB1cGRhdGVDb250ZW50cygpOwogCisg ICAgdm9pZCBzZXRDb250ZW50cyhOYXRpdmVJbWFnZVB0ciBjb250ZW50cyk7CisgICAgTmF0aXZl SW1hZ2VQdHIgY29udGVudHMoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRzOyB9CisKICAgICBz a2lhOjpQbGF0Zm9ybUNhbnZhcyogcGxhdGZvcm1DYW52YXMoKSB7IHJldHVybiBtX2NhbnZhcy5n ZXQoKTsgfQogICAgIEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0KCkgeyByZXR1cm4g bV9ncmFwaGljc0NvbnRleHQuZ2V0KCk7IH0KIApAQCAtMTc3LDE3ICsxODAsMTkgQEAgcHJpdmF0 ZToKICAgICAvLyBUaGlzIHNob3VsZCBvbmx5IGJlIGNhbGxlZCBmcm9tIHJlbW92ZUZyb21TdXBl cmxheWVyLgogICAgIHZvaWQgcmVtb3ZlU3VibGF5ZXIoTGF5ZXJDaHJvbWl1bSopOwogCi0gICAg Ly8gUmUtY3JlYXRlIHRoZSBjYW52YXMgYW5kIGdyYXBoaWNzIGNvbnRleHQuIFRoaXMgbWV0aG9k Ci0gICAgLy8gbXVzdCBiZSBjYWxsZWQgZXZlcnkgdGltZSB0aGUgbGF5ZXIgaXMgcmVzaXplZC4K KyAgICAvLyBSZS1jcmVhdGVzIHRoZSBjYW52YXMgYW5kIGdyYXBoaWNzIGNvbnRleHQuIFRoaXMg bWV0aG9kCisgICAgLy8gbXVzdCBiZSBjYWxsZWQgZXZlcnkgdGltZSB0aGUgbGF5ZXIgaXMgcmVz aXplZC4gT25seSBsYXllcnMKICAgICB2b2lkIHVwZGF0ZUdyYXBoaWNzQ29udGV4dChjb25zdCBJ bnRTaXplJik7CiAKICAgICBWZWN0b3I8UmVmUHRyPExheWVyQ2hyb21pdW0+ID4gbV9zdWJsYXll cnM7CiAgICAgTGF5ZXJDaHJvbWl1bSogbV9zdXBlcmxheWVyOwogCiAgICAgR3JhcGhpY3NMYXll ckNocm9taXVtKiBtX293bmVyOworI2lmIFBMQVRGT1JNKFNLSUEpCiAgICAgT3duUHRyPHNraWE6 OlBsYXRmb3JtQ2FudmFzPiBtX2NhbnZhczsKICAgICBPd25QdHI8UGxhdGZvcm1Db250ZXh0U2tp YT4gbV9za2lhQ29udGV4dDsKICAgICBPd25QdHI8R3JhcGhpY3NDb250ZXh0PiBtX2dyYXBoaWNz Q29udGV4dDsKKyNlbmRpZgogCiAgICAgTGF5ZXJUeXBlIG1fbGF5ZXJUeXBlOwogCkBAIC0yMTcs NiArMjIyLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fbmVlZHNEaXNwbGF5T25Cb3VuZHNDaGFu Z2U7CiAKICAgICBDb250ZW50c0dyYXZpdHlUeXBlIG1fY29udGVudHNHcmF2aXR5OworICAgIE5h dGl2ZUltYWdlUHRyIG1fY29udGVudHM7CiAgICAgU3RyaW5nIG1fbmFtZTsKIH07CiAK 56124 2010-05-14 16:57:48 -0700 2010-05-15 13:03:58 -0700 Patch fixed. Added URL to bug in ChangeLog imageLayers39142_1.txt text/plain 5977 vangelis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTUwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDUtMTQgIFZhbmdlbGlzIEtva2tldmlzICA8dmFuZ2VsaXNA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZGluZyBjb2RlIHBhdGggZm9yIGNvbXBvc2l0ZWQgbGF5ZXJzIChMYXllckNocm9t aXVtKSBjb250YWluaW5nIG9ubHkKKyAgICAgICAgYW4gSW1hZ2UgZWxlbWVudC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MTQyCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBjb3ZlcmVkIHVuZGVyIHRoZSBleGlzdGluZyB0ZXN0cyBmb3IgY29tcG9z aXRlZCBsYXllcnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFw aGljc0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNo cm9taXVtOjpzZXRDb250ZW50c1RvSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NM YXllckNocm9taXVtOjp1cGRhdGVDb250ZW50c0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheWVyQ2hyb21pdW06OkxheWVyQ2hyb21pdW0pOgorICAgICAgICAoV2ViQ29yZTo6TGF5 ZXJDaHJvbWl1bTo6c2V0Q29udGVudHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06 OmNvbnRlbnRzKToKKwogMjAxMC0wNS0xNCAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVy Q2hyb21pdW0uY3BwCShyZXZpc2lvbiA1OTQ5MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzExLDcgKzMxMSwyMyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNS CiAKIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250ZW50c1RvSW1hZ2UoSW1hZ2Uq IGltYWdlKQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQKKyAgICBib29sIGNoaWxkcmVuQ2hh bmdlZCA9IGZhbHNlOworICAgIGlmIChpbWFnZSkgeworICAgICAgICBtX3BlbmRpbmdDb250ZW50 c0ltYWdlID0gaW1hZ2UtPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CisgICAgICAgIG1f Y29udGVudHNMYXllclB1cnBvc2UgPSBDb250ZW50c0xheWVyRm9ySW1hZ2U7CisgICAgICAgIGlm ICghbV9jb250ZW50c0xheWVyKQorICAgICAgICAgICAgY2hpbGRyZW5DaGFuZ2VkID0gdHJ1ZTsK KyAgICB9IGVsc2UgeworICAgICAgICBtX3BlbmRpbmdDb250ZW50c0ltYWdlID0gMDsKKyAgICAg ICAgbV9jb250ZW50c0xheWVyUHVycG9zZSA9IE5vQ29udGVudHNMYXllcjsKKyAgICAgICAgaWYg KG1fY29udGVudHNMYXllcikKKyAgICAgICAgICAgIGNoaWxkcmVuQ2hhbmdlZCA9IHRydWU7Cisg ICAgfQorCisgICAgdXBkYXRlQ29udGVudHNJbWFnZSgpOworCisgICAgaWYgKGNoaWxkcmVuQ2hh bmdlZCkKKyAgICAgICAgdXBkYXRlU3VibGF5ZXJMaXN0KCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NM YXllckNocm9taXVtOjpzZXRDb250ZW50c1RvVmlkZW8oUGxhdGZvcm1MYXllciogdmlkZW9MYXll cikKQEAgLTQ4OSw3ICs1MDUsMjIgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0 ZUxheWVyQgogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29udGVudHNJbWFn ZSgpCiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudAorICAgIGlmIChtX3BlbmRpbmdDb250ZW50 c0ltYWdlKSB7CisgICAgICAgIGlmICghbV9jb250ZW50c0xheWVyLmdldCgpKSB7CisgICAgICAg ICAgICBSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gaW1hZ2VMYXllciA9IExheWVyQ2hyb21pdW06OmNy ZWF0ZShMYXllckNocm9taXVtOjpMYXllciwgdGhpcyk7CisKKyAgICAgICAgICAgIHNldHVwQ29u dGVudHNMYXllcihpbWFnZUxheWVyLmdldCgpKTsKKyAgICAgICAgICAgIG1fY29udGVudHNMYXll ciA9IGltYWdlTGF5ZXI7CisgICAgICAgICAgICAvLyBtX2NvbnRlbnRzTGF5ZXIgd2lsbCBiZSBw YXJlbnRlZCBieSB1cGRhdGVTdWJsYXllckxpc3QuCisgICAgICAgIH0KKyAgICAgICAgbV9jb250 ZW50c0xheWVyLT5zZXRDb250ZW50cyhtX3BlbmRpbmdDb250ZW50c0ltYWdlKTsKKyAgICAgICAg bV9wZW5kaW5nQ29udGVudHNJbWFnZSA9IDA7CisKKyAgICAgICAgdXBkYXRlQ29udGVudHNSZWN0 KCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gTm8gaW1hZ2UuIG1fY29udGVudHNMYXllciB3 aWxsIGJlIHJlbW92ZWQgdmlhIHVwZGF0ZVN1YmxheWVyTGlzdC4KKyAgICAgICAgbV9jb250ZW50 c0xheWVyID0gMDsKKyAgICB9CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjp1cGRh dGVDb250ZW50c1ZpZGVvKCkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vR3JhcGhpY3NMYXllckNocm9taXVtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaAkocmV2aXNpb24gNTk0 OTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJD aHJvbWl1bS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDAsNiArMTQwLDggQEAgcHJpdmF0ZToKIAog ICAgIENvbnRlbnRzTGF5ZXJQdXJwb3NlIG1fY29udGVudHNMYXllclB1cnBvc2U7CiAgICAgYm9v bCBtX2NvbnRlbnRzTGF5ZXJIYXNCYWNrZ3JvdW5kQ29sb3IgOiAxOworCisgICAgTmF0aXZlSW1h Z2VQdHIgbV9wZW5kaW5nQ29udGVudHNJbWFnZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1 bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmNwcAkocmV2aXNpb24gNTk0OTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OSw2 ICs2OSw3IEBAIExheWVyQ2hyb21pdW06OkxheWVyQ2hyb21pdW0oTGF5ZXJUeXBlIHQKICAgICAs IG1fc2tpYUNvbnRleHQoMCkKICAgICAsIG1fZ3JhcGhpY3NDb250ZXh0KDApCiAgICAgLCBtX2dl b21ldHJ5RmxpcHBlZChmYWxzZSkKKyAgICAsIG1fY29udGVudHMoMCkKIHsKICAgICB1cGRhdGVH cmFwaGljc0NvbnRleHQobV9iYWNraW5nU3RvcmVSZWN0KTsKIH0KQEAgLTEyMCw2ICsxMjEsMTQg QEAgdm9pZCBMYXllckNocm9taXVtOjpkcmF3RGVidWdCb3JkZXIoKQogICAgIG1fZ3JhcGhpY3ND b250ZXh0LT5kcmF3TGluZShJbnRQb2ludCgwLCBtX2JvdW5kcy5oZWlnaHQoKSksIEludFBvaW50 KG1fYm91bmRzLndpZHRoKCksIG1fYm91bmRzLmhlaWdodCgpKSk7CiB9CiAKK3ZvaWQgTGF5ZXJD aHJvbWl1bTo6c2V0Q29udGVudHMoTmF0aXZlSW1hZ2VQdHIgY29udGVudHMpCit7CisgICAgLy8g Q2hlY2sgaWYgdGhlIGltYWdlIGhhcyBjaGFuZ2VkLgorICAgIGlmIChtX2NvbnRlbnRzID09IGNv bnRlbnRzKQorICAgICAgICByZXR1cm47CisgICAgbV9jb250ZW50cyA9IGNvbnRlbnRzOworfQor CiB2b2lkIExheWVyQ2hyb21pdW06OnNldE5lZWRzQ29tbWl0KCkKIHsKICAgICAvLyBDYWxsIG5v dGlmeVN5bmNSZXF1aXJlZCgpLCB3aGljaCBpbiB0aGlzIGltcGxlbWVudGF0aW9uIHBsdW1icyB0 aHJvdWdoIHRvCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy Q2hyb21pdW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyQ2hyb21pdW0uaAkocmV2aXNpb24gNTk0OTIpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAkod29ya2luZyBjb3B5KQpAQCAtMTUy LDYgKzE1Miw5IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgdXBkYXRlQ29udGVudHMoKTsKIAorICAg IHZvaWQgc2V0Q29udGVudHMoTmF0aXZlSW1hZ2VQdHIgY29udGVudHMpOworICAgIE5hdGl2ZUlt YWdlUHRyIGNvbnRlbnRzKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50czsgfQorCiAgICAgc2tp YTo6UGxhdGZvcm1DYW52YXMqIHBsYXRmb3JtQ2FudmFzKCkgeyByZXR1cm4gbV9jYW52YXMuZ2V0 KCk7IH0KICAgICBHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCgpIHsgcmV0dXJuIG1f Z3JhcGhpY3NDb250ZXh0LmdldCgpOyB9CiAKQEAgLTE3NywxNyArMTgwLDE5IEBAIHByaXZhdGU6 CiAgICAgLy8gVGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgZnJvbSByZW1vdmVGcm9tU3VwZXJs YXllci4KICAgICB2b2lkIHJlbW92ZVN1YmxheWVyKExheWVyQ2hyb21pdW0qKTsKIAotICAgIC8v IFJlLWNyZWF0ZSB0aGUgY2FudmFzIGFuZCBncmFwaGljcyBjb250ZXh0LiBUaGlzIG1ldGhvZAot ICAgIC8vIG11c3QgYmUgY2FsbGVkIGV2ZXJ5IHRpbWUgdGhlIGxheWVyIGlzIHJlc2l6ZWQuCisg ICAgLy8gUmUtY3JlYXRlcyB0aGUgY2FudmFzIGFuZCBncmFwaGljcyBjb250ZXh0LiBUaGlzIG1l dGhvZAorICAgIC8vIG11c3QgYmUgY2FsbGVkIGV2ZXJ5IHRpbWUgdGhlIGxheWVyIGlzIHJlc2l6 ZWQuIE9ubHkgbGF5ZXJzCiAgICAgdm9pZCB1cGRhdGVHcmFwaGljc0NvbnRleHQoY29uc3QgSW50 U2l6ZSYpOwogCiAgICAgVmVjdG9yPFJlZlB0cjxMYXllckNocm9taXVtPiA+IG1fc3VibGF5ZXJz OwogICAgIExheWVyQ2hyb21pdW0qIG1fc3VwZXJsYXllcjsKIAogICAgIEdyYXBoaWNzTGF5ZXJD aHJvbWl1bSogbV9vd25lcjsKKyNpZiBQTEFURk9STShTS0lBKQogICAgIE93blB0cjxza2lhOjpQ bGF0Zm9ybUNhbnZhcz4gbV9jYW52YXM7CiAgICAgT3duUHRyPFBsYXRmb3JtQ29udGV4dFNraWE+ IG1fc2tpYUNvbnRleHQ7CiAgICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dD4gbV9ncmFwaGljc0Nv bnRleHQ7CisjZW5kaWYKIAogICAgIExheWVyVHlwZSBtX2xheWVyVHlwZTsKIApAQCAtMjE3LDYg KzIyMiw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX25lZWRzRGlzcGxheU9uQm91bmRzQ2hhbmdl OwogCiAgICAgQ29udGVudHNHcmF2aXR5VHlwZSBtX2NvbnRlbnRzR3Jhdml0eTsKKyAgICBOYXRp dmVJbWFnZVB0ciBtX2NvbnRlbnRzOwogICAgIFN0cmluZyBtX25hbWU7CiB9OwogCg==