91168 2012-07-12 17:11:56 -0700 REGRESSION: RenderInline boundingBox ignores relative position offset 2012-07-13 18:08:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cmuppala cmuppala cmuppala eric simon.fraser webkit-bug-importer webkit.review.bot oldest_to_newest 668424 0 cmuppala 2012-07-12 17:11:56 -0700 RenderInline::absoluteQuads was optimized to use a RenderGeometryMap for caching the transform for local to absolute coordinate conversion by https://bugs.webkit.org/show_bug.cgi?id=90715. But since that change, the bounding box returned is not adding the relative position offset of the inline element itself, if any. This leads to assertion failures when opening several webpages, including https://developer.mozilla.org/en/DOM/element.getBoundingClientRect. The root cause for this issue is that the GeometryMap expects the first mapping pushed to it be that of the RenderView, whereas RenderInline::absoluteQuads is pushing it's own mapping first, leading to the observed discrepancy. 668427 1 cmuppala 2012-07-12 17:13:25 -0700 <rdar://problem/11845860> 668490 2 152127 cmuppala 2012-07-12 18:44:37 -0700 Created attachment 152127 Patch 669105 3 152127 simon.fraser 2012-07-13 09:06:53 -0700 Comment on attachment 152127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152127&action=review > Source/WebCore/rendering/RenderInline.cpp:660 > + m_geometryMap.pushMappingsToAncestor(view, 0); > + m_geometryMap.pushMappingsToAncestor(renderer, view); > + } Does m_geometryMap.pushMappingsToAncestor(renderer, 0); not work? If so, we should just fix RenderGeometryMap so that it does. 669330 4 cmuppala 2012-07-13 12:15:40 -0700 (In reply to comment #3) > (From update of attachment 152127 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152127&action=review > > > Source/WebCore/rendering/RenderInline.cpp:660 > > + m_geometryMap.pushMappingsToAncestor(view, 0); > > + m_geometryMap.pushMappingsToAncestor(renderer, view); > > + } > > Does m_geometryMap.pushMappingsToAncestor(renderer, 0); not work? If so, we should just fix RenderGeometryMap so that it does. Yes, calling m_geometryMap.pushMappingsToAncestor(renderer, 0) results in the renderer's mapping pushed first, which is exactly what is happening currently. In fact the assertion, ASSERT(!m_mapping.size()), in RenderGeometryMap::pushView fails for such a call. 669485 5 152351 cmuppala 2012-07-13 15:17:03 -0700 Created attachment 152351 Patch 669538 6 152351 simon.fraser 2012-07-13 16:05:38 -0700 Comment on attachment 152351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152351&action=review > LayoutTests/fast/inline/inline-relative-offset-boundingbox.html:14 > + parentRect = parent.getBoundingClientRect(); > + shouldBe("inlineRect.left", "parentRect.left + inlineLeftOffset"); Indentation looks wrong here. 669544 7 152364 cmuppala 2012-07-13 16:10:09 -0700 Created attachment 152364 Patch 669547 8 cmuppala 2012-07-13 16:12:39 -0700 (In reply to comment #6) > (From update of attachment 152351 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152351&action=review > > > LayoutTests/fast/inline/inline-relative-offset-boundingbox.html:14 > > + parentRect = parent.getBoundingClientRect(); > > + shouldBe("inlineRect.left", "parentRect.left + inlineLeftOffset"); > > Indentation looks wrong here. My bad, there was a tab in the second line. I replaced it with spaces and that fixed the indentation. Uploaded a new patch. Only change is the fix for indentation. 669647 9 152364 webkit.review.bot 2012-07-13 18:08:18 -0700 Comment on attachment 152364 Patch Clearing flags on attachment: 152364 Committed r122653: <http://trac.webkit.org/changeset/122653> 669648 10 webkit.review.bot 2012-07-13 18:08:23 -0700 All reviewed patches have been landed. Closing bug. 152127 2012-07-12 18:44:37 -0700 2012-07-13 15:17:00 -0700 Patch bug-91168-20120712184434.patch text/plain 4780 cmuppala U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE4Zjg1NjlkMDJkMDAy MDVlMDkyZGE0NTM5N2IxZjQ4OGUzZmNhNi4uM2QwMGZjZGZjZDFmNDI2YTk5MGU3NjE0MTMzOGRm OWUwODY2ZDliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTEyICBLaXJh biBNdXBwYWxhICA8Y211cHBhbGFAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFJl bmRlcklubGluZSBib3VuZGluZ0JveCBpZ25vcmVzIHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExNjgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJHZW9t ZXRyeU1hcCwgdXNlZCBmb3IgY2FjaGluZyB0aGUgdHJhbnNmb3JtIHRvIHRoZSB2aWV3LAorICAg ICAgICBleHBlY3RzIHRoZSBmaXJzdCBtYXBwaW5nIHB1c2hlZCwgdG8gYmUgdGhhdCBvZiB0aGUg dmlldyBpdHNlbGYuCisgICAgICAgIFJlbmRlcklubGluZSB3YXMgaW5zdGVhZCBwdXNoaW5nIGl0 J3Mgb3duIG9mZnNldCBmaXJzdC4KKworICAgICAgICBUZXN0OiBmYXN0L2lubGluZS9pbmxpbmUt cmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6KGFub255bW91cyBuYW1lc3BhY2Up OjpBYnNvbHV0ZVF1YWRzR2VuZXJhdG9yQ29udGV4dDo6QWJzb2x1dGVRdWFkc0dlbmVyYXRvckNv bnRleHQpOiBQdXNoCisgICAgICAgIG1hcHBpbmcgb2YgUmVuZGVyVmlldyBiZWZvcmUgdGhhdCBv ZiBSZW5kZXJJbmxpbmUuCisKIDIwMTItMDctMTIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4LiBJbml0aWFsaXplIHVudXNlZCBjb25zdCBtZW1i ZXIgdmFyaWFibGVzIHRvIG1ha2UgY29tcGlsZXJzIGhhcHB5LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCAzMDMyNDgwYzZkNGQxOWNlOGUzN2E5Zjc2MTEx ZDgxZTliZGNjNDVhLi44MWI1NTEyZmMzZjg1MzI4ZjY0MThhNmY0NjNlMjAzNjAzZDg0MDMxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtNjUyLDEyICs2 NTIsMTIgQEAgcHVibGljOgogICAgICAgICAsIG1fd2FzRml4ZWQod2FzRml4ZWQpCiAgICAgICAg ICwgbV9nZW9tZXRyeU1hcCgpCiAgICAgewotICAgICAgICBSZW5kZXJPYmplY3QqIHJvb3QgPSBy ZW5kZXJlci0+cGFyZW50KCk7Ci0gICAgICAgIHdoaWxlIChyb290ICYmIHJvb3QtPnBhcmVudCgp KQotICAgICAgICAgICAgcm9vdCA9IHJvb3QtPnBhcmVudCgpOwotCi0gICAgICAgIGlmIChyb290 KQotICAgICAgICAgICAgbV9nZW9tZXRyeU1hcC5wdXNoTWFwcGluZ3NUb0FuY2VzdG9yKHJlbmRl cmVyLCB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHJvb3QpKTsKKyAgICAgICAgUmVuZGVyVmlldyog dmlldyA9IHJlbmRlcmVyLT52aWV3KCk7CisgICAgICAgIGlmICh2aWV3KSB7CisgICAgICAgICAg ICAvLyBQdXNoIHRoZSB2aWV3IGZpcnN0LCBhcyBleHBlY3RlZCBieSBSZW5kZXJHZW9tZXRyeU1h cC4KKyAgICAgICAgICAgIG1fZ2VvbWV0cnlNYXAucHVzaE1hcHBpbmdzVG9BbmNlc3Rvcih2aWV3 LCAwKTsKKyAgICAgICAgICAgIG1fZ2VvbWV0cnlNYXAucHVzaE1hcHBpbmdzVG9BbmNlc3Rvcihy ZW5kZXJlciwgdmlldyk7CisgICAgICAgIH0KICAgICB9CiAKICAgICB2b2lkIG9wZXJhdG9yKCko Y29uc3QgRmxvYXRSZWN0JiByZWN0KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQxYzY5MmY3ZmU5YWY1YzI5OWFhNGEwMDNl MDhkNmE5NTE1MjQ4MTUuLjA2NzIxMjVkMzMwZWJjNzMzNmM3MzNmMGFiYzIxNGQ4OTkyYTJlMTIg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wNy0xMiAgS2lyYW4gTXVwcGFsYSAgPGNtdXBw YWxhQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBSZW5kZXJJbmxpbmUgYm91bmRp bmdCb3ggaWdub3JlcyByZWxhdGl2ZSBwb3NpdGlvbiBvZmZzZXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMTY4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgcmVncmVzc2lvbiB0ZXN0IGZvciBi b3VuZGluZ0JveCBvZiBhbiBpbmxpbmUgZWxlbWVudCB3aXRoIHJlbGF0aXZlIHBvc2l0aW9uIG9m ZnNldHMuCisKKyAgICAgICAgKiBmYXN0L2lubGluZS9pbmxpbmUtcmVsYXRpdmUtb2Zmc2V0LWJv dW5kaW5nYm94LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9pbmxpbmUvaW5s aW5lLXJlbGF0aXZlLW9mZnNldC1ib3VuZGluZ2JveC5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0x MiAgS29ucmFkIFBpYXNjaWsgIDxrcGlhc2Npa0ByaW0uY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEdlb2xvY2F0aW9uIG92ZXJyaWRlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2lubGluZS9pbmxpbmUtcmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94LWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRpbmdi b3gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIxYTJmYTQxZmY2ODQzZDQ0MDA2ZmY5NjZjOTc3 M2VhY2ZmNDkwNjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9p bmxpbmUtcmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94LWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDEwIEBACitCdWcgOTExNjg6IFJFR1JFU1NJT046IFJlbmRlcklubGluZSBib3VuZGluZ0JveCBp Z25vcmVzIHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldAorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBz ZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVU RSIuCisKKworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRF CitQQVNTIGlubGluZVJlY3QubGVmdCBpcyBwYXJlbnRSZWN0LmxlZnQgKyBpbmxpbmVMZWZ0T2Zm c2V0CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1yZWxhdGl2 ZS1vZmZzZXQtYm91bmRpbmdib3guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGlu ZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRpbmdib3guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42MTE1YTRlODQx NWQxMTk0YmVhZTgxNGY5ZTZmYWI2MGIzYWZhMWE3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvaW5saW5lLXJlbGF0aXZlLW9mZnNldC1ib3VuZGluZ2JveC5odG1s CkBAIC0wLDAgKzEsMjQgQEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAg ICAgZGVzY3JpcHRpb24oJzxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05MTE2OCI+QnVnIDkxMTY4PC9hPjogUkVHUkVTU0lPTjogUmVuZGVySW5saW5lIGJv dW5kaW5nQm94IGlnbm9yZXMgcmVsYXRpdmUgcG9zaXRpb24gb2Zmc2V0Jyk7CisKKyAgICAgICAg ZnVuY3Rpb24gcnVuVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlubGluZSA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJpbmxpbmVFbGVtZW50Iik7CisgICAgICAgICAgICBpbmxpbmVS ZWN0ID0gaW5saW5lLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgICAgICAgaW5saW5l TGVmdE9mZnNldCA9IHBhcnNlSW50KGlubGluZS5zdHlsZS5sZWZ0KTsKKyAgICAgICAgICAgIHBh cmVudCA9IGlubGluZS5wYXJlbnROb2RlOworICAgICAgICAgICAgcGFyZW50UmVjdCA9IHBhcmVu dC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKwkgICAgc2hvdWxkQmUoImlubGluZVJlY3QubGVm dCIsICJwYXJlbnRSZWN0LmxlZnQgKyBpbmxpbmVMZWZ0T2Zmc2V0Iik7CisgICAgICAgIH0KKwor ICAgICAgICB3aW5kb3cub25sb2FkID0gcnVuVGVzdDsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5PgorICAgIDxzcGFuIGlkPSJpbmxpbmVFbGVtZW50IiBzdHlsZT0icG9zaXRpb246cmVs YXRpdmU7IGxlZnQ6MTBweDsiPjwvc3Bhbj4KKyAgICA8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 152351 2012-07-13 15:17:03 -0700 2012-07-13 16:10:06 -0700 Patch bug-91168-20120713151701.patch text/plain 7754 cmuppala U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE4Zjg1NjlkMDJkMDAy MDVlMDkyZGE0NTM5N2IxZjQ4OGUzZmNhNi4uZGUxMDAyMTgwMmZmYTJjZWRiOTA3NzdjZWE3MjNj ODAwNGI5ZDBiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA3LTEzICBLaXJh biBNdXBwYWxhICA8Y211cHBhbGFAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFJl bmRlcklubGluZSBib3VuZGluZ0JveCBpZ25vcmVzIHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExNjgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJHZW9t ZXRyeU1hcCwgdXNlZCBmb3IgY2FjaGluZyB0aGUgdHJhbnNmb3JtIHRvIHRoZSB2aWV3LAorICAg ICAgICBleHBlY3RzIHRoZSBmaXJzdCBtYXBwaW5nIHB1c2hlZCwgdG8gYmUgdGhhdCBvZiB0aGUg dmlldyBpdHNlbGYuCisgICAgICAgIFJlbmRlcklubGluZSB3YXMgaW5zdGVhZCBwdXNoaW5nIGl0 J3Mgb3duIG9mZnNldCBmaXJzdC4gIEJlc2lkZXMKKyAgICAgICAgdGhlIG9mZnNldCBvZiB0aGUg dmlldyBpdHNlbGYgd2FzIG5vdCBiZWluZyBwdXNoZWQuCisKKyAgICAgICAgUmVsYXhlZCB0aGUg UmVuZGVyR2VvbWV0cnlNYXAgcmVzdHJpY3Rpb24gdGhhdCB0aGUgZmlyc3QgcHVzaGVkCisgICAg ICAgIHN0ZXAgc2hvdWxkIGJlIG9mIHRoZSB2aWV3LiAgSXQgaXMgc3VmZmljaWVudCB0aGF0IHRo ZSB2aWV3J3MgbWFwcGluZworICAgICAgICBpcyBwdXNoZWQgaW4gdGhlIGZpcnN0IGNhbGwgdG8g cHVzaE1hcHBpbmdzVG9BbmNlc3Rvci4gIE1vZGlmaWVkCisgICAgICAgIFJlbmRlcklubGluZSB0 byBwdXNoIHRoZSBvZmZzZXQgb2YgdGhlIHZpZXcgYWxzbyB0byB0aGUgZ2VvbWV0cnkgbWFwLgor CisgICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRp bmdib3guaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdlb21ldHJ5TWFwLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdlb21ldHJ5TWFwOjpwdXNoTWFwcGluZ3NUb0FuY2Vz dG9yKTogQWRkIGFzc2VydGlvbiB0bworICAgICAgICBjaGVjayBpZiBtYXBwaW5nIHRvIHZpZXcg d2FzIHB1c2hlZCBpbiBmaXJzdCBpbnZvY2F0aW9uLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy R2VvbWV0cnlNYXA6OnB1c2hWaWV3KTogQ29ycmVjdCBhc3NlcnRpb24gdGhhdCBjaGVja3MKKyAg ICAgICAgaWYgdGhlIHZpZXcncyBtYXBwaW5nIGlzIHRoZSBmaXJzdCBvbmUgdG8gYmUgYXBwbGll ZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdlb21ldHJ5TWFwOjpzdGVwSW5zZXJ0ZWQpOiBV c2UgaXNSZW5kZXJWaWV3IHRvIGNoZWNrIGlmCisgICAgICAgIGEgbWFwcGluZyBzdGVwIGJlbG9u Z3MgdG8gYSB2aWV3IGluc3RlYWQgb2YgdXNpbmcgbWFwcGluZyBzaXplLgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyR2VvbWV0cnlNYXA6OnN0ZXBSZW1vdmVkKTogRGl0dG8uCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjooYW5vbnltb3Vz IG5hbWVzcGFjZSk6OkFic29sdXRlUXVhZHNHZW5lcmF0b3JDb250ZXh0OjpBYnNvbHV0ZVF1YWRz R2VuZXJhdG9yQ29udGV4dCk6CisgICAgICAgIFB1c2ggbWFwcGluZ3MgYWxsIHRoZSB3YXkgdXAg dG8gYW5kIGluY2x1ZGluZyB0aGUgdmlldy4KKwogMjAxMi0wNy0xMiAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBmaXguIEluaXRpYWxpemUgdW51c2Vk IGNvbnN0IG1lbWJlciB2YXJpYWJsZXMgdG8gbWFrZSBjb21waWxlcnMgaGFwcHkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR2VvbWV0cnlNYXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdlb21ldHJ5TWFwLmNwcAppbmRleCA4YzZmYTBi ZmM5Mjk4NzMwZmVlZmJlYTU2MjQyMTk3NWI0YjkwYmEwLi4wYTZjOWUwNGZhNzIxYzUyOTQ5ZDkx YWMxNjQ3OWI3YWZlMjQ1OGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyR2VvbWV0cnlNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHZW9tZXRyeU1hcC5jcHAKQEAgLTEzNiw2ICsxMzYsOCBAQCB2b2lkIFJlbmRlckdlb21ldHJ5 TWFwOjpwdXNoTWFwcGluZ3NUb0FuY2VzdG9yKGNvbnN0IFJlbmRlck9iamVjdCogcmVuZGVyZXIs IGNvbgogICAgIGRvIHsKICAgICAgICAgcmVuZGVyZXIgPSByZW5kZXJlci0+cHVzaE1hcHBpbmdU b0NvbnRhaW5lcihhbmNlc3RvclJlbmRlcmVyLCAqdGhpcyk7CiAgICAgfSB3aGlsZSAocmVuZGVy ZXIgJiYgcmVuZGVyZXIgIT0gYW5jZXN0b3JSZW5kZXJlcik7CisKKyAgICBBU1NFUlQobV9tYXBw aW5nLmlzRW1wdHkoKSB8fCBtX21hcHBpbmdbMF0ubV9yZW5kZXJlci0+aXNSZW5kZXJWaWV3KCkp OwogfQogCiBzdGF0aWMgYm9vbCBjYW5NYXBWaWFMYXllcihjb25zdCBSZW5kZXJMYXllciogbGF5 ZXIpCkBAIC0yMDUsNyArMjA3LDcgQEAgdm9pZCBSZW5kZXJHZW9tZXRyeU1hcDo6cHVzaChjb25z dCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBjb25zdCBUcmFuc2Zvcm1hdGlvbk0KIHZvaWQgUmVu ZGVyR2VvbWV0cnlNYXA6OnB1c2hWaWV3KGNvbnN0IFJlbmRlclZpZXcqIHZpZXcsIGNvbnN0IExh eW91dFNpemUmIHNjcm9sbE9mZnNldCwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgqIHQpCiB7 CiAgICAgQVNTRVJUKG1faW5zZXJ0aW9uUG9zaXRpb24gIT0gbm90Rm91bmQpOwotICAgIEFTU0VS VCghbV9tYXBwaW5nLnNpemUoKSk7IC8vIFRoZSB2aWV3IHNob3VsZCBhbHdheXMgYmUgdGhlIGZp cnN0IHRoaW5nIHB1c2hlZC4KKyAgICBBU1NFUlQoIW1faW5zZXJ0aW9uUG9zaXRpb24pOyAvLyBU aGUgdmlldyBzaG91bGQgYWx3YXlzIGJlIHRoZSBmaXJzdCBzdGVwLgogCiAgICAgbV9tYXBwaW5n Lmluc2VydChtX2luc2VydGlvblBvc2l0aW9uLCBSZW5kZXJHZW9tZXRyeU1hcFN0ZXAodmlldywg ZmFsc2UsIGZhbHNlLCBmYWxzZSwgdCkpOwogICAgIApAQCAtMjM1LDggKzIzNyw4IEBAIHZvaWQg UmVuZGVyR2VvbWV0cnlNYXA6OnBvcE1hcHBpbmdzVG9BbmNlc3Rvcihjb25zdCBSZW5kZXJMYXll ciogYW5jZXN0b3JMYXllcikKIAogdm9pZCBSZW5kZXJHZW9tZXRyeU1hcDo6c3RlcEluc2VydGVk KGNvbnN0IFJlbmRlckdlb21ldHJ5TWFwU3RlcCYgc3RlcCkKIHsKLSAgICAvLyBPZmZzZXQgb24g dGhlIGZpcnN0IHN0ZXAgaXMgdGhlIFJlbmRlclZpZXcncyBvZmZzZXQsIHdoaWNoIGlzIG9ubHkg YXBwbGllZCB3aGVuIHdlIGhhdmUgZml4ZWQtcG9zaXRpb24ucwotICAgIGlmIChtX21hcHBpbmcu c2l6ZSgpID4gMSkKKyAgICAvLyBSZW5kZXJWaWV3J3Mgb2Zmc2V0LCBpcyBvbmx5IGFwcGxpZWQg d2hlbiB3ZSBoYXZlIGZpeGVkLXBvc2l0aW9ucy4KKyAgICBpZiAoIXN0ZXAubV9yZW5kZXJlci0+ aXNSZW5kZXJWaWV3KCkpCiAgICAgICAgIG1fYWNjdW11bGF0ZWRPZmZzZXQgKz0gc3RlcC5tX29m ZnNldDsKIAogICAgIGlmIChzdGVwLm1faXNOb25Vbmlmb3JtKQpAQCAtMjUxLDggKzI1Myw4IEBA IHZvaWQgUmVuZGVyR2VvbWV0cnlNYXA6OnN0ZXBJbnNlcnRlZChjb25zdCBSZW5kZXJHZW9tZXRy eU1hcFN0ZXAmIHN0ZXApCiAKIHZvaWQgUmVuZGVyR2VvbWV0cnlNYXA6OnN0ZXBSZW1vdmVkKGNv bnN0IFJlbmRlckdlb21ldHJ5TWFwU3RlcCYgc3RlcCkKIHsKLSAgICAvLyBPZmZzZXQgb24gdGhl IGZpcnN0IHN0ZXAgaXMgdGhlIFJlbmRlclZpZXcncyBvZmZzZXQsIHdoaWNoIGlzIG9ubHkgYXBw bGllZCB3aGVuIHdlIGhhdmUgZml4ZWQtcG9zaXRpb24ucwotICAgIGlmIChtX21hcHBpbmcuc2l6 ZSgpID4gMSkKKyAgICAvLyBSZW5kZXJWaWV3J3Mgb2Zmc2V0LCBpcyBvbmx5IGFwcGxpZWQgd2hl biB3ZSBoYXZlIGZpeGVkLXBvc2l0aW9ucy4KKyAgICBpZiAoIXN0ZXAubV9yZW5kZXJlci0+aXNS ZW5kZXJWaWV3KCkpCiAgICAgICAgIG1fYWNjdW11bGF0ZWRPZmZzZXQgLT0gc3RlcC5tX29mZnNl dDsKIAogICAgIGlmIChzdGVwLm1faXNOb25Vbmlmb3JtKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IDMwMzI0ODBjNmQ0ZDE5Y2U4ZTM3YTlmNzYxMTFk ODFlOWJkY2M0NWEuLmM0ZTE0MjM5MmUyNWVmNTBjNmE5Mjg2ZTQ0ODU5YjQ5YWE3ZWY0MzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC02NTIsMTIgKzY1 Miw3IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX3dhc0ZpeGVkKHdhc0ZpeGVkKQogICAgICAgICAs IG1fZ2VvbWV0cnlNYXAoKQogICAgIHsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiByb290ID0gcmVu ZGVyZXItPnBhcmVudCgpOwotICAgICAgICB3aGlsZSAocm9vdCAmJiByb290LT5wYXJlbnQoKSkK LSAgICAgICAgICAgIHJvb3QgPSByb290LT5wYXJlbnQoKTsKLQotICAgICAgICBpZiAocm9vdCkK LSAgICAgICAgICAgIG1fZ2VvbWV0cnlNYXAucHVzaE1hcHBpbmdzVG9BbmNlc3RvcihyZW5kZXJl ciwgdG9SZW5kZXJCb3hNb2RlbE9iamVjdChyb290KSk7CisgICAgICAgIG1fZ2VvbWV0cnlNYXAu cHVzaE1hcHBpbmdzVG9BbmNlc3RvcihyZW5kZXJlciwgMCk7CiAgICAgfQogCiAgICAgdm9pZCBv cGVyYXRvcigpKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMWM2OTJmN2ZlOWFmNWMy OTlhYTRhMDAzZTA4ZDZhOTUxNTI0ODE1Li4zNGZjMzdiMmZkZWM3NTliM2FkMDhlOTUzNjE5ZmMw YmE2YTljYzQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDctMTMgIEtpcmFuIE11cHBh bGEgIDxjbXVwcGFsYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogUmVuZGVySW5s aW5lIGJvdW5kaW5nQm94IGlnbm9yZXMgcmVsYXRpdmUgcG9zaXRpb24gb2Zmc2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTE2OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHJlZ3Jlc3Npb24g dGVzdCBmb3IgYm91bmRpbmdCb3ggb2YgYW4gaW5saW5lIGVsZW1lbnQgd2l0aCByZWxhdGl2ZSBw b3NpdGlvbiBvZmZzZXRzLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvaW5saW5lLXJlbGF0aXZl LW9mZnNldC1ib3VuZGluZ2JveC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv aW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRpbmdib3guaHRtbDogQWRkZWQuCisK IDIwMTItMDctMTIgIEtvbnJhZCBQaWFzY2lrICA8a3BpYXNjaWtAcmltLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBHZW9sb2NhdGlvbiBvdmVycmlkZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvaW5saW5lLXJlbGF0aXZlLW9mZnNldC1ib3VuZGluZ2JveC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9pbmxpbmUtcmVsYXRpdmUtb2Zmc2V0 LWJvdW5kaW5nYm94LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMWEyZmE0MWZmNjg0M2Q0NDAw NmZmOTY2Yzk3NzNlYWNmZjQ5MDY4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9pbmxpbmUvaW5saW5lLXJlbGF0aXZlLW9mZnNldC1ib3VuZGluZ2JveC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxMCBAQAorQnVnIDkxMTY4OiBSRUdSRVNTSU9OOiBSZW5kZXJJbmxpbmUgYm91 bmRpbmdCb3ggaWdub3JlcyByZWxhdGl2ZSBwb3NpdGlvbiBvZmZzZXQKKworT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVT VCBDT01QTEVURQorUEFTUyBpbmxpbmVSZWN0LmxlZnQgaXMgcGFyZW50UmVjdC5sZWZ0ICsgaW5s aW5lTGVmdE9mZnNldAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9pbmxp bmUtcmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lu bGluZS9pbmxpbmUtcmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94Lmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NjExNWE0ZTg0MTVkMTE5NGJlYWU4MTRmOWU2ZmFiNjBiM2FmYTFhNwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRp bmdib3guaHRtbApAQCAtMCwwICsxLDI0IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQg c3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQ+CisgICAgICAgIGRlc2NyaXB0aW9uKCc8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTExNjgiPkJ1ZyA5MTE2ODwvYT46IFJFR1JFU1NJT046IFJlbmRl cklubGluZSBib3VuZGluZ0JveCBpZ25vcmVzIHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldCcpOwor CisgICAgICAgIGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBpbmxp bmUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaW5saW5lRWxlbWVudCIpOworICAgICAgICAg ICAgaW5saW5lUmVjdCA9IGlubGluZS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICAgICAg ICAgIGlubGluZUxlZnRPZmZzZXQgPSBwYXJzZUludChpbmxpbmUuc3R5bGUubGVmdCk7CisgICAg ICAgICAgICBwYXJlbnQgPSBpbmxpbmUucGFyZW50Tm9kZTsKKyAgICAgICAgICAgIHBhcmVudFJl Y3QgPSBwYXJlbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisJICAgIHNob3VsZEJlKCJpbmxp bmVSZWN0LmxlZnQiLCAicGFyZW50UmVjdC5sZWZ0ICsgaW5saW5lTGVmdE9mZnNldCIpOworICAg ICAgICB9CisKKyAgICAgICAgd2luZG93Lm9ubG9hZCA9IHJ1blRlc3Q7CisgICAgPC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8c3BhbiBpZD0iaW5saW5lRWxlbWVudCIgc3R5bGU9InBv c2l0aW9uOnJlbGF0aXZlOyBsZWZ0OjEwcHg7Ij48L3NwYW4+CisgICAgPHNjcmlwdCBzcmM9Ii4u L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1s Pgo= 152364 2012-07-13 16:10:09 -0700 2012-07-13 18:08:18 -0700 Patch bug-91168-20120713161008.patch text/plain 7761 cmuppala U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE4Zjg1NjlkMDJkMDAy MDVlMDkyZGE0NTM5N2IxZjQ4OGUzZmNhNi4uZGUxMDAyMTgwMmZmYTJjZWRiOTA3NzdjZWE3MjNj ODAwNGI5ZDBiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA3LTEzICBLaXJh biBNdXBwYWxhICA8Y211cHBhbGFAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFJl bmRlcklubGluZSBib3VuZGluZ0JveCBpZ25vcmVzIHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExNjgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJHZW9t ZXRyeU1hcCwgdXNlZCBmb3IgY2FjaGluZyB0aGUgdHJhbnNmb3JtIHRvIHRoZSB2aWV3LAorICAg ICAgICBleHBlY3RzIHRoZSBmaXJzdCBtYXBwaW5nIHB1c2hlZCwgdG8gYmUgdGhhdCBvZiB0aGUg dmlldyBpdHNlbGYuCisgICAgICAgIFJlbmRlcklubGluZSB3YXMgaW5zdGVhZCBwdXNoaW5nIGl0 J3Mgb3duIG9mZnNldCBmaXJzdC4gIEJlc2lkZXMKKyAgICAgICAgdGhlIG9mZnNldCBvZiB0aGUg dmlldyBpdHNlbGYgd2FzIG5vdCBiZWluZyBwdXNoZWQuCisKKyAgICAgICAgUmVsYXhlZCB0aGUg UmVuZGVyR2VvbWV0cnlNYXAgcmVzdHJpY3Rpb24gdGhhdCB0aGUgZmlyc3QgcHVzaGVkCisgICAg ICAgIHN0ZXAgc2hvdWxkIGJlIG9mIHRoZSB2aWV3LiAgSXQgaXMgc3VmZmljaWVudCB0aGF0IHRo ZSB2aWV3J3MgbWFwcGluZworICAgICAgICBpcyBwdXNoZWQgaW4gdGhlIGZpcnN0IGNhbGwgdG8g cHVzaE1hcHBpbmdzVG9BbmNlc3Rvci4gIE1vZGlmaWVkCisgICAgICAgIFJlbmRlcklubGluZSB0 byBwdXNoIHRoZSBvZmZzZXQgb2YgdGhlIHZpZXcgYWxzbyB0byB0aGUgZ2VvbWV0cnkgbWFwLgor CisgICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRp bmdib3guaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdlb21ldHJ5TWFwLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdlb21ldHJ5TWFwOjpwdXNoTWFwcGluZ3NUb0FuY2Vz dG9yKTogQWRkIGFzc2VydGlvbiB0bworICAgICAgICBjaGVjayBpZiBtYXBwaW5nIHRvIHZpZXcg d2FzIHB1c2hlZCBpbiBmaXJzdCBpbnZvY2F0aW9uLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy R2VvbWV0cnlNYXA6OnB1c2hWaWV3KTogQ29ycmVjdCBhc3NlcnRpb24gdGhhdCBjaGVja3MKKyAg ICAgICAgaWYgdGhlIHZpZXcncyBtYXBwaW5nIGlzIHRoZSBmaXJzdCBvbmUgdG8gYmUgYXBwbGll ZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdlb21ldHJ5TWFwOjpzdGVwSW5zZXJ0ZWQpOiBV c2UgaXNSZW5kZXJWaWV3IHRvIGNoZWNrIGlmCisgICAgICAgIGEgbWFwcGluZyBzdGVwIGJlbG9u Z3MgdG8gYSB2aWV3IGluc3RlYWQgb2YgdXNpbmcgbWFwcGluZyBzaXplLgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyR2VvbWV0cnlNYXA6OnN0ZXBSZW1vdmVkKTogRGl0dG8uCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjooYW5vbnltb3Vz IG5hbWVzcGFjZSk6OkFic29sdXRlUXVhZHNHZW5lcmF0b3JDb250ZXh0OjpBYnNvbHV0ZVF1YWRz R2VuZXJhdG9yQ29udGV4dCk6CisgICAgICAgIFB1c2ggbWFwcGluZ3MgYWxsIHRoZSB3YXkgdXAg dG8gYW5kIGluY2x1ZGluZyB0aGUgdmlldy4KKwogMjAxMi0wNy0xMiAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBmaXguIEluaXRpYWxpemUgdW51c2Vk IGNvbnN0IG1lbWJlciB2YXJpYWJsZXMgdG8gbWFrZSBjb21waWxlcnMgaGFwcHkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR2VvbWV0cnlNYXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdlb21ldHJ5TWFwLmNwcAppbmRleCA4YzZmYTBi ZmM5Mjk4NzMwZmVlZmJlYTU2MjQyMTk3NWI0YjkwYmEwLi4wYTZjOWUwNGZhNzIxYzUyOTQ5ZDkx YWMxNjQ3OWI3YWZlMjQ1OGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyR2VvbWV0cnlNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHZW9tZXRyeU1hcC5jcHAKQEAgLTEzNiw2ICsxMzYsOCBAQCB2b2lkIFJlbmRlckdlb21ldHJ5 TWFwOjpwdXNoTWFwcGluZ3NUb0FuY2VzdG9yKGNvbnN0IFJlbmRlck9iamVjdCogcmVuZGVyZXIs IGNvbgogICAgIGRvIHsKICAgICAgICAgcmVuZGVyZXIgPSByZW5kZXJlci0+cHVzaE1hcHBpbmdU b0NvbnRhaW5lcihhbmNlc3RvclJlbmRlcmVyLCAqdGhpcyk7CiAgICAgfSB3aGlsZSAocmVuZGVy ZXIgJiYgcmVuZGVyZXIgIT0gYW5jZXN0b3JSZW5kZXJlcik7CisKKyAgICBBU1NFUlQobV9tYXBw aW5nLmlzRW1wdHkoKSB8fCBtX21hcHBpbmdbMF0ubV9yZW5kZXJlci0+aXNSZW5kZXJWaWV3KCkp OwogfQogCiBzdGF0aWMgYm9vbCBjYW5NYXBWaWFMYXllcihjb25zdCBSZW5kZXJMYXllciogbGF5 ZXIpCkBAIC0yMDUsNyArMjA3LDcgQEAgdm9pZCBSZW5kZXJHZW9tZXRyeU1hcDo6cHVzaChjb25z dCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBjb25zdCBUcmFuc2Zvcm1hdGlvbk0KIHZvaWQgUmVu ZGVyR2VvbWV0cnlNYXA6OnB1c2hWaWV3KGNvbnN0IFJlbmRlclZpZXcqIHZpZXcsIGNvbnN0IExh eW91dFNpemUmIHNjcm9sbE9mZnNldCwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgqIHQpCiB7 CiAgICAgQVNTRVJUKG1faW5zZXJ0aW9uUG9zaXRpb24gIT0gbm90Rm91bmQpOwotICAgIEFTU0VS VCghbV9tYXBwaW5nLnNpemUoKSk7IC8vIFRoZSB2aWV3IHNob3VsZCBhbHdheXMgYmUgdGhlIGZp cnN0IHRoaW5nIHB1c2hlZC4KKyAgICBBU1NFUlQoIW1faW5zZXJ0aW9uUG9zaXRpb24pOyAvLyBU aGUgdmlldyBzaG91bGQgYWx3YXlzIGJlIHRoZSBmaXJzdCBzdGVwLgogCiAgICAgbV9tYXBwaW5n Lmluc2VydChtX2luc2VydGlvblBvc2l0aW9uLCBSZW5kZXJHZW9tZXRyeU1hcFN0ZXAodmlldywg ZmFsc2UsIGZhbHNlLCBmYWxzZSwgdCkpOwogICAgIApAQCAtMjM1LDggKzIzNyw4IEBAIHZvaWQg UmVuZGVyR2VvbWV0cnlNYXA6OnBvcE1hcHBpbmdzVG9BbmNlc3Rvcihjb25zdCBSZW5kZXJMYXll ciogYW5jZXN0b3JMYXllcikKIAogdm9pZCBSZW5kZXJHZW9tZXRyeU1hcDo6c3RlcEluc2VydGVk KGNvbnN0IFJlbmRlckdlb21ldHJ5TWFwU3RlcCYgc3RlcCkKIHsKLSAgICAvLyBPZmZzZXQgb24g dGhlIGZpcnN0IHN0ZXAgaXMgdGhlIFJlbmRlclZpZXcncyBvZmZzZXQsIHdoaWNoIGlzIG9ubHkg YXBwbGllZCB3aGVuIHdlIGhhdmUgZml4ZWQtcG9zaXRpb24ucwotICAgIGlmIChtX21hcHBpbmcu c2l6ZSgpID4gMSkKKyAgICAvLyBSZW5kZXJWaWV3J3Mgb2Zmc2V0LCBpcyBvbmx5IGFwcGxpZWQg d2hlbiB3ZSBoYXZlIGZpeGVkLXBvc2l0aW9ucy4KKyAgICBpZiAoIXN0ZXAubV9yZW5kZXJlci0+ aXNSZW5kZXJWaWV3KCkpCiAgICAgICAgIG1fYWNjdW11bGF0ZWRPZmZzZXQgKz0gc3RlcC5tX29m ZnNldDsKIAogICAgIGlmIChzdGVwLm1faXNOb25Vbmlmb3JtKQpAQCAtMjUxLDggKzI1Myw4IEBA IHZvaWQgUmVuZGVyR2VvbWV0cnlNYXA6OnN0ZXBJbnNlcnRlZChjb25zdCBSZW5kZXJHZW9tZXRy eU1hcFN0ZXAmIHN0ZXApCiAKIHZvaWQgUmVuZGVyR2VvbWV0cnlNYXA6OnN0ZXBSZW1vdmVkKGNv bnN0IFJlbmRlckdlb21ldHJ5TWFwU3RlcCYgc3RlcCkKIHsKLSAgICAvLyBPZmZzZXQgb24gdGhl IGZpcnN0IHN0ZXAgaXMgdGhlIFJlbmRlclZpZXcncyBvZmZzZXQsIHdoaWNoIGlzIG9ubHkgYXBw bGllZCB3aGVuIHdlIGhhdmUgZml4ZWQtcG9zaXRpb24ucwotICAgIGlmIChtX21hcHBpbmcuc2l6 ZSgpID4gMSkKKyAgICAvLyBSZW5kZXJWaWV3J3Mgb2Zmc2V0LCBpcyBvbmx5IGFwcGxpZWQgd2hl biB3ZSBoYXZlIGZpeGVkLXBvc2l0aW9ucy4KKyAgICBpZiAoIXN0ZXAubV9yZW5kZXJlci0+aXNS ZW5kZXJWaWV3KCkpCiAgICAgICAgIG1fYWNjdW11bGF0ZWRPZmZzZXQgLT0gc3RlcC5tX29mZnNl dDsKIAogICAgIGlmIChzdGVwLm1faXNOb25Vbmlmb3JtKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IDMwMzI0ODBjNmQ0ZDE5Y2U4ZTM3YTlmNzYxMTFk ODFlOWJkY2M0NWEuLmM0ZTE0MjM5MmUyNWVmNTBjNmE5Mjg2ZTQ0ODU5YjQ5YWE3ZWY0MzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC02NTIsMTIgKzY1 Miw3IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX3dhc0ZpeGVkKHdhc0ZpeGVkKQogICAgICAgICAs IG1fZ2VvbWV0cnlNYXAoKQogICAgIHsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiByb290ID0gcmVu ZGVyZXItPnBhcmVudCgpOwotICAgICAgICB3aGlsZSAocm9vdCAmJiByb290LT5wYXJlbnQoKSkK LSAgICAgICAgICAgIHJvb3QgPSByb290LT5wYXJlbnQoKTsKLQotICAgICAgICBpZiAocm9vdCkK LSAgICAgICAgICAgIG1fZ2VvbWV0cnlNYXAucHVzaE1hcHBpbmdzVG9BbmNlc3RvcihyZW5kZXJl ciwgdG9SZW5kZXJCb3hNb2RlbE9iamVjdChyb290KSk7CisgICAgICAgIG1fZ2VvbWV0cnlNYXAu cHVzaE1hcHBpbmdzVG9BbmNlc3RvcihyZW5kZXJlciwgMCk7CiAgICAgfQogCiAgICAgdm9pZCBv cGVyYXRvcigpKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMWM2OTJmN2ZlOWFmNWMy OTlhYTRhMDAzZTA4ZDZhOTUxNTI0ODE1Li4zNGZjMzdiMmZkZWM3NTliM2FkMDhlOTUzNjE5ZmMw YmE2YTljYzQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDctMTMgIEtpcmFuIE11cHBh bGEgIDxjbXVwcGFsYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogUmVuZGVySW5s aW5lIGJvdW5kaW5nQm94IGlnbm9yZXMgcmVsYXRpdmUgcG9zaXRpb24gb2Zmc2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTE2OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHJlZ3Jlc3Npb24g dGVzdCBmb3IgYm91bmRpbmdCb3ggb2YgYW4gaW5saW5lIGVsZW1lbnQgd2l0aCByZWxhdGl2ZSBw b3NpdGlvbiBvZmZzZXRzLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvaW5saW5lLXJlbGF0aXZl LW9mZnNldC1ib3VuZGluZ2JveC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv aW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRpbmdib3guaHRtbDogQWRkZWQuCisK IDIwMTItMDctMTIgIEtvbnJhZCBQaWFzY2lrICA8a3BpYXNjaWtAcmltLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBHZW9sb2NhdGlvbiBvdmVycmlkZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvaW5saW5lLXJlbGF0aXZlLW9mZnNldC1ib3VuZGluZ2JveC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9pbmxpbmUtcmVsYXRpdmUtb2Zmc2V0 LWJvdW5kaW5nYm94LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMWEyZmE0MWZmNjg0M2Q0NDAw NmZmOTY2Yzk3NzNlYWNmZjQ5MDY4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9pbmxpbmUvaW5saW5lLXJlbGF0aXZlLW9mZnNldC1ib3VuZGluZ2JveC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxMCBAQAorQnVnIDkxMTY4OiBSRUdSRVNTSU9OOiBSZW5kZXJJbmxpbmUgYm91 bmRpbmdCb3ggaWdub3JlcyByZWxhdGl2ZSBwb3NpdGlvbiBvZmZzZXQKKworT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVT VCBDT01QTEVURQorUEFTUyBpbmxpbmVSZWN0LmxlZnQgaXMgcGFyZW50UmVjdC5sZWZ0ICsgaW5s aW5lTGVmdE9mZnNldAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9pbmxp bmUtcmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lu bGluZS9pbmxpbmUtcmVsYXRpdmUtb2Zmc2V0LWJvdW5kaW5nYm94Lmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u ZDY5MzNjNjJiNGQ1NmIzN2ViM2IzMmNlZjQ4YjU1YzEyOTcyYmY2NwotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1yZWxhdGl2ZS1vZmZzZXQtYm91bmRp bmdib3guaHRtbApAQCAtMCwwICsxLDI0IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQg c3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQ+CisgICAgICAgIGRlc2NyaXB0aW9uKCc8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTExNjgiPkJ1ZyA5MTE2ODwvYT46IFJFR1JFU1NJT046IFJlbmRl cklubGluZSBib3VuZGluZ0JveCBpZ25vcmVzIHJlbGF0aXZlIHBvc2l0aW9uIG9mZnNldCcpOwor CisgICAgICAgIGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBpbmxp bmUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaW5saW5lRWxlbWVudCIpOworICAgICAgICAg ICAgaW5saW5lUmVjdCA9IGlubGluZS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICAgICAg ICAgIGlubGluZUxlZnRPZmZzZXQgPSBwYXJzZUludChpbmxpbmUuc3R5bGUubGVmdCk7CisgICAg ICAgICAgICBwYXJlbnQgPSBpbmxpbmUucGFyZW50Tm9kZTsKKyAgICAgICAgICAgIHBhcmVudFJl Y3QgPSBwYXJlbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAgICAgICBzaG91bGRC ZSgiaW5saW5lUmVjdC5sZWZ0IiwgInBhcmVudFJlY3QubGVmdCArIGlubGluZUxlZnRPZmZzZXQi KTsKKyAgICAgICAgfQorCisgICAgICAgIHdpbmRvdy5vbmxvYWQgPSBydW5UZXN0OworICAgIDwv c2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPHNwYW4gaWQ9ImlubGluZUVsZW1lbnQiIHN0 eWxlPSJwb3NpdGlvbjpyZWxhdGl2ZTsgbGVmdDoxMHB4OyI+PC9zcGFuPgorICAgIDxzY3JpcHQg c3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4K