91989 2012-07-23 06:38:33 -0700 [BlackBerry] Refactor BackingStorePrivate::render() to avoid touching tile frontbuffer 2012-07-26 09:00:42 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson manyoso mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 675671 0 anilsson 2012-07-23 06:38:33 -0700 Part of PR 141439 work 677295 1 154162 anilsson 2012-07-24 15:47:54 -0700 Created attachment 154162 Patch 679233 2 anilsson 2012-07-26 06:08:44 -0700 Reviewed internally by Jakob Petsovits 679236 3 154162 anilsson 2012-07-26 06:10:32 -0700 Comment on attachment 154162 Patch The ChangeLog contains an OOPS 679238 4 154629 anilsson 2012-07-26 06:11:42 -0700 Created attachment 154629 Patch 679385 5 154629 webkit.review.bot 2012-07-26 09:00:38 -0700 Comment on attachment 154629 Patch Clearing flags on attachment: 154629 Committed r123751: <http://trac.webkit.org/changeset/123751> 679386 6 webkit.review.bot 2012-07-26 09:00:42 -0700 All reviewed patches have been landed. Closing bug. 154162 2012-07-24 15:47:54 -0700 2012-07-26 06:11:37 -0700 Patch bug-91989-20120725004744.patch text/plain 6355 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2NWVkZjM1ODA1Y2QxNzMyZjU5YmM3ZjM1NjQ2OTYxZTBlZjM3YTc3Li4xOGEzOTMyMzUy MzAwMzY3YzgyZGZmMjQ5NWUzOWEyOTQzYjBlNjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSw0MSBAQAogMjAxMi0wNy0yMyAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CiAKKyAgICAgICAgW0JsYWNrQmVycnldIFJlZmFjdG9yIEJhY2tpbmdTdG9y ZVByaXZhdGU6OnJlbmRlcigpIHRvIGF2b2lkIHRvdWNoaW5nIHRpbGUgZnJvbnRidWZmZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxOTg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUFI6IDE0MTQzOQor ICAgICAgICBTcGVjaWZpY2FsbHksIHdlIHdhbnQgdG8gYXZvaWQgY2hhbmdpbmcgdGhlIHJlbmRl cmVkIHJlZ2lvbiBvZiB0aGUKKyAgICAgICAgZnJvbnQgYnVmZmVyLiBUaGUgY29kZSBvbmx5IHRv dWNoZWQgdGhlIGZyb250IGJ1ZmZlciByZW5kZXJlZCByZWdpb24KKyAgICAgICAgaWYgdGhlIHRp bGUgd2FzIG5vdCBjb21taXR0ZWQuCisKKyAgICAgICAgSW5zdGVhZCBvZiBpbW1lZGlhdGVseSBt YXJraW5nIHRoZSB0aWxlIGFzIGNvbW1pdHRlZCwgYW5kIGNsZWFyaW5nIHRoZQorICAgICAgICBm cm9udCBidWZmZXIncyByZW5kZXJlZCByZWdpb24gdG8gbWFrZSBpdCBhcHBlYXIgYXMgY2hlY2tl cmJvYXJkLCB3ZQorICAgICAgICBsZWF2ZSB0aGUgZnJvbnQgYnVmZmVyIGFsb25lIGFuZCBvbmx5 IG1hcmsgdGhlIHRpbGUgYXMgY29tbWl0dGVkIG9uY2UKKyAgICAgICAgdGhlIGZyb250IGJ1ZmZl ciBoYXMgdmFsaWQgY29udGVudC4gVW4tY29tbWl0dGVkIHRpbGVzIHdpbGwgYWxzbyBiZQorICAg ICAgICByZW5kZXJlZCBhcyBjaGVja2VyYm9hcmQsIHNvIGxlYXZpbmcgaXQgdW5jb21taXR0ZWQg aXMgZXF1aXZhbGVudCB0bworICAgICAgICBjbGVhcmluZyB0aGUgZnJvbnQgYnVmZmVyIHJlbmRl cmVkIHJlZ2lvbiBoZXJlLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHRoZSBtYWluIGNoYW5n ZSwgc29tZSByZWxhdGVkIGNoYW5nZXMgZm9sbG93IG5hdHVyYWxseS4KKworICAgICAgICBUaGUg Y29weVByZXZpb3VzQ29udGVudHNUb0JhY2tTdXJmYWNlT2ZUaWxlKCkgY2FsbCBvbmx5IG1ha2Vz IHNlbnNlIGlmCisgICAgICAgIHRoZSB0aWxlIGlzIGNvbW1pdHRlZCwgYW5kIHRoZSBmcm9udCBi dWZmZXIgaGFzIHZhbGlkIGNvbnRlbnQuCisgICAgICAgIE90aGVyd2lzZSwgY2xlYXJpbmcgdGhl IGJhY2sgYnVmZmVyIGlzIGVxdWl2YWxlbnQuIFRoZSBjb2RlIGhhcyBiZWVuCisgICAgICAgIHVw ZGF0ZWQgdG8gdGhpcyBlZmZlY3QuCisKKyAgICAgICAgU2luY2UgY29weVByZXZpb3VzQ29udGVu dHNUb0JhY2tTdXJmYWNlT2ZUaWxlKCkgYWx3YXlzIHNldHMgdGhlCisgICAgICAgIHJlbmRlcmVk IHJlZ2lvbiB0byB0aGUgdW5pb24gb2YgdGhlIGZyb250IGFuZCBiYWNrIGJ1ZmZlciByZWdpb25z LAorICAgICAgICB0aGVyZSBpcyBubyBwb2ludCBpbiB0aGUgImJhY2tCdWZmZXJJc1ZhbGlkIiBj aGVjay4gSXQgaGFzIGJlZW4gdHVybmVkCisgICAgICAgIGludG8gYW4gQVNTRVJUIGluc3RlYWQs IGp1c3QgdG8gbWFrZSBzdXJlLgorCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyKToKKworMjAx Mi0wNy0yMyAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CisKICAgICAgICAgW0Js YWNrQmVycnldIERvbid0IHRvdWNoIGEgdGlsZSBidWZmZXIgd2hpbGUgaXQncyBzdGlsbCBvbiBp dHMgd2F5IHRvIHRoZSBHUFUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkxOTkyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2lu Z1N0b3JlLmNwcAppbmRleCA3YTU5YmYwNGIxNWM0ZDU0MmZhYjBhNDA2MzE0MTU5YTRkMjJkZjk3 Li4wODE0ZjU4YTAxZjgyOTk2Y2YzNGM3MTI0Y2YyODA4MTQzNTIzNDEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCkBAIC0xMDg0LDE1ICsxMDg0 LDYgQEAgYm9vbCBCYWNraW5nU3RvcmVQcml2YXRlOjpyZW5kZXIoY29uc3QgUGxhdGZvcm06Oklu dFJlY3QmIHJlY3QpCiAgICAgICAgIC8vIHRyYW5zZm9ybWVkIGNvbnRlbnRzIGNvb3JkaW5hdGVz LgogICAgICAgICBQbGF0Zm9ybTo6SW50UmVjdCBkaXJ0eVJlY3QgPSBtYXBGcm9tVGlsZXNUb1Ry YW5zZm9ybWVkQ29udGVudHModGlsZVJlY3QpOwogCi0gICAgICAgIC8vIElmIHdlJ3JlIG5vdCB5 ZXQgY29tbWl0dGVkLCB0aGVuIGNvbW1pdCBub3cgYnkgY2xlYXJpbmcgdGhlIHJlbmRlcmVkIHJl Z2lvbgotICAgICAgICAvLyBhbmQgc2V0dGluZyB0aGUgY29tbWl0dGVkIGZsYWcgYXMgd2VsbCBh cyBjbGVhcmluZyB0aGUgc2hpZnQuCi0gICAgICAgIGlmICghdGlsZS0+aXNDb21taXR0ZWQoKSkg ewotICAgICAgICAgICAgdGlsZS0+c2V0Q29tbWl0dGVkKHRydWUpOwotICAgICAgICAgICAgdGls ZS0+ZnJvbnRCdWZmZXIoKS0+Y2xlYXJSZW5kZXJlZFJlZ2lvbigpOwotICAgICAgICAgICAgdGls ZS0+YmFja0J1ZmZlcigpLT5jbGVhclJlbmRlcmVkUmVnaW9uKCk7Ci0gICAgICAgICAgICB0aWxl LT5jbGVhclNoaWZ0KCk7Ci0gICAgICAgIH0KLQogICAgICAgICAvLyBJZiB0aGUgdGlsZSBoYXMg YmVlbiBjcmVhdGVkLCBidXQgdGhpcyBpcyB0aGUgZmlyc3QgdGltZSB3ZSBhcmUgcGFpbnRpbmcg b24gaXQKICAgICAgICAgLy8gdGhlbiBpdCBoYXNuJ3QgYmVlbiBnaXZlbiBhIGRlZmF1bHQgYmFj a2dyb3VuZCB5ZXQgc28gdGhhdCB3ZSBjYW4gc2F2ZSB0aW1lIGR1cmluZwogICAgICAgICAvLyBz dGFydHVwLiBUaGF0J3Mgd2h5IHdlIGFyZSBkb2luZyBpdCBoZXJlIGluc3RlYWQuLi4KQEAgLTEx MzcsNyArMTEyOCwxNCBAQCBib29sIEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlcihjb25zdCBQ bGF0Zm9ybTo6SW50UmVjdCYgcmVjdCkKIAogICAgICAgICAvLyBNb2RpZnkgdGhlIGJ1ZmZlciBv bmx5IGFmdGVyIHdlJ3ZlIHdhaXRlZCBmb3IgdGhlIGJ1ZmZlciB0byBiZWNvbWUgYXZhaWxhYmxl IGFib3ZlLgogCi0gICAgICAgIGNvcHlQcmV2aW91c0NvbnRlbnRzVG9CYWNrU3VyZmFjZU9mVGls ZShkaXJ0eVRpbGVSZWN0LCB0aWxlKTsKKyAgICAgICAgLy8gSWYgd2UncmUgbm90IHlldCBjb21t aXR0ZWQsIHRoZW4gY29tbWl0IG9ubHkgYWZ0ZXIgdGhlIHRpbGUgaGFzIGJhY2sgYnVmZmVyIGhh cyBiZWVuCisgICAgICAgIC8vIHN3YXBwZWQgaW4gc28gaXQgaGFzIHNvbWUgdmFsaWQgY29udGVu dC4KKyAgICAgICAgLy8gT3RoZXJ3aXNlIHRoZSBjb21wb3NpdGluZyB0aHJlYWQgY291bGQgcGlj ayB1cCB0aGUgdGlsZSB3aGlsZSBpdHMgZnJvbnQgYnVmZmVyIGlzIHN0aWxsIGludmFsaWQuCisg ICAgICAgIGJvb2wgd2FzQ29tbWl0dGVkID0gdGlsZS0+aXNDb21taXR0ZWQoKTsKKyAgICAgICAg aWYgKHdhc0NvbW1pdHRlZCkKKyAgICAgICAgICAgIGNvcHlQcmV2aW91c0NvbnRlbnRzVG9CYWNr U3VyZmFjZU9mVGlsZShkaXJ0eVRpbGVSZWN0LCB0aWxlKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgdGlsZS0+YmFja0J1ZmZlcigpLT5jbGVhclJlbmRlcmVkUmVnaW9uKCk7CiAKICAgICAg ICAgLy8gRklYTUU6IG1vZGlmeSByZW5kZXIgdG8gdGFrZSBhIFZlY3RvcjxJbnRSZWN0PiBwYXJh bWV0ZXIgc28gd2UncmUgbm90IHJlY3JlYXRpbmcKICAgICAgICAgLy8gR3JhcGhpY3NDb250ZXh0 IG9uIHRoZSBzdGFjayBlYWNoIHRpbWUuCkBAIC0xMTQ2LDIyICsxMTQ0LDI2IEBAIGJvb2wgQmFj a2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiByZWN0KQog ICAgICAgICAvLyBBZGQgdGhlIG5ld2x5IHJlbmRlcmVkIHJlZ2lvbiB0byB0aGUgdGlsZSBzbyBp dCBjYW4ga2VlcCB0cmFjayBmb3IgYmxpdHMuCiAgICAgICAgIHRpbGUtPmJhY2tCdWZmZXIoKS0+ YWRkUmVuZGVyZWRSZWdpb24oZGlydHlUaWxlUmVjdCk7CiAKLSAgICAgICAgLy8gQ2hlY2sgaWYg dGhlIGNvbnRlbnRzIGZvciB0aGlzIHRpbGUncyBiYWNrYnVmZmVyIGFyZSB2YWxpZCB3aGVuCi0g ICAgICAgIC8vIGNvbXBhcmVkIHRvIHRoZSBmcm9udCBidWZmZXIuCi0gICAgICAgIGJvb2wgYmFj a0J1ZmZlcklzVmFsaWQgPSB0aWxlLT5iYWNrQnVmZmVyKCktPmlzUmVuZGVyZWQodGlsZS0+ZnJv bnRCdWZmZXIoKS0+cmVuZGVyZWRSZWdpb24oKSk7Ci0KLSAgICAgICAgLy8gT3VyIGN1cnJlbnQg ZGVzaWduIGRlbWFuZHMgdGhhdCB0aGUgYmFja2J1ZmZlciBpcyB2YWxpZCBhZnRlciBhbnkKLSAg ICAgICAgLy8gcmVuZGVyaW5nIG9wZXJhdGlvbiBzbyBhc3NlcnQgdGhhdCBoZXJlLiBJZiB3ZSBo aXQgdGhpcyBhc3NlcnQgd2UKLSAgICAgICAgLy8ga25vdyB0aGF0IHdlJ3JlIGRvaW5nIHNvbWV0 aGluZyBiYWQgdGhhdCB3aWxsIHJlc3VsdCBpbiBhcnRpZmFjdHMuCi0gICAgICAgIEFTU0VSVChi YWNrQnVmZmVySXNWYWxpZCk7CisgICAgICAgIC8vIFRoYW5rcyB0byB0aGUgY29weVByZXZpb3Vz Q29udGVudHNUb0JhY2tTdXJmYWNlT2ZUaWxlKCkgY2FsbCBhYm92ZSwgd2Uga25vdyB0aGF0Cisg ICAgICAgIC8vIHRoZSByZW5kZXJlZCByZWdpb24gb2YgdGhlIGJhY2sgYnVmZmVyIGNvbnRhaW5z IHRoZSByZW5kZXJlZCByZWdpb24gb2YgdGhlIGZyb250IGJ1ZmZlci4KKyAgICAgICAgLy8gQXNz ZXJ0IHRoaXMganVzdCB0byBtYWtlIHN1cmUuCisgICAgICAgIC8vIEZvciBwcmV2aW91c2x5IHVu Y29tbWl0dGVkIHRpbGVzLCB0aGUgZnJvbnQgYnVmZmVyJ3MgcmVuZGVyZWQgcmVnaW9uIGlzIG5v dCByZWxldmFudC4KKyAgICAgICAgQVNTRVJUKCF3YXNDb21taXR0ZWQgfHwgdGlsZS0+YmFja0J1 ZmZlcigpLT5pc1JlbmRlcmVkKHRpbGUtPmZyb250QnVmZmVyKCktPnJlbmRlcmVkUmVnaW9uKCkp KTsKIAogICAgICAgICAvLyBXZSB3aWxsIG5lZWQgYSBzd2FwIGhlcmUgYmVjYXVzZSBvZiB0aGUg c2hhcmVkIGJhY2sgYnVmZmVyLgotICAgICAgICBpZiAoYmFja0J1ZmZlcklzVmFsaWQpIHsKLSAg ICAgICAgICAgIHRpbGUtPnN3YXBCdWZmZXJzKCk7Ci0gICAgICAgICAgICBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6dXNlckludGVyZmFjZVRocmVhZE1lc3NhZ2VDbGllbnQoKS0+c3luY1RvQ3VycmVu dE1lc3NhZ2UoKTsKLSAgICAgICAgICAgIHRpbGUtPmJhY2tCdWZmZXIoKS0+Y2xlYXJSZW5kZXJl ZFJlZ2lvbigpOworICAgICAgICB0aWxlLT5zd2FwQnVmZmVycygpOworCisgICAgICAgIGlmICgh d2FzQ29tbWl0dGVkKSB7CisgICAgICAgICAgICAvLyBDb21taXQgdGhlIHRpbGUgb25seSBhZnRl ciBpdCBoYXMgdmFsaWQgZnJvbnQgYnVmZmVyIGNvbnRlbnRzLiBOb3csIHRoZSBjb21wb3NpdGlu ZyB0aHJlYWQKKyAgICAgICAgICAgIC8vIGNhbiBmaW5hbGx5IHN0YXJ0IGJsaXR0aW5nIHRoaXMg dGlsZS4KKyAgICAgICAgICAgIHRpbGUtPmNsZWFyU2hpZnQoKTsKKyAgICAgICAgICAgIHRpbGUt PnNldENvbW1pdHRlZCh0cnVlKTsKICAgICAgICAgfQogCisgICAgICAgIC8vIEJlZm9yZSBjbGVh cmluZyB0aGUgcmVuZGVyIHJlZ2lvbiwgd2FpdCBmb3IgdGhlIGNvbXBvc2l0aW5nIHRocmVhZCB0 byBzdG9wIHVzaW5nIHRoZQorICAgICAgICAvLyBidWZmZXIsIGluIG9yZGVyIHRvIGF2b2lkIGEg cmFjZSBvbiBpdHMgcmVuZGVyZWQgcmVnaW9uLgorICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6dXNlckludGVyZmFjZVRocmVhZE1lc3NhZ2VDbGllbnQoKS0+c3luY1RvQ3VycmVudE1lc3Nh Z2UoKTsKKyAgICAgICAgdGlsZS0+YmFja0J1ZmZlcigpLT5jbGVhclJlbmRlcmVkUmVnaW9uKCk7 CiAgICAgfQogCiAgICAgcmV0dXJuIHRydWU7Cg== 154629 2012-07-26 06:11:42 -0700 2012-07-26 09:00:38 -0700 Patch bug-91989-20120726151131.patch text/plain 6297 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBmNWY5ZjhjNWFjMTYxODMzNDZiZDA5ODkzZjBjMGJhMDI5ODExYTY4Li44Zjc5ZTAzOWRl MDgwZDk2MTU0Zjg0ODZjYTIzOWFiMmUxMDQ4NGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMi0wNy0yMyAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlZmFjdG9yIEJhY2tpbmdTdG9y ZVByaXZhdGU6OnJlbmRlcigpIHRvIGF2b2lkIHRvdWNoaW5nIHRpbGUgZnJvbnRidWZmZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxOTg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUFI6IDE0MTQzOQor ICAgICAgICBTcGVjaWZpY2FsbHksIHdlIHdhbnQgdG8gYXZvaWQgY2hhbmdpbmcgdGhlIHJlbmRl cmVkIHJlZ2lvbiBvZiB0aGUKKyAgICAgICAgZnJvbnQgYnVmZmVyLiBUaGUgY29kZSBvbmx5IHRv dWNoZWQgdGhlIGZyb250IGJ1ZmZlciByZW5kZXJlZCByZWdpb24KKyAgICAgICAgaWYgdGhlIHRp bGUgd2FzIG5vdCBjb21taXR0ZWQuCisKKyAgICAgICAgSW5zdGVhZCBvZiBpbW1lZGlhdGVseSBt YXJraW5nIHRoZSB0aWxlIGFzIGNvbW1pdHRlZCwgYW5kIGNsZWFyaW5nIHRoZQorICAgICAgICBm cm9udCBidWZmZXIncyByZW5kZXJlZCByZWdpb24gdG8gbWFrZSBpdCBhcHBlYXIgYXMgY2hlY2tl cmJvYXJkLCB3ZQorICAgICAgICBsZWF2ZSB0aGUgZnJvbnQgYnVmZmVyIGFsb25lIGFuZCBvbmx5 IG1hcmsgdGhlIHRpbGUgYXMgY29tbWl0dGVkIG9uY2UKKyAgICAgICAgdGhlIGZyb250IGJ1ZmZl ciBoYXMgdmFsaWQgY29udGVudC4gVW4tY29tbWl0dGVkIHRpbGVzIHdpbGwgYWxzbyBiZQorICAg ICAgICByZW5kZXJlZCBhcyBjaGVja2VyYm9hcmQsIHNvIGxlYXZpbmcgaXQgdW5jb21taXR0ZWQg aXMgZXF1aXZhbGVudCB0bworICAgICAgICBjbGVhcmluZyB0aGUgZnJvbnQgYnVmZmVyIHJlbmRl cmVkIHJlZ2lvbiBoZXJlLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHRoZSBtYWluIGNoYW5n ZSwgc29tZSByZWxhdGVkIGNoYW5nZXMgZm9sbG93IG5hdHVyYWxseS4KKworICAgICAgICBUaGUg Y29weVByZXZpb3VzQ29udGVudHNUb0JhY2tTdXJmYWNlT2ZUaWxlKCkgY2FsbCBvbmx5IG1ha2Vz IHNlbnNlIGlmCisgICAgICAgIHRoZSB0aWxlIGlzIGNvbW1pdHRlZCwgYW5kIHRoZSBmcm9udCBi dWZmZXIgaGFzIHZhbGlkIGNvbnRlbnQuCisgICAgICAgIE90aGVyd2lzZSwgY2xlYXJpbmcgdGhl IGJhY2sgYnVmZmVyIGlzIGVxdWl2YWxlbnQuIFRoZSBjb2RlIGhhcyBiZWVuCisgICAgICAgIHVw ZGF0ZWQgdG8gdGhpcyBlZmZlY3QuCisKKyAgICAgICAgU2luY2UgY29weVByZXZpb3VzQ29udGVu dHNUb0JhY2tTdXJmYWNlT2ZUaWxlKCkgYWx3YXlzIHNldHMgdGhlCisgICAgICAgIHJlbmRlcmVk IHJlZ2lvbiB0byB0aGUgdW5pb24gb2YgdGhlIGZyb250IGFuZCBiYWNrIGJ1ZmZlciByZWdpb25z LAorICAgICAgICB0aGVyZSBpcyBubyBwb2ludCBpbiB0aGUgImJhY2tCdWZmZXJJc1ZhbGlkIiBj aGVjay4gSXQgaGFzIGJlZW4gdHVybmVkCisgICAgICAgIGludG8gYW4gQVNTRVJUIGluc3RlYWQs IGp1c3QgdG8gbWFrZSBzdXJlLgorCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkgSmFr b2IgUGV0c292aXRzLgorCisgICAgICAgICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAg IChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlcik6CisKIDIw MTItMDctMjUgIEpha29iIFBldHNvdml0cyAgPGpwZXRzb3ZpdHNAcmltLmNvbT4KIAogICAgICAg ICBbQmxhY2tCZXJyeV0gUmVwaHJhc2Ugc3VzcGVuZC9yZXN1bWUgY29uZGl0aW9uIHRvIGd1YXJk IGFnYWluc3QgY3Jhc2hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9CYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5n U3RvcmUuY3BwCmluZGV4IDkwY2I4NGEwYjgxZjAwZDY0YWJkMjY5NmQ3MDVmZTNjZGNlODFiYzcu LjVkMzBiNjY0YmI3ZjA1MDEwZjU1YzNmOTAzY2FhNzg4MGQ2NTM3MDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKQEAgLTEwOTIsMTUgKzEwOTIs NiBAQCBib29sIEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlcihjb25zdCBQbGF0Zm9ybTo6SW50 UmVjdCYgcmVjdCkKICAgICAgICAgLy8gdHJhbnNmb3JtZWQgY29udGVudHMgY29vcmRpbmF0ZXMu CiAgICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0IGRpcnR5UmVjdCA9IG1hcEZyb21UaWxlc1RvVHJh bnNmb3JtZWRDb250ZW50cyh0aWxlUmVjdCk7CiAKLSAgICAgICAgLy8gSWYgd2UncmUgbm90IHll dCBjb21taXR0ZWQsIHRoZW4gY29tbWl0IG5vdyBieSBjbGVhcmluZyB0aGUgcmVuZGVyZWQgcmVn aW9uCi0gICAgICAgIC8vIGFuZCBzZXR0aW5nIHRoZSBjb21taXR0ZWQgZmxhZyBhcyB3ZWxsIGFz IGNsZWFyaW5nIHRoZSBzaGlmdC4KLSAgICAgICAgaWYgKCF0aWxlLT5pc0NvbW1pdHRlZCgpKSB7 Ci0gICAgICAgICAgICB0aWxlLT5zZXRDb21taXR0ZWQodHJ1ZSk7Ci0gICAgICAgICAgICB0aWxl LT5mcm9udEJ1ZmZlcigpLT5jbGVhclJlbmRlcmVkUmVnaW9uKCk7Ci0gICAgICAgICAgICB0aWxl LT5iYWNrQnVmZmVyKCktPmNsZWFyUmVuZGVyZWRSZWdpb24oKTsKLSAgICAgICAgICAgIHRpbGUt PmNsZWFyU2hpZnQoKTsKLSAgICAgICAgfQotCiAgICAgICAgIC8vIElmIHRoZSB0aWxlIGhhcyBi ZWVuIGNyZWF0ZWQsIGJ1dCB0aGlzIGlzIHRoZSBmaXJzdCB0aW1lIHdlIGFyZSBwYWludGluZyBv biBpdAogICAgICAgICAvLyB0aGVuIGl0IGhhc24ndCBiZWVuIGdpdmVuIGEgZGVmYXVsdCBiYWNr Z3JvdW5kIHlldCBzbyB0aGF0IHdlIGNhbiBzYXZlIHRpbWUgZHVyaW5nCiAgICAgICAgIC8vIHN0 YXJ0dXAuIFRoYXQncyB3aHkgd2UgYXJlIGRvaW5nIGl0IGhlcmUgaW5zdGVhZC4uLgpAQCAtMTE0 NSw3ICsxMTM2LDE0IEBAIGJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IFBs YXRmb3JtOjpJbnRSZWN0JiByZWN0KQogCiAgICAgICAgIC8vIE1vZGlmeSB0aGUgYnVmZmVyIG9u bHkgYWZ0ZXIgd2UndmUgd2FpdGVkIGZvciB0aGUgYnVmZmVyIHRvIGJlY29tZSBhdmFpbGFibGUg YWJvdmUuCiAKLSAgICAgICAgY29weVByZXZpb3VzQ29udGVudHNUb0JhY2tTdXJmYWNlT2ZUaWxl KGRpcnR5VGlsZVJlY3QsIHRpbGUpOworICAgICAgICAvLyBJZiB3ZSdyZSBub3QgeWV0IGNvbW1p dHRlZCwgdGhlbiBjb21taXQgb25seSBhZnRlciB0aGUgdGlsZSBoYXMgYmFjayBidWZmZXIgaGFz IGJlZW4KKyAgICAgICAgLy8gc3dhcHBlZCBpbiBzbyBpdCBoYXMgc29tZSB2YWxpZCBjb250ZW50 LgorICAgICAgICAvLyBPdGhlcndpc2UgdGhlIGNvbXBvc2l0aW5nIHRocmVhZCBjb3VsZCBwaWNr IHVwIHRoZSB0aWxlIHdoaWxlIGl0cyBmcm9udCBidWZmZXIgaXMgc3RpbGwgaW52YWxpZC4KKyAg ICAgICAgYm9vbCB3YXNDb21taXR0ZWQgPSB0aWxlLT5pc0NvbW1pdHRlZCgpOworICAgICAgICBp ZiAod2FzQ29tbWl0dGVkKQorICAgICAgICAgICAgY29weVByZXZpb3VzQ29udGVudHNUb0JhY2tT dXJmYWNlT2ZUaWxlKGRpcnR5VGlsZVJlY3QsIHRpbGUpOworICAgICAgICBlbHNlCisgICAgICAg ICAgICB0aWxlLT5iYWNrQnVmZmVyKCktPmNsZWFyUmVuZGVyZWRSZWdpb24oKTsKIAogICAgICAg ICAvLyBGSVhNRTogbW9kaWZ5IHJlbmRlciB0byB0YWtlIGEgVmVjdG9yPEludFJlY3Q+IHBhcmFt ZXRlciBzbyB3ZSdyZSBub3QgcmVjcmVhdGluZwogICAgICAgICAvLyBHcmFwaGljc0NvbnRleHQg b24gdGhlIHN0YWNrIGVhY2ggdGltZS4KQEAgLTExNTQsMjIgKzExNTIsMjYgQEAgYm9vbCBCYWNr aW5nU3RvcmVQcml2YXRlOjpyZW5kZXIoY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHJlY3QpCiAg ICAgICAgIC8vIEFkZCB0aGUgbmV3bHkgcmVuZGVyZWQgcmVnaW9uIHRvIHRoZSB0aWxlIHNvIGl0 IGNhbiBrZWVwIHRyYWNrIGZvciBibGl0cy4KICAgICAgICAgdGlsZS0+YmFja0J1ZmZlcigpLT5h ZGRSZW5kZXJlZFJlZ2lvbihkaXJ0eVRpbGVSZWN0KTsKIAotICAgICAgICAvLyBDaGVjayBpZiB0 aGUgY29udGVudHMgZm9yIHRoaXMgdGlsZSdzIGJhY2tidWZmZXIgYXJlIHZhbGlkIHdoZW4KLSAg ICAgICAgLy8gY29tcGFyZWQgdG8gdGhlIGZyb250IGJ1ZmZlci4KLSAgICAgICAgYm9vbCBiYWNr QnVmZmVySXNWYWxpZCA9IHRpbGUtPmJhY2tCdWZmZXIoKS0+aXNSZW5kZXJlZCh0aWxlLT5mcm9u dEJ1ZmZlcigpLT5yZW5kZXJlZFJlZ2lvbigpKTsKLQotICAgICAgICAvLyBPdXIgY3VycmVudCBk ZXNpZ24gZGVtYW5kcyB0aGF0IHRoZSBiYWNrYnVmZmVyIGlzIHZhbGlkIGFmdGVyIGFueQotICAg ICAgICAvLyByZW5kZXJpbmcgb3BlcmF0aW9uIHNvIGFzc2VydCB0aGF0IGhlcmUuIElmIHdlIGhp dCB0aGlzIGFzc2VydCB3ZQotICAgICAgICAvLyBrbm93IHRoYXQgd2UncmUgZG9pbmcgc29tZXRo aW5nIGJhZCB0aGF0IHdpbGwgcmVzdWx0IGluIGFydGlmYWN0cy4KLSAgICAgICAgQVNTRVJUKGJh Y2tCdWZmZXJJc1ZhbGlkKTsKKyAgICAgICAgLy8gVGhhbmtzIHRvIHRoZSBjb3B5UHJldmlvdXND b250ZW50c1RvQmFja1N1cmZhY2VPZlRpbGUoKSBjYWxsIGFib3ZlLCB3ZSBrbm93IHRoYXQKKyAg ICAgICAgLy8gdGhlIHJlbmRlcmVkIHJlZ2lvbiBvZiB0aGUgYmFjayBidWZmZXIgY29udGFpbnMg dGhlIHJlbmRlcmVkIHJlZ2lvbiBvZiB0aGUgZnJvbnQgYnVmZmVyLgorICAgICAgICAvLyBBc3Nl cnQgdGhpcyBqdXN0IHRvIG1ha2Ugc3VyZS4KKyAgICAgICAgLy8gRm9yIHByZXZpb3VzbHkgdW5j b21taXR0ZWQgdGlsZXMsIHRoZSBmcm9udCBidWZmZXIncyByZW5kZXJlZCByZWdpb24gaXMgbm90 IHJlbGV2YW50LgorICAgICAgICBBU1NFUlQoIXdhc0NvbW1pdHRlZCB8fCB0aWxlLT5iYWNrQnVm ZmVyKCktPmlzUmVuZGVyZWQodGlsZS0+ZnJvbnRCdWZmZXIoKS0+cmVuZGVyZWRSZWdpb24oKSkp OwogCiAgICAgICAgIC8vIFdlIHdpbGwgbmVlZCBhIHN3YXAgaGVyZSBiZWNhdXNlIG9mIHRoZSBz aGFyZWQgYmFjayBidWZmZXIuCi0gICAgICAgIGlmIChiYWNrQnVmZmVySXNWYWxpZCkgewotICAg ICAgICAgICAgdGlsZS0+c3dhcEJ1ZmZlcnMoKTsKLSAgICAgICAgICAgIEJsYWNrQmVycnk6OlBs YXRmb3JtOjp1c2VySW50ZXJmYWNlVGhyZWFkTWVzc2FnZUNsaWVudCgpLT5zeW5jVG9DdXJyZW50 TWVzc2FnZSgpOwotICAgICAgICAgICAgdGlsZS0+YmFja0J1ZmZlcigpLT5jbGVhclJlbmRlcmVk UmVnaW9uKCk7CisgICAgICAgIHRpbGUtPnN3YXBCdWZmZXJzKCk7CisKKyAgICAgICAgaWYgKCF3 YXNDb21taXR0ZWQpIHsKKyAgICAgICAgICAgIC8vIENvbW1pdCB0aGUgdGlsZSBvbmx5IGFmdGVy IGl0IGhhcyB2YWxpZCBmcm9udCBidWZmZXIgY29udGVudHMuIE5vdywgdGhlIGNvbXBvc2l0aW5n IHRocmVhZAorICAgICAgICAgICAgLy8gY2FuIGZpbmFsbHkgc3RhcnQgYmxpdHRpbmcgdGhpcyB0 aWxlLgorICAgICAgICAgICAgdGlsZS0+Y2xlYXJTaGlmdCgpOworICAgICAgICAgICAgdGlsZS0+ c2V0Q29tbWl0dGVkKHRydWUpOwogICAgICAgICB9CiAKKyAgICAgICAgLy8gQmVmb3JlIGNsZWFy aW5nIHRoZSByZW5kZXIgcmVnaW9uLCB3YWl0IGZvciB0aGUgY29tcG9zaXRpbmcgdGhyZWFkIHRv IHN0b3AgdXNpbmcgdGhlCisgICAgICAgIC8vIGJ1ZmZlciwgaW4gb3JkZXIgdG8gYXZvaWQgYSBy YWNlIG9uIGl0cyByZW5kZXJlZCByZWdpb24uCisgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3Jt Ojp1c2VySW50ZXJmYWNlVGhyZWFkTWVzc2FnZUNsaWVudCgpLT5zeW5jVG9DdXJyZW50TWVzc2Fn ZSgpOworICAgICAgICB0aWxlLT5iYWNrQnVmZmVyKCktPmNsZWFyUmVuZGVyZWRSZWdpb24oKTsK ICAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsK