76296 2012-01-13 12:03:49 -0800 [Qt] Trigger forcing accelerated compositing from the UI process side. 2012-01-20 09:34:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76696 76708 1 jturcotte jturcotte kenneth noam ossy ostap73 webkit.review.bot zoltan oldest_to_newest 535872 0 jturcotte 2012-01-13 12:03:49 -0800 [Qt] Trigger forcing accelerated compositing from the UI process side. 535873 1 122478 jturcotte 2012-01-13 12:05:09 -0800 Created attachment 122478 Patch 535907 2 122478 noam 2012-01-13 12:44:34 -0800 Comment on attachment 122478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122478&action=review r=me with nitpicks > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:65 > + // Construct the proxy early to allow messages to be sent to the web process ASAP. > + if (webPageProxy->pageGroup()->preferences()->forceCompositingMode()) > + m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this)); > +#endif Instead of ASAP say when messages actually need to be sent, e.g. "before page load". Put this in PLATFORM(QT), other ports with WebKit2+TextureMapper might not want this. > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp:675 > if (m_layerTreeHost) You don't need this condition if you assert 537793 3 jturcotte 2012-01-18 05:37:25 -0800 (In reply to comment #2) > Put this in PLATFORM(QT), other ports with WebKit2+TextureMapper might not want this. The Qt platform isn't producing any specific behavior that isn't already covered by the forceCompositingMode() condition. I also like the benefit of having the texture mapper behaving as close as possible between ports to reduce the number of platform specific bugs and keep the code paths straightforward. I fixed the other issues. 537797 4 noam 2012-01-18 05:46:49 -0800 (In reply to comment #3) > (In reply to comment #2) > > Put this in PLATFORM(QT), other ports with WebKit2+TextureMapper might not want this. > The Qt platform isn't producing any specific behavior that isn't already covered by the forceCompositingMode() condition. I also like the benefit of having the texture mapper behaving as close as possible between ports to reduce the number of platform specific bugs and keep the code paths straightforward. Other ports that use texture-mapper don't have a LayerTreeHostProxy at this time. So generating a LayerTreeHostProxy for them at that point would break their webkit2. 539345 5 jturcotte 2012-01-20 01:32:25 -0800 (In reply to comment #4) > Other ports that use texture-mapper don't have a LayerTreeHostProxy at this time. So generating a LayerTreeHostProxy for them at that point would break their webkit2. As talked on IRC, this wouldn't be an issue as of today in trunk, so we can ifdef it out once it becomes a problem. 539357 6 jturcotte 2012-01-20 02:03:21 -0800 Committed r105497: <http://trac.webkit.org/changeset/105497> 539419 7 ossy 2012-01-20 04:31:08 -0800 (In reply to comment #6) > Committed r105497: <http://trac.webkit.org/changeset/105497> Reopen, because it was rolled out by http://trac.webkit.org/changeset/105504 539503 8 123315 jturcotte 2012-01-20 07:51:55 -0800 Created attachment 123315 Patch Fix the leak in the layout tests and the GTK build hang. The growing memory problem was caused by the rendered tiles accumulating in the LayerTreeHostProxy since there is no painting in WebKitTestRunner. They would previously be dropped since no LayerTreeHostProxy was created yet but the web process would still waste time rendering. This is fixed by making sure that RenderNextFrame and DidRenderFrame are cycling. The GTK hang was caused by the default value for forceCompositingMode to be poorly defined with a default value of true, it's fixed now. 539510 9 123315 noam 2012-01-20 07:54:28 -0800 Comment on attachment 123315 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123315&action=review > Source/WebKit2/ChangeLog:14 > + This patch also fix the flow of DidRenderFrame and RenderNextFrame messages fix -> fixes > Source/WebKit2/ChangeLog:40 > +2012-01-13 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> > + > + ? 539527 10 jturcotte 2012-01-20 08:25:37 -0800 Committed r105517: <http://trac.webkit.org/changeset/105517> 122478 2012-01-13 12:05:09 -0800 2012-01-20 07:51:47 -0800 Patch bug-76296-20120113210218.patch text/plain 8205 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDM4OWZkOTc3MWUwNjJl YTA4M2ZjMmM4OGIwMWQyNmFlYjIwNDZiMy4uYjJkYmVmMjg0NmVkZTkyYThiYWFiNzE2OTBhYzEw NDU4NDM3MjI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTAxLTEzICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XSBUcmlnZ2VyIGZvcmNpbmcgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZnJvbSB0aGUgVUkgcHJv Y2VzcyBzaWRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzYyOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTb21lIG1lc3NhZ2VzIGNhbiBiZSBzZW50IGZyb20gdGhlIHdlYiB2aWV3IHRvIHRoZSBMYXll clRyZWVIb3N0IGJlZm9yZQorICAgICAgICBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbnRl cmVkIG9uIHRoZSB3ZWIgcHJvY2VzcyBhbmQgc2lnbmFsZWQgYmFjay4KKyAgICAgICAgQnkgbGV0 dGluZyB0aGUgVUkgcHJvY2VzcyBkZWNpZGUgaWYgQUMgaGFzIHRvIGJlIGZvcmNlZCwgd2UgY2Fu IGNyZWF0ZQorICAgICAgICB0aGUgTGF5ZXJUcmVlSG9zdFByb3h5IGVhcmxpZXIgdG8gc2VuZCBt ZXNzYWdlcyB0byB0aGUgd2ViIHByb2Nlc3Mgd2hpbGUKKyAgICAgICAgQUMgaXMgYmVpbmcgZW50 ZXJlZCB0aGVyZS4KKworICAgICAgICBUaGlzIGZpeGVzIHRoZSBmaXJzdCB2aXNpYmxlIGNvbnRl bnQgcmVjdCBtZXNzYWdlIG5vdCBiZWluZyByZWNlaXZlZCB3aGVuCisgICAgICAgIGxvYWRpbmcg cGFnZXMgZnJvbSB0aGUgZGlzay4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcmVmZXJlbmNlc1N0 b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcDoKKyAg ICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0aWFsaXplKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5n QXJlYVByb3h5SW1wbDo6RHJhd2luZ0FyZWFQcm94eUltcGwpOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5n QXJlYUltcGw6OkRyYXdpbmdBcmVhSW1wbCk6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVh SW1wbDo6ZGlkUmVjZWl2ZUxheWVyVHJlZUhvc3RNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0 ZVByZWZlcmVuY2VzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvcXQvV2ViUGFnZVF0 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFsaXplKToKKwog MjAxMS0xMi0xNiAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29t PgogCiAgICAgICAgIFtRdF0gSGFuZGxlIHRoZSBsYXllcnMgdmlzaWJsZSByZWN0IGNhbGN1bGF0 aW9uIG9uIHRoZSB3ZWIgcHJvY2Vzcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVy ZW5jZXNTdG9yZS5oCmluZGV4IDZiMGExNDNjMTAwNWFmOTQ5OWJlYmNhYzcwNWE4Yjg4YmIwYjNk ZjIuLmFlZTFkZTdiOWM0ZWZkNDUyOTcwYWMxNDIzMmI3OGYxN2Q3MzQxMDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaApAQCAtNjYsNiArNjYsNyBAQCBu YW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNybyhIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQsIGh5 cGVybGlua0F1ZGl0aW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3JvKE5l ZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcywgQm9vbCwgYm9v bCwgZmFsc2UpIFwKICAgICBtYWNybyhBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwgYWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIHRydWUpIFwKKyAgICBtYWNy byhGb3JjZUNvbXBvc2l0aW5nTW9kZSwgZm9yY2VDb21wb3NpdGluZ01vZGUsIEJvb2wsIGJvb2ws IHRydWUpIFwKICAgICBtYWNybyhBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkLCBhY2NlbGVyYXRl ZERyYXdpbmdFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKENhbnZhc1Vz ZXNBY2NlbGVyYXRlZERyYXdpbmcsIGNhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmcsIEJvb2ws IGJvb2wsIHRydWUpIFwKICAgICBtYWNybyhDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlLCBjb21w b3NpdGluZ0JvcmRlcnNWaXNpYmxlLCBCb29sLCBib29sLCBmYWxzZSkgXApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggZGY3Yzhm ZGI5NmNlZDdjMzBhNjk3YTYzNGY5NmU0NDdmNmQ5YzRhZC4uNGJjZDdjY2UzNmY5MTNmZmZlNTY2 MmI0NWY2NTJhZmIwNmQzMmE4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0xMDQsNiArMTA0LDcgQEAgdm9pZCBRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdl R3JvdXBSZWYgcGEKICAgICAvLyBBbnkgcGFnZSBzZXR0aW5nIHNob3VsZCBwcmVmZXJyYWJsZSBi ZSBzZXQgYmVmb3JlIGNyZWF0aW5nIHRoZSBwYWdlLgogICAgIHNldFVzZVRyYWRpdGlvbmFsRGVz a3RvcEJlaGF2aW91cihmYWxzZSk7CiAgICAgd2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKS0+cHJl ZmVyZW5jZXMoKS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQodHJ1ZSk7CisgICAg d2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+c2V0Rm9yY2VDb21wb3Np dGluZ01vZGUodHJ1ZSk7CiAKICAgICBwYWdlQ2xpZW50LmluaXRpYWxpemUocV9wdHIsIHBhZ2VW aWV3UHJpdmF0ZS0+ZXZlbnRIYW5kbGVyLmRhdGEoKSwgJnVuZG9Db250cm9sbGVyKTsKICAgICB3 ZWJQYWdlUHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRleCA3YjE1Mzg0OGQzZTE4MmJh YzY3Y2MzZTRmZjkyYmRiMDMyYTYzOGMxLi5jMDQ2YWYwMjA1ZDIzNGU5M2YzNmZkZGUzMmNiYWY2 Yzc2OGM0NTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHAKQEAgLTMwLDcgKzMwLDkgQEAKICNpbmNsdWRlICJEcmF3aW5nQXJlYVBy b3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJMYXllclRyZWVDb250ZXh0LmgiCiAjaW5jbHVkZSAi VXBkYXRlSW5mby5oIgorI2luY2x1ZGUgIldlYlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIldlYlBh Z2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCiAjaW5jbHVkZSAiV2ViUHJv Y2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpb24uaD4KIApAQCAtNTYsNiArNTgs MTEgQEAgRHJhd2luZ0FyZWFQcm94eUltcGw6OkRyYXdpbmdBcmVhUHJveHlJbXBsKFdlYlBhZ2VQ cm94eSogd2ViUGFnZVByb3h5KQogICAgICwgbV9pc0JhY2tpbmdTdG9yZURpc2NhcmRhYmxlKHRy dWUpCiAgICAgLCBtX2Rpc2NhcmRCYWNraW5nU3RvcmVUaW1lcihSdW5Mb29wOjpjdXJyZW50KCks IHRoaXMsICZEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlzY2FyZEJhY2tpbmdTdG9yZSkKIHsKKyNp ZiBVU0UoVEVYVFVSRV9NQVBQRVIpCisgICAgLy8gQ29uc3RydWN0IHRoZSBwcm94eSBlYXJseSB0 byBhbGxvdyBtZXNzYWdlcyB0byBiZSBzZW50IHRvIHRoZSB3ZWIgcHJvY2VzcyBBU0FQLgorICAg IGlmICh3ZWJQYWdlUHJveHktPnBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLT5mb3JjZUNvbXBv c2l0aW5nTW9kZSgpKQorICAgICAgICBtX2xheWVyVHJlZUhvc3RQcm94eSA9IGFkb3B0UHRyKG5l dyBMYXllclRyZWVIb3N0UHJveHkodGhpcykpOworI2VuZGlmCiB9CiAKIERyYXdpbmdBcmVhUHJv eHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcAppbmRleCBlMjgxZDM2NTJh OThmZThhMDlhNDY0NDE5YmNhMTM1ZDdhODVmOTcyLi4zYzMyNjcxMmU1YzM3OWJmNDNiZmFkM2Iy M2NmZTU4N2M2NzQ5ODU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcApAQCAtNjgsNyArNjgsNyBAQCBEcmF3aW5nQXJl YUltcGw6OkRyYXdpbmdBcmVhSW1wbChXZWJQYWdlKiB3ZWJQYWdlLCBjb25zdCBXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZQogICAgICwgbV9kaXNwbGF5VGltZXIoV2ViUHJvY2Vzczo6c2hhcmVkKCku cnVuTG9vcCgpLCB0aGlzLCAmRHJhd2luZ0FyZWFJbXBsOjpkaXNwbGF5VGltZXJGaXJlZCkKICAg ICAsIG1fZXhpdENvbXBvc2l0aW5nVGltZXIoV2ViUHJvY2Vzczo6c2hhcmVkKCkucnVuTG9vcCgp LCB0aGlzLCAmRHJhd2luZ0FyZWFJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUp CiB7Ci0gICAgaWYgKHdlYlBhZ2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCktPmFjY2VsZXJhdGVk RHJhd2luZ0VuYWJsZWQoKSkKKyAgICBpZiAod2ViUGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3Mo KS0+YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCgpIHx8IHdlYlBhZ2UtPmNvcmVQYWdlKCktPnNl dHRpbmdzKCktPmZvcmNlQ29tcG9zaXRpbmdNb2RlKCkpCiAgICAgICAgIG1fYWx3YXlzVXNlQ29t cG9zaXRpbmcgPSB0cnVlOwogICAgICAgICAKICAgICBpZiAobV9hbHdheXNVc2VDb21wb3NpdGlu ZykKQEAgLTY3MCw2ICs2NzAsOCBAQCB2b2lkIERyYXdpbmdBcmVhSW1wbDo6ZGlzcGxheShVcGRh dGVJbmZvJiB1cGRhdGVJbmZvKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYg VVNFKFRFWFRVUkVfTUFQUEVSKQogdm9pZCBEcmF3aW5nQXJlYUltcGw6OmRpZFJlY2VpdmVMYXll clRyZWVIb3N0TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBD OjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50 cykKIHsKKyAgICAvLyBUaGUgcHJveHkgbWlnaHQgaGF2ZSBiZWVuIGNyZWF0ZWQgZWFybHkgb24g dGhlIFVJIHByb2Nlc3MsIG1ha2Ugc3VyZSB0aGF0IG5vIG1lc3NhZ2UgaXMgbG9zdCBoZXJlLgor ICAgIEFTU0VSVChtX2xheWVyVHJlZUhvc3QpOwogICAgIGlmIChtX2xheWVyVHJlZUhvc3QpCiAg ICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+ZGlkUmVjZWl2ZUxheWVyVHJlZUhvc3RNZXNzYWdlKGNv bm5lY3Rpb24sIG1lc3NhZ2VJRCwgYXJndW1lbnRzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBhMWMzYzJjMDAzMzcwOTQ3YjMwODIw ZDA5Y2EzMGE4Mzk3YzJmYTQwLi4wMzY2YzUzMTZjNTVlODM3MzIwODE1NTg3NGUzZjAyMGViNGNl Zjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CkBAIC0xODM2LDYgKzE4MzYsNyBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKGNv bnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogICAgIHNldHRpbmdzLT5zZXRTaG93c1Rv b2xUaXBPdmVyVHJ1bmNhdGVkVGV4dChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVy ZW5jZXNLZXk6OnNob3dzVG9vbFRpcE92ZXJUcnVuY2F0ZWRUZXh0S2V5KCkpKTsKIAogICAgIHNl dHRpbmdzLT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChzdG9yZS5nZXRCb29sVmFs dWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVk S2V5KCkpICYmIExheWVyVHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygp KTsKKyAgICBzZXR0aW5ncy0+c2V0Rm9yY2VDb21wb3NpdGluZ01vZGUoc3RvcmUuZ2V0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojpmb3JjZUNvbXBvc2l0aW5nTW9kZUtleSgpKSAm JiBMYXllclRyZWVIb3N0OjpzdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7CiAgICAg c2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVl Rm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkS2V5KCkp ICYmIExheWVyVHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpKTsKICAg ICBzZXR0aW5ncy0+c2V0Q2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZyhzdG9yZS5nZXRCb29s VmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmNhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdp bmdLZXkoKSkgJiYgTGF5ZXJUcmVlSG9zdDo6c3VwcG9ydHNBY2NlbGVyYXRlZENvbXBvc2l0aW5n KCkpOwogICAgIHNldHRpbmdzLT5zZXRTaG93RGVidWdCb3JkZXJzKHN0b3JlLmdldEJvb2xWYWx1 ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6Y29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZUtleSgp KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvV2Vi UGFnZVF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9XZWJQYWdl UXQuY3BwCmluZGV4IDU1MDgwZDAzY2QwM2EzY2RmOWNmMmMzNzE3MjdhNjI4ZGVmYTU1ZTMuLjcx ODBhOGM4ODM2MDY5ZDc2OGRjZjA5NzE2MTU2YTBiYjU2NjA0YmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9XZWJQYWdlUXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9XZWJQYWdlUXQuY3BwCkBAIC05MCwxMCAr OTAsNiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICAKIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1J bml0aWFsaXplKCkKIHsKLSAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3BhZ2UtPnNldHRpbmdz KCk7Ci0KLSAgICAvLyBJZiBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkLCB3ZSB3 YW50IHRvIGJlIGluIGZvcmNlLWNvbXBvc2l0aW5nIG1vZGUsIHNvIHRoYXQgd2UgZG9uJ3Qgc3dp dGNoIGJldHdlZW4gY29tcG9zaXRlZC9ub24tY29tcG9zaXRlZCBzdGF0ZS4KLSAgICBzZXR0aW5n cy0+c2V0Rm9yY2VDb21wb3NpdGluZ01vZGUodHJ1ZSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6cGxh dGZvcm1QcmVmZXJlbmNlc0RpZENoYW5nZShjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJikK 123315 2012-01-20 07:51:55 -0800 2012-01-20 07:54:27 -0800 Patch bug-76296-20120120165154.patch text/plain 10977 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTYxZWJiNmFhODBmMjky NDk5ZjY4ZDZkYTAzYjAyMTU4Nzc4ZTNhYS4uOWQzNTMwOGQ4MDQ3YjU3ZTg4MjZmOTU4ZGUyOWRh OTQzMTI4OTE5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDEyLTAxLTIwICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XSBUcmlnZ2VyIGZvcmNpbmcgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgZnJvbSB0aGUgVUkgcHJv Y2VzcyBzaWRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzYyOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTb21lIG1lc3NhZ2VzIGNhbiBiZSBzZW50IGZyb20gdGhlIHdlYiB2aWV3IHRvIHRoZSBMYXll clRyZWVIb3N0IGJlZm9yZQorICAgICAgICBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbnRl cmVkIG9uIHRoZSB3ZWIgcHJvY2VzcyBhbmQgc2lnbmFsZWQgYmFjay4KKyAgICAgICAgQnkgbGV0 dGluZyB0aGUgVUkgcHJvY2VzcyBkZWNpZGUgaWYgQUMgaGFzIHRvIGJlIGZvcmNlZCwgd2UgY2Fu IGNyZWF0ZQorICAgICAgICB0aGUgTGF5ZXJUcmVlSG9zdFByb3h5IGVhcmxpZXIgdG8gc2VuZCBt ZXNzYWdlcyB0byB0aGUgd2ViIHByb2Nlc3Mgd2hpbGUKKyAgICAgICAgQUMgaXMgYmVpbmcgZW50 ZXJlZCB0aGVyZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZml4IHRoZSBmbG93IG9mIERp ZFJlbmRlckZyYW1lIGFuZCBSZW5kZXJOZXh0RnJhbWUgbWVzc2FnZXMKKyAgICAgICAgYnkgc2V0 dGluZyB0aGUgbV93YWl0aW5nRm9yVUlQcm9jZXNzIGZsYWcgcHJvcGVybHkgYW5kIG9ubHkgc2Vu ZCB0aGUKKyAgICAgICAgUmVuZGVyTmV4dEZyYW1lIG9uY2UgdGhlIHBhaW50aW5nIHRocmVhZCBv biB0aGUgVUkgcHJvY2VzcyBpcyByZWFkeSB0byBwYWludC4KKworICAgICAgICBUaGlzIGZpeGVz IHRoZSBmaXJzdCB2aXNpYmxlIGNvbnRlbnQgcmVjdCBtZXNzYWdlIG5vdCBiZWluZyByZWNlaXZl ZCB3aGVuCisgICAgICAgIGxvYWRpbmcgcGFnZXMgZnJvbSB0aGUgZGlzay4KKworICAgICAgICAq IFNoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0 aWFsaXplKToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6RHJhd2luZ0FyZWFQcm94eUlt cGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9MYXllclRyZWVIb3N0UHJveHlRdC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RQcm94eTo6Zmx1c2hMYXllckNoYW5nZXMpOgor ICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0UHJveHk6OmRpZFJlbmRlckZyYW1lKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RHJhd2luZ0FyZWFJbXBsOjpEcmF3aW5nQXJlYUltcGwpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 dXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXll clRyZWVIb3N0UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0UXQ6OnBlcmZv cm1TY2hlZHVsZWRMYXllckZsdXNoKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvcXQv V2ViUGFnZVF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFs aXplKToKKworMjAxMi0wMS0xMyAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVA bm9raWEuY29tPgorCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChR UXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0Ry YXdpbmdBcmVhUHJveHlJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94 eUltcGw6OkRyYXdpbmdBcmVhUHJveHlJbXBsKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWFJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFJbXBs OjpEcmF3aW5nQXJlYUltcGwpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9xdC9XZWJQYWdlUXQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpwbGF0Zm9ybUluaXRpYWxpemUpOgorCiAyMDEyLTAxLTIwICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTA1NDk3LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVk L1dlYlByZWZlcmVuY2VzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJl bmNlc1N0b3JlLmgKaW5kZXggZjk4NGI5MTFkYjEzOTczYWU2ZjMyYmVlNjg5NDA2NmIwNTg0Mzhm ZC4uMjFkYTI4MTlkZWNmYjU4NjY3YWI4MjcxZmNhNzBkOGNhZmUxZjE5MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCkBAIC02Niw2ICs2Niw3IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogICAgIG1hY3JvKEh5cGVybGlua0F1ZGl0aW5nRW5hYmxlZCwgaHlw ZXJsaW5rQXVkaXRpbmdFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oTmVl ZHNTaXRlU3BlY2lmaWNRdWlya3MsIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzLCBCb29sLCBib29s LCBmYWxzZSkgXAogICAgIG1hY3JvKEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCBhY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAorICAgIG1hY3Jv KEZvcmNlQ29tcG9zaXRpbmdNb2RlLCBmb3JjZUNvbXBvc2l0aW5nTW9kZSwgQm9vbCwgYm9vbCwg ZmFsc2UpIFwKICAgICBtYWNybyhBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkLCBhY2NlbGVyYXRl ZERyYXdpbmdFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKENhbnZhc1Vz ZXNBY2NlbGVyYXRlZERyYXdpbmcsIGNhbnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmcsIEJvb2ws IGJvb2wsIHRydWUpIFwKICAgICBtYWNybyhDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlLCBjb21w b3NpdGluZ0JvcmRlcnNWaXNpYmxlLCBCb29sLCBib29sLCBmYWxzZSkgXApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggNTU5Njc1 MDE3ZDdhNjVmNzk2NzI0ZWNmMzgxYjMwODM1YThjNGUxNC4uOTRiNTI1NTQ1NTZhOGNjNzE3ZGQ3 ODVlOGJjMjgwN2I1YWY5YTc3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0xMDUsNiArMTA1LDcgQEAgdm9pZCBRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdl R3JvdXBSZWYgcGEKICAgICAvLyBBbnkgcGFnZSBzZXR0aW5nIHNob3VsZCBwcmVmZXJyYWJsZSBi ZSBzZXQgYmVmb3JlIGNyZWF0aW5nIHRoZSBwYWdlLgogICAgIHNldFVzZVRyYWRpdGlvbmFsRGVz a3RvcEJlaGF2aW91cihmYWxzZSk7CiAgICAgd2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKS0+cHJl ZmVyZW5jZXMoKS0+c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQodHJ1ZSk7CisgICAg d2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+c2V0Rm9yY2VDb21wb3Np dGluZ01vZGUodHJ1ZSk7CiAKICAgICBwYWdlQ2xpZW50LmluaXRpYWxpemUocV9wdHIsIHBhZ2VW aWV3UHJpdmF0ZS0+ZXZlbnRIYW5kbGVyLmRhdGEoKSwgJnVuZG9Db250cm9sbGVyKTsKICAgICB3 ZWJQYWdlUHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRleCA3YjE1Mzg0OGQzZTE4MmJh YzY3Y2MzZTRmZjkyYmRiMDMyYTYzOGMxLi5lYWMzZjAwMTdiMjIzNTI0ZjRmN2M0NTdmMGNmYmQ0 ZDIzNGNhOTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHAKQEAgLTMwLDcgKzMwLDkgQEAKICNpbmNsdWRlICJEcmF3aW5nQXJlYVBy b3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJMYXllclRyZWVDb250ZXh0LmgiCiAjaW5jbHVkZSAi VXBkYXRlSW5mby5oIgorI2luY2x1ZGUgIldlYlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIldlYlBh Z2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCiAjaW5jbHVkZSAiV2ViUHJv Y2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9SZWdpb24uaD4KIApAQCAtNTYsNiArNTgs MTEgQEAgRHJhd2luZ0FyZWFQcm94eUltcGw6OkRyYXdpbmdBcmVhUHJveHlJbXBsKFdlYlBhZ2VQ cm94eSogd2ViUGFnZVByb3h5KQogICAgICwgbV9pc0JhY2tpbmdTdG9yZURpc2NhcmRhYmxlKHRy dWUpCiAgICAgLCBtX2Rpc2NhcmRCYWNraW5nU3RvcmVUaW1lcihSdW5Mb29wOjpjdXJyZW50KCks IHRoaXMsICZEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlzY2FyZEJhY2tpbmdTdG9yZSkKIHsKKyNp ZiBVU0UoVEVYVFVSRV9NQVBQRVIpCisgICAgLy8gQ29uc3RydWN0IHRoZSBwcm94eSBlYXJseSB0 byBhbGxvdyBtZXNzYWdlcyB0byBiZSBzZW50IHRvIHRoZSB3ZWIgcHJvY2VzcyB3aGlsZSBBQyBp cyBlbnRlcmVkIHRoZXJlLgorICAgIGlmICh3ZWJQYWdlUHJveHktPnBhZ2VHcm91cCgpLT5wcmVm ZXJlbmNlcygpLT5mb3JjZUNvbXBvc2l0aW5nTW9kZSgpKQorICAgICAgICBtX2xheWVyVHJlZUhv c3RQcm94eSA9IGFkb3B0UHRyKG5ldyBMYXllclRyZWVIb3N0UHJveHkodGhpcykpOworI2VuZGlm CiB9CiAKIERyYXdpbmdBcmVhUHJveHlJbXBsOjp+RHJhd2luZ0FyZWFQcm94eUltcGwoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0xheWVyVHJlZUhvc3RQcm94eVF0 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9MYXllclRyZWVIb3N0UHJveHlRdC5j cHAKaW5kZXggZjlhYmY0OTI2MGUwNWFlMTllOTU4NWY4OTc3MDFmNWVlMjgwYzBlMi4uOGM0Mjhk Nzk5YzZiODIwNTc5NmE1ZTZjMjY5N2JkMmNhZTE3YjlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L0xheWVyVHJlZUhvc3RQcm94eVF0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvTGF5ZXJUcmVlSG9zdFByb3h5UXQuY3BwCkBAIC00MzEsNiAr NDMxLDggQEAgdm9pZCBMYXllclRyZWVIb3N0UHJveHk6OmFzc2lnbkltYWdlVG9MYXllcihHcmFw aGljc0xheWVyKiBsYXllciwgaW50NjRfdCBpbWFnZUkKIHZvaWQgTGF5ZXJUcmVlSG9zdFByb3h5 OjpmbHVzaExheWVyQ2hhbmdlcygpCiB7CiAgICAgbV9yb290TGF5ZXItPnN5bmNDb21wb3NpdGlu Z1N0YXRlKEZsb2F0UmVjdCgpKTsKKyAgICAvLyBUaGUgcGVuZGluZyB0aWxlcyBzdGF0ZSBpcyBv biBpdHMgd2F5IGZvciB0aGUgc2NyZWVuLCB0ZWxsIHRoZSB3ZWIgcHJvY2VzcyB0byByZW5kZXIg dGhlIG5leHQgb25lLgorICAgIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLT5wcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OkxheWVyVHJlZUhvc3Q6OlJlbmRlck5leHRGcmFtZSgpLCBtX2RyYXdp bmdBcmVhUHJveHktPnBhZ2UoKS0+cGFnZUlEKCkpOwogfQogCiB2b2lkIExheWVyVHJlZUhvc3RQ cm94eTo6ZW5zdXJlUm9vdExheWVyKCkKQEAgLTU3MSw3ICs1NzMsNiBAQCB2b2lkIExheWVyVHJl ZUhvc3RQcm94eTo6c3luY0NvbXBvc2l0aW5nTGF5ZXJTdGF0ZShjb25zdCBXZWJMYXllckluZm8m IGluZm8pCiAKIHZvaWQgTGF5ZXJUcmVlSG9zdFByb3h5OjpkaWRSZW5kZXJGcmFtZSgpCiB7Ci0g ICAgbV9kcmF3aW5nQXJlYVByb3h5LT5wYWdlKCktPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6 TGF5ZXJUcmVlSG9zdDo6UmVuZGVyTmV4dEZyYW1lKCksIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFn ZSgpLT5wYWdlSUQoKSk7CiAgICAgcHVzaFVwZGF0ZVRvUXVldWUoRmx1c2hMYXllckNoYW5nZXNN ZXNzYWdlOjpjcmVhdGUoKSk7CiAgICAgdXBkYXRlVmlld3BvcnQoKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKaW5k ZXggZTI4MWQzNjUyYTk4ZmU4YTA5YTQ2NDQxOWJjYTEzNWQ3YTg1Zjk3Mi4uM2FkMjdlN2FmMjBi NzBkM2VkOTZhOTcyMTkxY2NlZTY2ZTYwZTFmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKQEAgLTY4LDcgKzY4LDcg QEAgRHJhd2luZ0FyZWFJbXBsOjpEcmF3aW5nQXJlYUltcGwoV2ViUGFnZSogd2ViUGFnZSwgY29u c3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGUKICAgICAsIG1fZGlzcGxheVRpbWVyKFdlYlByb2Nl c3M6OnNoYXJlZCgpLnJ1bkxvb3AoKSwgdGhpcywgJkRyYXdpbmdBcmVhSW1wbDo6ZGlzcGxheVRp bWVyRmlyZWQpCiAgICAgLCBtX2V4aXRDb21wb3NpdGluZ1RpbWVyKFdlYlByb2Nlc3M6OnNoYXJl ZCgpLnJ1bkxvb3AoKSwgdGhpcywgJkRyYXdpbmdBcmVhSW1wbDo6ZXhpdEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdNb2RlKQogewotICAgIGlmICh3ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygp LT5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkpCisgICAgaWYgKHdlYlBhZ2UtPmNvcmVQYWdl KCktPnNldHRpbmdzKCktPmFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSB8fCB3ZWJQYWdlLT5j b3JlUGFnZSgpLT5zZXR0aW5ncygpLT5mb3JjZUNvbXBvc2l0aW5nTW9kZSgpKQogICAgICAgICBt X2Fsd2F5c1VzZUNvbXBvc2l0aW5nID0gdHJ1ZTsKICAgICAgICAgCiAgICAgaWYgKG1fYWx3YXlz VXNlQ29tcG9zaXRpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKaW5kZXggYTYwZDNiMjI4NjdjYTU2MTE2MmI4YzFkNmE3ZDdjZWJmZGU4NDNjNC4u OTBhMTg2MDc4Mjk4MGUwNTcxM2M2NzA1NjczOGRiNjdjYWE0YzU5YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTg0MCw2ICsxODQwLDcg QEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0 b3JlJiBzdG9yZSkKICAgICBzZXR0aW5ncy0+c2V0U2hvd3NUb29sVGlwT3ZlclRydW5jYXRlZFRl eHQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzaG93c1Rvb2xU aXBPdmVyVHJ1bmNhdGVkVGV4dEtleSgpKSk7CiAKICAgICBzZXR0aW5ncy0+c2V0QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5OjphY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZEtleSgpKSAmJiBMYXllclRyZWVI b3N0OjpzdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7CisgICAgc2V0dGluZ3MtPnNl dEZvcmNlQ29tcG9zaXRpbmdNb2RlKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJl bmNlc0tleTo6Zm9yY2VDb21wb3NpdGluZ01vZGVLZXkoKSkgJiYgTGF5ZXJUcmVlSG9zdDo6c3Vw cG9ydHNBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpOwogICAgIHNldHRpbmdzLT5zZXRBY2NlbGVy YXRlZERyYXdpbmdFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNl c0tleTo6YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZEtleSgpKSAmJiBMYXllclRyZWVIb3N0Ojpz dXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7CiAgICAgc2V0dGluZ3MtPnNldENhbnZh c1VzZXNBY2NlbGVyYXRlZERyYXdpbmcoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZl cmVuY2VzS2V5OjpjYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nS2V5KCkpICYmIExheWVyVHJl ZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpKTsKICAgICBzZXR0aW5ncy0+ c2V0U2hvd0RlYnVnQm9yZGVycyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5j ZXNLZXk6OmNvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGVLZXkoKSkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RRdC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNwcApp bmRleCAxOGI3ZmFjYTRkMDczNGU5M2EwMDBjYTAyZDkzN2RkYjBjN2Y1MzFjLi4xYzc0ZmM4NTJi ZDU3YTc0NzY1MmU5ZDFmMDc5Y2VkODNhNWY4MjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNwcApAQCAtMjQw LDE2ICsyNDAsMTYgQEAgdm9pZCBMYXllclRyZWVIb3N0UXQ6OmRpZERlbGV0ZUxheWVyKFdlYkxh eWVySUQgaWQpCiAKIHZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpwZXJmb3JtU2NoZWR1bGVkTGF5ZXJG bHVzaCgpCiB7Ci0gICAgbV93ZWJQYWdlLT5sYXlvdXRJZk5lZWRlZCgpOwotCi0gICAgaWYgKCFt X2lzVmFsaWQpCi0gICAgICAgIHJldHVybjsKLQogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JF KQogICAgIGlmIChtX2lzU3VzcGVuZGVkIHx8IG1fd2FpdGluZ0ZvclVJUHJvY2VzcykKICAgICAg ICAgcmV0dXJuOwogI2VuZGlmCiAKKyAgICBtX3dlYlBhZ2UtPmxheW91dElmTmVlZGVkKCk7CisK KyAgICBpZiAoIW1faXNWYWxpZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9zaG91bGRTeW5j RnJhbWUgPSBmYWxzZTsKICAgICBmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKTsKICAgICBpZiAo IW1fc2hvdWxkU3luY0ZyYW1lKQpAQCAtMjYxLDYgKzI2MSw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9z dFF0OjpwZXJmb3JtU2NoZWR1bGVkTGF5ZXJGbHVzaCgpCiAgICAgfQogCiAgICAgbV93ZWJQYWdl LT5zZW5kKE1lc3NhZ2VzOjpMYXllclRyZWVIb3N0UHJveHk6OkRpZFJlbmRlckZyYW1lKCkpOwor ICAgIG1fd2FpdGluZ0ZvclVJUHJvY2VzcyA9IHRydWU7CiAKICAgICBpZiAoIW1fbm90aWZ5QWZ0 ZXJTY2hlZHVsZWRMYXllckZsdXNoKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvV2ViUGFnZVF0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9XZWJQYWdlUXQuY3BwCmluZGV4IDU1MDgwZDAz Y2QwM2EzY2RmOWNmMmMzNzE3MjdhNjI4ZGVmYTU1ZTMuLjcxODBhOGM4ODM2MDY5ZDc2OGRjZjA5 NzE2MTU2YTBiYjU2NjA0YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9xdC9XZWJQYWdlUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9xdC9XZWJQYWdlUXQuY3BwCkBAIC05MCwxMCArOTAsNiBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKICAgICAKIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1Jbml0aWFsaXplKCkKIHsKLSAgICBT ZXR0aW5ncyogc2V0dGluZ3MgPSBtX3BhZ2UtPnNldHRpbmdzKCk7Ci0KLSAgICAvLyBJZiBhY2Nl bGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkLCB3ZSB3YW50IHRvIGJlIGluIGZvcmNlLWNv bXBvc2l0aW5nIG1vZGUsIHNvIHRoYXQgd2UgZG9uJ3Qgc3dpdGNoIGJldHdlZW4gY29tcG9zaXRl ZC9ub24tY29tcG9zaXRlZCBzdGF0ZS4KLSAgICBzZXR0aW5ncy0+c2V0Rm9yY2VDb21wb3NpdGlu Z01vZGUodHJ1ZSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6cGxhdGZvcm1QcmVmZXJlbmNlc0RpZENo YW5nZShjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJikK