102419 2012-11-15 12:43:45 -0800 Consolidate four accelerated compositing WKView methods into a single method 2012-11-15 12:56:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 768397 0 andersca 2012-11-15 12:43:45 -0800 Consolidate four accelerated compositing WKView methods into a single method 768398 1 174500 andersca 2012-11-15 12:46:20 -0800 Created attachment 174500 Patch 768401 2 174500 kling 2012-11-15 12:55:11 -0800 Comment on attachment 174500 Patch OK 768406 3 andersca 2012-11-15 12:56:45 -0800 Committed r134820: <http://trac.webkit.org/changeset/134820> 174500 2012-11-15 12:46:20 -0800 2012-11-15 12:55:11 -0800 Patch bug-102419-20121115124417.patch text/plain 12422 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0ODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWY1NjBiN2JmOWE1YTRm YjNmNDkwN2ZmYmUxY2VlMzc1Zjk1YzJkNi4uZDQ5MDM0YTA3YWYxM2NmNDMwMGMzZjBkNGVlNzZi OWYxYWI5ZjVkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTExLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ29uc29saWRhdGUg Zm91ciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBXS1ZpZXcgbWV0aG9kcyBpbnRvIGEgc2luZ2xl IG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAyNDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIGEgc2luZ2xlIC1bV0tWaWV3IF9zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZVJvb3RM YXllcjpdIG1ldGhvZCBhbmQgaGF2ZQorICAgICAgICB0aGUgZXhpc3RpbmcgUGFnZUNsaWVudElt cGwgbWVtYmVyIGZ1bmN0aW9ucyBjYWxsIGl0LiBBbHNvLCBhZGQgYSBuZXcKKyAgICAgICAgUGFn ZUNsaWVudCBtZW1iZXIgZnVuY3Rpb24sIHNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdSb290TGF5 ZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2Vi S2l0OjpQYWdlQ2xpZW50SW1wbDo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk6Cisg ICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6dXBkYXRlQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2V0 QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RMYXllcik6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgX3Byb2Nlc3NEaWRDcmFzaF0pOgor ICAgICAgICAoLVtXS1ZpZXcgX3NldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlUm9vdExheWVy Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1t OgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0Ojpjb21taXQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdSb290TGF5ZXIpOgorCiAyMDEy LTExLTE1ICBSaWNrIEJ5ZXJzICA8cmJ5ZXJzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBObyB0 ZXN0cyBmb3IgY2hhbmdpbmcgbW91c2UgY3Vyc29ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKaW5kZXggMTg1NzllZWU5ODFkM2M3YjYw YTA5ODE5N2M1Y2E1ZDBmOWE0OGI5YS4uYjAxOWM2OGRjOGE5MmI1ZDJiNWU2NDhkMWYxNDAwMjcz MjFkZDJkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFn ZUNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdl Q2xpZW50SW1wbC5oCkBAIC02Miw2ICs2Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29s IGlzVmlld0luV2luZG93KCk7CiAgICAgdmlydHVhbCBMYXllckhvc3RpbmdNb2RlIHZpZXdMYXll ckhvc3RpbmdNb2RlKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBDb2xvclNwYWNlRGF0YSBjb2xv clNwYWNlKCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdSb290TGF5ZXIoQ0FMYXllciAqKSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgdm9pZCBw cm9jZXNzRGlkQ3Jhc2goKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFnZUNsb3NlZCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQppbmRl eCA3YjU0YjRiZDdkN2RlYzllNzU4NGViMzcwZjQ2MjBmOTNhNWUwNTEwLi42YmRjMWI5ZWJhOWNh NTA0ZTU2MjAzODZkN2ZlM2QwODhiMGIxYjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQpAQCAtMzg0LDIyICszODQsMzEgQEAg dm9pZCBQYWdlQ2xpZW50SW1wbDo6YWNjZXNzaWJpbGl0eVdlYlByb2Nlc3NUb2tlblJlY2VpdmVk KGNvbnN0IENvcmVJUEM6OkRhdGFSZWYKICAgICBbbV93a1ZpZXcgX3NldEFjY2Vzc2liaWxpdHlX ZWJQcm9jZXNzVG9rZW46cmVtb3RlVG9rZW5dOwogfQogICAgIAotI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKIHZvaWQgUGFnZUNsaWVudEltcGw6OmVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJUcmVlQ29udGV4dCkKIHsK LSAgICBbbV93a1ZpZXcgX2VudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGU6bGF5ZXJUcmVl Q29udGV4dF07CisgICAgQVNTRVJUKCFsYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSk7CisKKyAg ICBDQUxheWVyICpyZW5kZXJMYXllciA9IFdLTWFrZVJlbmRlckxheWVyKGxheWVyVHJlZUNvbnRl eHQuY29udGV4dElEKTsKKyAgICBbbV93a1ZpZXcgX3NldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlUm9vdExheWVyOnJlbmRlckxheWVyXTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZXhp dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkKIHsKLSAgICBbbV93a1ZpZXcgX2V4aXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZV07CisgICAgW21fd2tWaWV3IF9zZXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nTW9kZVJvb3RMYXllcjpuaWxdOwogfQogCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjp1 cGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBs YXllclRyZWVDb250ZXh0KQogewotICAgIFttX3drVmlldyBfdXBkYXRlQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGU6bGF5ZXJUcmVlQ29udGV4dF07CisgICAgQVNTRVJUKCFsYXllclRyZWVDb250 ZXh0LmlzRW1wdHkoKSk7CisKKyAgICBDQUxheWVyICpyZW5kZXJMYXllciA9IFdLTWFrZVJlbmRl ckxheWVyKGxheWVyVHJlZUNvbnRleHQuY29udGV4dElEKTsKKyAgICBbbV93a1ZpZXcgX3NldEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlUm9vdExheWVyOnJlbmRlckxheWVyXTsKK30KKwordm9p ZCBQYWdlQ2xpZW50SW1wbDo6c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RMYXllcihDQUxh eWVyICpyb290TGF5ZXIpCit7CisgICAgW21fd2tWaWV3IF9zZXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZVJvb3RMYXllcjpyb290TGF5ZXJdOwogfQotI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6cGx1Z2luRm9jdXNPcldpbmRv d0ZvY3VzQ2hhbmdlZCh1aW50NjRfdCBwbHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwg Ym9vbCBwbHVnaW5IYXNGb2N1c0FuZFdpbmRvd0hhc0ZvY3VzKQogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4IDhlM2ZmM2E3OTZlZjBmNThkOWFmYWEx ZWEzMjBkNTU4Y2MwZDliYWYuLjRlMzBiMzM2OGE1NjJiN2NjMzA3YWQxM2EyMTM4ZDVlMWYxZDk2 YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTIz MTYsNyArMjMxNiw3IEBAIHN0YXRpYyB2b2lkIGRyYXdQYWdlQmFja2dyb3VuZChDR0NvbnRleHRS ZWYgY29udGV4dCwgV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBJCiAtICh2b2lkKV9wcm9jZXNz RGlkQ3Jhc2gKIHsKICAgICBpZiAoX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3KQotICAgICAgICBb c2VsZiBfZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlXTsKKyAgICAgICAgW3NlbGYgX3Nl dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlUm9vdExheWVyOm5pbF07CiAKICAgICBbc2VsZiBf dXBkYXRlUmVtb3RlQWNjZXNzaWJpbGl0eVJlZ2lzdHJhdGlvbjpOT107CiB9CkBAIC0yNTYyLDY4 ICsyNTYyLDQzIEBAIHN0YXRpYyB2b2lkIGRyYXdQYWdlQmFja2dyb3VuZChDR0NvbnRleHRSZWYg Y29udGV4dCwgV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBJCiAgICAgX2RhdGEtPl9maW5kSW5k aWNhdG9yV2luZG93LT5zZXRGaW5kSW5kaWNhdG9yKGZpbmRJbmRpY2F0b3IsIGZhZGVPdXQsIGFu aW1hdGUpOwogfQogCi0tICh2b2lkKV9lbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlOihj b25zdCBMYXllclRyZWVDb250ZXh0JilsYXllclRyZWVDb250ZXh0Ci17Ci0gICAgQVNTRVJUKCFs YXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSk7Ci0KLSAgICBDQUxheWVyICpyZW5kZXJMYXllciA9 IFdLTWFrZVJlbmRlckxheWVyKGxheWVyVHJlZUNvbnRleHQuY29udGV4dElEKTsKLSAgICBbc2Vs ZiBfZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZVdpdGhSb290TGF5ZXI6cmVuZGVyTGF5 ZXJdOwotfQogCi0tICh2b2lkKV9lbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlV2l0aFJv b3RMYXllcjooQ0FMYXllciAqKWxheWVyCistICh2b2lkKV9zZXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZVJvb3RMYXllcjooQ0FMYXllciAqKXJvb3RMYXllcgogewotICAgIEFTU0VSVCghX2Rh dGEtPl9sYXllckhvc3RpbmdWaWV3KTsKLQotICAgIC8vIENyZWF0ZSBhbiBOU1ZpZXcgdGhhdCB3 aWxsIGhvc3Qgb3VyIGxheWVyIHRyZWUuCi0gICAgX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3LmFk b3B0TlMoW1tXS0ZsaXBwZWRWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOltzZWxmIGJvdW5kc11d KTsKLSAgICBbX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3LmdldCgpIHNldEF1dG9yZXNpemluZ01h c2s6TlNWaWV3V2lkdGhTaXphYmxlIHwgTlNWaWV3SGVpZ2h0U2l6YWJsZV07Ci0KICAgICBbQ0FU cmFuc2FjdGlvbiBiZWdpbl07CiAgICAgW0NBVHJhbnNhY3Rpb24gc2V0RGlzYWJsZUFjdGlvbnM6 WUVTXTsKIAotICAgIFtzZWxmIGFkZFN1YnZpZXc6X2RhdGEtPl9sYXllckhvc3RpbmdWaWV3Lmdl dCgpIHBvc2l0aW9uZWQ6TlNXaW5kb3dCZWxvdyByZWxhdGl2ZVRvOm5pbF07Ci0KLSAgICAvLyBD cmVhdGUgYSByb290IGxheWVyIHRoYXQgd2lsbCBiYWNrIHRoZSBOU1ZpZXcuCi0gICAgUmV0YWlu UHRyPENBTGF5ZXI+IHJvb3RMYXllcihBZG9wdE5TLCBbW0NBTGF5ZXIgYWxsb2NdIGluaXRdKTsK LSNpZm5kZWYgTkRFQlVHCi0gICAgW3Jvb3RMYXllci5nZXQoKSBzZXROYW1lOkAiSG9zdGluZyBy b290IGxheWVyIl07Ci0jZW5kaWYKLQotICAgIFtyb290TGF5ZXIuZ2V0KCkgYWRkU3VibGF5ZXI6 bGF5ZXJdOwotCi0gICAgW19kYXRhLT5fbGF5ZXJIb3N0aW5nVmlldy5nZXQoKSBzZXRMYXllcjpy b290TGF5ZXIuZ2V0KCldOwotICAgIFtfZGF0YS0+X2xheWVySG9zdGluZ1ZpZXcuZ2V0KCkgc2V0 V2FudHNMYXllcjpZRVNdOwotCi0gICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKLX0KKyAgICBp ZiAocm9vdExheWVyKSB7CisgICAgICAgIGlmICghX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3KSB7 CisgICAgICAgICAgICAvLyBDcmVhdGUgYW4gTlNWaWV3IHRoYXQgd2lsbCBob3N0IG91ciBsYXll ciB0cmVlLgorICAgICAgICAgICAgX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3LmFkb3B0TlMoW1tX S0ZsaXBwZWRWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOltzZWxmIGJvdW5kc11dKTsKKyAgICAg ICAgICAgIFtfZGF0YS0+X2xheWVySG9zdGluZ1ZpZXcuZ2V0KCkgc2V0QXV0b3Jlc2l6aW5nTWFz azpOU1ZpZXdXaWR0aFNpemFibGUgfCBOU1ZpZXdIZWlnaHRTaXphYmxlXTsKIAotLSAodm9pZClf ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlCi17Ci0gICAgQVNTRVJUKF9kYXRhLT5fbGF5 ZXJIb3N0aW5nVmlldyk7CiAKLSAgICBbX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3LmdldCgpIHJl bW92ZUZyb21TdXBlcnZpZXddOwotICAgIFtfZGF0YS0+X2xheWVySG9zdGluZ1ZpZXcuZ2V0KCkg c2V0TGF5ZXI6bmlsXTsKLSAgICBbX2RhdGEtPl9sYXllckhvc3RpbmdWaWV3LmdldCgpIHNldFdh bnRzTGF5ZXI6Tk9dOwotICAgIAotICAgIF9kYXRhLT5fbGF5ZXJIb3N0aW5nVmlldyA9IG51bGxw dHI7Ci19CisgICAgICAgICAgICBbc2VsZiBhZGRTdWJ2aWV3Ol9kYXRhLT5fbGF5ZXJIb3N0aW5n Vmlldy5nZXQoKSBwb3NpdGlvbmVkOk5TV2luZG93QmVsb3cgcmVsYXRpdmVUbzpuaWxdOwogCi0t ICh2b2lkKV91cGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTooY29uc3QgV2ViS2l0OjpM YXllclRyZWVDb250ZXh0JilsYXllclRyZWVDb250ZXh0Ci17Ci0gICAgaWYgKF9kYXRhLT5fbGF5 ZXJIb3N0aW5nVmlldykgewotICAgICAgICAvLyBXcmFwIHRoZSBjYWxsIHRvIHNldFN1YmxheWVy czogaW4gYSBDQVRyYW5zYWN0aW9uIHdpdGggYWN0aW9ucyBkaXNhYmxlZCB0bwotICAgICAgICAv LyBrZWVwIENBIGZyb20gY3Jvc3MtZmFkaW5nIGJldHdlZW4gdGhlIHR3byBzdWJsYXllciBhcnJh eXMuCi0gICAgICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKLSAgICAgICAgW0NBVHJhbnNhY3Rp b24gc2V0RGlzYWJsZUFjdGlvbnM6WUVTXTsKKyAgICAgICAgICAgIC8vIENyZWF0ZSBhIHJvb3Qg bGF5ZXIgdGhhdCB3aWxsIGJhY2sgdGhlIE5TVmlldy4KKyAgICAgICAgICAgIFJldGFpblB0cjxD QUxheWVyPiBsYXllciA9IGFkb3B0TlMoW1tDQUxheWVyIGFsbG9jXSBpbml0XSk7CisjaWZuZGVm IE5ERUJVRworICAgICAgICAgICAgW2xheWVyIHNldE5hbWU6QCJIb3N0aW5nIHJvb3QgbGF5ZXIi XTsKKyNlbmRpZgogCi0gICAgICAgIENBTGF5ZXIgKnJlbmRlckxheWVyID0gV0tNYWtlUmVuZGVy TGF5ZXIobGF5ZXJUcmVlQ29udGV4dC5jb250ZXh0SUQpOwotICAgICAgICBbW19kYXRhLT5fbGF5 ZXJIb3N0aW5nVmlldy5nZXQoKSBsYXllcl0gc2V0U3VibGF5ZXJzOltOU0FycmF5IGFycmF5V2l0 aE9iamVjdDpyZW5kZXJMYXllcl1dOworICAgICAgICAgICAgW19kYXRhLT5fbGF5ZXJIb3N0aW5n VmlldyBzZXRMYXllcjpsYXllci5nZXQoKV07CisgICAgICAgICAgICBbX2RhdGEtPl9sYXllckhv c3RpbmdWaWV3IHNldFdhbnRzTGF5ZXI6WUVTXTsKKyAgICAgICAgfQogCi0gICAgICAgIFtDQVRy YW5zYWN0aW9uIGNvbW1pdF07CisgICAgICAgIFtfZGF0YS0+X2xheWVySG9zdGluZ1ZpZXcgbGF5 ZXJdLnN1YmxheWVycyA9IFtOU0FycmF5IGFycmF5V2l0aE9iamVjdDpyb290TGF5ZXJdOwogICAg IH0gZWxzZSB7Ci0gICAgICAgIFtzZWxmIF9leGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGVd OwotICAgICAgICBbc2VsZiBfZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTpsYXllclRy ZWVDb250ZXh0XTsKKyAgICAgICAgaWYgKF9kYXRhLT5fbGF5ZXJIb3N0aW5nVmlldykgeworICAg ICAgICAgICAgW19kYXRhLT5fbGF5ZXJIb3N0aW5nVmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsK KyAgICAgICAgICAgIFtfZGF0YS0+X2xheWVySG9zdGluZ1ZpZXcgc2V0TGF5ZXI6bmlsXTsKKyAg ICAgICAgICAgIFtfZGF0YS0+X2xheWVySG9zdGluZ1ZpZXcgc2V0V2FudHNMYXllcjpOT107CisK KyAgICAgICAgICAgIF9kYXRhLT5fbGF5ZXJIb3N0aW5nVmlldyA9IG51bGxwdHI7CisgICAgICAg IH0KICAgICB9CisKKyAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOwogfQogCiAtICh2b2lkKV9z ZXRBY2Nlc3NpYmlsaXR5V2ViUHJvY2Vzc1Rva2VuOihOU0RhdGEgKilkYXRhCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAppbmRleCBlNzVl NjdhNTRiYWJhNmZhNjZiMDQ0MTUyMDlhZGMwNDMzYjM0ZmU2Li4zZjYxMmQyNDA3YzlmZDYzZmQ0 M2I0NWQwMGQxOTViNGEzNTUxYzU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKQEAgLTY1LDEwICs2NSw3IEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogLSAoTlNSZWN0KV9jb252ZXJ0VG9Vc2VyU3BhY2U6KE5TUmVjdClyZWN0OwogLSAo dm9pZClfc2V0RmluZEluZGljYXRvcjooUGFzc1JlZlB0cjxXZWJLaXQ6OkZpbmRJbmRpY2F0b3I+ KWZpbmRJbmRpY2F0b3IgZmFkZU91dDooQk9PTClmYWRlT3V0IGFuaW1hdGU6KEJPT0wpYW5pbWF0 ZTsKIAotLSAodm9pZClfZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTooY29uc3QgV2Vi S2l0OjpMYXllclRyZWVDb250ZXh0JilsYXllclRyZWVDb250ZXh0OwotLSAodm9pZClfZW50ZXJB Y2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZVdpdGhSb290TGF5ZXI6KENBTGF5ZXIgKilyb290TGF5 ZXI7Ci0tICh2b2lkKV9leGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGU7Ci0tICh2b2lkKV91 cGRhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTooY29uc3QgV2ViS2l0OjpMYXllclRyZWVD b250ZXh0JilsYXllclRyZWVDb250ZXh0OworLSAodm9pZClfc2V0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ01vZGVSb290TGF5ZXI6KENBTGF5ZXIgKilyb290TGF5ZXI7CiAKIC0gKHZvaWQpX3NldEFj Y2Vzc2liaWxpdHlXZWJQcm9jZXNzVG9rZW46KE5TRGF0YSAqKWRhdGE7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUGFnZUNsaWVudC5oCmluZGV4IDk1NTJhYTFjNWVjMDNjNTY5OTYyNGRlMWRjYzYx ZjU0NWNiNDQyYzkuLjBjN2I4OTAxN2FiNzE2MzBhYzQyNDE0MjAxNGRmN2M2MjNjYzg1M2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaApAQCAtMzcsNiArMzcsOCBAQAogI2lm IFBMQVRGT1JNKE1BQykKICNpbmNsdWRlICJQbHVnaW5Db21wbGV4VGV4dElucHV0U3RhdGUuaCIK IAorT0JKQ19DTEFTUyBDQUxheWVyOworCiAjaWYgVVNFKEFQUEtJVCkKIE9CSkNfQ0xBU1MgV0tW aWV3OwogT0JKQ19DTEFTUyBOU1RleHRBbHRlcm5hdGl2ZXM7CkBAIC0yMTgsNiArMjIwLDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hh bmdlKGludDMyX3QgbmV3U3R5bGUpID0gMDsKIAogICAgIHZpcnR1YWwgQ29sb3JTcGFjZURhdGEg Y29sb3JTcGFjZSgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ1Jvb3RMYXllcihDQUxheWVyICopID0gMDsKIAogI2lmIFVTRShBUFBLSVQpCiAgICAgdmly dHVhbCBXS1ZpZXcqIHdrVmlldygpIGNvbnN0ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAppbmRleCAxYjViYjQwNWQ0NzE3ZGYyNzlkNjhmMThiYWE2YTdjNTJmOGM2 YzhiLi45MWZhZDMwM2UxNjY3NThlMWY0NmVhYTU2MGFhNTdhOTMzYjhkYWUwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC00MDQsNyArNDA0LDkgQEAgcHVibGlj OgogICAgIENHQ29udGV4dFJlZiBjb250YWluaW5nV2luZG93R3JhcGhpY3NDb250ZXh0KCk7CiAg ICAgYm9vbCBzaG91bGREZWxheVdpbmRvd09yZGVyaW5nRm9yRXZlbnQoY29uc3QgV2ViTW91c2VF dmVudCYpOwogICAgIGJvb2wgYWNjZXB0c0ZpcnN0TW91c2UoaW50IGV2ZW50TnVtYmVyLCBjb25z dCBXZWJNb3VzZUV2ZW50Jik7Ci0gICAgCisKKyAgICB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdSb290TGF5ZXIoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciopOworCiAjaWYgVVNF KEFQUEtJVCkKICAgICBXS1ZpZXcqIHdrVmlldygpIGNvbnN0OwogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZUhvc3QubW0gYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZUhvc3QubW0KaW5kZXgg OGI0ZGNlZTY3MDZlNWU1ZWI5Yzg4YzIzYzdiNDI3NzM4YWM4NTJlNy4uNDMwOGIxOTc4MGY5NzNh ZjQ3ZDRjMTFlM2VkNTZiZWFkNjIxNjAzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbQpAQCAtNjksNyArNjksOCBAQCB2b2lk IFJlbW90ZUxheWVyVHJlZUhvc3Q6OmNvbW1pdChjb25zdCBSZW1vdGVMYXllclRyZWVUcmFuc2Fj dGlvbiYgdHJhbnNhY3Rpb24pCiB7CiAgICAgR3JhcGhpY3NMYXllciogcm9vdExheWVyID0gZ2V0 T3JDcmVhdGVMYXllcih0cmFuc2FjdGlvbi5yb290TGF5ZXJJRCgpKTsKICAgICBpZiAobV9yb290 TGF5ZXIgIT0gcm9vdExheWVyKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBVcGRhdGUgdGhlIHJvb3Qg bGF5ZXIuCisgICAgICAgIG1fcm9vdExheWVyID0gcm9vdExheWVyOworICAgICAgICBtX3dlYlBh Z2VQcm94eS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RMYXllcihtX3Jvb3RMYXllcik7 CiAgICAgfQogCiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCBjNWZlMzM1ODYyNDAyMTAyYjY3ZTdmMjM5ODdi NThjZWZlYmIzMWQxLi42ZjA5NTZlNmRjMTcyNDU1ZmIxNzE5MDY2YTc4NTVkMDIyZmNjZTRiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQpA QCAtNDAsNiArNDAsNyBAQAogI2ltcG9ydCAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW1wb3J0ICJX ZWJQcm9jZXNzUHJveHkuaCIKICNpbXBvcnQgPFdlYkNvcmUvRGljdGF0aW9uQWx0ZXJuYXRpdmUu aD4KKyNpbXBvcnQgPFdlYkNvcmUvR3JhcGhpY3NMYXllci5oPgogI2ltcG9ydCA8V2ViQ29yZS9T aGFyZWRCdWZmZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvVGV4dEFsdGVybmF0aXZlV2l0aFJhbmdl Lmg+CiAjaW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KQEAgLTQ3Myw0ICs0NzQsOSBA QCBXS1ZpZXcqIFdlYlBhZ2VQcm94eTo6d2tWaWV3KCkgY29uc3QKICAgICByZXR1cm4gbV9wYWdl Q2xpZW50LT53a1ZpZXcoKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnNldEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdSb290TGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllciogcm9vdExheWVyKQorewor ICAgIG1fcGFnZUNsaWVudC0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RMYXllcihyb290 TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=