60966 2011-05-17 09:31:21 -0700 Web Inspector: model-based CSS editing does not update @import-ed stylesheet resources 2011-05-18 06:33:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 405090 0 apavlov 2011-05-17 09:31:21 -0700 Edit any rule from any stylesheet which is imported as @import url(...) and examine the Resources panel. The corresponding resource is not updated and there is no new revision there. Upstreaming http://code.google.com/p/chromium/issues/detail?id=81838 405603 1 93890 apavlov 2011-05-18 02:55:22 -0700 Created attachment 93890 [PATCH] Suggested fix 405605 2 93890 pfeldman 2011-05-18 03:00:03 -0700 Comment on attachment 93890 [PATCH] Suggested fix View in context: https://bugs.webkit.org/attachment.cgi?id=93890&action=review > Source/WebCore/inspector/InspectorCSSAgent.cpp:273 > + collectStyleSheets(static_cast<CSSStyleSheet*>(styleSheet), styleInfos->get(), maxImportDepth); Could you please test this scenario? > Source/WebCore/inspector/InspectorCSSAgent.cpp:431 > + collectStyleSheets(static_cast<CSSStyleSheet*>(importedStyleSheet), result, depth - 1); What if A and B import C. Does C stylesheet materialize into two different CSSStyleSheet instances? 405610 3 apavlov 2011-05-18 03:07:25 -0700 (In reply to comment #2) > (From update of attachment 93890 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93890&action=review > > > Source/WebCore/inspector/InspectorCSSAgent.cpp:273 > > + collectStyleSheets(static_cast<CSSStyleSheet*>(styleSheet), styleInfos->get(), maxImportDepth); > > Could you please test this scenario? Done. > > Source/WebCore/inspector/InspectorCSSAgent.cpp:431 > > + collectStyleSheets(static_cast<CSSStyleSheet*>(importedStyleSheet), result, depth - 1); > > What if A and B import C. Does C stylesheet materialize into two different CSSStyleSheet instances? Yes, it does. 405613 4 93893 apavlov 2011-05-18 03:21:35 -0700 Created attachment 93893 [PATCH] Comments addressed 405674 5 apavlov 2011-05-18 06:33:54 -0700 Committed r86754: <http://trac.webkit.org/changeset/86754> 93890 2011-05-18 02:55:22 -0700 2011-05-18 03:21:35 -0700 [PATCH] Suggested fix collectsheets.patch text/plain 9553 apavlov Y29tbWl0IGExYjQyNmY4YWEyN2NjZTRhOGVjNWFkYTU1YTMwZTU5ZGRmMGI4N2YKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBXZWQgTWF5IDE4 IDEzOjA2OjI5IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTc1ZjMzMC4uMmNmZTRlZiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTA1LTE4ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW9kZWwtYmFzZWQgQ1NTIGVkaXRpbmcgZG9lcyBu b3QgdXBkYXRlIEBpbXBvcnQtZWQgc3R5bGVzaGVldCByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwOTY2CisKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc3R5bGVzL3N0eWxlcy1uZXctQVBJLWV4cGVjdGVkLnR4dDoKKwogMjAxMS0wNS0xNyAg SmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdDIgbmVl ZHMgbGF5b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJpZGVQcmVmZXJlbmNlLgpAQCAtMTEzMzcsNyAr MTEzNDYsNyBAQAogICAgICAgICBbQ2hyb21pdW1dIE1hcmsgY3NzMi4xL3QxNDAyMDEtYzUzMy1i Z2ltYWdlLTAwLWEuaHRtbCBhcyBjcmFzaCBvbiBMaW51eCwgV2luIERlYnVnCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODk5NQogCi0JQWNjaWRlbnRh bGx5IGluZGljYXRlZCBNQUMgaW5zdGVhZCBvZiBXSU4uCisgICAgICAgIEFjY2lkZW50YWxseSBp bmRpY2F0ZWQgTUFDIGluc3RlYWQgb2YgV0lOLgogCiAgICAgICAgICogcGxhdGZvcm0vY2hyb21p dW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgogCkBAIC0xMTM5Nyw4ICsxMTQwNiw4IEBACiAgICAg ICAgIFtDaHJvbWl1bV0gUmViYXNlbGluZSBzb21lIGJvcmRlci1yZWxhdGVkIHRlc3RzIG9uIE1h YwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg5ODUK IAotCU1vc3QgbGlrZWx5IHJlbGF0ZWQgdG8gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2Vz ZXQvODQzNDEvCi0JImJhY2tncm91bmQgY29sb3Igb2YgZWxlbWVudHMgd2l0aCBib3JkZXItcmFk aXVzIHNob3dzIGFyb3VuZCBvdXRlciBlZGdlIG9mIGJvcmRlciBhdCBjb3JuZXJzIgorICAgICAg ICBNb3N0IGxpa2VseSByZWxhdGVkIHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0 Lzg0MzQxLworICAgICAgICAiYmFja2dyb3VuZCBjb2xvciBvZiBlbGVtZW50cyB3aXRoIGJvcmRl ci1yYWRpdXMgc2hvd3MgYXJvdW5kIG91dGVyIGVkZ2Ugb2YgYm9yZGVyIGF0IGNvcm5lcnMiCiAK ICAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS1tYWMtbGVvcGFyZC9mYXN0L2Zvcm1zL21lbnVs aXN0LWNsaXAtZXhwZWN0ZWQucG5nOgogICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtLW1hYy1s ZW9wYXJkL2Zhc3QvZm9ybXMvbWVudWxpc3QtbmFycm93LXdpZHRoLWV4cGVjdGVkLnBuZzoKQEAg LTExNDQ4LDggKzExNDU3LDggQEAKICAgICAgICAgW0Nocm9taXVtXSBSZWJhc2VsaW5lIGZhc3Qv cmVwYWludC90cmFpbGluZy1mbG9hdHMtcm9vdC1saW5lLWJveC1vdmVyZmxvdyBmYXN0L2NhbnZh cy93ZWJnbC9jc3Mtd2Via2l0LWNhbnZhcyBmYXN0L2NhbnZhcy93ZWJnbC9jc3Mtd2Via2l0LWNh bnZhcy1yZXBhaW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01ODk3OAogCi0JV2luZG93cyBib3RzIGFyZSBub3cgZ2VuZXJhdGluZyBiYXNlbGluZXMs IHNvIGluY2x1ZGUgdGhlbS4KLQlmYXN0L3JlcGFpbnQvdHJhaWxpbmctZmxvYXRzLXJvb3QtbGlu ZS1ib3gtb3ZlcmZsb3cgbG9va3MgbGlrZSBjb3JyZWN0IG91dHB1dC4KKyAgICAgICAgV2luZG93 cyBib3RzIGFyZSBub3cgZ2VuZXJhdGluZyBiYXNlbGluZXMsIHNvIGluY2x1ZGUgdGhlbS4KKyAg ICAgICAgZmFzdC9yZXBhaW50L3RyYWlsaW5nLWZsb2F0cy1yb290LWxpbmUtYm94LW92ZXJmbG93 IGxvb2tzIGxpa2UgY29ycmVjdCBvdXRwdXQuCiAKICAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS1tYWMvZmFzdC9yZXBhaW50L3RyYWlsaW5nLWZsb2F0cy1yb290LWxpbmUtYm94LW92ZXJmbG93 LWV4cGVjdGVkLnBuZzogQWRkZWQuCiAgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0td2luL2Zh c3QvY2FudmFzL3dlYmdsL2Nzcy13ZWJraXQtY2FudmFzLWV4cGVjdGVkLnBuZzogQWRkZWQuCkBA IC0xMjMyNiw4ICsxMjMzNSw4IEBACiAgICAgICAgIFtDaHJvbWl1bV0gTWFyayBhbmltYXRpb25z L3BsYXktc3RhdGUuaHRtbCBhcyBmbGFreS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4ODgwCiAKLQlTZWUgYWxzbyBleGlzdGluZyBjaHJvbWl1bSBi dWc6Ci0JaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9 NzY2MDkKKyAgICAgICAgU2VlIGFsc28gZXhpc3RpbmcgY2hyb21pdW0gYnVnOgorICAgICAgICBo dHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD03NjYwOQog CiAgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgogCkBA IC0xMjMzOCw4ICsxMjM0Nyw4IEBACiAgICAgICAgIFtDaHJvbWl1bV0gTWFyayB0YWJsZXMvbW96 aWxsYS9idWdzL2J1ZzI4MzQxLmh0bWwgYXMgZmxha3kgb24gTWFjCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODg3OQogCi0JU2VlIGFsc28gZXhpc3Rp bmcgY2hyb21pdW0gYnVnOgotCWh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1 ZXMvZGV0YWlsP2lkPTMyMjMxCisgICAgICAgIFNlZSBhbHNvIGV4aXN0aW5nIGNocm9taXVtIGJ1 ZzoKKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRh aWw/aWQ9MzIyMzEKIAogICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRp b25zLnR4dDoKIApAQCAtMTIzNTAsOCArMTIzNTksOCBAQAogICAgICAgICBbQ2hyb21pdW1dIE1h cmsgc3ZnL3RleHQvZm9udC1zaXplLWJlbG93LXBvaW50LWZpdmUuc3ZnIGFzIGZsYWt5IG9uIExp bnV4LCBNYWMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU4ODc4CiAKLQlTZWUgYWxzbyBleGlzdGluZyBjaHJvbWl1bSBidWc6Ci0JaHR0cDovL2NvZGUu Z29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9NzQ3MTAKKyAgICAgICAgU2Vl IGFsc28gZXhpc3RpbmcgY2hyb21pdW0gYnVnOgorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUu Y29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD03NDcxMAogCiAgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgogCkBAIC0xMjM2Miw4ICsxMjM3MSw4 IEBACiAgICAgICAgIFtDaHJvbWl1bV0gTWFyayBsYXlvdXQgdGVzdCBlZGl0aW5nL2V4ZWNDb21t YW5kL2RlbGV0ZS1lbXB0eS1jb250YWluZXIuaHRtbCBhcyBmbGFreQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg4NzcKIAotCUNocm9taXVtIGJ1ZyBm aWxlZC4KLQlodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9p ZD03OTg1NAorICAgICAgICBDaHJvbWl1bSBidWcgZmlsZWQuCisgICAgICAgIGh0dHA6Ly9jb2Rl Lmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTc5ODU0CiAKICAgICAgICAg KiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6CiAKQEAgLTEyMzk4LDgg KzEyNDA3LDggQEAKICAgICAgICAgW0Nocm9taXVtXSBSZWVuYWJsZSBsYXlvdXQgdGVzdCBjYW52 YXMvcGhpbGlwL3Rlc3RzLzJkLmdyYWRpZW50LmludGVycG9sYXRlLm91dHNpZGUuaHRtbAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg4NzMKIAotCUZp eGVkIGluIENocm9taXVtIHI4MTk1Ni4KLQlodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21p dW0vaXNzdWVzL2RldGFpbD9pZD03OTcyNQorICAgICAgICBGaXhlZCBpbiBDaHJvbWl1bSByODE5 NTYuCisgICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0 YWlsP2lkPTc5NzI1CiAKICAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0 aW9ucy50eHQ6CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5 bGVzLW5ldy1BUEktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9z dHlsZXMtbmV3LUFQSS1leHBlY3RlZC50eHQKaW5kZXggMzU0ZTUzMC4uZTJiYzJiZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS1leHBlY3Rl ZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS1l eHBlY3RlZC50eHQKQEAgLTE4NSw2ICsxODUsMzggQEAgaDE6IFtdCiBbJ2JvcmRlci1ib3R0b20t d2lkdGgnOicwcHgnXSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0eWxlCiBbJ2JvcmRlci1sZWZ0 LXdpZHRoJzonMHB4J10gQFt1bmRlZmluZWQtdW5kZWZpbmVkXSBzdHlsZQogCitTdHlsZVNoZWV0 OiAnQHBhZ2UgeyBtYXJnaW46IDJjbSB9IC8qIEFsbCBtYXJnaW5zIHNldCB0byAyY20gKi8KKwor QHBhZ2UgOmZpcnN0IHsKKyAgbWFyZ2luLXRvcDogMTBjbSAgICAvKiBUb3AgbWFyZ2luIG9uIGZp cnN0IHBhZ2UgMTBjbSAqLworfQorCitAbWVkaWEgc2NyZWVuIHsKKworI2Fic2VudC1pZCB7Cit9 CisKK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAnVGhlRm9udCc7CisgICAgc3JjOiB1 cmwoJ2ZvbnQudXJsJyk7CisgICAgZm9udC13ZWlnaHQ6IG5vcm1hbDsKKyAgICBmb250LXN0eWxl OiBub3JtYWw7Cit9CisKK2JvZHkgeworICAgIHByb3BlcnR5OiBpbXBvcnRlZC1tZWRpYS1zY3Jl ZW4tc3R5bGVzaGVldDsKK30KKworfQorJworCitydWxlCisjYWJzZW50LWlkOiBbXQorCitydWxl Citib2R5OiBbXQorWydwcm9wZXJ0eSc6J2ltcG9ydGVkLW1lZGlhLXNjcmVlbi1zdHlsZXNoZWV0 JyBub24tcGFyc2VkXSBAWzUtNDhdIGFjdGl2ZQorCiBTdHlsZVNoZWV0OiAnCiAKIC8qIEFuIGlu bGluZSBzdHlsZXNoZWV0ICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM4YzA2Yi4uYmZiOWQ2YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA1LTE4ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW9kZWwtYmFzZWQgQ1NTIGVkaXRpbmcgZG9lcyBu b3QgdXBkYXRlIEBpbXBvcnQtZWQgc3R5bGVzaGVldCByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwOTY2CisKKyAgICAgICAgVGhlIEBp bXBvcnQnZWQgc3R5bGVzaGVldHMgZGlkbid0IGFjdHVhbGx5IHVzZSB0byBiZSBjb2xsZWN0ZWQg aW4gSW5zcGVjdG9yQ1NTQWdlbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldEFsbFN0 eWxlU2hlZXRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50Ojpjb2xsZWN0 U3R5bGVTaGVldHMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oOgor CiAyMDExLTA1LTE3ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODY2NjAuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAppbmRleCAxNTNjNjYxLi4xNGY2 M2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdl bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5j cHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogCiAjaW5jbHVkZSAi Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmgiCisjaW5jbHVkZSAiQ1NTSW1wb3J0UnVsZS5o IgogI2luY2x1ZGUgIkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmgiCiAjaW5jbHVkZSAiQ1NT UHJvcGVydHlOYW1lcy5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5U291cmNlRGF0YS5oIgpAQCAt MjYyLDE1ICsyNjMsMTQgQEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6Z2V0Q29tcHV0ZWRTdHls ZUZvck5vZGUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgbm8KIAogdm9pZCBJbnNwZWN0 b3JDU1NBZ2VudDo6Z2V0QWxsU3R5bGVTaGVldHMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVj dG9yQXJyYXk+KiBzdHlsZUluZm9zKQogeworICAgIGNvbnN0IHN0YXRpYyBpbnQgbWF4SW1wb3J0 RGVwdGggPSAxMDAwOwogICAgIFZlY3RvcjxEb2N1bWVudCo+IGRvY3VtZW50cyA9IG1fZG9tQWdl bnQtPmRvY3VtZW50cygpOwogICAgIGZvciAoVmVjdG9yPERvY3VtZW50Kj46Oml0ZXJhdG9yIGl0 ID0gZG9jdW1lbnRzLmJlZ2luKCk7IGl0ICE9IGRvY3VtZW50cy5lbmQoKTsgKytpdCkgewogICAg ICAgICBTdHlsZVNoZWV0TGlzdCogbGlzdCA9ICgqaXQpLT5zdHlsZVNoZWV0cygpOwogICAgICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGlzdC0+bGVuZ3RoKCk7ICsraSkgewogICAgICAg ICAgICAgU3R5bGVTaGVldCogc3R5bGVTaGVldCA9IGxpc3QtPml0ZW0oaSk7Ci0gICAgICAgICAg ICBpZiAoc3R5bGVTaGVldC0+aXNDU1NTdHlsZVNoZWV0KCkpIHsKLSAgICAgICAgICAgICAgICBJ bnNwZWN0b3JTdHlsZVNoZWV0KiBpbnNwZWN0b3JTdHlsZVNoZWV0ID0gYmluZFN0eWxlU2hlZXQo c3RhdGljX2Nhc3Q8Q1NTU3R5bGVTaGVldCo+KHN0eWxlU2hlZXQpKTsKLSAgICAgICAgICAgICAg ICAoKnN0eWxlSW5mb3MpLT5wdXNoT2JqZWN0KGluc3BlY3RvclN0eWxlU2hlZXQtPmJ1aWxkT2Jq ZWN0Rm9yU3R5bGVTaGVldEluZm8oKSk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAo c3R5bGVTaGVldC0+aXNDU1NTdHlsZVNoZWV0KCkpCisgICAgICAgICAgICAgICAgY29sbGVjdFN0 eWxlU2hlZXRzKHN0YXRpY19jYXN0PENTU1N0eWxlU2hlZXQqPihzdHlsZVNoZWV0KSwgc3R5bGVJ bmZvcy0+Z2V0KCksIG1heEltcG9ydERlcHRoKTsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTQx Nyw2ICs0MTcsMjIgQEAgRWxlbWVudCogSW5zcGVjdG9yQ1NTQWdlbnQ6OmVsZW1lbnRGb3JJZChF cnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGludCBub2RlSWQpCiAgICAgcmV0dXJuIHN0YXRpY19j YXN0PEVsZW1lbnQqPihub2RlKTsKIH0KIAordm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6Y29sbGVj dFN0eWxlU2hlZXRzKENTU1N0eWxlU2hlZXQqIHN0eWxlU2hlZXQsIEluc3BlY3RvckFycmF5KiBy ZXN1bHQsIGludCBkZXB0aCkKK3sKKyAgICBpZiAoIWRlcHRoKQorICAgICAgICByZXR1cm47Cisg ICAgSW5zcGVjdG9yU3R5bGVTaGVldCogaW5zcGVjdG9yU3R5bGVTaGVldCA9IGJpbmRTdHlsZVNo ZWV0KHN0YXRpY19jYXN0PENTU1N0eWxlU2hlZXQqPihzdHlsZVNoZWV0KSk7CisgICAgcmVzdWx0 LT5wdXNoT2JqZWN0KGluc3BlY3RvclN0eWxlU2hlZXQtPmJ1aWxkT2JqZWN0Rm9yU3R5bGVTaGVl dEluZm8oKSk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMCwgc2l6ZSA9IHN0eWxlU2hlZXQtPmxl bmd0aCgpOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAgIFN0eWxlQmFzZSogc3R5bGVCYXNlID0g c3R5bGVTaGVldC0+aXRlbShpKTsKKyAgICAgICAgaWYgKHN0eWxlQmFzZS0+aXNJbXBvcnRSdWxl KCkpIHsKKyAgICAgICAgICAgIFN0eWxlQmFzZSogaW1wb3J0ZWRTdHlsZVNoZWV0ID0gc3RhdGlj X2Nhc3Q8Q1NTSW1wb3J0UnVsZSo+KHN0eWxlQmFzZSktPnN0eWxlU2hlZXQoKTsKKyAgICAgICAg ICAgIGlmIChpbXBvcnRlZFN0eWxlU2hlZXQgJiYgaW1wb3J0ZWRTdHlsZVNoZWV0LT5pc0NTU1N0 eWxlU2hlZXQoKSkKKyAgICAgICAgICAgICAgICBjb2xsZWN0U3R5bGVTaGVldHMoc3RhdGljX2Nh c3Q8Q1NTU3R5bGVTaGVldCo+KGltcG9ydGVkU3R5bGVTaGVldCksIHJlc3VsdCwgZGVwdGggLSAx KTsKKyAgICAgICAgfQorICAgIH0KK30KKwogSW5zcGVjdG9yU3R5bGVTaGVldCogSW5zcGVjdG9y Q1NTQWdlbnQ6OmJpbmRTdHlsZVNoZWV0KENTU1N0eWxlU2hlZXQqIHN0eWxlU2hlZXQpCiB7CiAg ICAgUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXQ+IGluc3BlY3RvclN0eWxlU2hlZXQgPSBtX2Nz c1N0eWxlU2hlZXRUb0luc3BlY3RvclN0eWxlU2hlZXQuZ2V0KHN0eWxlU2hlZXQpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAppbmRleCBjNTMzN2Q2Li44 ZjhmNWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQu aApAQCAtODQsNiArODQsNyBAQCBwcml2YXRlOgogCiAgICAgSW5zcGVjdG9yU3R5bGVTaGVldEZv cklubGluZVN0eWxlKiBhc0luc3BlY3RvclN0eWxlU2hlZXQoRWxlbWVudCogZWxlbWVudCk7CiAg ICAgRWxlbWVudCogZWxlbWVudEZvcklkKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCk7CisgICAg dm9pZCBjb2xsZWN0U3R5bGVTaGVldHMoQ1NTU3R5bGVTaGVldCosIEluc3BlY3RvckFycmF5Kiwg aW50KTsKIAogICAgIEluc3BlY3RvclN0eWxlU2hlZXQqIGJpbmRTdHlsZVNoZWV0KENTU1N0eWxl U2hlZXQqKTsKICAgICBJbnNwZWN0b3JTdHlsZVNoZWV0KiB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0 KERvY3VtZW50KiwgYm9vbCBjcmVhdGVJZkFic2VudCk7Cg== 93893 2011-05-18 03:21:35 -0700 2011-05-18 04:18:38 -0700 [PATCH] Comments addressed collectsheets.patch text/plain 11521 apavlov Y29tbWl0IGY2Nzc4NDJmMjE4ODdjMDcwMDU4MjJiMmIzZjYyZmIwYzdiZjAzMmUKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBXZWQgTWF5IDE4 IDEzOjA2OjI5IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTc1ZjMzMC4uMzI2OGUzNCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTA1LTE4ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW9kZWwtYmFzZWQgQ1NTIGVkaXRpbmcgZG9lcyBu b3QgdXBkYXRlIEBpbXBvcnQtZWQgc3R5bGVzaGVldCByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwOTY2CisKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc3R5bGVzL3Jlc291cmNlcy9zdHlsZXMtbmV3LUFQSS0xLmNzczoKKyAgICAgICAgKiBp bnNwZWN0b3Ivc3R5bGVzL3Jlc291cmNlcy9zdHlsZXMtbmV3LUFQSS0yLmNzczogQ29waWVkIGZy b20gTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9yZXNvdXJjZXMvc3R5bGVzLW5ldy1BUEkt MS5jc3MuCisgICAgICAgIChAcGFnZSk6CisgICAgICAgIChAcGFnZSA6Zmlyc3QpOgorICAgICAg ICAoI2Fic2VudC1pZCk6CisgICAgICAgIChAZm9udC1mYWNlKToKKyAgICAgICAgKGJvZHkpOgor ICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEktZXhwZWN0ZWQudHh0Ogor CiAyMDExLTA1LTE3ICBKZXNzaWUgQmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViS2l0MiBuZWVkcyBsYXlvdXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVByZWZlcmVuY2Uu CkBAIC0xMTMzNyw3ICsxMTM1Myw3IEBACiAgICAgICAgIFtDaHJvbWl1bV0gTWFyayBjc3MyLjEv dDE0MDIwMS1jNTMzLWJnaW1hZ2UtMDAtYS5odG1sIGFzIGNyYXNoIG9uIExpbnV4LCBXaW4gRGVi dWcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4OTk1 CiAKLQlBY2NpZGVudGFsbHkgaW5kaWNhdGVkIE1BQyBpbnN0ZWFkIG9mIFdJTi4KKyAgICAgICAg QWNjaWRlbnRhbGx5IGluZGljYXRlZCBNQUMgaW5zdGVhZCBvZiBXSU4uCiAKICAgICAgICAgKiBw bGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6CiAKQEAgLTExMzk3LDggKzEx NDEzLDggQEAKICAgICAgICAgW0Nocm9taXVtXSBSZWJhc2VsaW5lIHNvbWUgYm9yZGVyLXJlbGF0 ZWQgdGVzdHMgb24gTWFjCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01ODk4NQogCi0JTW9zdCBsaWtlbHkgcmVsYXRlZCB0byBodHRwOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC84NDM0MS8KLQkiYmFja2dyb3VuZCBjb2xvciBvZiBlbGVtZW50cyB3 aXRoIGJvcmRlci1yYWRpdXMgc2hvd3MgYXJvdW5kIG91dGVyIGVkZ2Ugb2YgYm9yZGVyIGF0IGNv cm5lcnMiCisgICAgICAgIE1vc3QgbGlrZWx5IHJlbGF0ZWQgdG8gaHR0cDovL3RyYWMud2Via2l0 Lm9yZy9jaGFuZ2VzZXQvODQzNDEvCisgICAgICAgICJiYWNrZ3JvdW5kIGNvbG9yIG9mIGVsZW1l bnRzIHdpdGggYm9yZGVyLXJhZGl1cyBzaG93cyBhcm91bmQgb3V0ZXIgZWRnZSBvZiBib3JkZXIg YXQgY29ybmVycyIKIAogICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtLW1hYy1sZW9wYXJkL2Zh c3QvZm9ybXMvbWVudWxpc3QtY2xpcC1leHBlY3RlZC5wbmc6CiAgICAgICAgICogcGxhdGZvcm0v Y2hyb21pdW0tbWFjLWxlb3BhcmQvZmFzdC9mb3Jtcy9tZW51bGlzdC1uYXJyb3ctd2lkdGgtZXhw ZWN0ZWQucG5nOgpAQCAtMTE0NDgsOCArMTE0NjQsOCBAQAogICAgICAgICBbQ2hyb21pdW1dIFJl YmFzZWxpbmUgZmFzdC9yZXBhaW50L3RyYWlsaW5nLWZsb2F0cy1yb290LWxpbmUtYm94LW92ZXJm bG93IGZhc3QvY2FudmFzL3dlYmdsL2Nzcy13ZWJraXQtY2FudmFzIGZhc3QvY2FudmFzL3dlYmds L2Nzcy13ZWJraXQtY2FudmFzLXJlcGFpbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4OTc4CiAKLQlXaW5kb3dzIGJvdHMgYXJlIG5vdyBnZW5lcmF0 aW5nIGJhc2VsaW5lcywgc28gaW5jbHVkZSB0aGVtLgotCWZhc3QvcmVwYWludC90cmFpbGluZy1m bG9hdHMtcm9vdC1saW5lLWJveC1vdmVyZmxvdyBsb29rcyBsaWtlIGNvcnJlY3Qgb3V0cHV0Lgor ICAgICAgICBXaW5kb3dzIGJvdHMgYXJlIG5vdyBnZW5lcmF0aW5nIGJhc2VsaW5lcywgc28gaW5j bHVkZSB0aGVtLgorICAgICAgICBmYXN0L3JlcGFpbnQvdHJhaWxpbmctZmxvYXRzLXJvb3QtbGlu ZS1ib3gtb3ZlcmZsb3cgbG9va3MgbGlrZSBjb3JyZWN0IG91dHB1dC4KIAogICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtLW1hYy9mYXN0L3JlcGFpbnQvdHJhaWxpbmctZmxvYXRzLXJvb3QtbGlu ZS1ib3gtb3ZlcmZsb3ctZXhwZWN0ZWQucG5nOiBBZGRlZC4KICAgICAgICAgKiBwbGF0Zm9ybS9j aHJvbWl1bS13aW4vZmFzdC9jYW52YXMvd2ViZ2wvY3NzLXdlYmtpdC1jYW52YXMtZXhwZWN0ZWQu cG5nOiBBZGRlZC4KQEAgLTEyMzI2LDggKzEyMzQyLDggQEAKICAgICAgICAgW0Nocm9taXVtXSBN YXJrIGFuaW1hdGlvbnMvcGxheS1zdGF0ZS5odG1sIGFzIGZsYWt5LgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg4ODAKIAotCVNlZSBhbHNvIGV4aXN0 aW5nIGNocm9taXVtIGJ1ZzoKLQlodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNz dWVzL2RldGFpbD9pZD03NjYwOQorICAgICAgICBTZWUgYWxzbyBleGlzdGluZyBjaHJvbWl1bSBi dWc6CisgICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0 YWlsP2lkPTc2NjA5CiAKICAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0 aW9ucy50eHQ6CiAKQEAgLTEyMzM4LDggKzEyMzU0LDggQEAKICAgICAgICAgW0Nocm9taXVtXSBN YXJrIHRhYmxlcy9tb3ppbGxhL2J1Z3MvYnVnMjgzNDEuaHRtbCBhcyBmbGFreSBvbiBNYWMKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4ODc5CiAKLQlT ZWUgYWxzbyBleGlzdGluZyBjaHJvbWl1bSBidWc6Ci0JaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9w L2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MzIyMzEKKyAgICAgICAgU2VlIGFsc28gZXhpc3Rp bmcgY2hyb21pdW0gYnVnOgorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21p dW0vaXNzdWVzL2RldGFpbD9pZD0zMjIzMQogCiAgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0v dGVzdF9leHBlY3RhdGlvbnMudHh0OgogCkBAIC0xMjM1MCw4ICsxMjM2Niw4IEBACiAgICAgICAg IFtDaHJvbWl1bV0gTWFyayBzdmcvdGV4dC9mb250LXNpemUtYmVsb3ctcG9pbnQtZml2ZS5zdmcg YXMgZmxha3kgb24gTGludXgsIE1hYwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTg4NzgKIAotCVNlZSBhbHNvIGV4aXN0aW5nIGNocm9taXVtIGJ1ZzoK LQlodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD03NDcx MAorICAgICAgICBTZWUgYWxzbyBleGlzdGluZyBjaHJvbWl1bSBidWc6CisgICAgICAgIGh0dHA6 Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTc0NzEwCiAKICAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6CiAKQEAgLTEy MzYyLDggKzEyMzc4LDggQEAKICAgICAgICAgW0Nocm9taXVtXSBNYXJrIGxheW91dCB0ZXN0IGVk aXRpbmcvZXhlY0NvbW1hbmQvZGVsZXRlLWVtcHR5LWNvbnRhaW5lci5odG1sIGFzIGZsYWt5CiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODg3NwogCi0J Q2hyb21pdW0gYnVnIGZpbGVkLgotCWh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS9p c3N1ZXMvZGV0YWlsP2lkPTc5ODU0CisgICAgICAgIENocm9taXVtIGJ1ZyBmaWxlZC4KKyAgICAg ICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9Nzk4 NTQKIAogICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoK IApAQCAtMTIzOTgsOCArMTI0MTQsOCBAQAogICAgICAgICBbQ2hyb21pdW1dIFJlZW5hYmxlIGxh eW91dCB0ZXN0IGNhbnZhcy9waGlsaXAvdGVzdHMvMmQuZ3JhZGllbnQuaW50ZXJwb2xhdGUub3V0 c2lkZS5odG1sCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01ODg3MwogCi0JRml4ZWQgaW4gQ2hyb21pdW0gcjgxOTU2LgotCWh0dHA6Ly9jb2RlLmdvb2ds ZS5jb20vcC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTc5NzI1CisgICAgICAgIEZpeGVkIGlu IENocm9taXVtIHI4MTk1Ni4KKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9t aXVtL2lzc3Vlcy9kZXRhaWw/aWQ9Nzk3MjUKIAogICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3N0eWxlcy9yZXNvdXJjZXMvc3R5bGVzLW5ldy1BUEktMS5jc3MgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc3R5bGVzL3Jlc291cmNlcy9zdHlsZXMtbmV3LUFQSS0xLmNzcwppbmRleCBhMzZi MTM3Li5mMTU0NjcwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3Jl c291cmNlcy9zdHlsZXMtbmV3LUFQSS0xLmNzcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv c3R5bGVzL3Jlc291cmNlcy9zdHlsZXMtbmV3LUFQSS0xLmNzcwpAQCAtMSwzICsxLDUgQEAKK0Bp bXBvcnQgdXJsKHN0eWxlcy1uZXctQVBJLTIuY3NzKTsKKwogQHBhZ2UgeyBtYXJnaW46IDJjbSB9 IC8qIEFsbCBtYXJnaW5zIHNldCB0byAyY20gKi8KIAogQHBhZ2UgOmZpcnN0IHsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvcmVzb3VyY2VzL3N0eWxlcy1uZXctQVBJ LTIuY3NzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9yZXNvdXJjZXMvc3R5bGVzLW5l dy1BUEktMi5jc3MKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uNDg4MmUwNwot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvcmVzb3VyY2Vz L3N0eWxlcy1uZXctQVBJLTIuY3NzCkBAIC0wLDAgKzEsMjUgQEAKK0BpbXBvcnQgdXJsKHN0eWxl cy1uZXctQVBJLTEuY3NzKTsKKworQHBhZ2UgeyBtYXJnaW46IDJjbSB9IC8qIEFsbCBtYXJnaW5z IHNldCB0byAyY20gKi8KKworQHBhZ2UgOmZpcnN0IHsKKyAgbWFyZ2luLXRvcDogMTBjbSAgICAv KiBUb3AgbWFyZ2luIG9uIGZpcnN0IHBhZ2UgMTBjbSAqLworfQorCitAbWVkaWEgc2NyZWVuIHsK KworI2Fic2VudC1pZCB7Cit9CisKK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAnVGhl Rm9udCc7CisgICAgc3JjOiB1cmwoJ2ZvbnQudXJsJyk7CisgICAgZm9udC13ZWlnaHQ6IG5vcm1h bDsKKyAgICBmb250LXN0eWxlOiBub3JtYWw7Cit9CisKK2JvZHkgeworICAgIHByb3BlcnR5OiBp bXBvcnRlZC1tZWRpYS1zY3JlZW4tc3R5bGVzaGVldDsKK30KKworfQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1uZXctQVBJLWV4cGVjdGVkLnR4dApp bmRleCAzNTRlNTMwLi4xMTM0ZDVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv c3R5bGVzL3N0eWxlcy1uZXctQVBJLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivc3R5bGVzL3N0eWxlcy1uZXctQVBJLWV4cGVjdGVkLnR4dApAQCAtMjIsNiArMjIsMTAg QEAgYm9keTogW10KIAogcnVsZQogYm9keTogW10KK1sncHJvcGVydHknOidpbXBvcnRlZC1tZWRp YS1zY3JlZW4tc3R5bGVzaGVldCcgbm9uLXBhcnNlZF0gQFs1LTQ4XSBhY3RpdmUKKworcnVsZQor Ym9keTogW10KIFsnZm9udC1zaXplJzonMTJweCddIEBbNS0yMV0gYWN0aXZlCiBbJ2Zvbyc6J2Jh ciAhCiAKQEAgLTE4NSw2ICsxODksNzQgQEAgaDE6IFtdCiBbJ2JvcmRlci1ib3R0b20td2lkdGgn OicwcHgnXSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0eWxlCiBbJ2JvcmRlci1sZWZ0LXdpZHRo JzonMHB4J10gQFt1bmRlZmluZWQtdW5kZWZpbmVkXSBzdHlsZQogCitTdHlsZVNoZWV0OiAnQGlt cG9ydCB1cmwoc3R5bGVzLW5ldy1BUEktMi5jc3MpOworCitAcGFnZSB7IG1hcmdpbjogMmNtIH0g LyogQWxsIG1hcmdpbnMgc2V0IHRvIDJjbSAqLworCitAcGFnZSA6Zmlyc3QgeworICBtYXJnaW4t dG9wOiAxMGNtICAgIC8qIFRvcCBtYXJnaW4gb24gZmlyc3QgcGFnZSAxMGNtICovCit9CisKK0Bt ZWRpYSBzY3JlZW4geworCisjYWJzZW50LWlkIHsKK30KKworQGZvbnQtZmFjZSB7CisgICAgZm9u dC1mYW1pbHk6ICdUaGVGb250JzsKKyAgICBzcmM6IHVybCgnZm9udC51cmwnKTsKKyAgICBmb250 LXdlaWdodDogbm9ybWFsOworICAgIGZvbnQtc3R5bGU6IG5vcm1hbDsKK30KKworYm9keSB7Cisg ICAgcHJvcGVydHk6IGltcG9ydGVkLW1lZGlhLXNjcmVlbi1zdHlsZXNoZWV0OworfQorCit9Cisn CisKK3J1bGUKKyNhYnNlbnQtaWQ6IFtdCisKK3J1bGUKK2JvZHk6IFtdCitbJ3Byb3BlcnR5Jzon aW1wb3J0ZWQtbWVkaWEtc2NyZWVuLXN0eWxlc2hlZXQnIG5vbi1wYXJzZWRdIEBbNS00OF0gYWN0 aXZlCisKK1N0eWxlU2hlZXQ6ICdAaW1wb3J0IHVybChzdHlsZXMtbmV3LUFQSS0xLmNzcyk7CisK K0BwYWdlIHsgbWFyZ2luOiAyY20gfSAvKiBBbGwgbWFyZ2lucyBzZXQgdG8gMmNtICovCisKK0Bw YWdlIDpmaXJzdCB7CisgIG1hcmdpbi10b3A6IDEwY20gICAgLyogVG9wIG1hcmdpbiBvbiBmaXJz dCBwYWdlIDEwY20gKi8KK30KKworQG1lZGlhIHNjcmVlbiB7CisKKyNhYnNlbnQtaWQgeworfQor CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogJ1RoZUZvbnQnOworICAgIHNyYzogdXJs KCdmb250LnVybCcpOworICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7CisgICAgZm9udC1zdHlsZTog bm9ybWFsOworfQorCitib2R5IHsKKyAgICBwcm9wZXJ0eTogaW1wb3J0ZWQtbWVkaWEtc2NyZWVu LXN0eWxlc2hlZXQ7Cit9CisKK30KKycKKworcnVsZQorI2Fic2VudC1pZDogW10KKworcnVsZQor Ym9keTogW10KK1sncHJvcGVydHknOidpbXBvcnRlZC1tZWRpYS1zY3JlZW4tc3R5bGVzaGVldCcg bm9uLXBhcnNlZF0gQFs1LTQ4XSBhY3RpdmUKKwogU3R5bGVTaGVldDogJwogCiAvKiBBbiBpbmxp bmUgc3R5bGVzaGVldCAqLwpAQCAtMjc0LDYgKzM0NiwxMCBAQCBib2R5OiBbXQogCiBydWxlCiBi b2R5OiBbXQorWydwcm9wZXJ0eSc6J2ltcG9ydGVkLW1lZGlhLXNjcmVlbi1zdHlsZXNoZWV0JyBu b24tcGFyc2VkXSBAWzUtNDhdIGFjdGl2ZQorCitydWxlCitib2R5OiBbXQogWydmb250LXNpemUn OicxMnB4J10gQFs1LTIxXSBhY3RpdmUKIFsnZm9vJzonYmFyICEKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDhj OGMwNmIuLmRjMzI0MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wNS0xOCAg QWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vZGVsLWJh c2VkIENTUyBlZGl0aW5nIGRvZXMgbm90IHVwZGF0ZSBAaW1wb3J0LWVkIHN0eWxlc2hlZXQgcmVz b3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 MDk2NgorCisgICAgICAgIEltcG9ydGVkIHN0eWxlc2hlZXRzIGRpZG4ndCB1c2UgdG8gYmUgcmV0 dXJuZWQgYnkgSW5zcGVjdG9yQ1NTQWdlbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6Omdl dEFsbFN0eWxlU2hlZXRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50Ojpj b2xsZWN0U3R5bGVTaGVldHMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2Vu dC5oOgorCiAyMDExLTA1LTE3ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODY2NjAuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAppbmRleCAxNTNjNjYx Li42MjAxMjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NB Z2VudC5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogCiAjaW5j bHVkZSAiQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmgiCisjaW5jbHVkZSAiQ1NTSW1wb3J0 UnVsZS5oIgogI2luY2x1ZGUgIkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmgiCiAjaW5jbHVk ZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5U291cmNlRGF0YS5o IgpAQCAtMjY3LDEwICsyNjgsOCBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50OjpnZXRBbGxTdHls ZVNoZWV0cyhFcnJvclN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qCiAgICAgICAgIFN0 eWxlU2hlZXRMaXN0KiBsaXN0ID0gKCppdCktPnN0eWxlU2hlZXRzKCk7CiAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBsaXN0LT5sZW5ndGgoKTsgKytpKSB7CiAgICAgICAgICAgICBT dHlsZVNoZWV0KiBzdHlsZVNoZWV0ID0gbGlzdC0+aXRlbShpKTsKLSAgICAgICAgICAgIGlmIChz dHlsZVNoZWV0LT5pc0NTU1N0eWxlU2hlZXQoKSkgewotICAgICAgICAgICAgICAgIEluc3BlY3Rv clN0eWxlU2hlZXQqIGluc3BlY3RvclN0eWxlU2hlZXQgPSBiaW5kU3R5bGVTaGVldChzdGF0aWNf Y2FzdDxDU1NTdHlsZVNoZWV0Kj4oc3R5bGVTaGVldCkpOwotICAgICAgICAgICAgICAgICgqc3R5 bGVJbmZvcyktPnB1c2hPYmplY3QoaW5zcGVjdG9yU3R5bGVTaGVldC0+YnVpbGRPYmplY3RGb3JT dHlsZVNoZWV0SW5mbygpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChzdHlsZVNo ZWV0LT5pc0NTU1N0eWxlU2hlZXQoKSkKKyAgICAgICAgICAgICAgICBjb2xsZWN0U3R5bGVTaGVl dHMoc3RhdGljX2Nhc3Q8Q1NTU3R5bGVTaGVldCo+KHN0eWxlU2hlZXQpLCBzdHlsZUluZm9zLT5n ZXQoKSk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC00MTcsNiArNDE2LDIwIEBAIEVsZW1lbnQq IEluc3BlY3RvckNTU0FnZW50OjplbGVtZW50Rm9ySWQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5n LCBpbnQgbm9kZUlkKQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSk7CiB9 CiAKK3ZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmNvbGxlY3RTdHlsZVNoZWV0cyhDU1NTdHlsZVNo ZWV0KiBzdHlsZVNoZWV0LCBJbnNwZWN0b3JBcnJheSogcmVzdWx0KQoreworICAgIEluc3BlY3Rv clN0eWxlU2hlZXQqIGluc3BlY3RvclN0eWxlU2hlZXQgPSBiaW5kU3R5bGVTaGVldChzdGF0aWNf Y2FzdDxDU1NTdHlsZVNoZWV0Kj4oc3R5bGVTaGVldCkpOworICAgIHJlc3VsdC0+cHVzaE9iamVj dChpbnNwZWN0b3JTdHlsZVNoZWV0LT5idWlsZE9iamVjdEZvclN0eWxlU2hlZXRJbmZvKCkpOwor ICAgIGZvciAodW5zaWduZWQgaSA9IDAsIHNpemUgPSBzdHlsZVNoZWV0LT5sZW5ndGgoKTsgaSA8 IHNpemU7ICsraSkgeworICAgICAgICBTdHlsZUJhc2UqIHN0eWxlQmFzZSA9IHN0eWxlU2hlZXQt Pml0ZW0oaSk7CisgICAgICAgIGlmIChzdHlsZUJhc2UtPmlzSW1wb3J0UnVsZSgpKSB7CisgICAg ICAgICAgICBTdHlsZUJhc2UqIGltcG9ydGVkU3R5bGVTaGVldCA9IHN0YXRpY19jYXN0PENTU0lt cG9ydFJ1bGUqPihzdHlsZUJhc2UpLT5zdHlsZVNoZWV0KCk7CisgICAgICAgICAgICBpZiAoaW1w b3J0ZWRTdHlsZVNoZWV0ICYmIGltcG9ydGVkU3R5bGVTaGVldC0+aXNDU1NTdHlsZVNoZWV0KCkp CisgICAgICAgICAgICAgICAgY29sbGVjdFN0eWxlU2hlZXRzKHN0YXRpY19jYXN0PENTU1N0eWxl U2hlZXQqPihpbXBvcnRlZFN0eWxlU2hlZXQpLCByZXN1bHQpOworICAgICAgICB9CisgICAgfQor fQorCiBJbnNwZWN0b3JTdHlsZVNoZWV0KiBJbnNwZWN0b3JDU1NBZ2VudDo6YmluZFN0eWxlU2hl ZXQoQ1NTU3R5bGVTaGVldCogc3R5bGVTaGVldCkKIHsKICAgICBSZWZQdHI8SW5zcGVjdG9yU3R5 bGVTaGVldD4gaW5zcGVjdG9yU3R5bGVTaGVldCA9IG1fY3NzU3R5bGVTaGVldFRvSW5zcGVjdG9y U3R5bGVTaGVldC5nZXQoc3R5bGVTaGVldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDU1NBZ2VudC5oCmluZGV4IGM1MzM3ZDYuLjMxMWY5ZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oCkBAIC04NCw2ICs4NCw3IEBAIHBy aXZhdGU6CiAKICAgICBJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUqIGFzSW5zcGVj dG9yU3R5bGVTaGVldChFbGVtZW50KiBlbGVtZW50KTsKICAgICBFbGVtZW50KiBlbGVtZW50Rm9y SWQoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkKTsKKyAgICB2b2lkIGNvbGxlY3RTdHlsZVNoZWV0 cyhDU1NTdHlsZVNoZWV0KiwgSW5zcGVjdG9yQXJyYXkqKTsKIAogICAgIEluc3BlY3RvclN0eWxl U2hlZXQqIGJpbmRTdHlsZVNoZWV0KENTU1N0eWxlU2hlZXQqKTsKICAgICBJbnNwZWN0b3JTdHls ZVNoZWV0KiB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0KERvY3VtZW50KiwgYm9vbCBjcmVhdGVJZkFi c2VudCk7Cg==