93319 2012-08-06 18:50:11 -0700 [chromium] Remove lingering unwrap<>() calls in GraphicsLayerChromium.cpp 2012-08-06 20:37:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth cc-bugs dglazkov enne fishd piman tkent+wkapi webkit.review.bot oldest_to_newest 688666 0 jamesr 2012-08-06 18:50:11 -0700 [chromium] Remove lingering unwrap<>() calls in GraphicsLayerChromium.cpp 688669 1 156823 jamesr 2012-08-06 18:51:24 -0700 Created attachment 156823 Patch 688670 2 jamesr 2012-08-06 18:52:18 -0700 Some cleanup that I've been sitting on for a while. This is prepwork for switching the PlatformLayer type over to WebLayer for the chromium port. 688671 3 webkit.review.bot 2012-08-06 18:52:40 -0700 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. 688676 4 piman 2012-08-06 18:54:59 -0700 LGTM 688680 5 156823 enne 2012-08-06 18:57:52 -0700 Comment on attachment 156823 Patch R=me. Maybe some day we can get rid of clearRenderSurface()... 688698 6 156823 jamesr 2012-08-06 19:20:07 -0700 Comment on attachment 156823 Patch Yeah, someday! Maybe separating the wrapper type from the type that RenderSurfaceChromium refers to will be the answer. 688750 7 156823 webkit.review.bot 2012-08-06 20:37:40 -0700 Comment on attachment 156823 Patch Clearing flags on attachment: 156823 Committed r124841: <http://trac.webkit.org/changeset/124841> 688751 8 webkit.review.bot 2012-08-06 20:37:45 -0700 All reviewed patches have been landed. Closing bug. 156823 2012-08-06 18:51:24 -0700 2012-08-06 20:37:40 -0700 Patch bug-93319-20120806185100.patch text/plain 16180 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MTNlYTIzNTQ1ZGRi MzNlYjllMDkyN2RkODM2ZWQzMmQzYWY1NTk5Li41OTQxNDhlZTBhZGJkNjk1ZmQ2OTIzYWRlNWYy ZmVkZjk5NzViYWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0wNiAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gUmVtb3ZlIGxpbmdlcmluZyB1bndyYXA8PigpIGNhbGxzIGluIEdyYXBoaWNzTGF5ZXJDaHJv bWl1bS5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkzMzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkcyBhIGZldyBtb3JlIGVudHJ5IHBvaW50cyB0byBXZWJMYXllciB0aGF0IGFyZSBiZWluZyB1 c2VkIGJ5IEdyYXBoaWNzTGF5ZXJDaHJvbWl1bS4KKworICAgICAgICAqIGNocm9taXVtL3B1Ymxp Yy9XZWJMYXllci5oOgorICAgICAgICAoV2ViTGF5ZXIpOgorCiAyMDEyLTA4LTAzICBOaWNvIFdl YmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEFkZCBBUEkg dG8gbWFrZSBpdCBwb3NzaWJsZSB0byByZXF1ZXN0IGFsbCB2YXJpYW50cyBvZiBhIFdlYkltYWdl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggNDczYjAyODEyYzlhNDk0NDhjMjQ1NDgwMGMwYjVmN2Q1MjQwMzFlMS4u MjU0NTYwYTE2MzA0NTI3ZmY5Y2VkNDQyMjA0OGU3YzBiYzBjNDJkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI3IEBACisyMDEyLTA4LTA2ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgbGluZ2VyaW5nIHVud3JhcDw+KCkg Y2FsbHMgaW4gR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHZXRzIHJpZCBvZiBhbGwgKGJ1dCBvbmUpIG9mIHRo ZSByZW1haW5pbmcgdW53cmFwPExheWVyQ2hyb21pdW0+KCkgY2FsbHMgaW4gR3JhcGhpY3NMYXll ciBjaHJvbWl1bSB0byBhdm9pZAorICAgICAgICBwdW5jaGluZyB0aHJvdWdoIHRoZSBXZWJMYXll ciBBUEkuICBDb3ZlcmVkIGJ5IG1hbnkgbGF5b3V0IHRlc3RzLCBtb3N0bHkgaW4gY29tcG9zaXRp bmcvCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVy Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjp3 aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVt OjpzZXROYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBk YXRlTmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRN YXNrTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRS ZXBsaWNhdGVkQnlMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21p dW06OnNldENvbnRlbnRzVG9JbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy Q2hyb21pdW06OnNldENvbnRlbnRzVG9DYW52YXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllckNocm9taXVtOjpzZXRDb250ZW50c1RvTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllckNocm9taXVtOjp1cGRhdGVDaGlsZExpc3QpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oOgorICAg ICAgICAoR3JhcGhpY3NMYXllckNocm9taXVtKToKKwogMjAxMi0wOC0wNiAgQW5uYSBDYXZlbmRl ciAgPGFubmFjY0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTWVkaWFTb3VyY2Ugc2hvdWxkIHVz ZSBpdCdzIG93biBsaXN0IG9mIHNvdXJjZSBVUkxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IGVlZGMwMjIzOGQzYjc0YmI3YzAxZTc1ZDc1YjlkMTc3OTlkNDE5ODguLjIxMDY2ODM5NmI3 NGFhYjk1NTVkNGVjOGVlYTQ4ZDM3OWYxMDdjM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDgtMDYgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNo cm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBsaW5nZXJpbmcgdW53cmFw PD4oKSBjYWxscyBpbiBHcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzMxOQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkxheWVyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViTGF5ZXI6OnNldENoaWxkcmVuKToKKyAgICAgICAgKFdlYktpdCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkxheWVyOjpzZXRSZXBsaWNhTGF5ZXIpOgorICAgICAgICAoV2Vi S2l0OjpXZWJMYXllcjo6c2V0RGVidWdOYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViTGF5ZXI6 OmNsZWFyUmVuZGVyU3VyZmFjZSk6CisKIDIwMTItMDgtMDYgIEFkcmllbm5lIFdhbGtlciAgPGVu bmVAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFJFR1JFU1NJT04ocjEyNDcxNCk6 IHdlYmtpdF91bml0X3Rlc3RzIGFzc2VydHMgaW4gRGVidWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXIuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJv bWl1bS9wdWJsaWMvV2ViTGF5ZXIuaAppbmRleCAzNjQzMTQ5OTEwZmJiNTU3N2Q5N2U1NmJlNDk2 MTBmZDlkZmY0NDkyLi5lYzYwMjQxMWI3Nzg4MGU1OTBiNzY3Y2Y2MTQ4YmZiNTA2Nzk2Yjc1IDEw MDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyLmgKKysr IGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJMYXllci5oCkBAIC0zMCw2ICsz MCw4IEBACiAjaW5jbHVkZSAiV2ViQ29sb3IuaCIKICNpbmNsdWRlICJXZWJDb21tb24uaCIKICNp bmNsdWRlICJXZWJQcml2YXRlUHRyLmgiCisjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCisjaW5jbHVk ZSAiV2ViVmVjdG9yLmgiCiAKIGNsYXNzIFNrTWF0cml4NDQ7CiBuYW1lc3BhY2UgV2ViQ29yZSB7 IGNsYXNzIExheWVyQ2hyb21pdW07IH0KQEAgLTczLDYgKzc1LDcgQEAgcHVibGljOgogICAgIFdF QktJVF9FWFBPUlQgdm9pZCBhZGRDaGlsZChjb25zdCBXZWJMYXllciYpOwogICAgIFdFQktJVF9F WFBPUlQgdm9pZCBpbnNlcnRDaGlsZChjb25zdCBXZWJMYXllciYsIHNpemVfdCBpbmRleCk7CiAg ICAgV0VCS0lUX0VYUE9SVCB2b2lkIHJlcGxhY2VDaGlsZChjb25zdCBXZWJMYXllciYgcmVmZXJl bmNlLCBjb25zdCBXZWJMYXllciYgbmV3TGF5ZXIpOworICAgIFdFQktJVF9FWFBPUlQgdm9pZCBz ZXRDaGlsZHJlbihjb25zdCBXZWJWZWN0b3I8V2ViTGF5ZXI+Jik7CiAgICAgV0VCS0lUX0VYUE9S VCB2b2lkIHJlbW92ZUZyb21QYXJlbnQoKTsKICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVtb3Zl QWxsQ2hpbGRyZW4oKTsKIApAQCAtOTEsNiArOTQsOCBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0VY UE9SVCB2b2lkIHNldE1hc2tMYXllcihjb25zdCBXZWJMYXllciYpOwogICAgIFdFQktJVF9FWFBP UlQgV2ViTGF5ZXIgbWFza0xheWVyKCkgY29uc3Q7CiAKKyAgICBXRUJLSVRfRVhQT1JUIHZvaWQg c2V0UmVwbGljYUxheWVyKGNvbnN0IFdlYkxheWVyJik7CisKICAgICBXRUJLSVRfRVhQT1JUIHZv aWQgc2V0T3BhY2l0eShmbG9hdCk7CiAgICAgV0VCS0lUX0VYUE9SVCBmbG9hdCBvcGFjaXR5KCkg Y29uc3Q7CiAKQEAgLTEzOCw2ICsxNDMsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJLSVRfRVhQT1JU IHZvaWQgc2V0RGVidWdCb3JkZXJDb2xvcihjb25zdCBXZWJDb2xvciYpOwogICAgIFdFQktJVF9F WFBPUlQgdm9pZCBzZXREZWJ1Z0JvcmRlcldpZHRoKGZsb2F0KTsKKyAgICBXRUJLSVRfRVhQT1JU IHZvaWQgc2V0RGVidWdOYW1lKFdlYlN0cmluZyk7CiAKICAgICAvLyBBbiBhbmltYXRpb24gZGVs ZWdhdGUgaXMgbm90aWZpZWQgd2hlbiBhbmltYXRpb25zIGFyZSBzdGFydGVkIGFuZAogICAgIC8v IHN0b3BwZWQuIFRoZSBXZWJMYXllciBkb2VzIG5vdCB0YWtlIG93bmVyc2hpcCBvZiB0aGUgZGVs ZWdhdGUsIGFuZCBpdCBpcwpAQCAtMTc0LDYgKzE4MCwxMCBAQCBwdWJsaWM6CiAgICAgLy8gc28s IGJ1dCB0aGlzIGlzIHRvIGZhY2lsaXRhdGUgYmVuY2htYXJrcyBhbmQgdGVzdHMuCiAgICAgV0VC S0lUX0VYUE9SVCB2b2lkIHNldEZvcmNlUmVuZGVyU3VyZmFjZShib29sKTsKIAorICAgIC8vIERy b3BzIHRoaXMgbGF5ZXIncyByZW5kZXIgc3VyZmFjZSwgaWYgaXQgaGFzIG9uZS4gVXNlZCB0byBi cmVhayBjeWNsZXMgaW4gc29tZQorICAgIC8vIGNhc2VzIC0gaWYgeW91IGFyZW4ndCBzdXJlLCB5 b3UgZG9uJ3QgbmVlZCB0byBjYWxsIHRoaXMuCisgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGNsZWFy UmVuZGVyU3VyZmFjZSgpOworCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gVCB0bygpCiAgICAg ewogICAgICAgICBUIHJlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmlu ZGV4IDViOGUyYzZhNTRiM2JhNDc1OThkZGIwYjYyMTg1MTM3MGEwZDBhZmMuLjk0MzNjOTc5MzAx ZmEyZDE3ZTI2NjAwOTFmMDBhMTVkY2U2NjZiZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXll ckNocm9taXVtLmNwcApAQCAtMTA3LDE3ICsxMDcsMTcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hy b21pdW06OndpbGxCZURlc3Ryb3llZCgpCiB7CiAgICAgaWYgKCFtX2xheWVyLmlzTnVsbCgpKSB7 CiAgICAgICAgIG1fbGF5ZXIuY2xlYXJDbGllbnQoKTsKLSAgICAgICAgbV9sYXllci51bndyYXA8 TGF5ZXJDaHJvbWl1bT4oKS0+Y2xlYXJSZW5kZXJTdXJmYWNlKCk7CisgICAgICAgIG1fbGF5ZXIu Y2xlYXJSZW5kZXJTdXJmYWNlKCk7CiAgICAgICAgIG1fbGF5ZXIuc2V0QW5pbWF0aW9uRGVsZWdh dGUoMCk7CiAgICAgfQogCiAgICAgaWYgKCFtX2NvbnRlbnRzTGF5ZXIuaXNOdWxsKCkpIHsKLSAg ICAgICAgbV9jb250ZW50c0xheWVyLnVud3JhcDxMYXllckNocm9taXVtPigpLT5jbGVhclJlbmRl clN1cmZhY2UoKTsKKyAgICAgICAgbV9jb250ZW50c0xheWVyLmNsZWFyUmVuZGVyU3VyZmFjZSgp OwogICAgICAgICBtX2NvbnRlbnRzTGF5ZXIuc2V0QW5pbWF0aW9uRGVsZWdhdGUoMCk7CiAgICAg fQogCiAgICAgaWYgKCFtX3RyYW5zZm9ybUxheWVyLmlzTnVsbCgpKSB7Ci0gICAgICAgIG1fdHJh bnNmb3JtTGF5ZXIudW53cmFwPExheWVyQ2hyb21pdW0+KCktPmNsZWFyUmVuZGVyU3VyZmFjZSgp OworICAgICAgICBtX3RyYW5zZm9ybUxheWVyLmNsZWFyUmVuZGVyU3VyZmFjZSgpOwogICAgICAg ICBtX3RyYW5zZm9ybUxheWVyLnNldEFuaW1hdGlvbkRlbGVnYXRlKDApOwogICAgIH0KIApAQCAt MTMwLDIxICsxMzAsMjkgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OndpbGxCZURlc3Ry b3llZCgpCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0TmFtZShjb25zdCBTdHJpbmcm IGluTmFtZSkKIHsKICAgICBtX25hbWVCYXNlID0gaW5OYW1lOwotICAgIFN0cmluZyBuYW1lID0g U3RyaW5nOjpmb3JtYXQoIkdyYXBoaWNzTGF5ZXJDaHJvbWl1bSglcCkgR3JhcGhpY3NMYXllcigl cCkgIiwgbV9sYXllci51bndyYXA8TGF5ZXJDaHJvbWl1bT4oKSwgdGhpcykgKyBpbk5hbWU7Cisg ICAgU3RyaW5nIG5hbWUgPSBTdHJpbmc6OmZvcm1hdCgiR3JhcGhpY3NMYXllciglcCkgIiwgdGhp cykgKyBpbk5hbWU7CiAgICAgR3JhcGhpY3NMYXllcjo6c2V0TmFtZShuYW1lKTsKICAgICB1cGRh dGVOYW1lcygpOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlTmFtZXMo KQogewotICAgIGlmICghbV9sYXllci5pc051bGwoKSkKLSAgICAgICAgbV9sYXllci51bndyYXA8 TGF5ZXJDaHJvbWl1bT4oKS0+c2V0RGVidWdOYW1lKCJMYXllciBmb3IgIiArIG1fbmFtZUJhc2Up OwotICAgIGlmICghbV90cmFuc2Zvcm1MYXllci5pc051bGwoKSkKLSAgICAgICAgbV90cmFuc2Zv cm1MYXllci51bndyYXA8TGF5ZXJDaHJvbWl1bT4oKS0+c2V0RGVidWdOYW1lKCJUcmFuc2Zvcm1M YXllciBmb3IgIiArIG1fbmFtZUJhc2UpOwotICAgIGlmICghbV9jb250ZW50c0xheWVyLmlzTnVs bCgpKQotICAgICAgICBtX2NvbnRlbnRzTGF5ZXIudW53cmFwPExheWVyQ2hyb21pdW0+KCktPnNl dERlYnVnTmFtZSgiQ29udGVudHNMYXllciBmb3IgIiArIG1fbmFtZUJhc2UpOwotICAgIGlmICht X2xpbmtIaWdobGlnaHQpCi0gICAgICAgIG1fbGlua0hpZ2hsaWdodC0+Y29udGVudExheWVyKCkt PnNldERlYnVnTmFtZSgiTGlua0hpZ2hsaWdodCBmb3IgIiArIG1fbmFtZUJhc2UpOworICAgIGlm ICghbV9sYXllci5pc051bGwoKSkgeworICAgICAgICBTdHJpbmcgZGVidWdOYW1lID0gIkxheWVy IGZvciAiICsgbV9uYW1lQmFzZTsKKyAgICAgICAgbV9sYXllci5zZXREZWJ1Z05hbWUoZGVidWdO YW1lKTsKKyAgICB9CisgICAgaWYgKCFtX3RyYW5zZm9ybUxheWVyLmlzTnVsbCgpKSB7CisgICAg ICAgIFN0cmluZyBkZWJ1Z05hbWUgPSAiVHJhbnNmb3JtTGF5ZXIgZm9yICIgKyBtX25hbWVCYXNl OworICAgICAgICBtX3RyYW5zZm9ybUxheWVyLnNldERlYnVnTmFtZShkZWJ1Z05hbWUpOworICAg IH0KKyAgICBpZiAoIW1fY29udGVudHNMYXllci5pc051bGwoKSkgeworICAgICAgICBTdHJpbmcg ZGVidWdOYW1lID0gIkNvbnRlbnRzTGF5ZXIgZm9yICIgKyBtX25hbWVCYXNlOworICAgICAgICBt X2NvbnRlbnRzTGF5ZXIuc2V0RGVidWdOYW1lKGRlYnVnTmFtZSk7CisgICAgfQorICAgIGlmICht X2xpbmtIaWdobGlnaHQpIHsKKyAgICAgICAgU3RyaW5nIGRlYnVnTmFtZSA9ICJMaW5rSGlnaGxp Z2h0IGZvciAiICsgbV9uYW1lQmFzZTsKKyAgICAgICAgbV9saW5rSGlnaGxpZ2h0LT5jb250ZW50 TGF5ZXIoKS0+c2V0RGVidWdOYW1lKGRlYnVnTmFtZSk7CisgICAgfQogfQogCiBib29sIEdyYXBo aWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q2hpbGRyZW4oY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXIq PiYgY2hpbGRyZW4pCkBAIC00MDIsOCArNDEwLDggQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21p dW06OnNldE1hc2tMYXllcihHcmFwaGljc0xheWVyKiBtYXNrTGF5ZXIpCiAKICAgICBHcmFwaGlj c0xheWVyOjpzZXRNYXNrTGF5ZXIobWFza0xheWVyKTsKIAotICAgIExheWVyQ2hyb21pdW0qIG1h c2tMYXllckNocm9taXVtID0gbV9tYXNrTGF5ZXIgPyBtX21hc2tMYXllci0+cGxhdGZvcm1MYXll cigpIDogMDsKLSAgICBtX2xheWVyLnVud3JhcDxMYXllckNocm9taXVtPigpLT5zZXRNYXNrTGF5 ZXIobWFza0xheWVyQ2hyb21pdW0pOworICAgIFdlYkxheWVyIG1hc2tXZWJMYXllcihtX21hc2tM YXllciA/IG1fbWFza0xheWVyLT5wbGF0Zm9ybUxheWVyKCkgOiAwKTsKKyAgICBtX2xheWVyLnNl dE1hc2tMYXllcihtYXNrV2ViTGF5ZXIpOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1 bTo6c2V0QmFja2ZhY2VWaXNpYmlsaXR5KGJvb2wgdmlzaWJsZSkKQEAgLTQyMyw4ICs0MzEsMTEg QEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldFJlcGxpY2F0ZWRCeUxheWVyKEdyYXBo aWNzTGF5ZXIqIGxheWVyKQogewogICAgIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSogbGF5ZXJDaHJv bWl1bSA9IHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSo+KGxheWVyKTsKICAgICBH cmFwaGljc0xheWVyOjpzZXRSZXBsaWNhdGVkQnlMYXllcihsYXllcik7Ci0gICAgTGF5ZXJDaHJv bWl1bSogcmVwbGljYUxheWVyID0gbGF5ZXJDaHJvbWl1bSA/IGxheWVyQ2hyb21pdW0tPnByaW1h cnlMYXllcigpLnVud3JhcDxMYXllckNocm9taXVtPigpIDogMDsKLSAgICBwcmltYXJ5TGF5ZXIo KS51bndyYXA8TGF5ZXJDaHJvbWl1bT4oKS0+c2V0UmVwbGljYUxheWVyKHJlcGxpY2FMYXllcik7 CisKKyAgICBXZWJMYXllciB3ZWJSZXBsaWNhTGF5ZXI7CisgICAgaWYgKGxheWVyQ2hyb21pdW0p CisgICAgICAgIHdlYlJlcGxpY2FMYXllciA9IGxheWVyQ2hyb21pdW0tPnByaW1hcnlMYXllcigp OworICAgIHByaW1hcnlMYXllcigpLnNldFJlcGxpY2FMYXllcih3ZWJSZXBsaWNhTGF5ZXIpOwog fQogCiAKQEAgLTQ2MSw3ICs0NzIsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0 Q29udGVudHNUb0ltYWdlKEltYWdlKiBpbWFnZSkKICAgICBpZiAoaW1hZ2UpIHsKICAgICAgICAg aWYgKG1fY29udGVudHNMYXllci5pc051bGwoKSB8fCBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlICE9 IENvbnRlbnRzTGF5ZXJGb3JJbWFnZSkgewogICAgICAgICAgICAgV2ViS2l0OjpXZWJJbWFnZUxh eWVyIGltYWdlTGF5ZXIgPSBXZWJLaXQ6OldlYkltYWdlTGF5ZXI6OmNyZWF0ZSgpOwotICAgICAg ICAgICAgc2V0dXBDb250ZW50c0xheWVyKGltYWdlTGF5ZXIudW53cmFwPExheWVyQ2hyb21pdW0+ KCkpOworICAgICAgICAgICAgc2V0dXBDb250ZW50c0xheWVyKGltYWdlTGF5ZXIpOwogICAgICAg ICAgICAgbV9jb250ZW50c0xheWVyUHVycG9zZSA9IENvbnRlbnRzTGF5ZXJGb3JJbWFnZTsKICAg ICAgICAgICAgIGNoaWxkcmVuQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KQEAgLTQ4Nyw4ICs0 OTgsOCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNUb0NhbnZhcyhQ bGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKQogewogICAgIGJvb2wgY2hpbGRyZW5DaGFuZ2Vk ID0gZmFsc2U7CiAgICAgaWYgKHBsYXRmb3JtTGF5ZXIpIHsKLSAgICAgICAgaWYgKG1fY29udGVu dHNMYXllci51bndyYXA8TGF5ZXJDaHJvbWl1bT4oKSAhPSBwbGF0Zm9ybUxheWVyKSB7Ci0gICAg ICAgICAgICBzZXR1cENvbnRlbnRzTGF5ZXIocGxhdGZvcm1MYXllcik7CisgICAgICAgIGlmICht X2NvbnRlbnRzTGF5ZXIgIT0gV2ViTGF5ZXIocGxhdGZvcm1MYXllcikpIHsKKyAgICAgICAgICAg IHNldHVwQ29udGVudHNMYXllcihXZWJMYXllcihwbGF0Zm9ybUxheWVyKSk7CiAgICAgICAgICAg ICBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlID0gQ29udGVudHNMYXllckZvckNhbnZhczsKICAgICAg ICAgICAgIGNoaWxkcmVuQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KQEAgLTU2Niw3ICs1Nzcs NyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNUb01lZGlhKFBsYXRm b3JtTGF5ZXIqIGxheWVyKQogICAgIGJvb2wgY2hpbGRyZW5DaGFuZ2VkID0gZmFsc2U7CiAgICAg aWYgKGxheWVyKSB7CiAgICAgICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIuaXNOdWxsKCkgfHwgbV9j b250ZW50c0xheWVyUHVycG9zZSAhPSBDb250ZW50c0xheWVyRm9yVmlkZW8pIHsKLSAgICAgICAg ICAgIHNldHVwQ29udGVudHNMYXllcihsYXllcik7CisgICAgICAgICAgICBzZXR1cENvbnRlbnRz TGF5ZXIoV2ViTGF5ZXIobGF5ZXIpKTsKICAgICAgICAgICAgIG1fY29udGVudHNMYXllclB1cnBv c2UgPSBDb250ZW50c0xheWVyRm9yVmlkZW87CiAgICAgICAgICAgICBjaGlsZHJlbkNoYW5nZWQg PSB0cnVlOwogICAgICAgICB9CkBAIC02MjAsMTYgKzYzMSwxNiBAQCB2b2lkIEdyYXBoaWNzTGF5 ZXJDaHJvbWl1bTo6c2V0RGVidWdCb3JkZXIoY29uc3QgQ29sb3ImIGNvbG9yLCBmbG9hdCBib3Jk ZXJXaWR0aAogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ2hpbGRMaXN0KCkK IHsKLSAgICBWZWN0b3I8UmVmUHRyPExheWVyQ2hyb21pdW0+ID4gbmV3Q2hpbGRyZW47CisgICAg VmVjdG9yPFdlYkxheWVyPiBuZXdDaGlsZHJlbjsKIAogICAgIGlmICghbV90cmFuc2Zvcm1MYXll ci5pc051bGwoKSkgewogICAgICAgICAvLyBBZGQgdGhlIHByaW1hcnkgbGF5ZXIgZmlyc3QuIEV2 ZW4gaWYgd2UgaGF2ZSBuZWdhdGl2ZSB6LW9yZGVyIGNoaWxkcmVuLCB0aGUgcHJpbWFyeSBsYXll ciBhbHdheXMgY29tZXMgYmVoaW5kLgotICAgICAgICBuZXdDaGlsZHJlbi5hcHBlbmQobV9sYXll ci51bndyYXA8TGF5ZXJDaHJvbWl1bT4oKSk7CisgICAgICAgIG5ld0NoaWxkcmVuLmFwcGVuZCht X2xheWVyKTsKICAgICB9IGVsc2UgaWYgKCFtX2NvbnRlbnRzTGF5ZXIuaXNOdWxsKCkpIHsKICAg ICAgICAgLy8gRklYTUU6IGFkZCB0aGUgY29udGVudHMgbGF5ZXIgaW4gdGhlIGNvcnJlY3Qgb3Jk ZXIgd2l0aCBuZWdhdGl2ZSB6LW9yZGVyIGNoaWxkcmVuLgogICAgICAgICAvLyBUaGlzIGRvZXMg bm90IGNhdXNlIHZpc2libGUgcmVuZGVyaW5nIGlzc3VlcyBiZWNhdXNlIGN1cnJlbnRseSBjb250 ZW50cyBsYXllcnMgYXJlIG9ubHkgdXNlZAogICAgICAgICAvLyBmb3IgcmVwbGFjZWQgZWxlbWVu dHMgdGhhdCBkb24ndCBoYXZlIGNoaWxkcmVuLgotICAgICAgICBuZXdDaGlsZHJlbi5hcHBlbmQo bV9jb250ZW50c0xheWVyLnVud3JhcDxMYXllckNocm9taXVtPigpKTsKKyAgICAgICAgbmV3Q2hp bGRyZW4uYXBwZW5kKG1fY29udGVudHNMYXllcik7CiAgICAgfQogCiAgICAgY29uc3QgVmVjdG9y PEdyYXBoaWNzTGF5ZXIqPiYgY2hpbGRMYXllcnMgPSBjaGlsZHJlbigpOwpAQCAtNjM3LDE4ICs2 NDgsMjAgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVwZGF0ZUNoaWxkTGlzdCgpCiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1DaGlsZHJlbjsgKytpKSB7CiAgICAgICAgIEdy YXBoaWNzTGF5ZXJDaHJvbWl1bSogY3VyQ2hpbGQgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVy Q2hyb21pdW0qPihjaGlsZExheWVyc1tpXSk7CiAKLSAgICAgICAgTGF5ZXJDaHJvbWl1bSogY2hp bGRMYXllciA9IGN1ckNoaWxkLT5sYXllckZvclBhcmVudCgpLnVud3JhcDxMYXllckNocm9taXVt PigpOwotICAgICAgICBuZXdDaGlsZHJlbi5hcHBlbmQoY2hpbGRMYXllcik7CisgICAgICAgIG5l d0NoaWxkcmVuLmFwcGVuZChjdXJDaGlsZC0+bGF5ZXJGb3JQYXJlbnQoKSk7CiAgICAgfQogCiAg ICAgaWYgKG1fbGlua0hpZ2hsaWdodCkKICAgICAgICAgbmV3Q2hpbGRyZW4uYXBwZW5kKG1fbGlu a0hpZ2hsaWdodC0+Y29udGVudExheWVyKCkpOwogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBuZXdDaGlsZHJlbi5zaXplKCk7ICsraSkKLSAgICAgICAgbmV3Q2hpbGRyZW5baV0tPnJlbW92 ZUZyb21QYXJlbnQoKTsKKyAgICAgICAgbmV3Q2hpbGRyZW5baV0ucmVtb3ZlRnJvbVBhcmVudCgp OworCisgICAgV2ViVmVjdG9yPFdlYkxheWVyPiBuZXdXZWJDaGlsZHJlbjsKKyAgICBuZXdXZWJD aGlsZHJlbi5hc3NpZ24obmV3Q2hpbGRyZW4uZGF0YSgpLCBuZXdDaGlsZHJlbi5zaXplKCkpOwog CiAgICAgaWYgKCFtX3RyYW5zZm9ybUxheWVyLmlzTnVsbCgpKSB7Ci0gICAgICAgIG1fdHJhbnNm b3JtTGF5ZXIudW53cmFwPExheWVyQ2hyb21pdW0+KCktPnNldENoaWxkcmVuKG5ld0NoaWxkcmVu KTsKKyAgICAgICAgbV90cmFuc2Zvcm1MYXllci5zZXRDaGlsZHJlbihuZXdXZWJDaGlsZHJlbik7 CiAKICAgICAgICAgaWYgKCFtX2NvbnRlbnRzTGF5ZXIuaXNOdWxsKCkpIHsKICAgICAgICAgICAg IC8vIElmIHdlIGhhdmUgYSB0cmFuc2Zvcm0gbGF5ZXIsIHRoZW4gdGhlIGNvbnRlbnRzIGxheWVy IGlzIHBhcmVudGVkIGluIHRoZQpAQCAtNjU3LDcgKzY3MCw3IEBAIHZvaWQgR3JhcGhpY3NMYXll ckNocm9taXVtOjp1cGRhdGVDaGlsZExpc3QoKQogICAgICAgICAgICAgbV9sYXllci5hZGRDaGls ZChtX2NvbnRlbnRzTGF5ZXIpOwogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIG1fbGF5 ZXIudW53cmFwPExheWVyQ2hyb21pdW0+KCktPnNldENoaWxkcmVuKG5ld0NoaWxkcmVuKTsKKyAg ICAgICAgbV9sYXllci5zZXRDaGlsZHJlbihuZXdXZWJDaGlsZHJlbik7CiB9CiAKIHZvaWQgR3Jh cGhpY3NMYXllckNocm9taXVtOjp1cGRhdGVMYXllclBvc2l0aW9uKCkKQEAgLTgxMiw5ICs4MjUs OSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29udGVudHNTY2FsZSgpCiAg ICAgbV9sYXllci5zZXRDb250ZW50c1NjYWxlKGNvbnRlbnRzU2NhbGUoKSk7CiB9CiAKLXZvaWQg R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIoTGF5ZXJDaHJvbWl1bSog Y29udGVudHNMYXllcikKK3ZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRz TGF5ZXIoV2ViTGF5ZXIgY29udGVudHNMYXllcikKIHsKLSAgICBpZiAoY29udGVudHNMYXllciA9 PSBtX2NvbnRlbnRzTGF5ZXIudW53cmFwPExheWVyQ2hyb21pdW0+KCkpCisgICAgaWYgKGNvbnRl bnRzTGF5ZXIgPT0gbV9jb250ZW50c0xheWVyKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAo IW1fY29udGVudHNMYXllci5pc051bGwoKSkgewpAQCAtODIzLDkgKzgzNiw5IEBAIHZvaWQgR3Jh cGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIoTGF5ZXJDaHJvbWl1bSogY29u dGVudHNMYXllcikKICAgICAgICAgbV9jb250ZW50c0xheWVyLnJlc2V0KCk7CiAgICAgfQogCi0g ICAgaWYgKGNvbnRlbnRzTGF5ZXIpIHsKLSAgICAgICAgbV9jb250ZW50c0xheWVyID0gV2ViTGF5 ZXIoY29udGVudHNMYXllcik7CisgICAgbV9jb250ZW50c0xheWVyID0gY29udGVudHNMYXllcjsK IAorICAgIGlmICghbV9jb250ZW50c0xheWVyLmlzTnVsbCgpKSB7CiAgICAgICAgIG1fY29udGVu dHNMYXllci5zZXRBbmNob3JQb2ludChGbG9hdFBvaW50KDAsIDApKTsKICAgICAgICAgbV9jb250 ZW50c0xheWVyLnNldFVzZVBhcmVudEJhY2tmYWNlVmlzaWJpbGl0eSh0cnVlKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NM YXllckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaAppbmRleCAyYzg1MTY0ZTc2OTQ2N2YyODdhYWUwMjdh NThlZjZjNzBlZDVmYWRkLi45NzdjMmQ0MGUyM2ZjNWEwYThkMmIyYzlmMzM2ZjI1YjQ3NjViMTIz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9H cmFwaGljc0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uaApAQCAtMTUyLDcgKzE1Miw3IEBA IHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVDb250ZW50c1JlY3QoKTsKICAgICB2b2lkIHVwZGF0 ZUNvbnRlbnRzU2NhbGUoKTsKIAotICAgIHZvaWQgc2V0dXBDb250ZW50c0xheWVyKExheWVyQ2hy b21pdW0qKTsKKyAgICB2b2lkIHNldHVwQ29udGVudHNMYXllcihXZWJLaXQ6OldlYkxheWVyKTsK ICAgICBmbG9hdCBjb250ZW50c1NjYWxlKCkgY29uc3Q7CiAKICAgICBpbnQgbWFwQW5pbWF0aW9u TmFtZVRvSWQoY29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkxheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkxheWVyLmNwcAppbmRleCA4YjlkNDgzZGU1NzVlZWE1MDc1M2I2OTZmYWYyZmQ5 MzE2NGZhZDVlLi43YTYwNGI4MWVlMGE3NzcyYzcxOTFjYjkxYWYyMzgzYzg5ZGU2NWY4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJMYXllci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTGF5ZXIuY3BwCkBAIC0xNDQsNiArMTQ0LDE0IEBA IHZvaWQgV2ViTGF5ZXI6OnJlcGxhY2VDaGlsZChjb25zdCBXZWJMYXllciYgcmVmZXJlbmNlLCBj b25zdCBXZWJMYXllciYgbmV3TGF5ZXIpCiAgICAgbV9wcml2YXRlLT5yZXBsYWNlQ2hpbGQocmVm LnVud3JhcDxMYXllckNocm9taXVtPigpLCBuZXdMYXllcik7CiB9CiAKK3ZvaWQgV2ViTGF5ZXI6 OnNldENoaWxkcmVuKGNvbnN0IFdlYlZlY3RvcjxXZWJMYXllcj4mIHdlYkNoaWxkcmVuKQorewor ICAgIFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gPiBjaGlsZHJlbih3ZWJDaGlsZHJlbi5z aXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgd2ViQ2hpbGRyZW4uc2l6ZSgpOyAr K2kpCisgICAgICAgIGNoaWxkcmVuW2ldID0gd2ViQ2hpbGRyZW5baV0udW53cmFwPExheWVyQ2hy b21pdW0+KCk7CisgICAgbV9wcml2YXRlLT5zZXRDaGlsZHJlbihjaGlsZHJlbik7Cit9CisKIHZv aWQgV2ViTGF5ZXI6OnJlbW92ZUZyb21QYXJlbnQoKQogewogICAgIG1fcHJpdmF0ZS0+cmVtb3Zl RnJvbVBhcmVudCgpOwpAQCAtMjA1LDYgKzIxMywxMiBAQCBXZWJMYXllciBXZWJMYXllcjo6bWFz a0xheWVyKCkgY29uc3QKICAgICByZXR1cm4gV2ViTGF5ZXIobV9wcml2YXRlLT5tYXNrTGF5ZXIo KSk7CiB9CiAKK3ZvaWQgV2ViTGF5ZXI6OnNldFJlcGxpY2FMYXllcihjb25zdCBXZWJMYXllciYg cmVwbGljYUxheWVyKQoreworICAgIFdlYkxheWVyIHJlZiA9IHJlcGxpY2FMYXllcjsKKyAgICBt X3ByaXZhdGUtPnNldFJlcGxpY2FMYXllcihyZWYudW53cmFwPExheWVyQ2hyb21pdW0+KCkpOwor fQorCiB2b2lkIFdlYkxheWVyOjpzZXRPcGFjaXR5KGZsb2F0IG9wYWNpdHkpCiB7CiAgICAgbV9w cml2YXRlLT5zZXRPcGFjaXR5KG9wYWNpdHkpOwpAQCAtMzEwLDYgKzMyNCwxMSBAQCB2b2lkIFdl YkxheWVyOjpzZXREZWJ1Z0JvcmRlcldpZHRoKGZsb2F0IHdpZHRoKQogICAgIG1fcHJpdmF0ZS0+ c2V0RGVidWdCb3JkZXJXaWR0aCh3aWR0aCk7CiB9CiAKK3ZvaWQgV2ViTGF5ZXI6OnNldERlYnVn TmFtZShXZWJTdHJpbmcgbmFtZSkKK3sKKyAgICBtX3ByaXZhdGUtPnNldERlYnVnTmFtZShuYW1l KTsKK30KKwogdm9pZCBXZWJMYXllcjo6c2V0QW5pbWF0aW9uRGVsZWdhdGUoV2ViQW5pbWF0aW9u RGVsZWdhdGUqIGRlbGVnYXRlKQogewogICAgIG1fcHJpdmF0ZS0+c2V0TGF5ZXJBbmltYXRpb25E ZWxlZ2F0ZShkZWxlZ2F0ZSk7CkBAIC0zNjIsNiArMzgxLDExIEBAIHZvaWQgV2ViTGF5ZXI6OnNl dEZvcmNlUmVuZGVyU3VyZmFjZShib29sIGZvcmNlUmVuZGVyU3VyZmFjZSkKICAgICBtX3ByaXZh dGUtPnNldEZvcmNlUmVuZGVyU3VyZmFjZShmb3JjZVJlbmRlclN1cmZhY2UpOwogfQogCit2b2lk IFdlYkxheWVyOjpjbGVhclJlbmRlclN1cmZhY2UoKQoreworICAgIG1fcHJpdmF0ZS0+Y2xlYXJS ZW5kZXJTdXJmYWNlKCk7Cit9CisKIFdlYkxheWVyOjpXZWJMYXllcihjb25zdCBQYXNzUmVmUHRy PExheWVyQ2hyb21pdW0+JiBub2RlKQogICAgIDogbV9wcml2YXRlKG5vZGUpCiB7Cg==