50849 2010-12-10 15:19:42 -0800 [Qt] StillImage::draw() should use ContextShadow 2010-12-14 04:43:00 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 34479 0 helder webkit-unassigned commit-queue eric mdelaney7 ossy pfeldman oldest_to_newest 320445 0 helder 2010-12-10 15:19:42 -0800 The branch that checks for a shadow requirement in StillImage::draw() is executed when drawing a canvas onto a canvas with ctx1.drawImage(canvas2, x, y). The current implementation supports solid shadows only. And if transformations are present, the offset gets transformed as well. Thus, ContextShadow must be used instead in order to support blur and correct offset transformations. 320450 1 76268 helder 2010-12-10 15:24:29 -0800 Created attachment 76268 Patch 320951 2 76268 eric 2010-12-13 00:17:43 -0800 Comment on attachment 76268 Patch LGTM. Assuming your test case failed before this change. 320967 3 76268 commit-queue 2010-12-13 00:56:43 -0800 Comment on attachment 76268 Patch Clearing flags on attachment: 76268 Committed r73889: <http://trac.webkit.org/changeset/73889> 320968 4 commit-queue 2010-12-13 00:56:49 -0800 All reviewed patches have been landed. Closing bug. 321263 5 eric 2010-12-13 11:15:43 -0800 pfeldman seems to believe this caused failures on cr win/linux: http://code.google.com/p/chromium/issues/detail?id=66683 That seems unlikely/impossible. 321897 6 pfeldman 2010-12-14 04:43:00 -0800 (In reply to comment #5) > pfeldman seems to believe this caused failures on cr win/linux: > http://code.google.com/p/chromium/issues/detail?id=66683 > That seems unlikely/impossible. Well, the new test introduced with this commit does not pass on chromium. Why unlikely/impossible? Please follow the link to find the failure details: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=canvas-draw-canvas-on-canvas-shadow.html Click "Show results" link and also click the rightmost vertical red bar in the test timeline to see the commit that caused the regression. It this case it is http://trac.webkit.org/changeset/73889 that you reviewed. 76268 2010-12-10 15:24:29 -0800 2010-12-13 00:56:43 -0800 Patch bug-50849-20101210152427.patch text/plain 10771 helder ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NzQ5NjMyMzQ3OTc0ZTcxNmQ3NjQ1OTY5ZjQxMDNkNjAzNmY2YWIyLi5iMzgxZDZl OGMzMDk5ODBhZDc5YzFjNzE0ZTRkM2E1NGJlYWNkZDhiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMTItMTAgIEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBTdGlsbEltYWdl OjpkcmF3KCkgc2hvdWxkIHVzZSBDb250ZXh0U2hhZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDg0OQorCisgICAgICAgIFRoZSBicmFuY2ggdGhh dCBjaGVja3MgZm9yIGEgc2hhZG93IHJlcXVpcmVtZW50IGluIFN0aWxsSW1hZ2U6OmRyYXcoKQor ICAgICAgICBpcyBleGVjdXRlZCB3aGVuIGRyYXdpbmcgYSBjYW52YXMgb250byBhIGNhbnZhcyB3 aXRoCisgICAgICAgIGN0eDEuZHJhd0ltYWdlKGNhbnZhczIsIHgsIHkpLiBUaGUgY3VycmVudCBp bXBsZW1lbnRhdGlvbiBzdXBwb3J0cworICAgICAgICBzb2xpZCBzaGFkb3dzIG9ubHkuIEFuZCBp ZiB0cmFuc2Zvcm1hdGlvbnMgYXJlIHByZXNlbnQsIHRoZSBvZmZzZXQgZ2V0cworICAgICAgICB0 cmFuc2Zvcm1lZCBhcyB3ZWxsLiBUaHVzLCBDb250ZXh0U2hhZG93IG11c3QgYmUgdXNlZCBpbnN0 ZWFkIGluIG9yZGVyCisgICAgICAgIHRvIHN1cHBvcnQgYmx1ciBhbmQgY29ycmVjdCBvZmZzZXQg dHJhbnNmb3JtYXRpb25zLgorCisgICAgICAgICogZmFzdC9jYW52YXMvY2FudmFzLWRyYXctY2Fu dmFzLW9uLWNhbnZhcy1zaGFkb3ctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2NhbnZhcy9jYW52YXMtZHJhdy1jYW52YXMtb24tY2FudmFzLXNoYWRvdy5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBmYXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2FudmFzLWRyYXctY2FudmFzLW9u LWNhbnZhcy1zaGFkb3cuanM6IEFkZGVkLgorCiAyMDEwLTEyLTA5ICBQZXRlciBLYXN0aW5nICA8 cGthc3RpbmdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIENocm9taXVtIHRlc3Qg ZXhwZWN0YXRpb25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFz L2NhbnZhcy1kcmF3LWNhbnZhcy1vbi1jYW52YXMtc2hhZG93LWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1kcmF3LWNhbnZhcy1vbi1jYW52YXMtc2hhZG93LWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41YjMxOTZiMjUzMmIzZDM4OGYzNWE3ZTQ4MmVkYmUzMWUy M2JlOTgyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFz LWRyYXctY2FudmFzLW9uLWNhbnZhcy1zaGFkb3ctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNTcg QEAKK0Vuc3VyZSBjb3JyZWN0IGJlaGF2aW9yIHdoZW4gZHJhd2luZyBhIGNhbnZhcyBvbiBhIGNh bnZhcyB3aXRoIHNoYWRvd3MuIEEgYmx1ZSBhbmQgcmVkIGNoZWNrZXJlZCBwYXR0ZXJuIHNob3Vs ZCBiZSBkaXNwbGF5ZWQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAi UEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIGRb MF0gaXMgMjU1CitQQVNTIGRbMV0gaXMgMAorUEFTUyBkWzJdIGlzIDAKK1BBU1MgZFszXSBpcyAy NTUKK1BBU1MgZFswXSBpcyAyNTUKK1BBU1MgZFsxXSBpcyAwCitQQVNTIGRbMl0gaXMgMAorUEFT UyBkWzNdIGlzIDI1NQorUEFTUyBkWzBdIGlzIDI1NQorUEFTUyBkWzFdIGlzIDAKK1BBU1MgZFsy XSBpcyAwCitQQVNTIGRbM10gaXMgMjU1CitQQVNTIGRbMF0gaXMgMjU1CitQQVNTIGRbMV0gaXMg MAorUEFTUyBkWzJdIGlzIDAKK1BBU1MgZFszXSBpcyBhcm91bmQgMTI3CitQQVNTIGRbMF0gaXMg MjU1CitQQVNTIGRbMV0gaXMgMAorUEFTUyBkWzJdIGlzIDAKK1BBU1MgZFszXSBpcyBhcm91bmQg MTI3CitQQVNTIGRbMF0gaXMgMjU1CitQQVNTIGRbMV0gaXMgMAorUEFTUyBkWzJdIGlzIDAKK1BB U1MgZFszXSBpcyBhcm91bmQgMTI3CitQQVNTIGRbMF0gaXMgMjU1CitQQVNTIGRbMV0gaXMgMAor UEFTUyBkWzJdIGlzIDAKK1BBU1MgZFszXSBpcyBhcm91bmQgMTAwCitQQVNTIGRbMF0gaXMgMjU1 CitQQVNTIGRbMV0gaXMgMAorUEFTUyBkWzJdIGlzIDAKK1BBU1MgZFszXSBpcyBhcm91bmQgMTAw CitQQVNTIGRbMF0gaXMgMjU1CitQQVNTIGRbMV0gaXMgMAorUEFTUyBkWzJdIGlzIDAKK1BBU1Mg ZFszXSBpcyBhcm91bmQgMTAwCitQQVNTIGRbMF0gaXMgMjU1CitQQVNTIGRbMV0gaXMgMAorUEFT UyBkWzJdIGlzIDAKK1BBU1MgZFszXSBpcyBhcm91bmQgNTAKK1BBU1MgZFswXSBpcyAyNTUKK1BB U1MgZFsxXSBpcyAwCitQQVNTIGRbMl0gaXMgMAorUEFTUyBkWzNdIGlzIGFyb3VuZCA1MAorUEFT UyBkWzBdIGlzIDI1NQorUEFTUyBkWzFdIGlzIDAKK1BBU1MgZFsyXSBpcyAwCitQQVNTIGRbM10g aXMgYXJvdW5kIDUwCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09N UExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLWRyYXct Y2FudmFzLW9uLWNhbnZhcy1zaGFkb3cuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2Nh bnZhcy1kcmF3LWNhbnZhcy1vbi1jYW52YXMtc2hhZG93Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWU3MWE2 YmFhNmZhNjdmNzViOTkwMDdjYTk0Zjc2Yjk5OWZlYTY1MAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1kcmF3LWNhbnZhcy1vbi1jYW52YXMtc2hhZG93 Lmh0bWwKQEAgLTAsMCArMSwxMyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9E VEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl Zj0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9q cy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8 cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlw dCBzcmM9InNjcmlwdC10ZXN0cy9jYW52YXMtZHJhdy1jYW52YXMtb24tY2FudmFzLXNoYWRvdy5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5q cyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2FudmFzLWRyYXctY2FudmFzLW9uLWNhbnZhcy1zaGFk b3cuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9zY3JpcHQtdGVzdHMvY2FudmFzLWRyYXct Y2FudmFzLW9uLWNhbnZhcy1zaGFkb3cuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODNhYjk5MDUwNmY3ZDkzOGQ3 Y2FjODJhODc0YzNmNjIyMDU1MzNiOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvY2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMtZHJhdy1jYW52YXMtb24tY2FudmFzLXNoYWRv dy5qcwpAQCAtMCwwICsxLDEzNSBAQAorZGVzY3JpcHRpb24oIkVuc3VyZSBjb3JyZWN0IGJlaGF2 aW9yIHdoZW4gZHJhd2luZyBhIGNhbnZhcyBvbiBhIGNhbnZhcyB3aXRoIHNoYWRvd3MuIEEgYmx1 ZSBhbmQgcmVkIGNoZWNrZXJlZCBwYXR0ZXJuIHNob3VsZCBiZSBkaXNwbGF5ZWQuIik7CisKK2Z1 bmN0aW9uIHByaW50KG1lc3NhZ2UsIGNvbG9yKQoreworICAgIHZhciBwYXJhZ3JhcGggPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICBwYXJhZ3JhcGguYXBwZW5kQ2hpbGQoZG9j dW1lbnQuY3JlYXRlVGV4dE5vZGUobWVzc2FnZSkpOworICAgIHBhcmFncmFwaC5zdHlsZS5mb250 RmFtaWx5ID0gIm1vbm9zcGFjZSI7CisgICAgaWYgKGNvbG9yKQorICAgICAgICBwYXJhZ3JhcGgu c3R5bGUuY29sb3IgPSBjb2xvcjsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29s ZSIpLmFwcGVuZENoaWxkKHBhcmFncmFwaCk7Cit9CisKK2Z1bmN0aW9uIHNob3VsZEJlQXJvdW5k KGEsIGIpCit7CisgICAgdmFyIGV2YWxBOworICAgIHRyeSB7CisgICAgICAgIGV2YWxBID0gZXZh bChhKTsKKyAgICB9IGNhdGNoKGUpIHsKKyAgICAgICAgZXZhbEEgPSBlOworICAgIH0KKworICAg IGlmIChNYXRoLmFicyhldmFsQSAtIGIpIDwgMTUpCisgICAgICAgIHByaW50KCJQQVNTICIgKyBh ICsgIiBpcyBhcm91bmQgIiArIGIgLCAiZ3JlZW4iKQorICAgIGVsc2UKKyAgICAgICAgcHJpbnQo IkZBSUwgIiArIGEgKyAiIGlzIG5vdCBhcm91bmQgIiArIGIgKyAiIChhY3R1YWw6ICIgKyBldmFs QSArICIpIiwgInJlZCIpOworfQorCit2YXIgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgnY2FudmFzJyk7Citkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGNhbnZhcyk7CitjYW52YXMu c2V0QXR0cmlidXRlKCd3aWR0aCcsICc2MDAnKTsKK2NhbnZhcy5zZXRBdHRyaWJ1dGUoJ2hlaWdo dCcsICc2MDAnKTsKK3ZhciBjdHggPSBjYW52YXMuZ2V0Q29udGV4dCgnMmQnKTsKK2N0eC5zaGFk b3dPZmZzZXRYID0gMTAwOworY3R4LnNoYWRvd09mZnNldFkgPSAxMDA7CisKK3ZhciBhQ2FudmFz ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnY2FudmFzJyk7CithQ2FudmFzLndpZHRoID0gMzAw OworYUNhbnZhcy5oZWlnaHQgPSAzMDA7CisKK3ZhciBhQ3R4ID0gYUNhbnZhcy5nZXRDb250ZXh0 KCcyZCcpOworYUN0eC5maWxsU3R5bGUgPSAncmdiYSgwLCAwLCAyNTUsIDEuMCknOworYUN0eC5m aWxsUmVjdCgxMDAsIDEwMCwgMTAwLCAxMDApOworCitjdHguc2hhZG93Q29sb3IgPSAncmdiYSgy NTUsIDAsIDAsIDEuMCknOworY3R4LmRyYXdJbWFnZShhQ2FudmFzLCAwLCAwKTsKKworY3R4LnNo YWRvd0NvbG9yID0gJ3JnYmEoMjU1LCAwLCAwLCAwLjUpJzsKK2N0eC5kcmF3SW1hZ2UoYUNhbnZh cywgMCwgMjAwKTsKKworY3R4LnNoYWRvd0JsdXIgPSA1OworY3R4LnNoYWRvd0NvbG9yID0gJ3Jn YmEoMjU1LCAwLCAwLCAxLjApJzsKK2N0eC5kcmF3SW1hZ2UoYUNhbnZhcywgMjAwLCAwKTsKKwor Y3R4LnNoYWRvd0NvbG9yID0gJ3JnYmEoMjU1LCAwLCAwLCAwLjUpJzsKK2N0eC5kcmF3SW1hZ2Uo YUNhbnZhcywgMjAwLCAyMDApOworCit2YXIgZDsgLy8gaW1hZ2VEYXRhLmRhdGEKKworLy8gVmVy aWZ5IHNvbGlkIHNoYWRvdy4KK2QgPSBjdHguZ2V0SW1hZ2VEYXRhKDIwMCwgMjA1LCAxLCAxKS5k YXRhOworc2hvdWxkQmUoJ2RbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZFsxXScsICcwJyk7Citz aG91bGRCZSgnZFsyXScsICcwJyk7CitzaG91bGRCZSgnZFszXScsICcyNTUnKTsKKworZCA9IGN0 eC5nZXRJbWFnZURhdGEoMjk5LCAyOTUsIDEsIDEpLmRhdGE7CitzaG91bGRCZSgnZFswXScsICcy NTUnKTsKK3Nob3VsZEJlKCdkWzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkWzJdJywgJzAnKTsKK3No b3VsZEJlKCdkWzNdJywgJzI1NScpOworCitkID0gY3R4LmdldEltYWdlRGF0YSgyMDAsIDI5OSwg MSwgMSkuZGF0YTsKK3Nob3VsZEJlKCdkWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RbMV0nLCAn MCcpOworc2hvdWxkQmUoJ2RbMl0nLCAnMCcpOworc2hvdWxkQmUoJ2RbM10nLCAnMjU1Jyk7CisK Ky8vIFZlcmlmeSBzb2xpZCBhbHBoYSBzaGFkb3cuCitkID0gY3R4LmdldEltYWdlRGF0YSgyMDAs IDQwNSwgMSwgMSkuZGF0YTsKK3Nob3VsZEJlKCdkWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2Rb MV0nLCAnMCcpOworc2hvdWxkQmUoJ2RbMl0nLCAnMCcpOworc2hvdWxkQmVBcm91bmQoJ2RbM10n LCAnMTI3Jyk7CisKK2QgPSBjdHguZ2V0SW1hZ2VEYXRhKDI5OSwgNDA1LCAxLCAxKS5kYXRhOwor c2hvdWxkQmUoJ2RbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZFsxXScsICcwJyk7CitzaG91bGRC ZSgnZFsyXScsICcwJyk7CitzaG91bGRCZUFyb3VuZCgnZFszXScsICcxMjcnKTsKKworZCA9IGN0 eC5nZXRJbWFnZURhdGEoMjA1LCA0OTksIDEsIDEpLmRhdGE7CitzaG91bGRCZSgnZFswXScsICcy NTUnKTsKK3Nob3VsZEJlKCdkWzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkWzJdJywgJzAnKTsKK3No b3VsZEJlQXJvdW5kKCdkWzNdJywgJzEyNycpOworCisvLyBWZXJpZnkgYmx1cnJ5IHNoYWRvdy4K K2QgPSBjdHguZ2V0SW1hZ2VEYXRhKDUwMCwgMjExLCAxLCAxKS5kYXRhOworc2hvdWxkQmUoJ2Rb MF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZFsxXScsICcwJyk7CitzaG91bGRCZSgnZFsyXScsICcw Jyk7CitzaG91bGRCZUFyb3VuZCgnZFszXScsICcxMDAnKTsKKworZCA9IGN0eC5nZXRJbWFnZURh dGEoMzk5LCAyMDUsIDEsIDEpLmRhdGE7CitzaG91bGRCZSgnZFswXScsICcyNTUnKTsKK3Nob3Vs ZEJlKCdkWzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkWzJdJywgJzAnKTsKK3Nob3VsZEJlQXJvdW5k KCdkWzNdJywgJzEwMCcpOworCitkID0gY3R4LmdldEltYWdlRGF0YSg0NTAsIDMwMCwgMSwgMSku ZGF0YTsKK3Nob3VsZEJlKCdkWzBdJywgJzI1NScpOworc2hvdWxkQmUoJ2RbMV0nLCAnMCcpOwor c2hvdWxkQmUoJ2RbMl0nLCAnMCcpOworc2hvdWxkQmVBcm91bmQoJ2RbM10nLCAnMTAwJyk7CisK Ky8vIFZlcmlmeSBibHVycnkgYWxwaGEgc2hhZG93LgorZCA9IGN0eC5nZXRJbWFnZURhdGEoNTAw LCA0MTEsIDEsIDEpLmRhdGE7CitzaG91bGRCZSgnZFswXScsICcyNTUnKTsKK3Nob3VsZEJlKCdk WzFdJywgJzAnKTsKK3Nob3VsZEJlKCdkWzJdJywgJzAnKTsKK3Nob3VsZEJlQXJvdW5kKCdkWzNd JywgJzUwJyk7CisKK2QgPSBjdHguZ2V0SW1hZ2VEYXRhKDM5OSwgNDA1LCAxLCAxKS5kYXRhOwor c2hvdWxkQmUoJ2RbMF0nLCAnMjU1Jyk7CitzaG91bGRCZSgnZFsxXScsICcwJyk7CitzaG91bGRC ZSgnZFsyXScsICcwJyk7CitzaG91bGRCZUFyb3VuZCgnZFszXScsICc1MCcpOworCitkID0gY3R4 LmdldEltYWdlRGF0YSg0NTAsIDUwMCwgMSwgMSkuZGF0YTsKK3Nob3VsZEJlKCdkWzBdJywgJzI1 NScpOworc2hvdWxkQmUoJ2RbMV0nLCAnMCcpOworc2hvdWxkQmUoJ2RbMl0nLCAnMCcpOworc2hv dWxkQmVBcm91bmQoJ2RbM10nLCAnNTAnKTsKKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRy dWU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGM4MTAxMTVhOGM2ZDFhN2NiMzU1ZmYxY2YxMzE4NTc2OTY4OTg5MjYuLjEyZDc4ZWFkNjQz YTQzYzE1YWYwNDExNGY3YmQyYThjZjk1YjAyMzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMTItMTAg IEhlbGRlciBDb3JyZWlhICA8aGVsZGVyQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBTdGlsbEltYWdlOjpkcmF3KCkgc2hv dWxkIHVzZSBDb250ZXh0U2hhZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDg0OQorCisgICAgICAgIFRoZSBicmFuY2ggdGhhdCBjaGVja3MgZm9y IGEgc2hhZG93IHJlcXVpcmVtZW50IGluIFN0aWxsSW1hZ2U6OmRyYXcoKQorICAgICAgICBpcyBl eGVjdXRlZCB3aGVuIGRyYXdpbmcgYSBjYW52YXMgb250byBhIGNhbnZhcyB3aXRoCisgICAgICAg IGN0eDEuZHJhd0ltYWdlKGNhbnZhczIsIHgsIHkpLiBUaGUgY3VycmVudCBpbXBsZW1lbnRhdGlv biBzdXBwb3J0cworICAgICAgICBzb2xpZCBzaGFkb3dzIG9ubHkuIEFuZCBpZiB0cmFuc2Zvcm1h dGlvbnMgYXJlIHByZXNlbnQsIHRoZSBvZmZzZXQgZ2V0cworICAgICAgICB0cmFuc2Zvcm1lZCBh cyB3ZWxsLiBUaHVzLCBDb250ZXh0U2hhZG93IG11c3QgYmUgdXNlZCBpbnN0ZWFkIGluIG9yZGVy CisgICAgICAgIHRvIHN1cHBvcnQgYmx1ciBhbmQgY29ycmVjdCBvZmZzZXQgdHJhbnNmb3JtYXRp b25zLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY2FudmFzL2NhbnZhcy1kcmF3LWNhbnZhcy1vbi1j YW52YXMtc2hhZG93Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L1N0aWxs SW1hZ2VRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdGlsbEltYWdlOjpkcmF3KToKKwogMjAx MC0xMi0wOSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFRyeSBhbmQg Zml4IHRoZSBtYWMgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L1N0aWxsSW1hZ2VRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1N0aWxs SW1hZ2VRdC5jcHAKaW5kZXggMzAzODM1NmY1MzVkM2QyOGRjNGRjOWYxNzI1YzY5OTFkZWU5MmQ3 Yy4uZjFlNWRjZDVkNjE4MDY2YzI5MGFhZDlhMzMxZDViNzExNTc1NTE1ZiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9TdGlsbEltYWdlUXQuY3BwCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU3RpbGxJbWFnZVF0LmNwcApAQCAtMjgsNiArMjgsNyBA QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlN0aWxsSW1hZ2VRdC5oIgogCisjaW5j bHVkZSAiQ29udGV4dFNoYWRvdy5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2lu Y2x1ZGUgIkludFNpemUuaCIKIApAQCAtNjcsNyArNjgsNiBAQCB2b2lkIFN0aWxsSW1hZ2U6OmRy YXcoR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBjb25zdCBGbG9hdFJlY3QmIGRzdCwKICAgICBpZiAo bV9waXhtYXAtPmlzTnVsbCgpKQogICAgICAgICByZXR1cm47CiAKLQogICAgIEZsb2F0UmVjdCBu b3JtYWxpemVkU3JjID0gc3JjLm5vcm1hbGl6ZWQoKTsKICAgICBGbG9hdFJlY3Qgbm9ybWFsaXpl ZERzdCA9IGRzdC5ub3JtYWxpemVkKCk7CiAKQEAgLTc2LDIxICs3NiwxNCBAQCB2b2lkIFN0aWxs SW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBjb25zdCBGbG9hdFJlY3QmIGRzdCwK IAogICAgIGN0eHQtPnNldENvbXBvc2l0ZU9wZXJhdGlvbihvcCk7CiAKLSAgICBGbG9hdFNpemUg c2hhZG93T2Zmc2V0OwotICAgIGZsb2F0IHNoYWRvd0JsdXI7Ci0gICAgQ29sb3Igc2hhZG93Q29s b3I7Ci0gICAgaWYgKGN0eHQtPmdldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNo YWRvd0NvbG9yKSkgewotICAgICAgICBGbG9hdFJlY3Qgc2hhZG93SW1hZ2VSZWN0KG5vcm1hbGl6 ZWREc3QpOwotICAgICAgICBzaGFkb3dJbWFnZVJlY3QubW92ZShzaGFkb3dPZmZzZXQud2lkdGgo KSwgc2hhZG93T2Zmc2V0LmhlaWdodCgpKTsKLQotICAgICAgICBRSW1hZ2Ugc2hhZG93SW1hZ2Uo UVNpemUoc3RhdGljX2Nhc3Q8aW50Pihub3JtYWxpemVkU3JjLndpZHRoKCkpLCBzdGF0aWNfY2Fz dDxpbnQ+KG5vcm1hbGl6ZWRTcmMuaGVpZ2h0KCkpKSwgUUltYWdlOjpGb3JtYXRfQVJHQjMyX1By ZW11bHRpcGxpZWQpOwotICAgICAgICBRUGFpbnRlciBwKCZzaGFkb3dJbWFnZSk7Ci0gICAgICAg IHAuc2V0Q29tcG9zaXRpb25Nb2RlKFFQYWludGVyOjpDb21wb3NpdGlvbk1vZGVfU291cmNlKTsK LSAgICAgICAgcC5maWxsUmVjdChzaGFkb3dJbWFnZS5yZWN0KCksIHNoYWRvd0NvbG9yKTsKLSAg ICAgICAgcC5zZXRDb21wb3NpdGlvbk1vZGUoUVBhaW50ZXI6OkNvbXBvc2l0aW9uTW9kZV9EZXN0 aW5hdGlvbkluKTsKLSAgICAgICAgcC5kcmF3UGl4bWFwKFFSZWN0KDAsIDAsIG5vcm1hbGl6ZWRE c3Qud2lkdGgoKSwgbm9ybWFsaXplZERzdC5oZWlnaHQoKSksICptX3BpeG1hcCwgbm9ybWFsaXpl ZFNyYyk7Ci0gICAgICAgIHAuZW5kKCk7Ci0gICAgICAgIHBhaW50ZXItPmRyYXdJbWFnZShzaGFk b3dJbWFnZVJlY3QsIHNoYWRvd0ltYWdlLCBub3JtYWxpemVkU3JjKTsKKyAgICBDb250ZXh0U2hh ZG93KiBzaGFkb3cgPSBjdHh0LT5jb250ZXh0U2hhZG93KCk7CisgICAgaWYgKHNoYWRvdy0+bV90 eXBlICE9IENvbnRleHRTaGFkb3c6Ok5vU2hhZG93KSB7CisgICAgICAgIFFQYWludGVyKiBzaGFk b3dQYWludGVyID0gc2hhZG93LT5iZWdpblNoYWRvd0xheWVyKHBhaW50ZXIsIG5vcm1hbGl6ZWRE c3QpOworICAgICAgICBpZiAoc2hhZG93UGFpbnRlcikgeworICAgICAgICAgICAgc2hhZG93UGFp bnRlci0+c2V0T3BhY2l0eShzdGF0aWNfY2FzdDxxcmVhbD4oc2hhZG93LT5tX2NvbG9yLmFscGhh KCkpIC8gMjU1KTsKKyAgICAgICAgICAgIHNoYWRvd1BhaW50ZXItPmRyYXdQaXhtYXAobm9ybWFs aXplZERzdCwgKm1fcGl4bWFwLCBub3JtYWxpemVkU3JjKTsKKyAgICAgICAgICAgIHNoYWRvdy0+ ZW5kU2hhZG93TGF5ZXIocGFpbnRlcik7CisgICAgICAgIH0KICAgICB9CiAKICAgICBwYWludGVy LT5kcmF3UGl4bWFwKG5vcm1hbGl6ZWREc3QsICptX3BpeG1hcCwgbm9ybWFsaXplZFNyYyk7Cg==