57800 2011-04-04 16:10:37 -0700 [Mac] When autocorrection occurs without showing correction panel, WebCore need to post accessibility notification. 2011-04-06 07:57:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 jiapu.mail jiapu.mail commit-queue ddavidso dglazkov webkit.review.bot oldest_to_newest 379169 0 jiapu.mail 2011-04-04 16:10:37 -0700 <rdar://problem/9218223> 379240 1 88167 jiapu.mail 2011-04-04 17:11:31 -0700 Created attachment 88167 Patch (v1) 379247 2 88167 darin 2011-04-04 17:24:58 -0700 Comment on attachment 88167 Patch (v1) View in context: https://bugs.webkit.org/attachment.cgi?id=88167&action=review > Source/WebCore/editing/Editor.cpp:2417 > + Element* rootEditable = m_frame->selection()->selection().rootEditableElement(); > + if (rootEditable) > + m_frame->document()->axObjectCache()->postNotification(rootEditable->renderer(), AXObjectCache::AXAutocorrectionOccured, true); It’s often better style to write it like this: if (Element* root = m_frame->selection()->selection().rootEditableElement()) m_frame->document()->axObjectCache()->postNotification(root->renderer(), AXObjectCache::AXAutocorrectionOccured, true); 379270 3 webkit.review.bot 2011-04-04 18:15:14 -0700 Attachment 88167 did not build on chromium: Build output: http://queues.webkit.org/results/8336085 379611 4 88243 jiapu.mail 2011-04-05 09:03:46 -0700 Created attachment 88243 Patch (v2) Fixed build failure on chromium. Changed the location from where we post notification, so that text replacement other than autocorrection also generates notification. 379639 5 88243 darin 2011-04-05 09:30:36 -0700 Comment on attachment 88243 Patch (v2) View in context: https://bugs.webkit.org/attachment.cgi?id=88243&action=review > Source/WebCore/accessibility/mac/AXObjectCacheMac.mm:77 > +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) > + case AXAutocorrectionOccured: > + macNotification = @"AXAutocorrectionOccurred"; > + break; > +#endif If the enum value exists, we probably need a case for it on all versions, not just versions newer than Snow Leopard. We could do ASSERT_NOT_REACHED on those other versions, but we will still want the case because you did not put an #if around the enum value. 379712 6 88271 jiapu.mail 2011-04-05 10:26:21 -0700 Created attachment 88271 Patch (v4) 379913 7 jiapu.mail 2011-04-05 15:32:16 -0700 (In reply to comment #5) > (From update of attachment 88243 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=88243&action=review > > > Source/WebCore/accessibility/mac/AXObjectCacheMac.mm:77 > > +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) > > + case AXAutocorrectionOccured: > > + macNotification = @"AXAutocorrectionOccurred"; > > + break; > > +#endif > > If the enum value exists, we probably need a case for it on all versions, not just versions newer than Snow Leopard. We could do ASSERT_NOT_REACHED on those other versions, but we will still want the case because you did not put an #if around the enum value. I have made slight change to make sure this builds on SL. Darin, could you take a look and r+ it if it's OK?Thanks. 380362 8 88271 commit-queue 2011-04-06 07:57:36 -0700 Comment on attachment 88271 Patch (v4) Clearing flags on attachment: 88271 Committed r83049: <http://trac.webkit.org/changeset/83049> 380363 9 commit-queue 2011-04-06 07:57:46 -0700 All reviewed patches have been landed. Closing bug. 88167 2011-04-04 17:11:31 -0700 2011-04-05 09:03:44 -0700 Patch (v1) bug-57800-20110404171130.patch text/plain 4067 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogODI4MzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNzk1ZTZjOGIzMWM4NDg5 NjRiYzAwYTYyYmJiNjU5MDllNzI3Y2NlLi4zMThlNDdkY2ZhZjcxZjdhMDZkOGIwYmJiNWNmM2Uw ZTdlYzQ5MDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMDQgIEppYSBQ dSAgPGpwdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW01hY10gV2hlbiBhdXRvY29ycmVjdGlvbiBvY2N1cnMgd2l0aG91dCBzaG93 aW5nIGNvcnJlY3Rpb24gcGFuZWwsIFdlYkNvcmUgbmVlZCB0byBwb3N0IGFjY2Vzc2liaWxpdHkg bm90aWZpY2F0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTc4MDAKKworICAgICAgICBEZWZpbmVkIGEgbmV3IGFjY2Vzc2liaWxpdHkgbm90aWZp Y2F0aW9uIHR5cGUsIEFYQXV0b2NvcnJlY3Rpb25PY2N1cmVkLiBFZGl0b3I6Om1hcmtBbGxNaXNz cGVsbGluZ3NBbmRCYWRHcmFtbWFySW5SYW5nZXMoKQorICAgICAgICBub3cgcG9zdHMgc2FpZCBu b3RpZmljYXRpb24gd2hlbiBhbnkgYXV0b2NvcnJlY3Rpb24gdGFrZXMgcGxhY2UuCisKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RD YWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRv ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om1hcmtBbGxNaXNzcGVsbGluZ3NBbmRC YWRHcmFtbWFySW5SYW5nZXMpOgorCiAyMDExLTA0LTA0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8 c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNv bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKaW5kZXgg NDgwNWE3Zjk5OTc1MjY4NWUzNmZhOThhMDM3Y2ZlYzk4MzFjMDAyMC4uOTVjYzdmM2FmNjFmODIw NWQzN2Q4NmE0ZmVlOGRhMDhiMTNmNzAwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTExOCw2ICsxMTgsNyBAQCBwdWJsaWM6CiAKICAgICBl bnVtIEFYTm90aWZpY2F0aW9uIHsKICAgICAgICAgQVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZCwK KyAgICAgICAgQVhBdXRvY29ycmVjdGlvbk9jY3VyZWQsCiAgICAgICAgIEFYQ2hlY2tlZFN0YXRl Q2hhbmdlZCwKICAgICAgICAgQVhDaGlsZHJlbkNoYW5nZWQsCiAgICAgICAgIEFYRm9jdXNlZFVJ RWxlbWVudENoYW5nZWQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9BWE9iamVjdENhY2hlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvQVhPYmplY3RDYWNoZU1hYy5tbQppbmRleCBlMjIzYmY0MjQ0YTlhZjI1YmI3MTFkYzEwOTcz YmY5YmE4YzFhNTc5Li5iZGE4ODUwNWRkOTQzMWQ4MDNjYTMyNTFiYzFlZWQyYTIxMWMxNDdkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hl TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2Fj aGVNYWMubW0KQEAgLTcwLDYgKzcwLDkgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZv cm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqLCBBWE5vdGlmaWMKICAgICAg ICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBOU0FjY2Vzc2li aWxpdHlGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZE5vdGlmaWNhdGlvbjsgICAgICAgICAgICAgICAg CiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBBWEF1dG9jb3JyZWN0aW9uT2NjdXJl ZDoKKyAgICAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IEAiQVhBdXRvY29ycmVjdGlvbk9jY3Vy cmVkIjsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFYRm9jdXNlZFVJRWxlbWVu dENoYW5nZWQ6CiAgICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBOU0FjY2Vzc2liaWxpdHlG b2N1c2VkVUlFbGVtZW50Q2hhbmdlZE5vdGlmaWNhdGlvbjsKICAgICAgICAgICAgIGJyZWFrOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCmluZGV4IDA1ZmExZDgwMmI3OTE2OTQ5NjEwOGJhNGQz YzljNTY2NzcyYTNmYzkuLmMyZTZkYmI4NmJmYjYxMmYyMzNmMjMxMDIzMWI4N2M4NTQwMWUwNzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKQEAgLTI0MDUsMTMgKzI0MDUsMTggQEAgdm9p ZCBFZGl0b3I6Om1hcmtBbGxNaXNzcGVsbGluZ3NBbmRCYWRHcmFtbWFySW5SYW5nZXMoVGV4dENo ZWNraW5nT3B0aW9ucyB0ZXh0Q2gKICAgICAgICAgICAgICAgICAgICAgcmVwbGFjZWRTdHJpbmcg PSBwbGFpblRleHQocmFuZ2VUb1JlcGxhY2UuZ2V0KCkpOwogCiAgICAgICAgICAgICAgICAgYm9v bCB1c2VTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kID0gZmFsc2U7Ci0jaWYgUExBVEZPUk0oTUFD KSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9USUdFUikgJiYgIWRlZmluZWQoQlVJTERJTkdfT05f TEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorI2lmIFNVUFBP UlRfQVVUT0NPUlJFQ1RJT05fUEFORUwKICAgICAgICAgICAgICAgICBpZiAocmVzdWx0LT50eXBl ID09IFRleHRDaGVja2luZ1R5cGVDb3JyZWN0aW9uKQogICAgICAgICAgICAgICAgICAgICB1c2VT cGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kID0gdHJ1ZTsKICNlbmRpZgotICAgICAgICAgICAgICAg IGlmICh1c2VTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kKQorICAgICAgICAgICAgICAgIGlmICh1 c2VTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kKSB7CiAgICAgICAgICAgICAgICAgICAgIGFwcGx5 Q29tbWFuZChTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kOjpjcmVhdGUocmFuZ2VUb1JlcGxhY2Us IHJlc3VsdC0+cmVwbGFjZW1lbnQpKTsKLSAgICAgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIEVsZW1lbnQqIHJvb3RFZGl0YWJsZSA9IG1fZnJhbWUt PnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5yb290RWRpdGFibGVFbGVtZW50KCk7CisgICAgICAg ICAgICAgICAgICAgICAgICBpZiAocm9vdEVkaXRhYmxlKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlmaWNh dGlvbihyb290RWRpdGFibGUtPnJlbmRlcmVyKCksIEFYT2JqZWN0Q2FjaGU6OkFYQXV0b2NvcnJl Y3Rpb25PY2N1cmVkLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPnNlbGVjdGlvbigpLT5z ZXRTZWxlY3Rpb24oc2VsZWN0aW9uVG9SZXBsYWNlKTsKICAgICAgICAgICAgICAgICAgICAgcmVw bGFjZVNlbGVjdGlvbldpdGhUZXh0KHJlc3VsdC0+cmVwbGFjZW1lbnQsIGZhbHNlLCBmYWxzZSk7 CiAgICAgICAgICAgICAgICAgfQo= 88243 2011-04-05 09:03:46 -0700 2011-04-05 10:26:18 -0700 Patch (v2) bug-57800-20110405090345.patch text/plain 5063 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogODI4MzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNzk1ZTZjOGIzMWM4NDg5 NjRiYzAwYTYyYmJiNjU5MDllNzI3Y2NlLi40YThlYWFhMzBiMjMwOTQ2ZDIzMjkyMjA1ZmJhNjY1 Mzg1NTM2MjJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMDUgIEppYSBQ dSAgPGpwdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW01hY10gV2hlbiBhdXRvY29ycmVjdGlvbiBvY2N1cnMgd2l0aG91dCBzaG93 aW5nIGNvcnJlY3Rpb24gcGFuZWwsIFdlYkNvcmUgbmVlZCB0byBwb3N0IGFjY2Vzc2liaWxpdHkg bm90aWZpY2F0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTc4MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyMTgyMjM+CisKKyAgICAgICAg RGVmaW5lZCBhIG5ldyBhY2Nlc3NpYmlsaXR5IG5vdGlmaWNhdGlvbiB0eXBlLCBBWEF1dG9jb3Jy ZWN0aW9uT2NjdXJlZC4gRWRpdG9yOjptYXJrQWxsTWlzc3BlbGxpbmdzQW5kQmFkR3JhbW1hcklu UmFuZ2VzKCkKKyAgICAgICAgbm93IHBvc3RzIHNhaWQgbm90aWZpY2F0aW9uIHdoZW4gYW55IGF1 dG9jb3JyZWN0aW9uIG9yIHRleHQgcmVwbGFjZW1lbnQgKGUuZy4gcmVwbGFjaW5nICIoYykiIHdp dGggY29weXJpZ2h0IG1hcmspIHRha2VzIHBsYWNlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BWE9i amVjdENhY2hlQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6 cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9B WE9iamVjdENhY2hlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9z dFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om1hcmtBbGxNaXNzcGVsbGluZ3NBbmRCYWRHcmFtbWFy SW5SYW5nZXMpOgorCiAyMDExLTA0LTA0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBp Z2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKaW5kZXggNDgwNWE3Zjk5 OTc1MjY4NWUzNmZhOThhMDM3Y2ZlYzk4MzFjMDAyMC4uOTVjYzdmM2FmNjFmODIwNWQzN2Q4NmE0 ZmVlOGRhMDhiMTNmNzAwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmgKQEAgLTExOCw2ICsxMTgsNyBAQCBwdWJsaWM6CiAKICAgICBlbnVtIEFYTm90 aWZpY2F0aW9uIHsKICAgICAgICAgQVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZCwKKyAgICAgICAg QVhBdXRvY29ycmVjdGlvbk9jY3VyZWQsCiAgICAgICAgIEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZCwK ICAgICAgICAgQVhDaGlsZHJlbkNoYW5nZWQsCiAgICAgICAgIEFYRm9jdXNlZFVJRWxlbWVudENo YW5nZWQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nocm9taXVt L0FYT2JqZWN0Q2FjaGVDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2Nocm9taXVtL0FYT2JqZWN0Q2FjaGVDaHJvbWl1bS5jcHAKaW5kZXggMGRkZGMxNzFjZjk4NGZl ZTM2MzEwMjNiMDU3ODY1Y2IzOGI1Y2Q4NC4uYjc5ZmQwYzYxZTljZGMxNzg0NDVjNmViYTI3YzAy NzgwZmRmNGQ0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJv bWl1bS9BWE9iamVjdENhY2hlQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvY2hyb21pdW0vQVhPYmplY3RDYWNoZUNocm9taXVtLmNwcApAQCAtNzYsNiArNzYs NyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3Np YmlsaXR5T2JqZWN0KiBvYmosIEFYTm90aWZpYwogICAgICAgICAvLyBkZXNjZW5kYW50IGFuZCBz ZW5kIHRoZSBBWEZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbi4KICAgICAgICAg aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQoMCwgb2JqLT5kb2N1bWVudCgpLT5mb2N1c2Vk Tm9kZSgpLT5yZW5kZXJlcigpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBWEF1dG9jb3Jy ZWN0aW9uT2NjdXJlZDoKICAgICBjYXNlIEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZDoKICAgICBjYXNl IEFYQ2hpbGRyZW5DaGFuZ2VkOgogICAgIGNhc2UgQVhGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZDoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2Fj aGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hl TWFjLm1tCmluZGV4IGUyMjNiZjQyNDRhOWFmMjViYjcxMWRjMTA5NzNiZjliYThjMWE1NzkuLjMw NDcyMTI5M2I4MTBlMDNiNGU1ODczYWVhN2UxZDg5ZmVkZmI5MGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQpAQCAtNzAs NiArNzAsMTEgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24o QWNjZXNzaWJpbGl0eU9iamVjdCogb2JqLCBBWE5vdGlmaWMKICAgICAgICAgICAgIGVsc2UKICAg ICAgICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBOU0FjY2Vzc2liaWxpdHlGb2N1c2VkVUlF bGVtZW50Q2hhbmdlZE5vdGlmaWNhdGlvbjsgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICBi cmVhazsKKyNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9USUdFUikgJiYgIWRlZmluZWQoQlVJTERJ TkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAg ICAgICBjYXNlIEFYQXV0b2NvcnJlY3Rpb25PY2N1cmVkOgorICAgICAgICAgICAgbWFjTm90aWZp Y2F0aW9uID0gQCJBWEF1dG9jb3JyZWN0aW9uT2NjdXJyZWQiOworICAgICAgICAgICAgYnJlYWs7 CisjZW5kaWYKICAgICAgICAgY2FzZSBBWEZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkOgogICAgICAg ICAgICAgbWFjTm90aWZpY2F0aW9uID0gTlNBY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudENo YW5nZWROb3RpZmljYXRpb247CiAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dG9yLmNwcAppbmRleCAwNWZhMWQ4MDJiNzkxNjk0OTYxMDhiYTRkM2M5YzU2Njc3MmEzZmM5Li45 NmQwMDJiZTlmOTRjNjhhNTI5ODdiMzcxOTZmY2JlODkyNjA5OWUxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9FZGl0b3IuY3BwCkBAIC0yNDA1LDcgKzI0MDUsNyBAQCB2b2lkIEVkaXRvcjo6bWFya0FsbE1p c3NwZWxsaW5nc0FuZEJhZEdyYW1tYXJJblJhbmdlcyhUZXh0Q2hlY2tpbmdPcHRpb25zIHRleHRD aAogICAgICAgICAgICAgICAgICAgICByZXBsYWNlZFN0cmluZyA9IHBsYWluVGV4dChyYW5nZVRv UmVwbGFjZS5nZXQoKSk7CiAKICAgICAgICAgICAgICAgICBib29sIHVzZVNwZWxsaW5nQ29ycmVj dGlvbkNvbW1hbmQgPSBmYWxzZTsKLSNpZiBQTEFURk9STShNQUMpICYmICFkZWZpbmVkKEJVSUxE SU5HX09OX1RJR0VSKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5l ZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCisjaWYgU1VQUE9SVF9BVVRPQ09SUkVDVElPTl9Q QU5FTAogICAgICAgICAgICAgICAgIGlmIChyZXN1bHQtPnR5cGUgPT0gVGV4dENoZWNraW5nVHlw ZUNvcnJlY3Rpb24pCiAgICAgICAgICAgICAgICAgICAgIHVzZVNwZWxsaW5nQ29ycmVjdGlvbkNv bW1hbmQgPSB0cnVlOwogI2VuZGlmCkBAIC0yNDE2LDYgKzI0MTYsMTEgQEAgdm9pZCBFZGl0b3I6 Om1hcmtBbGxNaXNzcGVsbGluZ3NBbmRCYWRHcmFtbWFySW5SYW5nZXMoVGV4dENoZWNraW5nT3B0 aW9ucyB0ZXh0Q2gKICAgICAgICAgICAgICAgICAgICAgcmVwbGFjZVNlbGVjdGlvbldpdGhUZXh0 KHJlc3VsdC0+cmVwbGFjZW1lbnQsIGZhbHNlLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgfQog CisgICAgICAgICAgICAgICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVk KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKEVsZW1lbnQqIHJvb3QgPSBtX2ZyYW1lLT5z ZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCkucm9vdEVkaXRhYmxlRWxlbWVudCgpKQorICAgICAgICAg ICAgICAgICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5wb3N0 Tm90aWZpY2F0aW9uKHJvb3QtPnJlbmRlcmVyKCksIEFYT2JqZWN0Q2FjaGU6OkFYQXV0b2NvcnJl Y3Rpb25PY2N1cmVkLCB0cnVlKTsKKyAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAg ICBzZWxlY3Rpb25DaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBvZmZzZXREdWVUb1Jl cGxhY2VtZW50ICs9IHJlcGxhY2VtZW50TGVuZ3RoIC0gcmVzdWx0TGVuZ3RoOwogICAgICAgICAg ICAgICAgIGlmIChyZXN1bHRMb2NhdGlvbiA8IHNlbGVjdGlvbk9mZnNldCkgewo= 88271 2011-04-05 10:26:21 -0700 2011-04-06 07:57:36 -0700 Patch (v4) bug-57800-20110405102620.patch text/plain 5091 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogODI4MzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNzk1ZTZjOGIzMWM4NDg5 NjRiYzAwYTYyYmJiNjU5MDllNzI3Y2NlLi40YThlYWFhMzBiMjMwOTQ2ZDIzMjkyMjA1ZmJhNjY1 Mzg1NTM2MjJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMDUgIEppYSBQ dSAgPGpwdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW01hY10gV2hlbiBhdXRvY29ycmVjdGlvbiBvY2N1cnMgd2l0aG91dCBzaG93 aW5nIGNvcnJlY3Rpb24gcGFuZWwsIFdlYkNvcmUgbmVlZCB0byBwb3N0IGFjY2Vzc2liaWxpdHkg bm90aWZpY2F0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTc4MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyMTgyMjM+CisKKyAgICAgICAg RGVmaW5lZCBhIG5ldyBhY2Nlc3NpYmlsaXR5IG5vdGlmaWNhdGlvbiB0eXBlLCBBWEF1dG9jb3Jy ZWN0aW9uT2NjdXJlZC4gRWRpdG9yOjptYXJrQWxsTWlzc3BlbGxpbmdzQW5kQmFkR3JhbW1hcklu UmFuZ2VzKCkKKyAgICAgICAgbm93IHBvc3RzIHNhaWQgbm90aWZpY2F0aW9uIHdoZW4gYW55IGF1 dG9jb3JyZWN0aW9uIG9yIHRleHQgcmVwbGFjZW1lbnQgKGUuZy4gcmVwbGFjaW5nICIoYykiIHdp dGggY29weXJpZ2h0IG1hcmspIHRha2VzIHBsYWNlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9jaHJvbWl1bS9BWE9i amVjdENhY2hlQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6 cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9B WE9iamVjdENhY2hlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9z dFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om1hcmtBbGxNaXNzcGVsbGluZ3NBbmRCYWRHcmFtbWFy SW5SYW5nZXMpOgorCiAyMDExLTA0LTA0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBp Z2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKaW5kZXggNDgwNWE3Zjk5 OTc1MjY4NWUzNmZhOThhMDM3Y2ZlYzk4MzFjMDAyMC4uOTVjYzdmM2FmNjFmODIwNWQzN2Q4NmE0 ZmVlOGRhMDhiMTNmNzAwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmgKQEAgLTExOCw2ICsxMTgsNyBAQCBwdWJsaWM6CiAKICAgICBlbnVtIEFYTm90 aWZpY2F0aW9uIHsKICAgICAgICAgQVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZCwKKyAgICAgICAg QVhBdXRvY29ycmVjdGlvbk9jY3VyZWQsCiAgICAgICAgIEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZCwK ICAgICAgICAgQVhDaGlsZHJlbkNoYW5nZWQsCiAgICAgICAgIEFYRm9jdXNlZFVJRWxlbWVudENo YW5nZWQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nocm9taXVt L0FYT2JqZWN0Q2FjaGVDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2Nocm9taXVtL0FYT2JqZWN0Q2FjaGVDaHJvbWl1bS5jcHAKaW5kZXggMGRkZGMxNzFjZjk4NGZl ZTM2MzEwMjNiMDU3ODY1Y2IzOGI1Y2Q4NC4uYjc5ZmQwYzYxZTljZGMxNzg0NDVjNmViYTI3YzAy NzgwZmRmNGQ0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9jaHJv bWl1bS9BWE9iamVjdENhY2hlQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvY2hyb21pdW0vQVhPYmplY3RDYWNoZUNocm9taXVtLmNwcApAQCAtNzYsNiArNzYs NyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3Np YmlsaXR5T2JqZWN0KiBvYmosIEFYTm90aWZpYwogICAgICAgICAvLyBkZXNjZW5kYW50IGFuZCBz ZW5kIHRoZSBBWEZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbi4KICAgICAgICAg aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQoMCwgb2JqLT5kb2N1bWVudCgpLT5mb2N1c2Vk Tm9kZSgpLT5yZW5kZXJlcigpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBWEF1dG9jb3Jy ZWN0aW9uT2NjdXJlZDoKICAgICBjYXNlIEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZDoKICAgICBjYXNl IEFYQ2hpbGRyZW5DaGFuZ2VkOgogICAgIGNhc2UgQVhGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZDoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2Fj aGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hl TWFjLm1tCmluZGV4IGUyMjNiZjQyNDRhOWFmMjViYjcxMWRjMTA5NzNiZjliYThjMWE1NzkuLjI3 YzRlOTM0NGEzZmQ2NWJkYTlkMWE3NjA4ZWQyMTA1YWU4ODY3MDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQpAQCAtNzAs NiArNzAsMTMgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24o QWNjZXNzaWJpbGl0eU9iamVjdCogb2JqLCBBWE5vdGlmaWMKICAgICAgICAgICAgIGVsc2UKICAg ICAgICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBOU0FjY2Vzc2liaWxpdHlGb2N1c2VkVUlF bGVtZW50Q2hhbmdlZE5vdGlmaWNhdGlvbjsgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgY2FzZSBBWEF1dG9jb3JyZWN0aW9uT2NjdXJlZDoKKyNpZiAhZGVmaW5l ZChCVUlMRElOR19PTl9USUdFUikgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgJiYg IWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAgICAgICAgICAgbWFjTm90aWZp Y2F0aW9uID0gQCJBWEF1dG9jb3JyZWN0aW9uT2NjdXJyZWQiOworICAgICAgICAgICAgYnJlYWs7 CisjZWxzZQorICAgICAgICAgICAgcmV0dXJuOworI2VuZGlmCiAgICAgICAgIGNhc2UgQVhGb2N1 c2VkVUlFbGVtZW50Q2hhbmdlZDoKICAgICAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IE5TQWNj ZXNzaWJpbGl0eUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkTm90aWZpY2F0aW9uOwogICAgICAgICAg ICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggMDVmYTFkODAyYjc5MTY5 NDk2MTA4YmE0ZDNjOWM1NjY3NzJhM2ZjOS4uOTZkMDAyYmU5Zjk0YzY4YTUyOTg3YjM3MTk2ZmNi ZTg5MjYwOTllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMjQwNSw3ICsyNDA1 LDcgQEAgdm9pZCBFZGl0b3I6Om1hcmtBbGxNaXNzcGVsbGluZ3NBbmRCYWRHcmFtbWFySW5SYW5n ZXMoVGV4dENoZWNraW5nT3B0aW9ucyB0ZXh0Q2gKICAgICAgICAgICAgICAgICAgICAgcmVwbGFj ZWRTdHJpbmcgPSBwbGFpblRleHQocmFuZ2VUb1JlcGxhY2UuZ2V0KCkpOwogCiAgICAgICAgICAg ICAgICAgYm9vbCB1c2VTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kID0gZmFsc2U7Ci0jaWYgUExB VEZPUk0oTUFDKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9USUdFUikgJiYgIWRlZmluZWQoQlVJ TERJTkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQor I2lmIFNVUFBPUlRfQVVUT0NPUlJFQ1RJT05fUEFORUwKICAgICAgICAgICAgICAgICBpZiAocmVz dWx0LT50eXBlID09IFRleHRDaGVja2luZ1R5cGVDb3JyZWN0aW9uKQogICAgICAgICAgICAgICAg ICAgICB1c2VTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kID0gdHJ1ZTsKICNlbmRpZgpAQCAtMjQx Niw2ICsyNDE2LDExIEBAIHZvaWQgRWRpdG9yOjptYXJrQWxsTWlzc3BlbGxpbmdzQW5kQmFkR3Jh bW1hckluUmFuZ2VzKFRleHRDaGVja2luZ09wdGlvbnMgdGV4dENoCiAgICAgICAgICAgICAgICAg ICAgIHJlcGxhY2VTZWxlY3Rpb25XaXRoVGV4dChyZXN1bHQtPnJlcGxhY2VtZW50LCBmYWxzZSwg ZmFsc2UpOwogICAgICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgICAgIGlmIChBWE9iamVj dENhY2hlOjphY2Nlc3NpYmlsaXR5RW5hYmxlZCgpKSB7CisgICAgICAgICAgICAgICAgICAgIGlm IChFbGVtZW50KiByb290ID0gbV9mcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpLnJvb3RF ZGl0YWJsZUVsZW1lbnQoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPmRvY3Vt ZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlmaWNhdGlvbihyb290LT5yZW5kZXJlcigp LCBBWE9iamVjdENhY2hlOjpBWEF1dG9jb3JyZWN0aW9uT2NjdXJlZCwgdHJ1ZSk7CisgICAgICAg ICAgICAgICAgfQorCiAgICAgICAgICAgICAgICAgc2VsZWN0aW9uQ2hhbmdlZCA9IHRydWU7CiAg ICAgICAgICAgICAgICAgb2Zmc2V0RHVlVG9SZXBsYWNlbWVudCArPSByZXBsYWNlbWVudExlbmd0 aCAtIHJlc3VsdExlbmd0aDsKICAgICAgICAgICAgICAgICBpZiAocmVzdWx0TG9jYXRpb24gPCBz ZWxlY3Rpb25PZmZzZXQpIHsK