58383 2011-04-12 15:41:40 -0700 Fix bug with adding wrong context to LayerRendererChromium and get rid of RefPtr loop. 2011-04-14 02:29:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jbates jbates ap commit-queue dglazkov kbr piman webkit.review.bot oldest_to_newest 384429 0 jbates 2011-04-12 15:41:40 -0700 workaround possible HashMap RefPtr key bug 384430 1 89284 jbates 2011-04-12 15:42:36 -0700 Created attachment 89284 Patch 384535 2 89284 kbr 2011-04-12 17:17:58 -0700 Comment on attachment 89284 Patch Per our offline discussion and analysis this doesn't work. 384942 3 89388 jbates 2011-04-13 09:26:43 -0700 Created attachment 89388 Patch 384950 4 89388 jbates 2011-04-13 09:38:14 -0700 Comment on attachment 89388 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89388&action=review > Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp:-100 > - layerRenderer()->addChildContext(m_context); This appears to be the bug that caused the map to be empty. 384955 5 webkit.review.bot 2011-04-13 09:42:45 -0700 Attachment 89388 did not build on chromium: Build output: http://queues.webkit.org/results/8403269 385016 6 89388 kbr 2011-04-13 11:07:43 -0700 Comment on attachment 89388 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89388&action=review Looks good overall. Did you test this both with and without the GL_CHROMIUM_latch extension exposed from the command buffer service code, and do page reloads, verifying that the assertion failure is fixed when the extension isn't present, and that there is no memory leak (in either the renderer or GPU process) when it is? r- just because the ChangeLogs need the synopsis updated. I recommend rerunning prepare-ChangeLog. > Source/WebCore/ChangeLog:5 > + workaround possible HashMap RefPtr key bug Please update this synopsis. > Source/WebKit/chromium/ChangeLog:5 > + workaround possible HashMap RefPtr key bug Please update synopsis. 385025 7 kbr 2011-04-13 11:17:10 -0700 Also, the build failure on Chromium-Linux is occurring because you need to roll the chromium_rev in Source/WebKit/chromium/DEPS forward to a revision containing your implementation of the newly pure virtual methods in WebGraphicsContext3D.h. You should make that change and do the DEPS roll in a separate bug. They're unrelated to this bug fix. 385185 8 89448 jbates 2011-04-13 13:48:54 -0700 Created attachment 89448 Patch 385193 9 89448 kbr 2011-04-13 13:53:58 -0700 Comment on attachment 89448 Patch This looks great. Thanks for the quick fix. 385601 10 commit-queue 2011-04-14 02:24:20 -0700 The commit-queue encountered the following flaky tests while processing attachment 89448: http/tests/xmlhttprequest/basic-auth.html bug 51613 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 385604 11 89448 commit-queue 2011-04-14 02:28:53 -0700 Comment on attachment 89448 Patch Clearing flags on attachment: 89448 Committed r83828: <http://trac.webkit.org/changeset/83828> 385605 12 commit-queue 2011-04-14 02:29:00 -0700 All reviewed patches have been landed. Closing bug. 89284 2011-04-12 15:42:36 -0700 2011-04-13 09:26:41 -0700 Patch bug-58383-20110412154235.patch text/plain 4168 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogODM2MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ZWZmMWZlZjkxYTJmNDEw YmQ0MGYxNjJjYTFiYTFjZTdlMjYzNmY0Li5iNDBhYjExMWUxMTQzZDI5YjM0ZjBmNGE3M2NmNTZh NDBjODg1MjRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICB3b3JrYXJvdW5kIHBvc3NpYmxlIEhhc2hNYXAgUmVmUHRyIGtl eSBidWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4 MzgzCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjphZGRDaGlsZENvbnRleHQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpyZW1vdmVDaGlsZENvbnRleHQpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5oOgorCiAyMDExLTA0LTEyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9t aXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXggNGJkOGUwNjI0Y2Y2ZmRjOTEzODE2ZmZhMWY0MDZm NDA2NTJkYjJiZC4uOGZhZmIzNGVhZjg5YTZlZTYwMGQ1ZTUwOTY2NmVjYjQzNDQwNmI1YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJS ZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0xMTE1LDI0ICsxMTE1LDI0 IEBAIFN0cmluZyBMYXllclJlbmRlcmVyQ2hyb21pdW06OmxheWVyVHJlZUFzVGV4dCgpIGNvbnN0 CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjphZGRDaGlsZENvbnRleHQoUGFzc1JlZlB0 cjxHcmFwaGljc0NvbnRleHQzRD4gcGN0eCkKIHsKLSAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0 M0Q+IGN0eCA9IHBjdHg7Ci0gICAgaWYgKCFjdHgtPmdldEV4dGVuc2lvbnMoKS0+c3VwcG9ydHMo IkdMX0NIUk9NSVVNX2xhdGNoIikpCisgICAgcGFpcjxSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+ LCBpbnQ+IGN0eCA9IG1ha2VfcGFpcihwY3R4LCAxKTsKKyAgICBpZiAoIWN0eC5maXJzdC0+Z2V0 RXh0ZW5zaW9ucygpLT5zdXBwb3J0cygiR0xfQ0hST01JVU1fbGF0Y2giKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gVGhpcyBpcyBhIHJlZi1jb3VudGluZyBtYXAsIGJlY2F1c2Ugc29tZSBj b250ZXh0cyBhcmUgc2hhcmVkIGJ5IG11bHRpcGxlCiAgICAgLy8gbGF5ZXJzIChzcGVjaWZpY2Fs bHksIENhbnZhczJETGF5ZXJDaHJvbWl1bSkuCiAKICAgICAvLyBJbnNlcnQgdGhlIGN0eCB3aXRo IGEgY291bnQgb2YgMSwgb3IgcmV0dXJuIHRoZSBleGlzdGluZyBpdGVyYXRvci4KLSAgICBzdGQ6 OnBhaXI8Q2hpbGRDb250ZXh0TWFwOjppdGVyYXRvciwgYm9vbD4gaW5zZXJ0X3Jlc3VsdCA9IG1f Y2hpbGRDb250ZXh0cy5hZGQoY3R4LCAxKTsKKyAgICBzdGQ6OnBhaXI8Q2hpbGRDb250ZXh0TWFw OjppdGVyYXRvciwgYm9vbD4gaW5zZXJ0X3Jlc3VsdCA9IG1fY2hpbGRDb250ZXh0cy5hZGQoY3R4 LmZpcnN0LmdldCgpLCBjdHgpOwogICAgIGlmICghaW5zZXJ0X3Jlc3VsdC5zZWNvbmQpIHsKICAg ICAgICAgLy8gQWxyZWFkeSBwcmVzZW50IGluIG1hcCwgc28gaW5jcmVtZW50LgotICAgICAgICAr K2luc2VydF9yZXN1bHQuZmlyc3QtPnNlY29uZDsKKyAgICAgICAgKytpbnNlcnRfcmVzdWx0LmZp cnN0LT5zZWNvbmQuc2Vjb25kOwogICAgIH0gZWxzZSB7CiAvLyBGSVhNRShqYmF0ZXMpOiB3aGVu IGNvbXBvc2l0b3IgaXMgbXVsdGl0aHJlYWRlZCBhbmQgY29weVRleEltYWdlMkQgYnVnIGlzIGZp eGVkLAogLy8gdW5jb21tZW50IHRoaXMgYmxvY2s6CiAvLyAgICAgIC8vIFRoaXMgaXMgYSBuZXcg Y2hpbGQgY29udGV4dCAtIHNldCB0aGUgcGFyZW50VG9DaGlsZCBsYXRjaCBzbyB0aGF0IGl0CiAv LyAgICAgIC8vIGNhbiBjb250aW51ZSBwYXN0IGl0cyBmaXJzdCB3YWl0IGxhdGNoLgotLy8gICAg ICBFeHRlbnNpb25zM0RDaHJvbWl1bSogZXh0ID0gc3RhdGljX2Nhc3Q8RXh0ZW5zaW9uczNEQ2hy b21pdW0qPihjdHgtPmdldEV4dGVuc2lvbnMoKSk7CisvLyAgICAgIEV4dGVuc2lvbnMzRENocm9t aXVtKiBleHQgPSBzdGF0aWNfY2FzdDxFeHRlbnNpb25zM0RDaHJvbWl1bSo+KGN0eC5maXJzdC0+ Z2V0RXh0ZW5zaW9ucygpKTsKIC8vICAgICAgR0MzRHVpbnQgbGF0Y2hJZDsKIC8vICAgICAgZXh0 LT5nZXRQYXJlbnRUb0NoaWxkTGF0Y2hDSFJPTUlVTSgmbGF0Y2hJZCk7CiAvLyAgICAgIGV4dC0+ c2V0TGF0Y2hDSFJPTUlVTSgwLCBsYXRjaElkKTsKQEAgLTExNDUsOSArMTE0NSw5IEBAIHZvaWQg TGF5ZXJSZW5kZXJlckNocm9taXVtOjpyZW1vdmVDaGlsZENvbnRleHQoUGFzc1JlZlB0cjxHcmFw aGljc0NvbnRleHQzRD4gcGN0CiAgICAgaWYgKCFjdHgtPmdldEV4dGVuc2lvbnMoKS0+c3VwcG9y dHMoIkdMX0NIUk9NSVVNX2xhdGNoIikpCiAgICAgICAgIHJldHVybjsKIAotICAgIENoaWxkQ29u dGV4dE1hcDo6aXRlcmF0b3IgaSA9IG1fY2hpbGRDb250ZXh0cy5maW5kKGN0eCk7CisgICAgQ2hp bGRDb250ZXh0TWFwOjppdGVyYXRvciBpID0gbV9jaGlsZENvbnRleHRzLmZpbmQoY3R4LmdldCgp KTsKICAgICBpZiAoaSAhPSBtX2NoaWxkQ29udGV4dHMuZW5kKCkpIHsKLSAgICAgICAgaWYgKC0t aS0+c2Vjb25kIDw9IDApIHsKKyAgICAgICAgaWYgKC0taS0+c2Vjb25kLnNlY29uZCA8PSAwKSB7 CiAgICAgICAgICAgICAvLyBDb3VudCByZWFjaGVkIHplcm8sIHNvIHJlbW92ZSBmcm9tIG1hcC4K ICAgICAgICAgICAgIG1fY2hpbGRDb250ZXh0cy5yZW1vdmUoaSk7CiAgICAgICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVu ZGVyZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKaW5kZXggNzEwODc4YWUxM2ZiNTdjNTg5M2YyY2E2 ZWE4ZWUxYjE0ZDI3YmM1MS4uZTZiNzNlYzViMDc2ZmU3ZjI3ODdjOGFiZDliNTI2MDViZDk4Yjc4 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v TGF5ZXJSZW5kZXJlckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKQEAgLTEzNiw3ICsxMzYsNyBA QCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdHlwZWRlZiBWZWN0b3I8UmVmUHRyPENDTGF5ZXJJ bXBsPiA+IExheWVyTGlzdDsKLSAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPEdyYXBoaWNzQ29u dGV4dDNEPiwgaW50PiBDaGlsZENvbnRleHRNYXA7CisgICAgdHlwZWRlZiBIYXNoTWFwPEdyYXBo aWNzQ29udGV4dDNEKiwgcGFpcjxSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+LCBpbnQ+ID4gQ2hp bGRDb250ZXh0TWFwOwogCiAgICAgZXhwbGljaXQgTGF5ZXJSZW5kZXJlckNocm9taXVtKFBhc3NS ZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+LCBQYXNzT3duUHRyPFRpbGVQYWludEludGVyZmFjZT4g Y29udGVudFBhaW50LCBQYXNzT3duUHRyPFRpbGVQYWludEludGVyZmFjZT4gc2Nyb2xsYmFyUGFp bnQpOwogCg== 89388 2011-04-13 09:26:43 -0700 2011-04-13 13:48:51 -0700 Patch bug-58383-20110413092642.patch text/plain 8197 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogODM3NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNThmNDBkNjVmZTQ5ZGMw YWQwMDBjNjE5YjVhYjE3NmJhYjNhNDYyLi4yYTJkOWI0ZTViYTlkMmY4YTQ5MDlmM2IzNTY4YzJm ZGZjYjg1MzY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMTIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICB3b3JrYXJvdW5kIHBvc3NpYmxlIEhhc2hNYXAgUmVmUHRyIGtl eSBidWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4 MzgzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVy Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjph ZGRDaGlsZENvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVt OjpyZW1vdmVDaGlsZENvbnRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5oOgorCiAyMDExLTA0LTEzICBUaGllcnJ5IFJlZGlu ZyAgPHRoaWVycnkucmVkaW5nQGF2aW9uaWMtZGVzaWduLmRlPgogCiAgICAgICAgIEd0aysgcG9y dCBmYWlscyB0byBidWlsZCB3aGVuIGVuYWJsaW5nIFdlYkdMCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRM YXllckNocm9taXVtLmNwcAppbmRleCBlMzI1M2FiZTZjODM1ZTBhYmQ2YWJjOTNmZGEwMmFmNGEy Y2Y5NjFkLi4yNmFkMzdhMDMyMTBkZDNmMjU0ZTU2YmEyOWRhZDMzNjk2MDc0ODZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExh eWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgQ2FudmFz MkRMYXllckNocm9taXVtOjp+Q2FudmFzMkRMYXllckNocm9taXVtKCkKICAgICBpZiAobV90ZXh0 dXJlSWQpCiAgICAgICAgIGxheWVyUmVuZGVyZXJDb250ZXh0KCktPmRlbGV0ZVRleHR1cmUobV90 ZXh0dXJlSWQpOwogICAgIGlmIChtX2RyYXdpbmdCdWZmZXIgJiYgbGF5ZXJSZW5kZXJlcigpKQot ICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92ZUNoaWxkQ29udGV4dChtX2RyYXdpbmdCdWZm ZXItPmdyYXBoaWNzQ29udGV4dDNEKCkpOworICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92 ZUNoaWxkQ29udGV4dChtX2RyYXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkuZ2V0KCkp OwogfQogCiB2b2lkIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29tcG9zaXRvclJlc291 cmNlcygpCkBAIC0xMDcsMTMgKzEwNywxMyBAQCB2b2lkIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6 c2V0RHJhd2luZ0J1ZmZlcihEcmF3aW5nQnVmZmVyKiBkcmF3aW5nQnVmZmVyKQogewogICAgIGlm IChkcmF3aW5nQnVmZmVyICE9IG1fZHJhd2luZ0J1ZmZlcikgewogICAgICAgICBpZiAobV9kcmF3 aW5nQnVmZmVyICYmIGxheWVyUmVuZGVyZXIoKSkKLSAgICAgICAgICAgIGxheWVyUmVuZGVyZXIo KS0+cmVtb3ZlQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0Qo KSk7CisgICAgICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92ZUNoaWxkQ29udGV4dChtX2Ry YXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkuZ2V0KCkpOwogCiAgICAgICAgIG1fZHJh d2luZ0J1ZmZlciA9IGRyYXdpbmdCdWZmZXI7CiAgICAgICAgIG1fdGV4dHVyZUNoYW5nZWQgPSB0 cnVlOwogCiAgICAgICAgIGlmIChkcmF3aW5nQnVmZmVyICYmIGxheWVyUmVuZGVyZXIoKSkKLSAg ICAgICAgICAgIGxheWVyUmVuZGVyZXIoKS0+YWRkQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZl ci0+Z3JhcGhpY3NDb250ZXh0M0QoKSk7CisgICAgICAgICAgICBsYXllclJlbmRlcmVyKCktPmFk ZENoaWxkQ29udGV4dChtX2RyYXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkuZ2V0KCkp OwogICAgIH0KIH0KIApAQCAtMTIyLDkgKzEyMiw5IEBAIHZvaWQgQ2FudmFzMkRMYXllckNocm9t aXVtOjpzZXRMYXllclJlbmRlcmVyKExheWVyUmVuZGVyZXJDaHJvbWl1bSogbmV3TGF5ZXJSZW5k CiAgICAgaWYgKGxheWVyUmVuZGVyZXIoKSAhPSBuZXdMYXllclJlbmRlcmVyKSB7CiAgICAgICAg IGlmIChtX2RyYXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkpIHsKICAgICAgICAgICAg IGlmIChsYXllclJlbmRlcmVyKCkpCi0gICAgICAgICAgICAgICAgbGF5ZXJSZW5kZXJlcigpLT5y ZW1vdmVDaGlsZENvbnRleHQobV9kcmF3aW5nQnVmZmVyLT5ncmFwaGljc0NvbnRleHQzRCgpKTsK KyAgICAgICAgICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92ZUNoaWxkQ29udGV4dChtX2Ry YXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkuZ2V0KCkpOwogICAgICAgICAgICAgaWYg KG5ld0xheWVyUmVuZGVyZXIpCi0gICAgICAgICAgICAgICAgbmV3TGF5ZXJSZW5kZXJlci0+YWRk Q2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKSk7CisgICAg ICAgICAgICAgICAgbmV3TGF5ZXJSZW5kZXJlci0+YWRkQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1 ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7CiAgICAgICAgIH0KIAogICAgICAgICBM YXllckNocm9taXVtOjpzZXRMYXllclJlbmRlcmVyKG5ld0xheWVyUmVuZGVyZXIpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5k ZXJlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXggNGI1N2ExNWUxZTE1NjUxZGZkNDEx Yzc4ZWQxYjVlNmI2ZWVhZjUwOS4uZTc2NWEwNzM3Yjc1NmMwYmYwZjVkMGE4NDYyNDc5MWQ0YWMx ZDljZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0xMTEzLDkg KzExMTMsOCBAQCBTdHJpbmcgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpsYXllclRyZWVBc1RleHQo KSBjb25zdAogICAgIHJldHVybiB0cy5yZWxlYXNlKCk7CiB9CiAKLXZvaWQgTGF5ZXJSZW5kZXJl ckNocm9taXVtOjphZGRDaGlsZENvbnRleHQoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4g cGN0eCkKK3ZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjphZGRDaGlsZENvbnRleHQoR3JhcGhp Y3NDb250ZXh0M0QqIGN0eCkKIHsKLSAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGN0eCA9 IHBjdHg7CiAgICAgaWYgKCFjdHgtPmdldEV4dGVuc2lvbnMoKS0+c3VwcG9ydHMoIkdMX0NIUk9N SVVNX2xhdGNoIikpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTEzOSw5ICsxMTM4LDggQEAgdm9p ZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmFkZENoaWxkQ29udGV4dChQYXNzUmVmUHRyPEdyYXBo aWNzQ29udGV4dDNEPiBwY3R4KQogICAgIH0KIH0KIAotdm9pZCBMYXllclJlbmRlcmVyQ2hyb21p dW06OnJlbW92ZUNoaWxkQ29udGV4dChQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBwY3R4 KQordm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnJlbW92ZUNoaWxkQ29udGV4dChHcmFwaGlj c0NvbnRleHQzRCogY3R4KQogewotICAgIFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY3R4ID0g cGN0eDsKICAgICBpZiAoIWN0eC0+Z2V0RXh0ZW5zaW9ucygpLT5zdXBwb3J0cygiR0xfQ0hST01J VU1fbGF0Y2giKSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJv bWl1bS5oCmluZGV4IDcxMDg3OGFlMTNmYjU3YzU4OTNmMmNhNmVhOGVlMWIxNGQyN2JjNTEuLmVh OTU5ZDI5OWNhZDA2MDgzNTNhNDJjNmExNzgwM2QzNjU2ZmVhM2IgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5oCkBAIC0xMzEsMTIgKzEzMSwxMiBAQCBwdWJsaWM6CiAKICAgICBT dHJpbmcgbGF5ZXJUcmVlQXNUZXh0KCkgY29uc3Q7CiAKLSAgICB2b2lkIGFkZENoaWxkQ29udGV4 dChQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPik7Ci0gICAgdm9pZCByZW1vdmVDaGlsZENv bnRleHQoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4pOworICAgIHZvaWQgYWRkQ2hpbGRD b250ZXh0KEdyYXBoaWNzQ29udGV4dDNEKik7CisgICAgdm9pZCByZW1vdmVDaGlsZENvbnRleHQo R3JhcGhpY3NDb250ZXh0M0QqKTsKIAogcHJpdmF0ZToKICAgICB0eXBlZGVmIFZlY3RvcjxSZWZQ dHI8Q0NMYXllckltcGw+ID4gTGF5ZXJMaXN0OwotICAgIHR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8 R3JhcGhpY3NDb250ZXh0M0Q+LCBpbnQ+IENoaWxkQ29udGV4dE1hcDsKKyAgICB0eXBlZGVmIEhh c2hNYXA8R3JhcGhpY3NDb250ZXh0M0QqLCBpbnQ+IENoaWxkQ29udGV4dE1hcDsKIAogICAgIGV4 cGxpY2l0IExheWVyUmVuZGVyZXJDaHJvbWl1bShQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNE PiwgUGFzc093blB0cjxUaWxlUGFpbnRJbnRlcmZhY2U+IGNvbnRlbnRQYWludCwgUGFzc093blB0 cjxUaWxlUGFpbnRJbnRlcmZhY2U+IHNjcm9sbGJhclBhaW50KTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVt LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5 ZXJDaHJvbWl1bS5jcHAKaW5kZXggMzFiMWIxNjk0YjBiNWMzNDBkZmI5NGJkYWQzMWY4ZGY5YjMy YWYzMS4uYWVmMTRlZDhkYTNiZDcyMTkzZWU1ZGI1ZDNlM2M0ZGJmZjJhNzZhYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNo cm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCkBAIC05Nyw3ICs5Nyw3IEBAIHZvaWQgV2ViR0xMYXll ckNocm9taXVtOjpzZXRDb250ZXh0KGNvbnN0IEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQog ICAgICAgICBpZiAobV9jb250ZXh0KQogICAgICAgICAgICAgbGF5ZXJSZW5kZXJlcigpLT5yZW1v dmVDaGlsZENvbnRleHQobV9jb250ZXh0KTsKICAgICAgICAgaWYgKGNvbnRleHQpCi0gICAgICAg ICAgICBsYXllclJlbmRlcmVyKCktPmFkZENoaWxkQ29udGV4dChtX2NvbnRleHQpOworICAgICAg ICAgICAgbGF5ZXJSZW5kZXJlcigpLT5hZGRDaGlsZENvbnRleHQoY29uc3RfY2FzdDxHcmFwaGlj c0NvbnRleHQzRCo+KGNvbnRleHQpKTsKICAgICB9CiAKICAgICBtX2NvbnRleHQgPSBjb25zdF9j YXN0PEdyYXBoaWNzQ29udGV4dDNEKj4oY29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CmluZGV4IGRkMjczNmRmM2IwYzk0Y2NiNzRlYWFkYzA2ZjMyZjBhZjAwNmRiMjcuLjY1Yzg4NzQ3 MmI3YmI3MzYwM2RjNDdiMTBmNzI5NDM2ZjYyYzQ0MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMTIgIEpvaG4gQmF0ZXMgIDxqYmF0ZXNAZ29v Z2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICB3b3JrYXJvdW5kIHBvc3NpYmxlIEhhc2hNYXAgUmVmUHRyIGtleSBidWcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4MzgzCisKKyAgICAgICAgKiBw dWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhp Y3NDb250ZXh0M0Q6OmdldFBhcmVudFRvQ2hpbGRMYXRjaENIUk9NSVVNKToKKyAgICAgICAgKFdl YktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q6OmdldENoaWxkVG9QYXJlbnRMYXRjaENIUk9NSVVN KToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q6OndhaXRMYXRjaENIUk9N SVVNKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q6OnNldExhdGNoQ0hS T01JVU0pOgorCiAyMDExLTA0LTEzICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oCmluZGV4IGZmN2U1 MDJjZTQ2MzI3YmM5OGM5MmM2MzE3ODg1ZjFhZmNmNjM2OTUuLjJkN2IwYTU1OWVlOWIzY2FlYWI3 MzdiYzBhOTI0NmRjN2Y0Yzk2Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaApAQCAtMTY5LDEwICsxNjksMTAgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCByZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGVDSFJP TUlVTShXR0MzRGVudW0gdGFyZ2V0LCBXR0MzRHNpemVpIHNhbXBsZXMsIFdHQzNEZW51bSBpbnRl cm5hbGZvcm1hdCwgV0dDM0RzaXplaSB3aWR0aCwgV0dDM0RzaXplaSBoZWlnaHQpID0gMDsKIAog ICAgIC8vIEdMX0NIUk9NSVVNX2xhdGNoCi0gICAgdmlydHVhbCB2b2lkIGdldFBhcmVudFRvQ2hp bGRMYXRjaENIUk9NSVVNKFdHQzNEdWludCogbGF0Y2hJZCkge30gLy8gRklYTUU6ID0gMDsKLSAg ICB2aXJ0dWFsIHZvaWQgZ2V0Q2hpbGRUb1BhcmVudExhdGNoQ0hST01JVU0oV0dDM0R1aW50KiBs YXRjaElkKSB7fSAvLyBGSVhNRTogPSAwOwotICAgIHZpcnR1YWwgdm9pZCB3YWl0TGF0Y2hDSFJP TUlVTShXR0MzRHVpbnQgbGF0Y2hJZCkge30gLy8gRklYTUU6ID0gMDsKLSAgICB2aXJ0dWFsIHZv aWQgc2V0TGF0Y2hDSFJPTUlVTShXR0MzRHVpbnQgbGF0Y2hJZCkge30gLy8gRklYTUU6ID0gMDsK KyAgICB2aXJ0dWFsIHZvaWQgZ2V0UGFyZW50VG9DaGlsZExhdGNoQ0hST01JVU0oV0dDM0R1aW50 KiBsYXRjaElkKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGdldENoaWxkVG9QYXJlbnRMYXRjaENI Uk9NSVVNKFdHQzNEdWludCogbGF0Y2hJZCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCB3YWl0TGF0 Y2hDSFJPTUlVTShXR0MzRHVpbnQgbGF0Y2hJZCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRM YXRjaENIUk9NSVVNKFdHQzNEdWludCBsYXRjaElkKSA9IDA7CiAKICAgICAvLyBUaGUgZW50cnkg cG9pbnRzIGJlbG93IG1hcCBkaXJlY3RseSB0byB0aGUgT3BlbkdMIEVTIDIuMCBBUEkuCiAgICAg Ly8gU2VlOiBodHRwOi8vd3d3Lmtocm9ub3Mub3JnL3JlZ2lzdHJ5L2dsZXMvCg== 89448 2011-04-13 13:48:54 -0700 2011-04-14 02:28:52 -0700 Patch bug-58383-20110413134853.patch text/plain 6120 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogODM3NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNThmNDBkNjVmZTQ5ZGMw YWQwMDBjNjE5YjVhYjE3NmJhYjNhNDYyLi41YjhmZjkzMDg3ZjQ5ZmJiNTQ0NTUwZmM0NGFiZGQw MmZjOTM1OTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMTMgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGaXggYnVnIHdpdGggYWRkaW5nIHdyb25nIGNvbnRleHQgdG8g TGF5ZXJSZW5kZXJlckNocm9taXVtIGFuZCBnZXQgcmlkIG9mIFJlZlB0ciBsb29wLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgzODMKKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmFkZENoaWxkQ29udGV4 dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnJlbW92ZUNoaWxk Q29udGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5k ZXJlckNocm9taXVtLmg6CisKIDIwMTEtMDQtMTMgIFRoaWVycnkgUmVkaW5nICA8dGhpZXJyeS5y ZWRpbmdAYXZpb25pYy1kZXNpZ24uZGU+CiAKICAgICAgICAgR3RrKyBwb3J0IGZhaWxzIHRvIGJ1 aWxkIHdoZW4gZW5hYmxpbmcgV2ViR0wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0u Y3BwCmluZGV4IGUzMjUzYWJlNmM4MzVlMGFiZDZhYmM5M2ZkYTAyYWY0YTJjZjk2MWQuLjI2YWQz N2EwMzIxMGRkM2YyNTRlNTZiYTI5ZGFkMzM2OTYwNzQ4NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFz MkRMYXllckNocm9taXVtLmNwcApAQCAtNTYsNyArNTYsNyBAQCBDYW52YXMyRExheWVyQ2hyb21p dW06On5DYW52YXMyRExheWVyQ2hyb21pdW0oKQogICAgIGlmIChtX3RleHR1cmVJZCkKICAgICAg ICAgbGF5ZXJSZW5kZXJlckNvbnRleHQoKS0+ZGVsZXRlVGV4dHVyZShtX3RleHR1cmVJZCk7CiAg ICAgaWYgKG1fZHJhd2luZ0J1ZmZlciAmJiBsYXllclJlbmRlcmVyKCkpCi0gICAgICAgIGxheWVy UmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3ND b250ZXh0M0QoKSk7CisgICAgICAgIGxheWVyUmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0 KG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7CiB9CiAKIHZvaWQg Q2FudmFzMkRMYXllckNocm9taXVtOjp1cGRhdGVDb21wb3NpdG9yUmVzb3VyY2VzKCkKQEAgLTEw NywxMyArMTA3LDEzIEBAIHZvaWQgQ2FudmFzMkRMYXllckNocm9taXVtOjpzZXREcmF3aW5nQnVm ZmVyKERyYXdpbmdCdWZmZXIqIGRyYXdpbmdCdWZmZXIpCiB7CiAgICAgaWYgKGRyYXdpbmdCdWZm ZXIgIT0gbV9kcmF3aW5nQnVmZmVyKSB7CiAgICAgICAgIGlmIChtX2RyYXdpbmdCdWZmZXIgJiYg bGF5ZXJSZW5kZXJlcigpKQotICAgICAgICAgICAgbGF5ZXJSZW5kZXJlcigpLT5yZW1vdmVDaGls ZENvbnRleHQobV9kcmF3aW5nQnVmZmVyLT5ncmFwaGljc0NvbnRleHQzRCgpKTsKKyAgICAgICAg ICAgIGxheWVyUmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZlci0+ Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7CiAKICAgICAgICAgbV9kcmF3aW5nQnVmZmVyID0g ZHJhd2luZ0J1ZmZlcjsKICAgICAgICAgbV90ZXh0dXJlQ2hhbmdlZCA9IHRydWU7CiAKICAgICAg ICAgaWYgKGRyYXdpbmdCdWZmZXIgJiYgbGF5ZXJSZW5kZXJlcigpKQotICAgICAgICAgICAgbGF5 ZXJSZW5kZXJlcigpLT5hZGRDaGlsZENvbnRleHQobV9kcmF3aW5nQnVmZmVyLT5ncmFwaGljc0Nv bnRleHQzRCgpKTsKKyAgICAgICAgICAgIGxheWVyUmVuZGVyZXIoKS0+YWRkQ2hpbGRDb250ZXh0 KG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7CiAgICAgfQogfQog CkBAIC0xMjIsOSArMTIyLDkgQEAgdm9pZCBDYW52YXMyRExheWVyQ2hyb21pdW06OnNldExheWVy UmVuZGVyZXIoTGF5ZXJSZW5kZXJlckNocm9taXVtKiBuZXdMYXllclJlbmQKICAgICBpZiAobGF5 ZXJSZW5kZXJlcigpICE9IG5ld0xheWVyUmVuZGVyZXIpIHsKICAgICAgICAgaWYgKG1fZHJhd2lu Z0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKSkgewogICAgICAgICAgICAgaWYgKGxheWVyUmVu ZGVyZXIoKSkKLSAgICAgICAgICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92ZUNoaWxkQ29u dGV4dChtX2RyYXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkpOworICAgICAgICAgICAg ICAgIGxheWVyUmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZlci0+ Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7CiAgICAgICAgICAgICBpZiAobmV3TGF5ZXJSZW5k ZXJlcikKLSAgICAgICAgICAgICAgICBuZXdMYXllclJlbmRlcmVyLT5hZGRDaGlsZENvbnRleHQo bV9kcmF3aW5nQnVmZmVyLT5ncmFwaGljc0NvbnRleHQzRCgpKTsKKyAgICAgICAgICAgICAgICBu ZXdMYXllclJlbmRlcmVyLT5hZGRDaGlsZENvbnRleHQobV9kcmF3aW5nQnVmZmVyLT5ncmFwaGlj c0NvbnRleHQzRCgpLmdldCgpKTsKICAgICAgICAgfQogCiAgICAgICAgIExheWVyQ2hyb21pdW06 OnNldExheWVyUmVuZGVyZXIobmV3TGF5ZXJSZW5kZXJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5k ZXJlckNocm9taXVtLmNwcAppbmRleCA0YjU3YTE1ZTFlMTU2NTFkZmQ0MTFjNzhlZDFiNWU2YjZl ZWFmNTA5Li5lNzY1YTA3MzdiNzU2YzBiZjBmNWQwYTg0NjI0NzkxZDRhYzFkOWNlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRl cmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTExMTMsOSArMTExMyw4IEBAIFN0 cmluZyBMYXllclJlbmRlcmVyQ2hyb21pdW06OmxheWVyVHJlZUFzVGV4dCgpIGNvbnN0CiAgICAg cmV0dXJuIHRzLnJlbGVhc2UoKTsKIH0KIAotdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmFk ZENoaWxkQ29udGV4dChQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBwY3R4KQordm9pZCBM YXllclJlbmRlcmVyQ2hyb21pdW06OmFkZENoaWxkQ29udGV4dChHcmFwaGljc0NvbnRleHQzRCog Y3R4KQogewotICAgIFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY3R4ID0gcGN0eDsKICAgICBp ZiAoIWN0eC0+Z2V0RXh0ZW5zaW9ucygpLT5zdXBwb3J0cygiR0xfQ0hST01JVU1fbGF0Y2giKSkK ICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTM5LDkgKzExMzgsOCBAQCB2b2lkIExheWVyUmVuZGVy ZXJDaHJvbWl1bTo6YWRkQ2hpbGRDb250ZXh0KFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+ IHBjdHgpCiAgICAgfQogfQogCi12b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6cmVtb3ZlQ2hp bGRDb250ZXh0KFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IHBjdHgpCit2b2lkIExheWVy UmVuZGVyZXJDaHJvbWl1bTo6cmVtb3ZlQ2hpbGRDb250ZXh0KEdyYXBoaWNzQ29udGV4dDNEKiBj dHgpCiB7Ci0gICAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBjdHggPSBwY3R4OwogICAgIGlm ICghY3R4LT5nZXRFeHRlbnNpb25zKCktPnN1cHBvcnRzKCJHTF9DSFJPTUlVTV9sYXRjaCIpKQog ICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKaW5kZXgg NzEwODc4YWUxM2ZiNTdjNTg5M2YyY2E2ZWE4ZWUxYjE0ZDI3YmM1MS4uZWE5NTlkMjk5Y2FkMDYw ODM1M2E0MmM2YTE3ODAzZDM2NTZmZWEzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9t aXVtLmgKQEAgLTEzMSwxMiArMTMxLDEyIEBAIHB1YmxpYzoKIAogICAgIFN0cmluZyBsYXllclRy ZWVBc1RleHQoKSBjb25zdDsKIAotICAgIHZvaWQgYWRkQ2hpbGRDb250ZXh0KFBhc3NSZWZQdHI8 R3JhcGhpY3NDb250ZXh0M0Q+KTsKLSAgICB2b2lkIHJlbW92ZUNoaWxkQ29udGV4dChQYXNzUmVm UHRyPEdyYXBoaWNzQ29udGV4dDNEPik7CisgICAgdm9pZCBhZGRDaGlsZENvbnRleHQoR3JhcGhp Y3NDb250ZXh0M0QqKTsKKyAgICB2b2lkIHJlbW92ZUNoaWxkQ29udGV4dChHcmFwaGljc0NvbnRl eHQzRCopOwogCiBwcml2YXRlOgogICAgIHR5cGVkZWYgVmVjdG9yPFJlZlB0cjxDQ0xheWVySW1w bD4gPiBMYXllckxpc3Q7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxHcmFwaGljc0NvbnRl eHQzRD4sIGludD4gQ2hpbGRDb250ZXh0TWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxHcmFwaGlj c0NvbnRleHQzRCosIGludD4gQ2hpbGRDb250ZXh0TWFwOwogCiAgICAgZXhwbGljaXQgTGF5ZXJS ZW5kZXJlckNocm9taXVtKFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+LCBQYXNzT3duUHRy PFRpbGVQYWludEludGVyZmFjZT4gY29udGVudFBhaW50LCBQYXNzT3duUHRyPFRpbGVQYWludElu dGVyZmFjZT4gc2Nyb2xsYmFyUGFpbnQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmNw cAppbmRleCAzMWIxYjE2OTRiMGI1YzM0MGRmYjk0YmRhZDMxZjhkZjliMzJhZjMxLi5hZWYxNGVk OGRhM2JkNzIxOTNlZTVkYjVkM2UzYzRkYmZmMmE3NmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJD aHJvbWl1bS5jcHAKQEAgLTk3LDcgKzk3LDcgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNl dENvbnRleHQoY29uc3QgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgICAgIGlmICht X2NvbnRleHQpCiAgICAgICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92ZUNoaWxkQ29udGV4 dChtX2NvbnRleHQpOwogICAgICAgICBpZiAoY29udGV4dCkKLSAgICAgICAgICAgIGxheWVyUmVu ZGVyZXIoKS0+YWRkQ2hpbGRDb250ZXh0KG1fY29udGV4dCk7CisgICAgICAgICAgICBsYXllclJl bmRlcmVyKCktPmFkZENoaWxkQ29udGV4dChjb25zdF9jYXN0PEdyYXBoaWNzQ29udGV4dDNEKj4o Y29udGV4dCkpOwogICAgIH0KIAogICAgIG1fY29udGV4dCA9IGNvbnN0X2Nhc3Q8R3JhcGhpY3ND b250ZXh0M0QqPihjb250ZXh0KTsK