56924 2011-03-23 07:55:40 -0700 [Qt] Fix Api tests for QWebPage on symbian 2011-05-17 06:16:26 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) S60 Hardware Other RESOLVED FIXED P2 Normal --- 50925 1 max.hong.shen max.hong.shen ademar commit-queue laszlo.gombos menard oldest_to_newest 372141 0 max.hong.shen 2011-03-23 07:55:40 -0700 There are several Api test failures for QWebpage on Symbian, which are caused by the font ('NOkia Sans S60') used on Symbian. I will provide a patch for reviewing. 372161 1 86620 max.hong.shen 2011-03-23 08:46:12 -0700 Created attachment 86620 first try 375493 2 86620 menard 2011-03-29 10:34:42 -0700 Comment on attachment 86620 first try View in context: https://bugs.webkit.org/attachment.cgi?id=86620&action=review A quick look tells me that the html code used as reference is the same except for the font-family. Could you use instead QString::arg and specify a different arg for either Symbian or other platforms? I'm wondering also if you could get the current font used so that we don't need to add ifdef at all. > Source/WebKit/qt/ChangeLog:8 > + Modified test case to use font 'NOkia Sans S60' on Symbian. Typo :D I believe it's Nokia not NOkia. 376606 3 87599 max.hong.shen 2011-03-30 12:55:46 -0700 Created attachment 87599 updated with Alexis's suggestion 376610 4 87599 menard 2011-03-30 13:02:34 -0700 Comment on attachment 87599 updated with Alexis's suggestion Great so much better, need a r+ from a reviewer now :D 386926 5 87599 laszlo.gombos 2011-04-15 14:17:41 -0700 Comment on attachment 87599 updated with Alexis's suggestion I do not think autotests should be sensitive to platform fonts. I would rather modify the tests so that it simply ignores the style. For font-sensitive tests we should use LayoutTests which has a mechanism of platform dependent expected results. Yi, can you change the test so that it ignores the style that selectedHtml() returns ? 386940 6 89855 max.hong.shen 2011-04-15 14:32:25 -0700 Created attachment 89855 ignores the style 387907 7 90063 max.hong.shen 2011-04-18 11:54:39 -0700 Created attachment 90063 fix the regular expression 387916 8 90063 laszlo.gombos 2011-04-18 12:14:11 -0700 Comment on attachment 90063 fix the regular expression r=me. Thanks. 387956 9 90063 commit-queue 2011-04-18 12:49:49 -0700 Comment on attachment 90063 fix the regular expression Clearing flags on attachment: 90063 Committed r84171: <http://trac.webkit.org/changeset/84171> 387957 10 commit-queue 2011-04-18 12:49:56 -0700 All reviewed patches have been landed. Closing bug. 86620 2011-03-23 08:46:12 -0700 2011-03-30 12:55:46 -0700 first try 56924.patch text/plain 6212 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MTc3MykKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMjMgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IEFwaSB0ZXN0cyBmb3IgUVdlYlBhZ2Ugb24g U3ltYmlhbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5MjQKKworICAgICAgICBNb2RpZmllZCB0ZXN0IGNhc2UgdG8gdXNlIGZvbnQgJ05Pa2lhIFNh bnMgUzYwJyBvbiBTeW1iaWFuLgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3Vyc29yTW92ZW1lbnRzKToKKyAgICAg ICAgKHRzdF9RV2ViUGFnZTo6dGV4dFNlbGVjdGlvbik6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6 OmZpbmRUZXh0KToKKwogMjAxMS0wMy0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogU291 cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkocmV2 aXNpb24gODE3NjgpCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk4NSw4ICs5ODUsMTEgQEAgdm9pZCB0c3RfUVdl YlBhZ2U6OmN1cnNvck1vdmVtZW50cygpCiAgICAgICAgICJnZXRTZWxlY3Rpb24oKS5hZGRSYW5n ZShyYW5nZSk7IjsKICAgICBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KHNj cmlwdCk7CiAgICAgUUNPTVBBUkUocGFnZS0+c2VsZWN0ZWRUZXh0KCkudHJpbW1lZCgpLCBRU3Ry aW5nOjpmcm9tTGF0aW4xKCJUaGUgcXVpY2sgYnJvd24gZm94IikpOworI2lmZGVmIFFfT1NfU1lN QklBTgorICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkSHRtbCgpLnRyaW1tZWQoKSwgUVN0cmlu Zzo6ZnJvbUxhdGluMSgiPHNwYW4gY2xhc3M9XCJBcHBsZS1zdHlsZS1zcGFuXCIgc3R5bGU9XCJi b3JkZXItY29sbGFwc2U6IHNlcGFyYXRlOyBjb2xvcjogcmdiKDAsIDAsIDApOyBmb250LWZhbWls eTogXCdOb2tpYSBTYW5zIFM2MFwnOyBmb250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDog bm9ybWFsOyBmb250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5l LWhlaWdodDogbm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRl eHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFs OyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFs LXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Vi a2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1h ZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBt ZWRpdW07IFwiPjxwIGlkPVwib25lXCI+VGhlIHF1aWNrIGJyb3duIGZveDwvcD48L3NwYW4+Iikp OworI2Vsc2UKICAgICBRQ09NUEFSRShwYWdlLT5zZWxlY3RlZEh0bWwoKS50cmltbWVkKCksIFFT dHJpbmc6OmZyb21MYXRpbjEoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxl PVwiYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1m YW1pbHk6IFRpbWVzOyBmb250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBm b250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDog bm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50 OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6 IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6 IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQt ZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1 dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwi PjxwIGlkPVwib25lXCI+VGhlIHF1aWNrIGJyb3duIGZveDwvcD48L3NwYW4+IikpOwotCisjZW5k aWYKICAgICAvLyB0aGVzZSBhY3Rpb25zIG11c3QgZXhpc3QKICAgICBRVkVSSUZZKHBhZ2UtPmFj dGlvbihRV2ViUGFnZTo6TW92ZVRvTmV4dENoYXIpICE9IDApOwogICAgIFFWRVJJRlkocGFnZS0+ YWN0aW9uKFFXZWJQYWdlOjpNb3ZlVG9QcmV2aW91c0NoYXIpICE9IDApOwpAQCAtMTIxNiw3ICsx MjE5LDExIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp0ZXh0U2VsZWN0aW9uKCkKICAgICAgICAgImdl dFNlbGVjdGlvbigpLmFkZFJhbmdlKHJhbmdlKTsiOwogICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5l dmFsdWF0ZUphdmFTY3JpcHQoc2VsZWN0U2NyaXB0KTsKICAgICBRQ09NUEFSRShwYWdlLT5zZWxl Y3RlZFRleHQoKS50cmltbWVkKCksIFFTdHJpbmc6OmZyb21MYXRpbjEoIlRoZSBxdWljayBicm93 biBmb3giKSk7CisjaWZkZWYgUV9PU19TWU1CSUFOCisgICAgUUNPTVBBUkUocGFnZS0+c2VsZWN0 ZWRIdG1sKCkudHJpbW1lZCgpLCBRU3RyaW5nOjpmcm9tTGF0aW4xKCI8c3BhbiBjbGFzcz1cIkFw cGxlLXN0eWxlLXNwYW5cIiBzdHlsZT1cImJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7IGNvbG9y OiByZ2IoMCwgMCwgMCk7IGZvbnQtZmFtaWx5OiBcJ05va2lhIFNhbnMgUzYwXCc7IGZvbnQtc3R5 bGU6IG5vcm1hbDsgZm9udC12YXJpYW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3JtYWw7IGxl dHRlci1zcGFjaW5nOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6IDI7IHRl eHQtYWxpZ246IC13ZWJraXQtYXV0bzsgdGV4dC1pbmRlbnQ6IDBweDsgdGV4dC10cmFuc2Zvcm06 IG5vbmU7IHdoaXRlLXNwYWNlOiBub3JtYWw7IHdpZG93czogMjsgd29yZC1zcGFjaW5nOiAwcHg7 IC13ZWJraXQtYm9yZGVyLWhvcml6b250YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci12 ZXJ0aWNhbC1zcGFjaW5nOiAwcHg7IC13ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1lZmZlY3Q6 IG5vbmU7IC13ZWJraXQtdGV4dC1zaXplLWFkanVzdDogYXV0bzsgLXdlYmtpdC10ZXh0LXN0cm9r ZS13aWR0aDogMHB4OyBmb250LXNpemU6IG1lZGl1bTsgXCI+PHAgaWQ9XCJvbmVcIj5UaGUgcXVp Y2sgYnJvd24gZm94PC9wPjwvc3Bhbj4iKSk7CisjZWxzZQogICAgIFFDT01QQVJFKHBhZ2UtPnNl bGVjdGVkSHRtbCgpLnRyaW1tZWQoKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiPHNwYW4gY2xhc3M9 XCJBcHBsZS1zdHlsZS1zcGFuXCIgc3R5bGU9XCJib3JkZXItY29sbGFwc2U6IHNlcGFyYXRlOyBj b2xvcjogcmdiKDAsIDAsIDApOyBmb250LWZhbWlseTogVGltZXM7IGZvbnQtc3R5bGU6IG5vcm1h bDsgZm9udC12YXJpYW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3JtYWw7IGxldHRlci1zcGFj aW5nOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6IDI7IHRleHQtYWxpZ246 IC13ZWJraXQtYXV0bzsgdGV4dC1pbmRlbnQ6IDBweDsgdGV4dC10cmFuc2Zvcm06IG5vbmU7IHdo aXRlLXNwYWNlOiBub3JtYWw7IHdpZG93czogMjsgd29yZC1zcGFjaW5nOiAwcHg7IC13ZWJraXQt Ym9yZGVyLWhvcml6b250YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci12ZXJ0aWNhbC1z cGFjaW5nOiAwcHg7IC13ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1lZmZlY3Q6IG5vbmU7IC13 ZWJraXQtdGV4dC1zaXplLWFkanVzdDogYXV0bzsgLXdlYmtpdC10ZXh0LXN0cm9rZS13aWR0aDog MHB4OyBmb250LXNpemU6IG1lZGl1bTsgXCI+PHAgaWQ9XCJvbmVcIj5UaGUgcXVpY2sgYnJvd24g Zm94PC9wPjwvc3Bhbj4iKSk7CisjZW5kaWYKIAogICAgIC8vIE1ha2Ugc3VyZSBoYXNTZWxlY3Rp b24gcmV0dXJucyB0cnVlLCBzaW5jZSB0aGVyZSBpcyBzZWxlY3RlZCB0ZXh0IG5vdy4uLgogICAg IFFDT01QQVJFKHBhZ2UtPmhhc1NlbGVjdGlvbigpLCB0cnVlKTsKQEAgLTI2NTEsNyArMjY1OCwx MSBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6ZmluZFRleHQoKQogICAgIGZvcmVhY2ggKFFTdHJpbmcg c3ViU3RyaW5nLCB3b3JkcykgewogICAgICAgICBtX3BhZ2UtPmZpbmRUZXh0KHN1YlN0cmluZywg UVdlYlBhZ2U6OkZpbmRXcmFwc0Fyb3VuZERvY3VtZW50KTsKICAgICAgICAgUUNPTVBBUkUobV9w YWdlLT5zZWxlY3RlZFRleHQoKSwgc3ViU3RyaW5nKTsKKyNpZmRlZiBRX09TX1NZTUJJQU4KKyAg ICAgICAgUUNPTVBBUkUobV9wYWdlLT5zZWxlY3RlZEh0bWwoKSwgUVN0cmluZygiPHNwYW4gY2xh c3M9XCJBcHBsZS1zdHlsZS1zcGFuXCIgc3R5bGU9XCJib3JkZXItY29sbGFwc2U6IHNlcGFyYXRl OyBjb2xvcjogcmdiKDAsIDAsIDApOyBmb250LWZhbWlseTogXCdOb2tpYSBTYW5zIFM2MFwnOyBm b250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250LXdlaWdodDogbm9y bWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9ybWFsOyBvcnBoYW5z OiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJh bnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2lu ZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1i b3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4t ZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4 dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPiUxPC9zcGFuPiIpLmFy ZyhzdWJTdHJpbmcpKTsKKyNlbHNlCiAgICAgICAgIFFDT01QQVJFKG1fcGFnZS0+c2VsZWN0ZWRI dG1sKCksIFFTdHJpbmcoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxlPVwi Ym9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1mYW1p bHk6IFRpbWVzOyBmb250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250 LXdlaWdodDogbm9ybWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9y bWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAw cHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7 IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBw eDsgLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVj b3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87 IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPiUx PC9zcGFuPiIpLmFyZyhzdWJTdHJpbmcpKTsKKyNlbmRpZgogICAgICAgICBtX3BhZ2UtPmZpbmRU ZXh0KCIiKTsKICAgICAgICAgUVZFUklGWShtX3BhZ2UtPnNlbGVjdGVkVGV4dCgpLmlzRW1wdHko KSk7CiAgICAgICAgIFFWRVJJRlkobV9wYWdlLT5zZWxlY3RlZEh0bWwoKS5pc0VtcHR5KCkpOwo= 87599 2011-03-30 12:55:46 -0700 2011-04-15 14:32:25 -0700 updated with Alexis's suggestion 56924.patch text/plain 6613 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MjQ4MikKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMzAgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IEFwaSB0ZXN0cyBmb3IgUVdlYlBhZ2Ugb24g U3ltYmlhbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5MjQKKworICAgICAgICBNb2RpZmllZCB0ZXN0IGNhc2UgdG8gdXNlIGZvbnQgJ05va2lhIFNh bnMgUzYwJyBvbiBTeW1iaWFuLgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3Vyc29yTW92ZW1lbnRzKToKKyAgICAg ICAgKHRzdF9RV2ViUGFnZTo6dGV4dFNlbGVjdGlvbik6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6 OmZpbmRUZXh0KToKKwogMjAxMS0wMy0yOSAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRA b3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgYnVpbGQt d2Via2l0IC1taW5pbWFsLgpJbmRleDogU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90 c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gODI0NzYpCisrKyBTb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk4 NSw4ICs5ODUsMTIgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmN1cnNvck1vdmVtZW50cygpCiAgICAg ICAgICJyYW5nZS5zZWxlY3ROb2RlKG5vZGUpOyAiIFwKICAgICAgICAgImdldFNlbGVjdGlvbigp LmFkZFJhbmdlKHJhbmdlKTsiOwogICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFT Y3JpcHQoc2NyaXB0KTsKKyAgICBRU3RyaW5nIGZvbnRGYW1pbHkgPSAiVGltZXMiOworI2lmZGVm IFFfT1NfU1lNQklBTgorICAgIGZvbnRGYW1pbHkgPSAiXCdOb2tpYSBTYW5zIFM2MFwnIjsKKyNl bmRpZgogICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkVGV4dCgpLnRyaW1tZWQoKSwgUVN0cmlu Zzo6ZnJvbUxhdGluMSgiVGhlIHF1aWNrIGJyb3duIGZveCIpKTsKLSAgICBRQ09NUEFSRShwYWdl LT5zZWxlY3RlZEh0bWwoKS50cmltbWVkKCksIFFTdHJpbmc6OmZyb21MYXRpbjEoIjxzcGFuIGNs YXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxlPVwiYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0 ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1mYW1pbHk6IFRpbWVzOyBmb250LXN0eWxlOiBu b3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXIt c3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFs aWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25l OyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Vi a2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGlj YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25l OyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lk dGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPjxwIGlkPVwib25lXCI+VGhlIHF1aWNrIGJy b3duIGZveDwvcD48L3NwYW4+IikpOworICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkSHRtbCgp LnRyaW1tZWQoKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiPHNwYW4gY2xhc3M9XCJBcHBsZS1zdHls ZS1zcGFuXCIgc3R5bGU9XCJib3JkZXItY29sbGFwc2U6IHNlcGFyYXRlOyBjb2xvcjogcmdiKDAs IDAsIDApOyBmb250LWZhbWlseTogJTE7IGZvbnQtc3R5bGU6IG5vcm1hbDsgZm9udC12YXJpYW50 OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3JtYWw7IGxldHRlci1zcGFjaW5nOiBub3JtYWw7IGxp bmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6IDI7IHRleHQtYWxpZ246IC13ZWJraXQtYXV0bzsg dGV4dC1pbmRlbnQ6IDBweDsgdGV4dC10cmFuc2Zvcm06IG5vbmU7IHdoaXRlLXNwYWNlOiBub3Jt YWw7IHdpZG93czogMjsgd29yZC1zcGFjaW5nOiAwcHg7IC13ZWJraXQtYm9yZGVyLWhvcml6b250 YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci12ZXJ0aWNhbC1zcGFjaW5nOiAwcHg7IC13 ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1lZmZlY3Q6IG5vbmU7IC13ZWJraXQtdGV4dC1zaXpl LWFkanVzdDogYXV0bzsgLXdlYmtpdC10ZXh0LXN0cm9rZS13aWR0aDogMHB4OyBmb250LXNpemU6 IG1lZGl1bTsgXCI+PHAgaWQ9XCJvbmVcIj5UaGUgcXVpY2sgYnJvd24gZm94PC9wPjwvc3Bhbj4i KS5hcmcoZm9udEZhbWlseSkpOwogCiAgICAgLy8gdGhlc2UgYWN0aW9ucyBtdXN0IGV4aXN0CiAg ICAgUVZFUklGWShwYWdlLT5hY3Rpb24oUVdlYlBhZ2U6Ok1vdmVUb05leHRDaGFyKSAhPSAwKTsK QEAgLTEyMTYsOCArMTIyMCwxMiBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6dGV4dFNlbGVjdGlvbigp CiAgICAgICAgICJyYW5nZS5zZWxlY3ROb2RlKG5vZGUpOyAiIFwKICAgICAgICAgImdldFNlbGVj dGlvbigpLmFkZFJhbmdlKHJhbmdlKTsiOwogICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0 ZUphdmFTY3JpcHQoc2VsZWN0U2NyaXB0KTsKKyAgICBRU3RyaW5nIGZvbnRGYW1pbHkgPSAiVGlt ZXMiOworI2lmZGVmIFFfT1NfU1lNQklBTgorICAgIGZvbnRGYW1pbHkgPSAiXCdOb2tpYSBTYW5z IFM2MFwnIjsKKyNlbmRpZgogICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkVGV4dCgpLnRyaW1t ZWQoKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiVGhlIHF1aWNrIGJyb3duIGZveCIpKTsKLSAgICBR Q09NUEFSRShwYWdlLT5zZWxlY3RlZEh0bWwoKS50cmltbWVkKCksIFFTdHJpbmc6OmZyb21MYXRp bjEoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxlPVwiYm9yZGVyLWNvbGxh cHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1mYW1pbHk6IFRpbWVzOyBm b250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250LXdlaWdodDogbm9y bWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9ybWFsOyBvcnBoYW5z OiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJh bnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2lu ZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1i b3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4t ZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4 dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPjxwIGlkPVwib25lXCI+ VGhlIHF1aWNrIGJyb3duIGZveDwvcD48L3NwYW4+IikpOworICAgIFFDT01QQVJFKHBhZ2UtPnNl bGVjdGVkSHRtbCgpLnRyaW1tZWQoKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiPHNwYW4gY2xhc3M9 XCJBcHBsZS1zdHlsZS1zcGFuXCIgc3R5bGU9XCJib3JkZXItY29sbGFwc2U6IHNlcGFyYXRlOyBj b2xvcjogcmdiKDAsIDAsIDApOyBmb250LWZhbWlseTogJTE7IGZvbnQtc3R5bGU6IG5vcm1hbDsg Zm9udC12YXJpYW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3JtYWw7IGxldHRlci1zcGFjaW5n OiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6IDI7IHRleHQtYWxpZ246IC13 ZWJraXQtYXV0bzsgdGV4dC1pbmRlbnQ6IDBweDsgdGV4dC10cmFuc2Zvcm06IG5vbmU7IHdoaXRl LXNwYWNlOiBub3JtYWw7IHdpZG93czogMjsgd29yZC1zcGFjaW5nOiAwcHg7IC13ZWJraXQtYm9y ZGVyLWhvcml6b250YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci12ZXJ0aWNhbC1zcGFj aW5nOiAwcHg7IC13ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1lZmZlY3Q6IG5vbmU7IC13ZWJr aXQtdGV4dC1zaXplLWFkanVzdDogYXV0bzsgLXdlYmtpdC10ZXh0LXN0cm9rZS13aWR0aDogMHB4 OyBmb250LXNpemU6IG1lZGl1bTsgXCI+PHAgaWQ9XCJvbmVcIj5UaGUgcXVpY2sgYnJvd24gZm94 PC9wPjwvc3Bhbj4iKS5hcmcoZm9udEZhbWlseSkpOwogCiAgICAgLy8gTWFrZSBzdXJlIGhhc1Nl bGVjdGlvbiByZXR1cm5zIHRydWUsIHNpbmNlIHRoZXJlIGlzIHNlbGVjdGVkIHRleHQgbm93Li4u CiAgICAgUUNPTVBBUkUocGFnZS0+aGFzU2VsZWN0aW9uKCksIHRydWUpOwpAQCAtMjY3MSwxMCAr MjY3OSwxNCBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6ZmluZFRleHQoKQogICAgIFFWRVJJRlkobV9w YWdlLT5zZWxlY3RlZFRleHQoKS5pc0VtcHR5KCkpOwogICAgIFFWRVJJRlkobV9wYWdlLT5zZWxl Y3RlZEh0bWwoKS5pc0VtcHR5KCkpOwogICAgIFFTdHJpbmdMaXN0IHdvcmRzID0gKFFTdHJpbmdM aXN0KCkgPDwgImZvbyIgPDwgImJhciIpOworICAgIFFTdHJpbmcgZm9udEZhbWlseSA9ICJUaW1l cyI7CisjaWZkZWYgUV9PU19TWU1CSUFOCisgICAgZm9udEZhbWlseSA9ICJcJ05va2lhIFNhbnMg UzYwXCciOworI2VuZGlmCiAgICAgZm9yZWFjaCAoUVN0cmluZyBzdWJTdHJpbmcsIHdvcmRzKSB7 CiAgICAgICAgIG1fcGFnZS0+ZmluZFRleHQoc3ViU3RyaW5nLCBRV2ViUGFnZTo6RmluZFdyYXBz QXJvdW5kRG9jdW1lbnQpOwogICAgICAgICBRQ09NUEFSRShtX3BhZ2UtPnNlbGVjdGVkVGV4dCgp LCBzdWJTdHJpbmcpOwotICAgICAgICBRQ09NUEFSRShtX3BhZ2UtPnNlbGVjdGVkSHRtbCgpLCBR U3RyaW5nKCI8c3BhbiBjbGFzcz1cIkFwcGxlLXN0eWxlLXNwYW5cIiBzdHlsZT1cImJvcmRlci1j b2xsYXBzZTogc2VwYXJhdGU7IGNvbG9yOiByZ2IoMCwgMCwgMCk7IGZvbnQtZmFtaWx5OiBUaW1l czsgZm9udC1zdHlsZTogbm9ybWFsOyBmb250LXZhcmlhbnQ6IG5vcm1hbDsgZm9udC13ZWlnaHQ6 IG5vcm1hbDsgbGV0dGVyLXNwYWNpbmc6IG5vcm1hbDsgbGluZS1oZWlnaHQ6IG5vcm1hbDsgb3Jw aGFuczogMjsgdGV4dC1hbGlnbjogLXdlYmtpdC1hdXRvOyB0ZXh0LWluZGVudDogMHB4OyB0ZXh0 LXRyYW5zZm9ybTogbm9uZTsgd2hpdGUtc3BhY2U6IG5vcm1hbDsgd2lkb3dzOiAyOyB3b3JkLXNw YWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItaG9yaXpvbnRhbC1zcGFjaW5nOiAwcHg7IC13ZWJr aXQtYm9yZGVyLXZlcnRpY2FsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC10ZXh0LWRlY29yYXRpb25z LWluLWVmZmVjdDogbm9uZTsgLXdlYmtpdC10ZXh0LXNpemUtYWRqdXN0OiBhdXRvOyAtd2Via2l0 LXRleHQtc3Ryb2tlLXdpZHRoOiAwcHg7IGZvbnQtc2l6ZTogbWVkaXVtOyBcIj4lMTwvc3Bhbj4i KS5hcmcoc3ViU3RyaW5nKSk7CisgICAgICAgIFFDT01QQVJFKG1fcGFnZS0+c2VsZWN0ZWRIdG1s KCksIFFTdHJpbmcoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxlPVwiYm9y ZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1mYW1pbHk6 ICUxOyBmb250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250LXdlaWdo dDogbm9ybWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9ybWFsOyBv cnBoYW5zOiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRl eHQtdHJhbnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQt c3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdl YmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlv bnMtaW4tZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJr aXQtdGV4dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPiUyPC9zcGFu PiIpLmFyZyhmb250RmFtaWx5KS5hcmcoc3ViU3RyaW5nKSk7CiAgICAgICAgIG1fcGFnZS0+Zmlu ZFRleHQoIiIpOwogICAgICAgICBRVkVSSUZZKG1fcGFnZS0+c2VsZWN0ZWRUZXh0KCkuaXNFbXB0 eSgpKTsKICAgICAgICAgUVZFUklGWShtX3BhZ2UtPnNlbGVjdGVkSHRtbCgpLmlzRW1wdHkoKSk7 Cg== 89855 2011-04-15 14:32:25 -0700 2011-04-18 11:54:39 -0700 ignores the style 56924.patch text/plain 4853 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NDAzMykKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTUgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IEFwaSB0ZXN0cyBmb3IgUVdlYlBhZ2Ugb24g U3ltYmlhbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5MjQKKworICAgICAgICBJZ25vcmVzIHRoZSBzdHlsZSB0aGF0IHNlbGVjdGVkSHRtbCgpIHJl dHVybnMuCisKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAg ICAgICAodHN0X1FXZWJQYWdlOjpjdXJzb3JNb3ZlbWVudHMpOgorICAgICAgICAodHN0X1FXZWJQ YWdlOjp0ZXh0U2VsZWN0aW9uKToKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6ZmluZFRleHQpOgor CiAyMDExLTA0LTE1ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRleDogU291cmNlL1dlYktpdC9xdC90ZXN0 cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gODM5OTgpCisrKyBT b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTk4Niw3ICs5ODYsMTAgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmN1cnNvck1vdmVt ZW50cygpCiAgICAgICAgICJnZXRTZWxlY3Rpb24oKS5hZGRSYW5nZShyYW5nZSk7IjsKICAgICBw YWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KHNjcmlwdCk7CiAgICAgUUNPTVBB UkUocGFnZS0+c2VsZWN0ZWRUZXh0KCkudHJpbW1lZCgpLCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJU aGUgcXVpY2sgYnJvd24gZm94IikpOwotICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkSHRtbCgp LnRyaW1tZWQoKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiPHNwYW4gY2xhc3M9XCJBcHBsZS1zdHls ZS1zcGFuXCIgc3R5bGU9XCJib3JkZXItY29sbGFwc2U6IHNlcGFyYXRlOyBjb2xvcjogcmdiKDAs IDAsIDApOyBmb250LWZhbWlseTogVGltZXM7IGZvbnQtc3R5bGU6IG5vcm1hbDsgZm9udC12YXJp YW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3JtYWw7IGxldHRlci1zcGFjaW5nOiBub3JtYWw7 IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6IDI7IHRleHQtYWxpZ246IC13ZWJraXQtYXV0 bzsgdGV4dC1pbmRlbnQ6IDBweDsgdGV4dC10cmFuc2Zvcm06IG5vbmU7IHdoaXRlLXNwYWNlOiBu b3JtYWw7IHdpZG93czogMjsgd29yZC1zcGFjaW5nOiAwcHg7IC13ZWJraXQtYm9yZGVyLWhvcml6 b250YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci12ZXJ0aWNhbC1zcGFjaW5nOiAwcHg7 IC13ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1lZmZlY3Q6IG5vbmU7IC13ZWJraXQtdGV4dC1z aXplLWFkanVzdDogYXV0bzsgLXdlYmtpdC10ZXh0LXN0cm9rZS13aWR0aDogMHB4OyBmb250LXNp emU6IG1lZGl1bTsgXCI+PHAgaWQ9XCJvbmVcIj5UaGUgcXVpY2sgYnJvd24gZm94PC9wPjwvc3Bh bj4iKSk7CisKKyAgICBRUmVnRXhwIHJlZ0V4cCgiIHN0eWxlPS4qPiIpOworICAgIHJlZ0V4cC5z ZXRNaW5pbWFsKHRydWUpOworICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkSHRtbCgpLnRyaW1t ZWQoKS5yZXBsYWNlKHJlZ0V4cCwgIj4iKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiPHNwYW4gY2xh c3M9XCJBcHBsZS1zdHlsZS1zcGFuXCI+PHAgaWQ9XCJvbmVcIj5UaGUgcXVpY2sgYnJvd24gZm94 PC9wPjwvc3Bhbj4iKSk7CiAKICAgICAvLyB0aGVzZSBhY3Rpb25zIG11c3QgZXhpc3QKICAgICBR VkVSSUZZKHBhZ2UtPmFjdGlvbihRV2ViUGFnZTo6TW92ZVRvTmV4dENoYXIpICE9IDApOwpAQCAt MTIxNyw3ICsxMjIwLDkgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnRleHRTZWxlY3Rpb24oKQogICAg ICAgICAiZ2V0U2VsZWN0aW9uKCkuYWRkUmFuZ2UocmFuZ2UpOyI7CiAgICAgcGFnZS0+bWFpbkZy YW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdChzZWxlY3RTY3JpcHQpOwogICAgIFFDT01QQVJFKHBh Z2UtPnNlbGVjdGVkVGV4dCgpLnRyaW1tZWQoKSwgUVN0cmluZzo6ZnJvbUxhdGluMSgiVGhlIHF1 aWNrIGJyb3duIGZveCIpKTsKLSAgICBRQ09NUEFSRShwYWdlLT5zZWxlY3RlZEh0bWwoKS50cmlt bWVkKCksIFFTdHJpbmc6OmZyb21MYXRpbjEoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3Bh blwiIHN0eWxlPVwiYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAw KTsgZm9udC1mYW1pbHk6IFRpbWVzOyBmb250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFudDog bm9ybWFsOyBmb250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5l LWhlaWdodDogbm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRl eHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFs OyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFs LXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Vi a2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1h ZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBt ZWRpdW07IFwiPjxwIGlkPVwib25lXCI+VGhlIHF1aWNrIGJyb3duIGZveDwvcD48L3NwYW4+Iikp OworICAgIFFSZWdFeHAgcmVnRXhwKCIgc3R5bGU9Lio+Iik7CisgICAgcmVnRXhwLnNldE1pbmlt YWwodHJ1ZSk7CisgICAgUUNPTVBBUkUocGFnZS0+c2VsZWN0ZWRIdG1sKCkudHJpbW1lZCgpLnJl cGxhY2UocmVnRXhwLCAiPiIpLCBRU3RyaW5nOjpmcm9tTGF0aW4xKCI8c3BhbiBjbGFzcz1cIkFw cGxlLXN0eWxlLXNwYW5cIj48cCBpZD1cIm9uZVwiPlRoZSBxdWljayBicm93biBmb3g8L3A+PC9z cGFuPiIpKTsKIAogICAgIC8vIE1ha2Ugc3VyZSBoYXNTZWxlY3Rpb24gcmV0dXJucyB0cnVlLCBz aW5jZSB0aGVyZSBpcyBzZWxlY3RlZCB0ZXh0IG5vdy4uLgogICAgIFFDT01QQVJFKHBhZ2UtPmhh c1NlbGVjdGlvbigpLCB0cnVlKTsKQEAgLTI2NzEsMTAgKzI2NzYsMTIgQEAgdm9pZCB0c3RfUVdl YlBhZ2U6OmZpbmRUZXh0KCkKICAgICBRVkVSSUZZKG1fcGFnZS0+c2VsZWN0ZWRUZXh0KCkuaXNF bXB0eSgpKTsKICAgICBRVkVSSUZZKG1fcGFnZS0+c2VsZWN0ZWRIdG1sKCkuaXNFbXB0eSgpKTsK ICAgICBRU3RyaW5nTGlzdCB3b3JkcyA9IChRU3RyaW5nTGlzdCgpIDw8ICJmb28iIDw8ICJiYXIi KTsKKyAgICBRUmVnRXhwIHJlZ0V4cCgiIHN0eWxlPS4qPiIpOworICAgIHJlZ0V4cC5zZXRNaW5p bWFsKHRydWUpOwogICAgIGZvcmVhY2ggKFFTdHJpbmcgc3ViU3RyaW5nLCB3b3JkcykgewogICAg ICAgICBtX3BhZ2UtPmZpbmRUZXh0KHN1YlN0cmluZywgUVdlYlBhZ2U6OkZpbmRXcmFwc0Fyb3Vu ZERvY3VtZW50KTsKICAgICAgICAgUUNPTVBBUkUobV9wYWdlLT5zZWxlY3RlZFRleHQoKSwgc3Vi U3RyaW5nKTsKLSAgICAgICAgUUNPTVBBUkUobV9wYWdlLT5zZWxlY3RlZEh0bWwoKSwgUVN0cmlu ZygiPHNwYW4gY2xhc3M9XCJBcHBsZS1zdHlsZS1zcGFuXCIgc3R5bGU9XCJib3JkZXItY29sbGFw c2U6IHNlcGFyYXRlOyBjb2xvcjogcmdiKDAsIDAsIDApOyBmb250LWZhbWlseTogVGltZXM7IGZv bnQtc3R5bGU6IG5vcm1hbDsgZm9udC12YXJpYW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3Jt YWw7IGxldHRlci1zcGFjaW5nOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6 IDI7IHRleHQtYWxpZ246IC13ZWJraXQtYXV0bzsgdGV4dC1pbmRlbnQ6IDBweDsgdGV4dC10cmFu c2Zvcm06IG5vbmU7IHdoaXRlLXNwYWNlOiBub3JtYWw7IHdpZG93czogMjsgd29yZC1zcGFjaW5n OiAwcHg7IC13ZWJraXQtYm9yZGVyLWhvcml6b250YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LWJv cmRlci12ZXJ0aWNhbC1zcGFjaW5nOiAwcHg7IC13ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1l ZmZlY3Q6IG5vbmU7IC13ZWJraXQtdGV4dC1zaXplLWFkanVzdDogYXV0bzsgLXdlYmtpdC10ZXh0 LXN0cm9rZS13aWR0aDogMHB4OyBmb250LXNpemU6IG1lZGl1bTsgXCI+JTE8L3NwYW4+IikuYXJn KHN1YlN0cmluZykpOworICAgICAgICBRQ09NUEFSRShtX3BhZ2UtPnNlbGVjdGVkSHRtbCgpLnRy aW1tZWQoKS5yZXBsYWNlKHJlZ0V4cCwgIj4iKSwgUVN0cmluZygiPHNwYW4gY2xhc3M9XCJBcHBs ZS1zdHlsZS1zcGFuXCI+JTE8L3NwYW4+IikuYXJnKHN1YlN0cmluZykpOwogICAgICAgICBtX3Bh Z2UtPmZpbmRUZXh0KCIiKTsKICAgICAgICAgUVZFUklGWShtX3BhZ2UtPnNlbGVjdGVkVGV4dCgp LmlzRW1wdHkoKSk7CiAgICAgICAgIFFWRVJJRlkobV9wYWdlLT5zZWxlY3RlZEh0bWwoKS5pc0Vt cHR5KCkpOwo= 90063 2011-04-18 11:54:39 -0700 2011-04-18 12:49:49 -0700 fix the regular expression 56924.patch text/plain 4875 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NDE2NCkKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTggIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IEFwaSB0ZXN0cyBmb3IgUVdlYlBhZ2Ugb24g U3ltYmlhbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5MjQKKworICAgICAgICBJZ25vcmVzIHRoZSBzdHlsZSBhdHRyaWJ1dGUgdGhhdCBzZWxlY3Rl ZEh0bWwoKSByZXR1cm5zLgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3Vyc29yTW92ZW1lbnRzKToKKyAgICAgICAg KHRzdF9RV2ViUGFnZTo6dGV4dFNlbGVjdGlvbik6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmZp bmRUZXh0KToKKwogMjAxMS0wNC0xOCAgRG9taW5pYyBDb29uZXkgIDxkb21pbmljY0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KSW5kZXg6IFNvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHJldmlz aW9uIDg0MTYyKQorKysgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBh Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05ODYsNyArOTg2LDEwIEBAIHZvaWQgdHN0X1FXZWJQ YWdlOjpjdXJzb3JNb3ZlbWVudHMoKQogICAgICAgICAiZ2V0U2VsZWN0aW9uKCkuYWRkUmFuZ2Uo cmFuZ2UpOyI7CiAgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdChzY3Jp cHQpOwogICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkVGV4dCgpLnRyaW1tZWQoKSwgUVN0cmlu Zzo6ZnJvbUxhdGluMSgiVGhlIHF1aWNrIGJyb3duIGZveCIpKTsKLSAgICBRQ09NUEFSRShwYWdl LT5zZWxlY3RlZEh0bWwoKS50cmltbWVkKCksIFFTdHJpbmc6OmZyb21MYXRpbjEoIjxzcGFuIGNs YXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxlPVwiYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0 ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1mYW1pbHk6IFRpbWVzOyBmb250LXN0eWxlOiBu b3JtYWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXIt c3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFs aWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25l OyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Vi a2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGlj YWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25l OyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lk dGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPjxwIGlkPVwib25lXCI+VGhlIHF1aWNrIGJy b3duIGZveDwvcD48L3NwYW4+IikpOworCisgICAgUVJlZ0V4cCByZWdFeHAoIiBzdHlsZT1cIi4q XCIiKTsKKyAgICByZWdFeHAuc2V0TWluaW1hbCh0cnVlKTsKKyAgICBRQ09NUEFSRShwYWdlLT5z ZWxlY3RlZEh0bWwoKS50cmltbWVkKCkucmVwbGFjZShyZWdFeHAsICIiKSwgUVN0cmluZzo6ZnJv bUxhdGluMSgiPHNwYW4gY2xhc3M9XCJBcHBsZS1zdHlsZS1zcGFuXCI+PHAgaWQ9XCJvbmVcIj5U aGUgcXVpY2sgYnJvd24gZm94PC9wPjwvc3Bhbj4iKSk7CiAKICAgICAvLyB0aGVzZSBhY3Rpb25z IG11c3QgZXhpc3QKICAgICBRVkVSSUZZKHBhZ2UtPmFjdGlvbihRV2ViUGFnZTo6TW92ZVRvTmV4 dENoYXIpICE9IDApOwpAQCAtMTIxNyw3ICsxMjIwLDkgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnRl eHRTZWxlY3Rpb24oKQogICAgICAgICAiZ2V0U2VsZWN0aW9uKCkuYWRkUmFuZ2UocmFuZ2UpOyI7 CiAgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdChzZWxlY3RTY3JpcHQp OwogICAgIFFDT01QQVJFKHBhZ2UtPnNlbGVjdGVkVGV4dCgpLnRyaW1tZWQoKSwgUVN0cmluZzo6 ZnJvbUxhdGluMSgiVGhlIHF1aWNrIGJyb3duIGZveCIpKTsKLSAgICBRQ09NUEFSRShwYWdlLT5z ZWxlY3RlZEh0bWwoKS50cmltbWVkKCksIFFTdHJpbmc6OmZyb21MYXRpbjEoIjxzcGFuIGNsYXNz PVwiQXBwbGUtc3R5bGUtc3BhblwiIHN0eWxlPVwiYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsg Y29sb3I6IHJnYigwLCAwLCAwKTsgZm9udC1mYW1pbHk6IFRpbWVzOyBmb250LXN0eWxlOiBub3Jt YWw7IGZvbnQtdmFyaWFudDogbm9ybWFsOyBmb250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXItc3Bh Y2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDogbm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFsaWdu OiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3 aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0 LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGljYWwt c3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAt d2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6 IDBweDsgZm9udC1zaXplOiBtZWRpdW07IFwiPjxwIGlkPVwib25lXCI+VGhlIHF1aWNrIGJyb3du IGZveDwvcD48L3NwYW4+IikpOworICAgIFFSZWdFeHAgcmVnRXhwKCIgc3R5bGU9XCIuKlwiIik7 CisgICAgcmVnRXhwLnNldE1pbmltYWwodHJ1ZSk7CisgICAgUUNPTVBBUkUocGFnZS0+c2VsZWN0 ZWRIdG1sKCkudHJpbW1lZCgpLnJlcGxhY2UocmVnRXhwLCAiIiksIFFTdHJpbmc6OmZyb21MYXRp bjEoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiPjxwIGlkPVwib25lXCI+VGhlIHF1 aWNrIGJyb3duIGZveDwvcD48L3NwYW4+IikpOwogCiAgICAgLy8gTWFrZSBzdXJlIGhhc1NlbGVj dGlvbiByZXR1cm5zIHRydWUsIHNpbmNlIHRoZXJlIGlzIHNlbGVjdGVkIHRleHQgbm93Li4uCiAg ICAgUUNPTVBBUkUocGFnZS0+aGFzU2VsZWN0aW9uKCksIHRydWUpOwpAQCAtMjY3MSwxMCArMjY3 NiwxMiBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6ZmluZFRleHQoKQogICAgIFFWRVJJRlkobV9wYWdl LT5zZWxlY3RlZFRleHQoKS5pc0VtcHR5KCkpOwogICAgIFFWRVJJRlkobV9wYWdlLT5zZWxlY3Rl ZEh0bWwoKS5pc0VtcHR5KCkpOwogICAgIFFTdHJpbmdMaXN0IHdvcmRzID0gKFFTdHJpbmdMaXN0 KCkgPDwgImZvbyIgPDwgImJhciIpOworICAgIFFSZWdFeHAgcmVnRXhwKCIgc3R5bGU9XCIuKlwi Iik7CisgICAgcmVnRXhwLnNldE1pbmltYWwodHJ1ZSk7CiAgICAgZm9yZWFjaCAoUVN0cmluZyBz dWJTdHJpbmcsIHdvcmRzKSB7CiAgICAgICAgIG1fcGFnZS0+ZmluZFRleHQoc3ViU3RyaW5nLCBR V2ViUGFnZTo6RmluZFdyYXBzQXJvdW5kRG9jdW1lbnQpOwogICAgICAgICBRQ09NUEFSRShtX3Bh Z2UtPnNlbGVjdGVkVGV4dCgpLCBzdWJTdHJpbmcpOwotICAgICAgICBRQ09NUEFSRShtX3BhZ2Ut PnNlbGVjdGVkSHRtbCgpLCBRU3RyaW5nKCI8c3BhbiBjbGFzcz1cIkFwcGxlLXN0eWxlLXNwYW5c IiBzdHlsZT1cImJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7IGNvbG9yOiByZ2IoMCwgMCwgMCk7 IGZvbnQtZmFtaWx5OiBUaW1lczsgZm9udC1zdHlsZTogbm9ybWFsOyBmb250LXZhcmlhbnQ6IG5v cm1hbDsgZm9udC13ZWlnaHQ6IG5vcm1hbDsgbGV0dGVyLXNwYWNpbmc6IG5vcm1hbDsgbGluZS1o ZWlnaHQ6IG5vcm1hbDsgb3JwaGFuczogMjsgdGV4dC1hbGlnbjogLXdlYmtpdC1hdXRvOyB0ZXh0 LWluZGVudDogMHB4OyB0ZXh0LXRyYW5zZm9ybTogbm9uZTsgd2hpdGUtc3BhY2U6IG5vcm1hbDsg d2lkb3dzOiAyOyB3b3JkLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItaG9yaXpvbnRhbC1z cGFjaW5nOiAwcHg7IC13ZWJraXQtYm9yZGVyLXZlcnRpY2FsLXNwYWNpbmc6IDBweDsgLXdlYmtp dC10ZXh0LWRlY29yYXRpb25zLWluLWVmZmVjdDogbm9uZTsgLXdlYmtpdC10ZXh0LXNpemUtYWRq dXN0OiBhdXRvOyAtd2Via2l0LXRleHQtc3Ryb2tlLXdpZHRoOiAwcHg7IGZvbnQtc2l6ZTogbWVk aXVtOyBcIj4lMTwvc3Bhbj4iKS5hcmcoc3ViU3RyaW5nKSk7CisgICAgICAgIFFDT01QQVJFKG1f cGFnZS0+c2VsZWN0ZWRIdG1sKCkudHJpbW1lZCgpLnJlcGxhY2UocmVnRXhwLCAiIiksIFFTdHJp bmcoIjxzcGFuIGNsYXNzPVwiQXBwbGUtc3R5bGUtc3BhblwiPiUxPC9zcGFuPiIpLmFyZyhzdWJT dHJpbmcpKTsKICAgICAgICAgbV9wYWdlLT5maW5kVGV4dCgiIik7CiAgICAgICAgIFFWRVJJRlko bV9wYWdlLT5zZWxlY3RlZFRleHQoKS5pc0VtcHR5KCkpOwogICAgICAgICBRVkVSSUZZKG1fcGFn ZS0+c2VsZWN0ZWRIdG1sKCkuaXNFbXB0eSgpKTsK