96285 2012-09-10 10:07:57 -0700 [CSS Shaders] The mesh should be specified using <column, row> order 2012-10-24 16:01:51 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71392 1 achicu mvujovic allan.jensen cmarcelo dino macpherson menard mvujovic webkit.review.bot oldest_to_newest 716209 0 achicu 2012-09-10 10:07:57 -0700 The spec says the mesh is defined using <column, row> and not <row, column>. Update the implementation to match that. https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#vertexMesh-attribute 748086 1 170027 mvujovic 2012-10-22 16:50:27 -0700 Created attachment 170027 Patch 748736 2 170027 achicu 2012-10-23 09:40:19 -0700 Comment on attachment 170027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170027&action=review Looks good. > LayoutTests/css3/filters/resources/discard-bottom-vertices.vs:13 > + if (position.y > 0.0) Why not use the a_triangleCoord.y instead? > LayoutTests/css3/filters/resources/discard-bottom-vertices.vs:14 > + position = vec4(-0.5); nit: use 4 spaces for indentation. nit: You are also setting the 3rd and 4th values to -0.5. > Source/WebCore/css/CSSComputedStyleDeclaration.cpp:939 > - meshParameters->append(cssValuePool().createValue(customOperation->meshRows(), CSSPrimitiveValue::CSS_NUMBER)); > meshParameters->append(cssValuePool().createValue(customOperation->meshColumns(), CSSPrimitiveValue::CSS_NUMBER)); > + meshParameters->append(cssValuePool().createValue(customOperation->meshRows(), CSSPrimitiveValue::CSS_NUMBER)); Add a test for the computed style. 748843 3 170203 mvujovic 2012-10-23 11:55:48 -0700 Created attachment 170203 Patch 748938 4 170226 mvujovic 2012-10-23 13:44:59 -0700 Created attachment 170226 Patch Removed tab character from test. 748942 5 170027 mvujovic 2012-10-23 13:47:19 -0700 Comment on attachment 170027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170027&action=review >> LayoutTests/css3/filters/resources/discard-bottom-vertices.vs:13 >> + if (position.y > 0.0) > > Why not use the a_triangleCoord.y instead? After our in-person discussion, I've changed the test to create a checkboard pattern by coloring the mesh tiles using a_triangleCoord. If the checkboard tiles are squares, the test passes. If not, the test fails. >> LayoutTests/css3/filters/resources/discard-bottom-vertices.vs:14 >> + position = vec4(-0.5); > > nit: use 4 spaces for indentation. > nit: You are also setting the 3rd and 4th values to -0.5. nit 1: Thanks for catching that. My editor was misbehaving. nit 2: The new test doesn't need to do that anymore. >> Source/WebCore/css/CSSComputedStyleDeclaration.cpp:939 >> + meshParameters->append(cssValuePool().createValue(customOperation->meshRows(), CSSPrimitiveValue::CSS_NUMBER)); > > Add a test for the computed style. This is already covered by the computed style tests. In computed style, we can only check that the order we input the mesh attributes is the order we output them. For example, we can only check that the mesh coords of "10 20" come back as "10 20". They're not labeled, so I can't test which one represents numColumns vs. numRows. However, the test I've added verifies the numColumns vs. numRows difference by rendering it. 750140 6 mvujovic 2012-10-24 15:43:10 -0700 Thanks for the review, Dean! 750159 7 170226 webkit.review.bot 2012-10-24 16:01:46 -0700 Comment on attachment 170226 Patch Clearing flags on attachment: 170226 Committed r132416: <http://trac.webkit.org/changeset/132416> 750160 8 webkit.review.bot 2012-10-24 16:01:51 -0700 All reviewed patches have been landed. Closing bug. 170027 2012-10-22 16:50:27 -0700 2012-10-23 13:47:19 -0700 Patch 96285-1.patch text/plain 9305 mvujovic ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyYTExZGY4Li5hMmRiM2I4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTAt MjIgIE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hh ZGVyc10gVGhlIG1lc2ggc2hvdWxkIGJlIHNwZWNpZmllZCB1c2luZyA8Y29sdW1uLCByb3c+IG9y ZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjI4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh IHRlc3QgdmVyaWZ5aW5nIHRoYXQgV2ViS2l0IGludGVycHJldHMgdGhlIENTUyBtZXNoIHZhbHVl cyBpbiBjb2x1bW4sIHJvdyBvcmRlci4KKyAgICAgICAgVXBkYXRlIGV4aXN0aW5nIHRlc3RzIGZv ciB1X21lc2hTaXplIGFuZCB1X3RpbGVTaXplIHRvIGV4cGVjdCBjb2x1bW4sIHJvdyBvcmRlci4K KworICAgICAgICAqIGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tZXNoLWNvbHVt bi1yb3ctb3JkZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9maWx0ZXJz L2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBjc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL2Rpc2NhcmQtYm90dG9tLXZlcnRpY2Vz LnZzOiBBZGRlZC4KKyAgICAgICAgKiBjc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3UtbWVzaC1zaXpl LmZzOgorICAgICAgICAqIGNzczMvZmlsdGVycy9yZXNvdXJjZXMvdS10aWxlLXNpemUuZnM6CisK IDIwMTItMTAtMTkgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQgY2hyb21pdW0gcmViYXNlbGluZSBmb3IgcjEzMTUwMy4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tZXNoLWNvbHVt bi1yb3ctb3JkZXItZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9jdXN0 b20vY3VzdG9tLWZpbHRlci1tZXNoLWNvbHVtbi1yb3ctb3JkZXItZXhwZWN0ZWQuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lMjMxY2ZlCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29s dW1uLXJvdy1vcmRlci1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjEgQEAKKzwhZG9jdHlwZSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+VGVzdCB0aGF0IGluIENTUywgdGhlIHZl cnRleCBtZXNoIGRpbWVuc2lvbnMgYXJlIHNwZWNpZmllZCBpbiBjb2x1bW4sIHJvdyBvcmRlci48 L3RpdGxlPgorICAgIDwhLS0KKyAgICAgICAgVGhpcyBpcyB0aGUgcmVmZXJlbmNlIGZpbGUgZm9y IHRoZSB0ZXN0LgorICAgICAgICBJZiB0aGUgdGVzdCBwYXNzZXMsIHlvdSBzaG91bGQgc2VlIGEg Z3JlZW4gc3F1YXJlLgorICAgIC0tPgorICAgIDxzdHlsZT4KKyAgICBkaXYgeworICAgICAgICBw b3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgaGVpZ2h0 OiAxMDBweDsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDAsIDI1NSwgMCk7CisgICAg fQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2PjwvZGl2PgorPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9j dXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1sIGIvTGF5b3V0VGVzdHMvY3Nz My9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQxMzQ0MzIKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItbWVz aC1jb2x1bW4tcm93LW9yZGVyLmh0bWwKQEAgLTAsMCArMSw1MSBAQAorPCFkb2N0eXBlIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5UZXN0IHRoYXQgaW4gQ1NTLCB0aGUgdmVydGV4 IG1lc2ggZGltZW5zaW9ucyBhcmUgc3BlY2lmaWVkIGluIGNvbHVtbiwgcm93IG9yZGVyLjwvdGl0 bGU+CisgICAgPCEtLSBJZiB0aGUgdGVzdCBwYXNzZXMsIHlvdSBzaG91bGQgc2VlIGEgZ3JlZW4g c3F1YXJlLiAtLT4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIp IHsKKyAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2Vi S2l0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCIsICIxIik7CisgICAgICAgICAgICB3aW5kb3cudGVz dFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktpdFdlYkdMRW5hYmxlZCIsICIxIik7Cisg ICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgIH0K KyAgICAgICAgCisgICAgICAgIGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgICAgICB7CisgICAgICAg ICAgICAvLyBXZSBuZWVkIHRvIHJ1biB0aGUgdGVzdHMgYWZ0ZXIgdGhlIHNoYWRlcnMgZG93bmxv YWQuCisgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAg d2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+ CisgICAgPHN0eWxlPgorICAgICNjb3ZlcmVkLXJlZC1yZWN0YW5nbGUgeworICAgICAgICBwb3Np dGlvbjogYWJzb2x1dGU7CisgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgaGVpZ2h0OiAx MDBweDsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgIH0KKyAgICAjZmlsdGVy LXRhcmdldCB7CisgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgd2lkdGg6IDEw MHB4OworICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy ZWQ7CisgICAgICAgIC8qCisgICAgICAgICAgICBTcGVjaWZ5IGEgbWVzaCB3aXRoIDEgY29sdW1u IGFuZCAyIHJvd3MuCisgICAgICAgICAgICBUaGUgdmVydGV4IHNoYWRlciBzaG91bGQgZGlzY2Fy ZCB0aGUgbG93ZXIgcm93LCBsZWF2aW5nIGEgMTAweDEwMCBzcXVhcmUuCisgICAgICAgICAgICBU aGUgZnJhZ21lbnQgc2hhZGVyIHNob3VsZCBwYWludCB0aGUgcmVzdWx0aW5nIHNxdWFyZSBncmVl bi4KKworICAgICAgICAgICAgSWYgc29tZXRoaW5nIHdlbnQgd3JvbmcsIGNhdXNpbmcgdGhlcmUg dG8gYmUgMiBjb2x1bW5zIGFuZCAxIHJvdywgCisgICAgICAgICAgICB0aGUgb25seSByb3cgd2ls bCBiZSBkaXNjYXJkZWQsIHJldmVhbGluZyBhIHJlZCByZWN0YW5nbGUgdW5kZXJuZWF0aC4KKwor ICAgICAgICAgICAgSWYgc29tZXRoaW5nIGVsc2Ugd2VudCB3cm9uZywgYW5kIHRoZSBjdXN0b20g ZmlsdGVyIGRpZCBub3QgcmVuZGVyLAorICAgICAgICAgICAgdGhpcyBlbGVtZW50IHdpbGwgcmVu ZGVyIGl0cyBiYWNrZ3JvdW5kIGNvbG9yIG9mIHJlZC4KKyAgICAgICAgKi8KKyAgICAgICAgLXdl YmtpdC1maWx0ZXI6IGN1c3RvbSh1cmwoLi4vcmVzb3VyY2VzL2Rpc2NhcmQtYm90dG9tLXZlcnRp Y2VzLnZzKSBtaXgodXJsKC4uL3Jlc291cmNlcy9taXgtY29sb3IuZnMpIG5vcm1hbCBzb3VyY2Ut YXRvcCksIDEgMiwgbWl4X2NvbG9yIDAgMSAwIDEpOworICAgIH0KKyAgICA8L3N0eWxlPgorPC9o ZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorICAgIDxkaXYgaWQ9ImNvdmVyZWQtcmVk LXJlY3RhbmdsZSI+PC9kaXY+CisgICAgPGRpdiBpZD0iZmlsdGVyLXRhcmdldCI+PC9kaXY+Cis8 L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVz b3VyY2VzL2Rpc2NhcmQtYm90dG9tLXZlcnRpY2VzLnZzIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0 ZXJzL3Jlc291cmNlcy9kaXNjYXJkLWJvdHRvbS12ZXJ0aWNlcy52cwpuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwLi40YTgzMzVkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy9kaXNjYXJkLWJvdHRvbS12ZXJ0aWNlcy52cwpAQCAt MCwwICsxLDE3IEBACisvLyBUaGlzIHZlcnRleCBzaGFkZXIgaGlkZXMgYWxsIHZlcnRpY2VzIHBh c3QgdGhlIHZlcnRpY2FsIGhhbGZ3YXkgcG9pbnQgb2YgdGhlIG1lc2guCisKK3ByZWNpc2lvbiBt ZWRpdW1wIGZsb2F0OworCithdHRyaWJ1dGUgdmVjNCBhX3Bvc2l0aW9uOworCit1bmlmb3JtIG1h dDQgdV9wcm9qZWN0aW9uTWF0cml4OworCit2b2lkIG1haW4oKQoreworCXZlYzQgcG9zaXRpb24g PSBhX3Bvc2l0aW9uOworCisJaWYgKHBvc2l0aW9uLnkgPiAwLjApCisJCXBvc2l0aW9uID0gdmVj NCgtMC41KTsKKworICAgIGdsX1Bvc2l0aW9uID0gdV9wcm9qZWN0aW9uTWF0cml4ICogcG9zaXRp b247Cit9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3Ut bWVzaC1zaXplLmZzIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LW1lc2gt c2l6ZS5mcwppbmRleCBmYmZlMzRjLi5iNTUyNzc0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9j c3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3UtbWVzaC1zaXplLmZzCisrKyBiL0xheW91dFRlc3RzL2Nz czMvZmlsdGVycy9yZXNvdXJjZXMvdS1tZXNoLXNpemUuZnMKQEAgLTE1LDUgKzE1LDUgQEAgYm9v bCBhcmVWZWN0b3JzRXF1YWwodmVjMiBhLCB2ZWMyIGIpCiAKIHZvaWQgbWFpbigpCiB7Ci0gICAg Z2xfRnJhZ0NvbG9yID0gYXJlVmVjdG9yc0VxdWFsKHVfbWVzaFNpemUsIHZlYzIoMjAuMCwgMTAu MCkpID8gdmVjNCgwLjAsIDEuMCwgMC4wLCAxLjApIDogdmVjNCgxLjAsIDAuMCwgMC4wLCAxLjAp OworICAgIGdsX0ZyYWdDb2xvciA9IGFyZVZlY3RvcnNFcXVhbCh1X21lc2hTaXplLCB2ZWMyKDEw LjAsIDIwLjApKSA/IHZlYzQoMC4wLCAxLjAsIDAuMCwgMS4wKSA6IHZlYzQoMS4wLCAwLjAsIDAu MCwgMS4wKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9yZXNvdXJj ZXMvdS10aWxlLXNpemUuZnMgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3Ut dGlsZS1zaXplLmZzCmluZGV4IGZiZjA4YTMuLjkzNWUzNDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2NzczMvZmlsdGVycy9yZXNvdXJjZXMvdS10aWxlLXNpemUuZnMKKysrIGIvTGF5b3V0VGVz dHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LXRpbGUtc2l6ZS5mcwpAQCAtMTUsNSArMTUsNSBA QCBib29sIGFyZVZlY3RvcnNFcXVhbCh2ZWMyIGEsIHZlYzIgYikKIAogdm9pZCBtYWluKCkKIHsK LSAgICBnbF9GcmFnQ29sb3IgPSBhcmVWZWN0b3JzRXF1YWwodV90aWxlU2l6ZSwgdmVjMigwLjA1 LCAwLjEwKSkgPyB2ZWM0KDAuMCwgMS4wLCAwLjAsIDEuMCkgOiB2ZWM0KDEuMCwgMC4wLCAwLjAs IDEuMCk7CisgICAgZ2xfRnJhZ0NvbG9yID0gYXJlVmVjdG9yc0VxdWFsKHVfdGlsZVNpemUsIHZl YzIoMS4wIC8gMTAuMCwgMS4wIC8gMjAuMCkpID8gdmVjNCgwLjAsIDEuMCwgMC4wLCAxLjApIDog dmVjNCgxLjAsIDAuMCwgMC4wLCAxLjApOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc0ZjhjNmQuLjE0MDlj ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0xMC0yMiAgTWF4IFZ1am92aWMg IDxtdnVqb3ZpY0BhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFkZXJzXSBUaGUgbWVzaCBz aG91bGQgYmUgc3BlY2lmaWVkIHVzaW5nIDxjb2x1bW4sIHJvdz4gb3JkZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2Mjg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIFN0eWxlUmVzb2x2ZXIg YW5kIENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbiB0byBoYW5kbGUgdGhlIG1lc2ggcGFyYW1l dGVycyBpbgorICAgICAgICBjb2x1bW4sIHJvdyBvcmRlci4KKworICAgICAgICBUZXN0OiBjc3Mz L2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItbWVzaC1jb2x1bW4tcm93LW9yZGVyLmh0bWwK KworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjp2YWx1ZUZvckZpbHRlcik6 CisgICAgICAgICAgICBBcHBlbmQgdGhlIG51bWJlciBvZiBjb2x1bW5zIGJlZm9yZSB0aGUgbnVt YmVyIG9mIHJvd3MgaW4gdGhlIG1lc2hQYXJhbWV0ZXJzCisgICAgICAgICAgICBDU1NWYWx1ZUxp c3QuCisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVSZXNvbHZlcjo6Y3JlYXRlQ3VzdG9tRmlsdGVyT3BlcmF0aW9uKToKKyAgICAgICAgICAg IFN0b3JlIHRoZSBzZWNvbmQgbWVzaCBwYXJhbWV0ZXIgaW4gbWVzaFJvd3MgaW5zdGVhZCBvZiBt ZXNoQ29sdW1ucy4KKwogMjAxMi0xMC0xOSAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJlb3JkZXIgc29tZSBmdW5jdGlvbnMgaW4gU3VicmVzb3VyY2VMb2Fk ZXIgdG8gcGVybWl0IG1haW4gcmVzb3VyY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IDczMDc0MDIuLjMwMTFmNGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24u Y3BwCkBAIC05MzUsOCArOTM1LDggQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uOjp2YWx1ZUZvckZpbHRlcihjb25zdCBSZW5kZXJPYmoKICAgICAgICAg ICAgIGZpbHRlclZhbHVlLT5hcHBlbmQoc2hhZGVyc0xpc3QucmVsZWFzZSgpKTsKICAgICAgICAg ICAgIAogICAgICAgICAgICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbWVzaFBhcmFtZXRlcnMgPSBD U1NWYWx1ZUxpc3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7Ci0gICAgICAgICAgICBtZXNoUGFy YW1ldGVycy0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGN1c3RvbU9wZXJhdGlv bi0+bWVzaFJvd3MoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpKTsKICAgICAgICAg ICAgIG1lc2hQYXJhbWV0ZXJzLT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoY3Vz dG9tT3BlcmF0aW9uLT5tZXNoQ29sdW1ucygpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJF UikpOworICAgICAgICAgICAgbWVzaFBhcmFtZXRlcnMtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5j cmVhdGVWYWx1ZShjdXN0b21PcGVyYXRpb24tPm1lc2hSb3dzKCksIENTU1ByaW1pdGl2ZVZhbHVl OjpDU1NfTlVNQkVSKSk7CiAgICAgICAgICAgICBtZXNoUGFyYW1ldGVycy0+YXBwZW5kKGNzc1Zh bHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGN1c3RvbU9wZXJhdGlvbi0+bWVzaEJveFR5cGUoKSkpOwog ICAgICAgICAgICAgCiAgICAgICAgICAgICAvLyBGSVhNRTogVGhlIHNwZWNpZmljYXRpb24gZG9l c24ndCBoYXZlIGFueSAiYXR0YWNoZWQiIGlkZW50aWZpZXIuIFNob3VsZCB3ZSBhZGQgb25lPwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGM3OTMxNTQuLmMxOWUxOWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTQ4NDksMTQgKzQ4NDksMTQgQEAg UGFzc1JlZlB0cjxDdXN0b21GaWx0ZXJPcGVyYXRpb24+IFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUN1 c3RvbUZpbHRlck9wZXJhdGlvbihXZWIKICAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+ aXNOdW1iZXIoKSkgewogICAgICAgICAgICAgICAgIC8vIElmIG9ubHkgb25lIGludGVnZXIgdmFs dWUgaXMgc3BlY2lmaWVkLCBpdCB3aWxsIHNldCBib3RoCiAgICAgICAgICAgICAgICAgLy8gdGhl IHJvd3MgYW5kIHRoZSBjb2x1bW5zLgotICAgICAgICAgICAgICAgIG1lc2hSb3dzID0gbWVzaENv bHVtbnMgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0SW50VmFsdWUoKTsKKyAgICAgICAgICAgICAgICBt ZXNoQ29sdW1ucyA9IG1lc2hSb3dzID0gcHJpbWl0aXZlVmFsdWUtPmdldEludFZhbHVlKCk7CiAg ICAgICAgICAgICAgICAgaXRlcmF0b3IuYWR2YW5jZSgpOwogICAgICAgICAgICAgICAgIAotICAg ICAgICAgICAgICAgIC8vIFRyeSB0byBtYXRjaCBhbm90aGVyIG51bWJlciBmb3IgdGhlIGNvbHVt bnMuCisgICAgICAgICAgICAgICAgLy8gVHJ5IHRvIG1hdGNoIGFub3RoZXIgbnVtYmVyIGZvciB0 aGUgcm93cy4KICAgICAgICAgICAgICAgICBpZiAoaXRlcmF0b3IuaGFzTW9yZSgpICYmIGl0ZXJh dG9yLmlzUHJpbWl0aXZlVmFsdWUoKSkgewogICAgICAgICAgICAgICAgICAgICBDU1NQcmltaXRp dmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+ KGl0ZXJhdG9yLnZhbHVlKCkpOwogICAgICAgICAgICAgICAgICAgICBpZiAocHJpbWl0aXZlVmFs dWUtPmlzTnVtYmVyKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1lc2hDb2x1bW5zID0g cHJpbWl0aXZlVmFsdWUtPmdldEludFZhbHVlKCk7CisgICAgICAgICAgICAgICAgICAgICAgICBt ZXNoUm93cyA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgpOwogICAgICAgICAgICAgICAg ICAgICAgICAgaXRlcmF0b3IuYWR2YW5jZSgpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgfQo= 170203 2012-10-23 11:55:48 -0700 2012-10-23 13:44:59 -0700 Patch 96285-2.patch text/plain 9423 mvujovic ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxZDU5ZGFjLi40NzE3MDJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMTAt MjMgIE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hh ZGVyc10gVGhlIG1lc2ggc2hvdWxkIGJlIHNwZWNpZmllZCB1c2luZyA8Y29sdW1uLCByb3c+IG9y ZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjI4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh IHRlc3QgdmVyaWZ5aW5nIHRoYXQgV2ViS2l0IGludGVycHJldHMgdGhlIENTUyBtZXNoIHZhbHVl cyBpbiBjb2x1bW4sIHJvdyBvcmRlci4KKyAgICAgICAgVXBkYXRlIGV4aXN0aW5nIHRlc3RzIGZv ciB1X21lc2hTaXplIGFuZCB1X3RpbGVTaXplIHRvIGV4cGVjdCBjb2x1bW4sIHJvdyBvcmRlci4K KworICAgICAgICAqIGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tZXNoLWNvbHVt bi1yb3ctb3JkZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9maWx0ZXJz L2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBjc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL2NoZWNrZXJib2FyZC52czogQWRkZWQu CisgICAgICAgICogY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LW1lc2gtc2l6ZS5mczoKKyAgICAg ICAgKiBjc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3UtdGlsZS1zaXplLmZzOgorICAgICAgICAqIGNz czMvZmlsdGVycy9yZXNvdXJjZXMvdmFyeWluZy1taXgtY29sb3IuZnM6IEFkZGVkLgorCiAyMDEy LTEwLTIyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgbWFyZ2lu LXRvcC9ib3R0b20gaGFzIG5vIGVmZmVjdCBmb3IgY2hpbGQgbm9kZXMgb2YgZmxleCBpdGVtcwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVy LW1lc2gtY29sdW1uLXJvdy1vcmRlci1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9m aWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci1leHBlY3Rl ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA5YjBjODYKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0 ZXItbWVzaC1jb2x1bW4tcm93LW9yZGVyLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzMiBAQAor PCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5UZXN0IHRoYXQgaW4g Q1NTLCB0aGUgdmVydGV4IG1lc2ggZGltZW5zaW9ucyBhcmUgc3BlY2lmaWVkIGluIGNvbHVtbiwg cm93IG9yZGVyLjwvdGl0bGU+CisgICAgPCEtLQorICAgICAgICBUaGlzIGlzIHRoZSByZWZlcmVu Y2UgZmlsZSBmb3IgdGhlIHRlc3QuCisgICAgICAgIElmIHRoZSB0ZXN0IHBhc3NlcywgeW91IHNo b3VsZCBzZWUgYSBjaGVja2JvYXJkIHdpdGggMiBjb2x1bW5zIGFuZCA0IHJvd3Mgb2YgYmxhY2sg YW5kIGdyZWVuIHNxdWFyZXMuCisgICAgLS0+CisgICAgPHN0eWxlPgorICAgIGJvZHkgeworICAg ICAgICB3aWR0aDogMTAwcHg7CisgICAgfQorICAgIGRpdiB7CisgICAgICAgIGZsb2F0OiBsZWZ0 OworICAgICAgICB3aWR0aDogNTBweDsKKyAgICAgICAgaGVpZ2h0OiA1MHB4OworICAgIH0KKyAg ICBkaXY6bnRoLWNoaWxkKDRuKSwgZGl2Om50aC1jaGlsZCg0bisxKSB7IGJhY2tncm91bmQtY29s b3I6ICMwMDAgfQorICAgIGRpdjpudGgtY2hpbGQoNG4rMiksIGRpdjpudGgtY2hpbGQoNG4rMykg eyBiYWNrZ3JvdW5kLWNvbG9yOiAjMGYwIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ CisgICAgPGRpdj48L2Rpdj4KKyAgICA8ZGl2PjwvZGl2PgorICAgIDxkaXY+PC9kaXY+CisgICAg PGRpdj48L2Rpdj4KKyAgICA8ZGl2PjwvZGl2PgorICAgIDxkaXY+PC9kaXY+CisgICAgPGRpdj48 L2Rpdj4KKyAgICA8ZGl2PjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJv dy1vcmRlci5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmls dGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjkwYjc0ZDkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2Zp bHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItbWVzaC1jb2x1bW4tcm93LW9yZGVyLmh0bWwKQEAg LTAsMCArMSwzMyBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRs ZT5UZXN0IHRoYXQgaW4gQ1NTLCB0aGUgdmVydGV4IG1lc2ggZGltZW5zaW9ucyBhcmUgc3BlY2lm aWVkIGluIGNvbHVtbiwgcm93IG9yZGVyLjwvdGl0bGU+CisgICAgPCEtLSBJZiB0aGUgdGVzdCBw YXNzZXMsIHlvdSBzaG91bGQgc2VlIGEgY2hlY2tib2FyZCB3aXRoIDIgY29sdW1ucyBhbmQgNCBy b3dzIG9mIGJsYWNrIGFuZCBncmVlbiBzcXVhcmVzLiAtLT4KKyAgICA8c2NyaXB0PgorICAgICAg ICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVy Lm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCIsICIxIik7 CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktp dFdlYkdMRW5hYmxlZCIsICIxIik7CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci53YWl0 VW50aWxEb25lKCk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGZ1bmN0aW9uIHJ1blRl c3QoKQorICAgICAgICB7CisgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHJ1biB0aGUgdGVzdHMg YWZ0ZXIgdGhlIHNoYWRlcnMgZG93bmxvYWQuCisgICAgICAgICAgICBpZiAod2luZG93LnRlc3RS dW5uZXIpCisgICAgICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwor ICAgICAgICB9CisgICAgPC9zY3JpcHQ+CisgICAgPHN0eWxlPgorICAgICNmaWx0ZXItdGFyZ2V0 IHsKKyAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICB3aWR0aDogMTAwcHg7Cisg ICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAg ICAgICAgLXdlYmtpdC1maWx0ZXI6IGN1c3RvbSh1cmwoLi4vcmVzb3VyY2VzL2NoZWNrZXJib2Fy ZC52cykgbWl4KHVybCguLi9yZXNvdXJjZXMvdmFyeWluZy1taXgtY29sb3IuZnMpIG5vcm1hbCBz b3VyY2UtYXRvcCksIDIgNCBkZXRhY2hlZCk7CisgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+ Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPGRpdiBpZD0iZmlsdGVyLXRhcmdldCI+ PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2Zp bHRlcnMvcmVzb3VyY2VzL2NoZWNrZXJib2FyZC52cyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVy cy9yZXNvdXJjZXMvY2hlY2tlcmJvYXJkLnZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmYxNGQxNmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRl cnMvcmVzb3VyY2VzL2NoZWNrZXJib2FyZC52cwpAQCAtMCwwICsxLDE4IEBACisvLyBUaGlzIHNo YWRlciBjb2xvcnMgYWx0ZXJuYXRpbmcgdGlsZXMgaW4gdGhlIG1lc2ggYmxhY2sgb3IgZ3JlZW4g dG8gY3JlYXRlIGEgY2hlY2tib2FyZCBwYXR0ZXJuLgorCitwcmVjaXNpb24gbWVkaXVtcCBmbG9h dDsKK3ByZWNpc2lvbiBtZWRpdW1wIGludDsKKworYXR0cmlidXRlIHZlYzQgYV9wb3NpdGlvbjsK K2F0dHJpYnV0ZSB2ZWMzIGFfdHJpYW5nbGVDb29yZDsKKwordW5pZm9ybSBtYXQ0IHVfcHJvamVj dGlvbk1hdHJpeDsKKwordmFyeWluZyB2ZWM0IHZfbWl4Q29sb3I7CisKK3ZvaWQgbWFpbigpCit7 CisJZmxvYXQgZ3JlZW4gPSBtb2QoYV90cmlhbmdsZUNvb3JkLnggKyBhX3RyaWFuZ2xlQ29vcmQu eSwgMi4wKTsKKwl2X21peENvbG9yID0gdmVjNCgwLjAsIGdyZWVuLCAwLjAsIDEuMCk7CisgICAg Z2xfUG9zaXRpb24gPSB1X3Byb2plY3Rpb25NYXRyaXggKiBhX3Bvc2l0aW9uOworfQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LW1lc2gtc2l6ZS5mcyBi L0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9yZXNvdXJjZXMvdS1tZXNoLXNpemUuZnMKaW5kZXgg ZmJmZTM0Yy4uYjU1Mjc3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jl c291cmNlcy91LW1lc2gtc2l6ZS5mcworKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVz b3VyY2VzL3UtbWVzaC1zaXplLmZzCkBAIC0xNSw1ICsxNSw1IEBAIGJvb2wgYXJlVmVjdG9yc0Vx dWFsKHZlYzIgYSwgdmVjMiBiKQogCiB2b2lkIG1haW4oKQogewotICAgIGdsX0ZyYWdDb2xvciA9 IGFyZVZlY3RvcnNFcXVhbCh1X21lc2hTaXplLCB2ZWMyKDIwLjAsIDEwLjApKSA/IHZlYzQoMC4w LCAxLjAsIDAuMCwgMS4wKSA6IHZlYzQoMS4wLCAwLjAsIDAuMCwgMS4wKTsKKyAgICBnbF9GcmFn Q29sb3IgPSBhcmVWZWN0b3JzRXF1YWwodV9tZXNoU2l6ZSwgdmVjMigxMC4wLCAyMC4wKSkgPyB2 ZWM0KDAuMCwgMS4wLCAwLjAsIDEuMCkgOiB2ZWM0KDEuMCwgMC4wLCAwLjAsIDEuMCk7CiB9CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3UtdGlsZS1zaXpl LmZzIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LXRpbGUtc2l6ZS5mcwpp bmRleCBmYmYwOGEzLi45MzVlMzQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRl cnMvcmVzb3VyY2VzL3UtdGlsZS1zaXplLmZzCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVy cy9yZXNvdXJjZXMvdS10aWxlLXNpemUuZnMKQEAgLTE1LDUgKzE1LDUgQEAgYm9vbCBhcmVWZWN0 b3JzRXF1YWwodmVjMiBhLCB2ZWMyIGIpCiAKIHZvaWQgbWFpbigpCiB7Ci0gICAgZ2xfRnJhZ0Nv bG9yID0gYXJlVmVjdG9yc0VxdWFsKHVfdGlsZVNpemUsIHZlYzIoMC4wNSwgMC4xMCkpID8gdmVj NCgwLjAsIDEuMCwgMC4wLCAxLjApIDogdmVjNCgxLjAsIDAuMCwgMC4wLCAxLjApOworICAgIGds X0ZyYWdDb2xvciA9IGFyZVZlY3RvcnNFcXVhbCh1X3RpbGVTaXplLCB2ZWMyKDEuMCAvIDEwLjAs IDEuMCAvIDIwLjApKSA/IHZlYzQoMC4wLCAxLjAsIDAuMCwgMS4wKSA6IHZlYzQoMS4wLCAwLjAs IDAuMCwgMS4wKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9yZXNv dXJjZXMvdmFyeWluZy1taXgtY29sb3IuZnMgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVz b3VyY2VzL3ZhcnlpbmctbWl4LWNvbG9yLmZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmZhYmMxNDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRl cnMvcmVzb3VyY2VzL3ZhcnlpbmctbWl4LWNvbG9yLmZzCkBAIC0wLDAgKzEsOCBAQAorcHJlY2lz aW9uIG1lZGl1bXAgZmxvYXQ7CisKK3ZhcnlpbmcgdmVjNCB2X21peENvbG9yOworCit2b2lkIG1h aW4oKQoreworICAgIGNzc19NaXhDb2xvciA9IHZfbWl4Q29sb3I7Cit9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzEzNGVmYy4uOWUzMmEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTIz ICBNYXggVnVqb3ZpYyAgPG12dWpvdmljQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFNoYWRl cnNdIFRoZSBtZXNoIHNob3VsZCBiZSBzcGVjaWZpZWQgdXNpbmcgPGNvbHVtbiwgcm93PiBvcmRl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYyODUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2Ug U3R5bGVSZXNvbHZlciBhbmQgQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uIHRvIGhhbmRsZSB0 aGUgbWVzaCBwYXJhbWV0ZXJzIGluCisgICAgICAgIGNvbHVtbiwgcm93IG9yZGVyLgorCisgICAg ICAgIFRlc3Q6IGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tZXNoLWNvbHVtbi1y b3ctb3JkZXIuaHRtbAorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OnZh bHVlRm9yRmlsdGVyKToKKyAgICAgICAgICAgIEFwcGVuZCB0aGUgbnVtYmVyIG9mIGNvbHVtbnMg YmVmb3JlIHRoZSBudW1iZXIgb2Ygcm93cyBpbiB0aGUgbWVzaFBhcmFtZXRlcnMKKyAgICAgICAg ICAgIENTU1ZhbHVlTGlzdC4KKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjcmVhdGVDdXN0b21GaWx0ZXJPcGVyYXRpb24p OgorICAgICAgICAgICAgU3RvcmUgdGhlIHNlY29uZCBtZXNoIHBhcmFtZXRlciBpbiBtZXNoUm93 cyBpbnN0ZWFkIG9mIG1lc2hDb2x1bW5zLgorCiAyMDEyLTEwLTIyICBUb255IENoYW5nICA8dG9u eUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgbWFyZ2luLXRvcC9ib3R0b20gaGFzIG5vIGVmZmVj dCBmb3IgY2hpbGQgbm9kZXMgb2YgZmxleCBpdGVtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCA1ODZjMTMzLi44YmIwYzU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcApAQCAtOTM1LDggKzkzNSw4IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbjo6dmFsdWVGb3JGaWx0ZXIoY29uc3QgUmVuZGVyT2JqCiAgICAg ICAgICAgICBmaWx0ZXJWYWx1ZS0+YXBwZW5kKHNoYWRlcnNMaXN0LnJlbGVhc2UoKSk7CiAgICAg ICAgICAgICAKICAgICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IG1lc2hQYXJhbWV0ZXJz ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNlcGFyYXRlZCgpOwotICAgICAgICAgICAgbWVz aFBhcmFtZXRlcnMtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShjdXN0b21PcGVy YXRpb24tPm1lc2hSb3dzKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSk7CiAgICAg ICAgICAgICBtZXNoUGFyYW1ldGVycy0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVl KGN1c3RvbU9wZXJhdGlvbi0+bWVzaENvbHVtbnMoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19O VU1CRVIpKTsKKyAgICAgICAgICAgIG1lc2hQYXJhbWV0ZXJzLT5hcHBlbmQoY3NzVmFsdWVQb29s KCkuY3JlYXRlVmFsdWUoY3VzdG9tT3BlcmF0aW9uLT5tZXNoUm93cygpLCBDU1NQcmltaXRpdmVW YWx1ZTo6Q1NTX05VTUJFUikpOwogICAgICAgICAgICAgbWVzaFBhcmFtZXRlcnMtPmFwcGVuZChj c3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShjdXN0b21PcGVyYXRpb24tPm1lc2hCb3hUeXBlKCkp KTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBzcGVjaWZpY2F0aW9u IGRvZXNuJ3QgaGF2ZSBhbnkgImF0dGFjaGVkIiBpZGVudGlmaWVyLiBTaG91bGQgd2UgYWRkIG9u ZT8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA5MzE4YjdhLi43ODdhOWUz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC00ODE0LDE0ICs0ODE0LDE0 IEBAIFBhc3NSZWZQdHI8Q3VzdG9tRmlsdGVyT3BlcmF0aW9uPiBTdHlsZVJlc29sdmVyOjpjcmVh dGVDdXN0b21GaWx0ZXJPcGVyYXRpb24oV2ViCiAgICAgICAgICAgICBpZiAocHJpbWl0aXZlVmFs dWUtPmlzTnVtYmVyKCkpIHsKICAgICAgICAgICAgICAgICAvLyBJZiBvbmx5IG9uZSBpbnRlZ2Vy IHZhbHVlIGlzIHNwZWNpZmllZCwgaXQgd2lsbCBzZXQgYm90aAogICAgICAgICAgICAgICAgIC8v IHRoZSByb3dzIGFuZCB0aGUgY29sdW1ucy4KLSAgICAgICAgICAgICAgICBtZXNoUm93cyA9IG1l c2hDb2x1bW5zID0gcHJpbWl0aXZlVmFsdWUtPmdldEludFZhbHVlKCk7CisgICAgICAgICAgICAg ICAgbWVzaENvbHVtbnMgPSBtZXNoUm93cyA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgp OwogICAgICAgICAgICAgICAgIGl0ZXJhdG9yLmFkdmFuY2UoKTsKICAgICAgICAgICAgICAgICAK LSAgICAgICAgICAgICAgICAvLyBUcnkgdG8gbWF0Y2ggYW5vdGhlciBudW1iZXIgZm9yIHRoZSBj b2x1bW5zLgorICAgICAgICAgICAgICAgIC8vIFRyeSB0byBtYXRjaCBhbm90aGVyIG51bWJlciBm b3IgdGhlIHJvd3MuCiAgICAgICAgICAgICAgICAgaWYgKGl0ZXJhdG9yLmhhc01vcmUoKSAmJiBp dGVyYXRvci5pc1ByaW1pdGl2ZVZhbHVlKCkpIHsKICAgICAgICAgICAgICAgICAgICAgQ1NTUHJp bWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFs dWUqPihpdGVyYXRvci52YWx1ZSgpKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKHByaW1pdGl2 ZVZhbHVlLT5pc051bWJlcigpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBtZXNoQ29sdW1u cyA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICAg ICAgbWVzaFJvd3MgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0SW50VmFsdWUoKTsKICAgICAgICAgICAg ICAgICAgICAgICAgIGl0ZXJhdG9yLmFkdmFuY2UoKTsKICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIH0K 170226 2012-10-23 13:44:59 -0700 2012-10-24 16:01:45 -0700 Patch 96285-3.patch text/plain 9429 mvujovic ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxZDU5ZGFjLi40NzE3MDJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMTAt MjMgIE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hh ZGVyc10gVGhlIG1lc2ggc2hvdWxkIGJlIHNwZWNpZmllZCB1c2luZyA8Y29sdW1uLCByb3c+IG9y ZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjI4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh IHRlc3QgdmVyaWZ5aW5nIHRoYXQgV2ViS2l0IGludGVycHJldHMgdGhlIENTUyBtZXNoIHZhbHVl cyBpbiBjb2x1bW4sIHJvdyBvcmRlci4KKyAgICAgICAgVXBkYXRlIGV4aXN0aW5nIHRlc3RzIGZv ciB1X21lc2hTaXplIGFuZCB1X3RpbGVTaXplIHRvIGV4cGVjdCBjb2x1bW4sIHJvdyBvcmRlci4K KworICAgICAgICAqIGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tZXNoLWNvbHVt bi1yb3ctb3JkZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9maWx0ZXJz L2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBjc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL2NoZWNrZXJib2FyZC52czogQWRkZWQu CisgICAgICAgICogY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LW1lc2gtc2l6ZS5mczoKKyAgICAg ICAgKiBjc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3UtdGlsZS1zaXplLmZzOgorICAgICAgICAqIGNz czMvZmlsdGVycy9yZXNvdXJjZXMvdmFyeWluZy1taXgtY29sb3IuZnM6IEFkZGVkLgorCiAyMDEy LTEwLTIyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgbWFyZ2lu LXRvcC9ib3R0b20gaGFzIG5vIGVmZmVjdCBmb3IgY2hpbGQgbm9kZXMgb2YgZmxleCBpdGVtcwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVy LW1lc2gtY29sdW1uLXJvdy1vcmRlci1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9m aWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci1leHBlY3Rl ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA5YjBjODYKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0 ZXItbWVzaC1jb2x1bW4tcm93LW9yZGVyLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzMiBAQAor PCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5UZXN0IHRoYXQgaW4g Q1NTLCB0aGUgdmVydGV4IG1lc2ggZGltZW5zaW9ucyBhcmUgc3BlY2lmaWVkIGluIGNvbHVtbiwg cm93IG9yZGVyLjwvdGl0bGU+CisgICAgPCEtLQorICAgICAgICBUaGlzIGlzIHRoZSByZWZlcmVu Y2UgZmlsZSBmb3IgdGhlIHRlc3QuCisgICAgICAgIElmIHRoZSB0ZXN0IHBhc3NlcywgeW91IHNo b3VsZCBzZWUgYSBjaGVja2JvYXJkIHdpdGggMiBjb2x1bW5zIGFuZCA0IHJvd3Mgb2YgYmxhY2sg YW5kIGdyZWVuIHNxdWFyZXMuCisgICAgLS0+CisgICAgPHN0eWxlPgorICAgIGJvZHkgeworICAg ICAgICB3aWR0aDogMTAwcHg7CisgICAgfQorICAgIGRpdiB7CisgICAgICAgIGZsb2F0OiBsZWZ0 OworICAgICAgICB3aWR0aDogNTBweDsKKyAgICAgICAgaGVpZ2h0OiA1MHB4OworICAgIH0KKyAg ICBkaXY6bnRoLWNoaWxkKDRuKSwgZGl2Om50aC1jaGlsZCg0bisxKSB7IGJhY2tncm91bmQtY29s b3I6ICMwMDAgfQorICAgIGRpdjpudGgtY2hpbGQoNG4rMiksIGRpdjpudGgtY2hpbGQoNG4rMykg eyBiYWNrZ3JvdW5kLWNvbG9yOiAjMGYwIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ CisgICAgPGRpdj48L2Rpdj4KKyAgICA8ZGl2PjwvZGl2PgorICAgIDxkaXY+PC9kaXY+CisgICAg PGRpdj48L2Rpdj4KKyAgICA8ZGl2PjwvZGl2PgorICAgIDxkaXY+PC9kaXY+CisgICAgPGRpdj48 L2Rpdj4KKyAgICA8ZGl2PjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLW1lc2gtY29sdW1uLXJv dy1vcmRlci5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmls dGVyLW1lc2gtY29sdW1uLXJvdy1vcmRlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjkwYjc0ZDkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2Zp bHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItbWVzaC1jb2x1bW4tcm93LW9yZGVyLmh0bWwKQEAg LTAsMCArMSwzMyBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRs ZT5UZXN0IHRoYXQgaW4gQ1NTLCB0aGUgdmVydGV4IG1lc2ggZGltZW5zaW9ucyBhcmUgc3BlY2lm aWVkIGluIGNvbHVtbiwgcm93IG9yZGVyLjwvdGl0bGU+CisgICAgPCEtLSBJZiB0aGUgdGVzdCBw YXNzZXMsIHlvdSBzaG91bGQgc2VlIGEgY2hlY2tib2FyZCB3aXRoIDIgY29sdW1ucyBhbmQgNCBy b3dzIG9mIGJsYWNrIGFuZCBncmVlbiBzcXVhcmVzLiAtLT4KKyAgICA8c2NyaXB0PgorICAgICAg ICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVy Lm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0Q1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCIsICIxIik7 CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktp dFdlYkdMRW5hYmxlZCIsICIxIik7CisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci53YWl0 VW50aWxEb25lKCk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGZ1bmN0aW9uIHJ1blRl c3QoKQorICAgICAgICB7CisgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHJ1biB0aGUgdGVzdHMg YWZ0ZXIgdGhlIHNoYWRlcnMgZG93bmxvYWQuCisgICAgICAgICAgICBpZiAod2luZG93LnRlc3RS dW5uZXIpCisgICAgICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwor ICAgICAgICB9CisgICAgPC9zY3JpcHQ+CisgICAgPHN0eWxlPgorICAgICNmaWx0ZXItdGFyZ2V0 IHsKKyAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICB3aWR0aDogMTAwcHg7Cisg ICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAg ICAgICAgLXdlYmtpdC1maWx0ZXI6IGN1c3RvbSh1cmwoLi4vcmVzb3VyY2VzL2NoZWNrZXJib2Fy ZC52cykgbWl4KHVybCguLi9yZXNvdXJjZXMvdmFyeWluZy1taXgtY29sb3IuZnMpIG5vcm1hbCBz b3VyY2UtYXRvcCksIDIgNCBkZXRhY2hlZCk7CisgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+ Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPGRpdiBpZD0iZmlsdGVyLXRhcmdldCI+ PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2Zp bHRlcnMvcmVzb3VyY2VzL2NoZWNrZXJib2FyZC52cyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVy cy9yZXNvdXJjZXMvY2hlY2tlcmJvYXJkLnZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjhjYjI0ZmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRl cnMvcmVzb3VyY2VzL2NoZWNrZXJib2FyZC52cwpAQCAtMCwwICsxLDE4IEBACisvLyBUaGlzIHNo YWRlciBjb2xvcnMgYWx0ZXJuYXRpbmcgdGlsZXMgaW4gdGhlIG1lc2ggYmxhY2sgb3IgZ3JlZW4g dG8gY3JlYXRlIGEgY2hlY2tib2FyZCBwYXR0ZXJuLgorCitwcmVjaXNpb24gbWVkaXVtcCBmbG9h dDsKK3ByZWNpc2lvbiBtZWRpdW1wIGludDsKKworYXR0cmlidXRlIHZlYzQgYV9wb3NpdGlvbjsK K2F0dHJpYnV0ZSB2ZWMzIGFfdHJpYW5nbGVDb29yZDsKKwordW5pZm9ybSBtYXQ0IHVfcHJvamVj dGlvbk1hdHJpeDsKKwordmFyeWluZyB2ZWM0IHZfbWl4Q29sb3I7CisKK3ZvaWQgbWFpbigpCit7 CisgICAgZmxvYXQgZ3JlZW4gPSBtb2QoYV90cmlhbmdsZUNvb3JkLnggKyBhX3RyaWFuZ2xlQ29v cmQueSwgMi4wKTsKKyAgICB2X21peENvbG9yID0gdmVjNCgwLjAsIGdyZWVuLCAwLjAsIDEuMCk7 CisgICAgZ2xfUG9zaXRpb24gPSB1X3Byb2plY3Rpb25NYXRyaXggKiBhX3Bvc2l0aW9uOworfQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LW1lc2gtc2l6 ZS5mcyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9yZXNvdXJjZXMvdS1tZXNoLXNpemUuZnMK aW5kZXggZmJmZTM0Yy4uYjU1Mjc3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9maWx0 ZXJzL3Jlc291cmNlcy91LW1lc2gtc2l6ZS5mcworKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRl cnMvcmVzb3VyY2VzL3UtbWVzaC1zaXplLmZzCkBAIC0xNSw1ICsxNSw1IEBAIGJvb2wgYXJlVmVj dG9yc0VxdWFsKHZlYzIgYSwgdmVjMiBiKQogCiB2b2lkIG1haW4oKQogewotICAgIGdsX0ZyYWdD b2xvciA9IGFyZVZlY3RvcnNFcXVhbCh1X21lc2hTaXplLCB2ZWMyKDIwLjAsIDEwLjApKSA/IHZl YzQoMC4wLCAxLjAsIDAuMCwgMS4wKSA6IHZlYzQoMS4wLCAwLjAsIDAuMCwgMS4wKTsKKyAgICBn bF9GcmFnQ29sb3IgPSBhcmVWZWN0b3JzRXF1YWwodV9tZXNoU2l6ZSwgdmVjMigxMC4wLCAyMC4w KSkgPyB2ZWM0KDAuMCwgMS4wLCAwLjAsIDEuMCkgOiB2ZWM0KDEuMCwgMC4wLCAwLjAsIDEuMCk7 CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL3UtdGls ZS1zaXplLmZzIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy91LXRpbGUtc2l6 ZS5mcwppbmRleCBmYmYwOGEzLi45MzVlMzQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9jc3Mz L2ZpbHRlcnMvcmVzb3VyY2VzL3UtdGlsZS1zaXplLmZzCisrKyBiL0xheW91dFRlc3RzL2NzczMv ZmlsdGVycy9yZXNvdXJjZXMvdS10aWxlLXNpemUuZnMKQEAgLTE1LDUgKzE1LDUgQEAgYm9vbCBh cmVWZWN0b3JzRXF1YWwodmVjMiBhLCB2ZWMyIGIpCiAKIHZvaWQgbWFpbigpCiB7Ci0gICAgZ2xf RnJhZ0NvbG9yID0gYXJlVmVjdG9yc0VxdWFsKHVfdGlsZVNpemUsIHZlYzIoMC4wNSwgMC4xMCkp ID8gdmVjNCgwLjAsIDEuMCwgMC4wLCAxLjApIDogdmVjNCgxLjAsIDAuMCwgMC4wLCAxLjApOwor ICAgIGdsX0ZyYWdDb2xvciA9IGFyZVZlY3RvcnNFcXVhbCh1X3RpbGVTaXplLCB2ZWMyKDEuMCAv IDEwLjAsIDEuMCAvIDIwLjApKSA/IHZlYzQoMC4wLCAxLjAsIDAuMCwgMS4wKSA6IHZlYzQoMS4w LCAwLjAsIDAuMCwgMS4wKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmlsdGVy cy9yZXNvdXJjZXMvdmFyeWluZy1taXgtY29sb3IuZnMgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRl cnMvcmVzb3VyY2VzL3ZhcnlpbmctbWl4LWNvbG9yLmZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmZhYmMxNDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZpbHRlcnMvcmVzb3VyY2VzL3ZhcnlpbmctbWl4LWNvbG9yLmZzCkBAIC0wLDAgKzEsOCBAQAor cHJlY2lzaW9uIG1lZGl1bXAgZmxvYXQ7CisKK3ZhcnlpbmcgdmVjNCB2X21peENvbG9yOworCit2 b2lkIG1haW4oKQoreworICAgIGNzc19NaXhDb2xvciA9IHZfbWl4Q29sb3I7Cit9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggYzEzNGVmYy4uOWUzMmEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEy LTEwLTIzICBNYXggVnVqb3ZpYyAgPG12dWpvdmljQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NT IFNoYWRlcnNdIFRoZSBtZXNoIHNob3VsZCBiZSBzcGVjaWZpZWQgdXNpbmcgPGNvbHVtbiwgcm93 PiBvcmRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTYyODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD aGFuZ2UgU3R5bGVSZXNvbHZlciBhbmQgQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uIHRvIGhh bmRsZSB0aGUgbWVzaCBwYXJhbWV0ZXJzIGluCisgICAgICAgIGNvbHVtbiwgcm93IG9yZGVyLgor CisgICAgICAgIFRlc3Q6IGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tZXNoLWNv bHVtbi1yb3ctb3JkZXIuaHRtbAorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRp b246OnZhbHVlRm9yRmlsdGVyKToKKyAgICAgICAgICAgIEFwcGVuZCB0aGUgbnVtYmVyIG9mIGNv bHVtbnMgYmVmb3JlIHRoZSBudW1iZXIgb2Ygcm93cyBpbiB0aGUgbWVzaFBhcmFtZXRlcnMKKyAg ICAgICAgICAgIENTU1ZhbHVlTGlzdC4KKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjcmVhdGVDdXN0b21GaWx0ZXJPcGVy YXRpb24pOgorICAgICAgICAgICAgU3RvcmUgdGhlIHNlY29uZCBtZXNoIHBhcmFtZXRlciBpbiBt ZXNoUm93cyBpbnN0ZWFkIG9mIG1lc2hDb2x1bW5zLgorCiAyMDEyLTEwLTIyICBUb255IENoYW5n ICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgbWFyZ2luLXRvcC9ib3R0b20gaGFzIG5v IGVmZmVjdCBmb3IgY2hpbGQgbm9kZXMgb2YgZmxleCBpdGVtcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCA1ODZjMTMzLi44 YmIwYzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcApAQCAtOTM1LDggKzkzNSw4IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6dmFsdWVGb3JGaWx0ZXIoY29uc3QgUmVuZGVyT2Jq CiAgICAgICAgICAgICBmaWx0ZXJWYWx1ZS0+YXBwZW5kKHNoYWRlcnNMaXN0LnJlbGVhc2UoKSk7 CiAgICAgICAgICAgICAKICAgICAgICAgICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IG1lc2hQYXJh bWV0ZXJzID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNlcGFyYXRlZCgpOwotICAgICAgICAg ICAgbWVzaFBhcmFtZXRlcnMtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShjdXN0 b21PcGVyYXRpb24tPm1lc2hSb3dzKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSk7 CiAgICAgICAgICAgICBtZXNoUGFyYW1ldGVycy0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZVZhbHVlKGN1c3RvbU9wZXJhdGlvbi0+bWVzaENvbHVtbnMoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU19OVU1CRVIpKTsKKyAgICAgICAgICAgIG1lc2hQYXJhbWV0ZXJzLT5hcHBlbmQoY3NzVmFs dWVQb29sKCkuY3JlYXRlVmFsdWUoY3VzdG9tT3BlcmF0aW9uLT5tZXNoUm93cygpLCBDU1NQcmlt aXRpdmVWYWx1ZTo6Q1NTX05VTUJFUikpOwogICAgICAgICAgICAgbWVzaFBhcmFtZXRlcnMtPmFw cGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShjdXN0b21PcGVyYXRpb24tPm1lc2hCb3hU eXBlKCkpKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBzcGVjaWZp Y2F0aW9uIGRvZXNuJ3QgaGF2ZSBhbnkgImF0dGFjaGVkIiBpZGVudGlmaWVyLiBTaG91bGQgd2Ug YWRkIG9uZT8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA5MzE4YjdhLi43 ODdhOWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC00ODE0LDE0ICs0 ODE0LDE0IEBAIFBhc3NSZWZQdHI8Q3VzdG9tRmlsdGVyT3BlcmF0aW9uPiBTdHlsZVJlc29sdmVy OjpjcmVhdGVDdXN0b21GaWx0ZXJPcGVyYXRpb24oV2ViCiAgICAgICAgICAgICBpZiAocHJpbWl0 aXZlVmFsdWUtPmlzTnVtYmVyKCkpIHsKICAgICAgICAgICAgICAgICAvLyBJZiBvbmx5IG9uZSBp bnRlZ2VyIHZhbHVlIGlzIHNwZWNpZmllZCwgaXQgd2lsbCBzZXQgYm90aAogICAgICAgICAgICAg ICAgIC8vIHRoZSByb3dzIGFuZCB0aGUgY29sdW1ucy4KLSAgICAgICAgICAgICAgICBtZXNoUm93 cyA9IG1lc2hDb2x1bW5zID0gcHJpbWl0aXZlVmFsdWUtPmdldEludFZhbHVlKCk7CisgICAgICAg ICAgICAgICAgbWVzaENvbHVtbnMgPSBtZXNoUm93cyA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRW YWx1ZSgpOwogICAgICAgICAgICAgICAgIGl0ZXJhdG9yLmFkdmFuY2UoKTsKICAgICAgICAgICAg ICAgICAKLSAgICAgICAgICAgICAgICAvLyBUcnkgdG8gbWF0Y2ggYW5vdGhlciBudW1iZXIgZm9y IHRoZSBjb2x1bW5zLgorICAgICAgICAgICAgICAgIC8vIFRyeSB0byBtYXRjaCBhbm90aGVyIG51 bWJlciBmb3IgdGhlIHJvd3MuCiAgICAgICAgICAgICAgICAgaWYgKGl0ZXJhdG9yLmhhc01vcmUo KSAmJiBpdGVyYXRvci5pc1ByaW1pdGl2ZVZhbHVlKCkpIHsKICAgICAgICAgICAgICAgICAgICAg Q1NTUHJpbWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0 aXZlVmFsdWUqPihpdGVyYXRvci52YWx1ZSgpKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKHBy aW1pdGl2ZVZhbHVlLT5pc051bWJlcigpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBtZXNo Q29sdW1ucyA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgpOworICAgICAgICAgICAgICAg ICAgICAgICAgbWVzaFJvd3MgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0SW50VmFsdWUoKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIGl0ZXJhdG9yLmFkdmFuY2UoKTsKICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIH0K