46679 2010-09-27 17:13:02 -0700 Delete and forward delete shouldn't start autocorrection panel timer. 2010-09-28 17:14:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 0 jiapu.mail webkit-unassigned abarth adele commit-queue eric jiapu.mail webkit-ews oldest_to_newest 285926 0 jiapu.mail 2010-09-27 17:13:02 -0700 <rdar://problem/8463917> Autocorrection panel should not show up when user is deleting or forward deleting. 285973 1 69004 jiapu.mail 2010-09-27 18:00:16 -0700 Created attachment 69004 Proposed patch (v1) 286368 2 69004 commit-queue 2010-09-28 10:49:35 -0700 Comment on attachment 69004 Proposed patch (v1) Rejecting patch 69004 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']" exit_code: 2 Building WebKit Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Full output: http://queues.webkit.org/results/4059172 286406 3 69004 adele 2010-09-28 11:42:35 -0700 Comment on attachment 69004 Proposed patch (v1) I'm not sure why the cq failed- trying again... 286417 4 eric 2010-09-28 11:53:06 -0700 I'm not sure either. I suspect this is a bug from the CommitQueueTask rewrite. I suspect we're not raising the right ScriptError, thus we're losing the log information? 286423 5 69004 commit-queue 2010-09-28 12:01:11 -0700 Comment on attachment 69004 Proposed patch (v1) Rejecting patch 69004 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']" exit_code: 2 Building WebKit Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Full output: http://queues.webkit.org/results/4111094 286428 6 eric 2010-09-28 12:06:21 -0700 This patch doesn't seem to build correctly on the mac. However the commit-queue's rejection path is not correctly spitting out the build log. Investigating. 286432 7 eric 2010-09-28 12:09:02 -0700 http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/tool/bot/commitqueuetask.py#L142 is the path it should be hitting. It's possible somehow the ScriptError which was saved is losing its log? 286435 8 adele 2010-09-28 12:10:53 -0700 I'm building this locally, and will land manually eventually. 286461 9 abarth 2010-09-28 12:43:37 -0700 > I suspect we're not raising the right ScriptError, thus we're losing the log information? The problem is that the bug comment is now coming from the master process, but the child process never outputs any build spew. We probably want the child to print some of the build spew on failure so the parent can see it. 286465 10 adele 2010-09-28 12:48:30 -0700 TypingCommand.cpp:286: warning: unused parameter 'commandType' This is the warning that I'm getting. 286466 11 69004 adele 2010-09-28 12:48:52 -0700 Comment on attachment 69004 Proposed patch (v1) r- so Jia can fix the warning. 286514 12 69099 jiapu.mail 2010-09-28 14:03:00 -0700 Created attachment 69099 Proposed patch (v2) Fixed a build failure on non-Mac OSX platforms. Not sure if this is cleanest way to fix it. Any suggestion from reviewers is welcome. 286520 13 69099 adele 2010-09-28 14:07:52 -0700 Comment on attachment 69099 Proposed patch (v2) I'm not sure about this. I was seeing the warning on 10.6.4. 286525 14 69099 mitz 2010-09-28 14:17:37 -0700 Comment on attachment 69099 Proposed patch (v2) View in context: https://bugs.webkit.org/attachment.cgi?id=69099&action=review > WebCore/editing/TypingCommand.cpp:321 > +#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) > void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedTyping) > +#else > +void TypingCommand::typingAddedToOpenCommand(ETypingCommand) > +#endif The complaint was about markMisspellingsAfterTyping() having an unused (in some configurations) parameter, not about this method, so I’m not sure why you’re changing this one. I think it will break all builds. The way to fix the warning about markMisspellingsAfterTyping() is to add UNUSED_PARAM(commandType) for the configurations that don’t use commandType. You’ll need to make sure that you’re including <wtf/UnusedParam.h>—but I think you have it by way of including Editor.h. 286530 15 webkit-ews 2010-09-28 14:24:44 -0700 Attachment 69099 did not build on qt: Build output: http://queues.webkit.org/results/4211001 286537 16 jiapu.mail 2010-09-28 14:36:33 -0700 (In reply to comment #14) > (From update of attachment 69099 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69099&action=review > > > WebCore/editing/TypingCommand.cpp:321 > > +#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) > > void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedTyping) > > +#else > > +void TypingCommand::typingAddedToOpenCommand(ETypingCommand) > > +#endif > > The complaint was about markMisspellingsAfterTyping() having an unused (in some configurations) parameter, not about this method, so I’m not sure why you’re changing this one. I think it will break all builds. > Sorry, totally messed up this one. Let me generate another patch, and test building it on both platforms 286613 17 69127 jiapu.mail 2010-09-28 16:22:23 -0700 Created attachment 69127 Proposed patch (v3) 286651 18 69127 commit-queue 2010-09-28 17:14:26 -0700 Comment on attachment 69127 Proposed patch (v3) Clearing flags on attachment: 69127 Committed r68613: <http://trac.webkit.org/changeset/68613> 286652 19 commit-queue 2010-09-28 17:14:33 -0700 All reviewed patches have been landed. Closing bug. 69004 2010-09-27 18:00:16 -0700 2010-09-28 14:03:00 -0700 Proposed patch (v1) webkit_bug46679.patch text/plain 3377 jiapu.mail SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODQ1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjcgIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVsZXRlIGFuZCBm b3J3YXJkIGRlbGV0ZSBzaG91bGRuJ3Qgc3RhcnQgYXV0b2NvcnJlY3Rpb24gcGFuZWwgdGltZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjY3OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ2MzkxNz4KKworICAgICAgICAqIGVkaXRpbmcvVHlw aW5nQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUeXBpbmdDb21tYW5kOjptYXJrTWlz c3BlbGxpbmdzQWZ0ZXJUeXBpbmcpOiBPbmx5IHN0YXJ0IGNvcnJlY3Rpb24gcGFuZWwgdGltZXIg CisgICAgICAgICAgd2hlbiB0aGUgZWRpdGluZyBjb21tYW5kIGlzIEluc2VydFRleHQuCisgICAg ICAgIChXZWJDb3JlOjpUeXBpbmdDb21tYW5kOjp0eXBpbmdBZGRlZFRvT3BlbkNvbW1hbmQpOiBB ZGQgYW4gYXJndW1lbnQgdG8gcGFzcyBpbiBjb21tYW5kIHR5cGUuCisKKyAgICAgICAgKiBlZGl0 aW5nL1R5cGluZ0NvbW1hbmQuaDogQWRkIGFuIGFyZ3VtZW50IHRvIHR5cGluZ0FkZGVkVG9PcGVu Q29tbWFuZCgpLgorCiAyMDEwLTA5LTI3ICBWaWN0b3JpYSBLaXJzdCAgPHZya0Bnb29nbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDogV2ViQ29yZS9l ZGl0aW5nL1R5cGluZ0NvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9U eXBpbmdDb21tYW5kLmNwcAkocmV2aXNpb24gNjg0NTIpCisrKyBXZWJDb3JlL2VkaXRpbmcvVHlw aW5nQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4Myw3ICsyODMsNyBAQCBFZGl0QWN0 aW9uIFR5cGluZ0NvbW1hbmQ6OmVkaXRpbmdBY3Rpb24oCiAgICAgcmV0dXJuIEVkaXRBY3Rpb25U eXBpbmc7CiB9CiAKLXZvaWQgVHlwaW5nQ29tbWFuZDo6bWFya01pc3NwZWxsaW5nc0FmdGVyVHlw aW5nKCkKK3ZvaWQgVHlwaW5nQ29tbWFuZDo6bWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKEVU eXBpbmdDb21tYW5kIGNvbW1hbmRUeXBlKQogewogI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmlu ZWQoQlVJTERJTkdfT05fVElHRVIpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCiAg ICAgaWYgKCFkb2N1bWVudCgpLT5mcmFtZSgpLT5lZGl0b3IoKS0+aXNDb250aW51b3VzU3BlbGxD aGVja2luZ0VuYWJsZWQoKQpAQCAtMzA4LDcgKzMwOCw3IEBAIHZvaWQgVHlwaW5nQ29tbWFuZDo6 bWFya01pc3NwZWxsaW5nc0FmdGUKICAgICAgICAgaWYgKHAxICE9IHAyKQogICAgICAgICAgICAg ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPm1hcmtNaXNzcGVsbGluZ3NBZnRlclR5cGlu Z1RvUG9zaXRpb24ocDEpOwogI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoQlVJTERJTkdf T05fVElHRVIpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJV SUxESU5HX09OX1NOT1dfTEVPUEFSRCkKLSAgICAgICAgZWxzZQorICAgICAgICBlbHNlIGlmIChj b21tYW5kVHlwZSA9PSBUeXBpbmdDb21tYW5kOjpJbnNlcnRUZXh0KQogICAgICAgICAgICAgZG9j dW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPnN0YXJ0Q29ycmVjdGlvblBhbmVsVGltZXIoKTsK ICNlbmRpZgogICAgIH0KQEAgLTMyMSwxMCArMzIxLDEwIEBAIHZvaWQgVHlwaW5nQ29tbWFuZDo6 dHlwaW5nQWRkZWRUb09wZW5Db20KICNpZiBQTEFURk9STShNQUMpICYmICFkZWZpbmVkKEJVSUxE SU5HX09OX1RJR0VSKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKQogICAgIGRvY3Vt ZW50KCktPmZyYW1lKCktPmVkaXRvcigpLT5hcHBsaWVkRWRpdGluZyh0aGlzKTsKICAgICAvLyBT aW5jZSB0aGUgc3BlbGxjaGVja2luZyBjb2RlIG1heSBhbHNvIHBlcmZvcm0gY29ycmVjdGlvbnMg YW5kIG90aGVyIHJlcGxhY2VtZW50cywgaXQgc2hvdWxkIGhhcHBlbiBhZnRlciB0aGUgdHlwaW5n IGNoYW5nZXMuCi0gICAgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKCk7CisgICAgbWFya01p c3NwZWxsaW5nc0FmdGVyVHlwaW5nKGNvbW1hbmRUeXBlRm9yQWRkZWRUeXBpbmcpOwogI2Vsc2UK ICAgICAvLyBUaGUgb2xkIHNwZWxsY2hlY2tpbmcgY29kZSByZXF1aXJlcyB0aGF0IGNoZWNraW5n IGJlIGRvbmUgZmlyc3QsIHRvIHByZXZlbnQgaXNzdWVzIGxpa2UgdGhhdCBpbiA2ODY0MDcyLCB3 aGVyZSA8ZG9lc24ndD4gaXMgbWFya2VkIGFzIG1pc3NwZWxsZWQuCi0gICAgbWFya01pc3NwZWxs aW5nc0FmdGVyVHlwaW5nKCk7CisgICAgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKGNvbW1h bmRUeXBlRm9yQWRkZWRUeXBpbmcpOwogICAgIGRvY3VtZW50KCktPmZyYW1lKCktPmVkaXRvcigp LT5hcHBsaWVkRWRpdGluZyh0aGlzKTsKICNlbmRpZgogfQpJbmRleDogV2ViQ29yZS9lZGl0aW5n L1R5cGluZ0NvbW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvVHlwaW5nQ29t bWFuZC5oCShyZXZpc2lvbiA2ODQ1MikKKysrIFdlYkNvcmUvZWRpdGluZy9UeXBpbmdDb21tYW5k LmgJKHdvcmtpbmcgY29weSkKQEAgLTgyLDEwICs4MiwxMCBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgYm9vbCBwcmVzZXJ2ZXNUeXBpbmdTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJlc2VydmVz VHlwaW5nU3R5bGU7IH0KIAogICAgIHZvaWQgdXBkYXRlUHJlc2VydmVzVHlwaW5nU3R5bGUoRVR5 cGluZ0NvbW1hbmQpOwotICAgIHZvaWQgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKCk7Cisg ICAgdm9pZCBtYXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmcoRVR5cGluZ0NvbW1hbmQpOwogICAg IHZvaWQgdHlwaW5nQWRkZWRUb09wZW5Db21tYW5kKEVUeXBpbmdDb21tYW5kKTsKICAgICBib29s IG1ha2VFZGl0YWJsZVJvb3RFbXB0eSgpOwotICAgIAorCiAgICAgRVR5cGluZ0NvbW1hbmQgbV9j b21tYW5kVHlwZTsKICAgICBTdHJpbmcgbV90ZXh0VG9JbnNlcnQ7CiAgICAgYm9vbCBtX29wZW5G b3JNb3JlVHlwaW5nOwo= 69099 2010-09-28 14:03:00 -0700 2010-09-28 16:22:23 -0700 Proposed patch (v2) webkit_bug46679.patch text/plain 3641 jiapu.mail SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODU0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjggIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVsZXRlIGFuZCBm b3J3YXJkIGRlbGV0ZSBzaG91bGRuJ3Qgc3RhcnQgYXV0b2NvcnJlY3Rpb24gcGFuZWwgdGltZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjY3OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ2MzkxNz4KKworICAgICAgICAqIGVkaXRpbmcvVHlw aW5nQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUeXBpbmdDb21tYW5kOjptYXJrTWlz c3BlbGxpbmdzQWZ0ZXJUeXBpbmcpOiBPbmx5IHN0YXJ0IGNvcnJlY3Rpb24gcGFuZWwgdGltZXIK KyAgICAgICAgICB3aGVuIHRoZSBlZGl0aW5nIGNvbW1hbmQgaXMgSW5zZXJ0VGV4dC4KKyAgICAg ICAgKFdlYkNvcmU6OlR5cGluZ0NvbW1hbmQ6OnR5cGluZ0FkZGVkVG9PcGVuQ29tbWFuZCk6IEFk ZCBhbiBhcmd1bWVudCB0byBwYXNzIGluIGNvbW1hbmQgdHlwZS4KKworICAgICAgICAqIGVkaXRp bmcvVHlwaW5nQ29tbWFuZC5oOiBBZGQgYW4gYXJndW1lbnQgdG8gdHlwaW5nQWRkZWRUb09wZW5D b21tYW5kKCkuCisKIDIwMTAtMDktMjggIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29nbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KSW5kZXg6IFdlYkNvcmUv ZWRpdGluZy9UeXBpbmdDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcv VHlwaW5nQ29tbWFuZC5jcHAJKHJldmlzaW9uIDY4NTQ2KQorKysgV2ViQ29yZS9lZGl0aW5nL1R5 cGluZ0NvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsNyArMjgzLDcgQEAgRWRpdEFj dGlvbiBUeXBpbmdDb21tYW5kOjplZGl0aW5nQWN0aW9uKAogICAgIHJldHVybiBFZGl0QWN0aW9u VHlwaW5nOwogfQogCi12b2lkIFR5cGluZ0NvbW1hbmQ6Om1hcmtNaXNzcGVsbGluZ3NBZnRlclR5 cGluZygpCit2b2lkIFR5cGluZ0NvbW1hbmQ6Om1hcmtNaXNzcGVsbGluZ3NBZnRlclR5cGluZyhF VHlwaW5nQ29tbWFuZCBjb21tYW5kVHlwZSkKIHsKICNpZiBQTEFURk9STShNQUMpICYmICFkZWZp bmVkKEJVSUxESU5HX09OX1RJR0VSKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKQog ICAgIGlmICghZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPmlzQ29udGludW91c1NwZWxs Q2hlY2tpbmdFbmFibGVkKCkKQEAgLTMwOCwyMyArMzA4LDI3IEBAIHZvaWQgVHlwaW5nQ29tbWFu ZDo6bWFya01pc3NwZWxsaW5nc0FmdGUKICAgICAgICAgaWYgKHAxICE9IHAyKQogICAgICAgICAg ICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPm1hcmtNaXNzcGVsbGluZ3NBZnRlclR5 cGluZ1RvUG9zaXRpb24ocDEpOwogI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoQlVJTERJ TkdfT05fVElHRVIpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVk KEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKLSAgICAgICAgZWxzZQorICAgICAgICBlbHNlIGlm IChjb21tYW5kVHlwZSA9PSBUeXBpbmdDb21tYW5kOjpJbnNlcnRUZXh0KQogICAgICAgICAgICAg ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPnN0YXJ0Q29ycmVjdGlvblBhbmVsVGltZXIo KTsKICNlbmRpZgogICAgIH0KIH0KIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoQlVJ TERJTkdfT05fVElHRVIpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCiB2b2lkIFR5 cGluZ0NvbW1hbmQ6OnR5cGluZ0FkZGVkVG9PcGVuQ29tbWFuZChFVHlwaW5nQ29tbWFuZCBjb21t YW5kVHlwZUZvckFkZGVkVHlwaW5nKQorI2Vsc2UKK3ZvaWQgVHlwaW5nQ29tbWFuZDo6dHlwaW5n QWRkZWRUb09wZW5Db21tYW5kKEVUeXBpbmdDb21tYW5kKQorI2VuZGlmCiB7CiAgICAgdXBkYXRl UHJlc2VydmVzVHlwaW5nU3R5bGUoY29tbWFuZFR5cGVGb3JBZGRlZFR5cGluZyk7Ci0gICAgCisK ICNpZiBQTEFURk9STShNQUMpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1RJR0VSKSAmJiAhZGVm aW5lZChCVUlMRElOR19PTl9MRU9QQVJEKQogICAgIGRvY3VtZW50KCktPmZyYW1lKCktPmVkaXRv cigpLT5hcHBsaWVkRWRpdGluZyh0aGlzKTsKICAgICAvLyBTaW5jZSB0aGUgc3BlbGxjaGVja2lu ZyBjb2RlIG1heSBhbHNvIHBlcmZvcm0gY29ycmVjdGlvbnMgYW5kIG90aGVyIHJlcGxhY2VtZW50 cywgaXQgc2hvdWxkIGhhcHBlbiBhZnRlciB0aGUgdHlwaW5nIGNoYW5nZXMuCi0gICAgbWFya01p c3NwZWxsaW5nc0FmdGVyVHlwaW5nKCk7CisgICAgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5n KGNvbW1hbmRUeXBlRm9yQWRkZWRUeXBpbmcpOwogI2Vsc2UKICAgICAvLyBUaGUgb2xkIHNwZWxs Y2hlY2tpbmcgY29kZSByZXF1aXJlcyB0aGF0IGNoZWNraW5nIGJlIGRvbmUgZmlyc3QsIHRvIHBy ZXZlbnQgaXNzdWVzIGxpa2UgdGhhdCBpbiA2ODY0MDcyLCB3aGVyZSA8ZG9lc24ndD4gaXMgbWFy a2VkIGFzIG1pc3NwZWxsZWQuCi0gICAgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKCk7Cisg ICAgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKGNvbW1hbmRUeXBlRm9yQWRkZWRUeXBpbmcp OwogICAgIGRvY3VtZW50KCktPmZyYW1lKCktPmVkaXRvcigpLT5hcHBsaWVkRWRpdGluZyh0aGlz KTsKICNlbmRpZgogfQpJbmRleDogV2ViQ29yZS9lZGl0aW5nL1R5cGluZ0NvbW1hbmQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvVHlwaW5nQ29tbWFuZC5oCShyZXZpc2lvbiA2ODU0 NikKKysrIFdlYkNvcmUvZWRpdGluZy9UeXBpbmdDb21tYW5kLmgJKHdvcmtpbmcgY29weSkKQEAg LTgyLDEwICs4MiwxMCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBwcmVzZXJ2ZXNUeXBp bmdTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJlc2VydmVzVHlwaW5nU3R5bGU7IH0KIAogICAg IHZvaWQgdXBkYXRlUHJlc2VydmVzVHlwaW5nU3R5bGUoRVR5cGluZ0NvbW1hbmQpOwotICAgIHZv aWQgbWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nKCk7CisgICAgdm9pZCBtYXJrTWlzc3BlbGxp bmdzQWZ0ZXJUeXBpbmcoRVR5cGluZ0NvbW1hbmQpOwogICAgIHZvaWQgdHlwaW5nQWRkZWRUb09w ZW5Db21tYW5kKEVUeXBpbmdDb21tYW5kKTsKICAgICBib29sIG1ha2VFZGl0YWJsZVJvb3RFbXB0 eSgpOwotICAgIAorCiAgICAgRVR5cGluZ0NvbW1hbmQgbV9jb21tYW5kVHlwZTsKICAgICBTdHJp bmcgbV90ZXh0VG9JbnNlcnQ7CiAgICAgYm9vbCBtX29wZW5Gb3JNb3JlVHlwaW5nOwo= 69127 2010-09-28 16:22:23 -0700 2010-09-28 17:14:26 -0700 Proposed patch (v3) webkit_bug46679.patch text/plain 3580 jiapu.mail SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODU0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjggIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVsZXRlIGFuZCBm b3J3YXJkIGRlbGV0ZSBzaG91bGRuJ3Qgc3RhcnQgYXV0b2NvcnJlY3Rpb24gcGFuZWwgdGltZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjY3OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ2MzkxNz4KKworICAgICAgICAqIGVkaXRpbmcvVHlw aW5nQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUeXBpbmdDb21tYW5kOjptYXJrTWlz c3BlbGxpbmdzQWZ0ZXJUeXBpbmcpOiBPbmx5IHN0YXJ0IGNvcnJlY3Rpb24gcGFuZWwgdGltZXIK KyAgICAgICAgICB3aGVuIHRoZSBlZGl0aW5nIGNvbW1hbmQgaXMgSW5zZXJ0VGV4dC4KKyAgICAg ICAgKFdlYkNvcmU6OlR5cGluZ0NvbW1hbmQ6OnR5cGluZ0FkZGVkVG9PcGVuQ29tbWFuZCk6IEFk ZCBhbiBhcmd1bWVudCB0byBwYXNzIGluIGNvbW1hbmQgdHlwZS4KKworICAgICAgICAqIGVkaXRp bmcvVHlwaW5nQ29tbWFuZC5oOiBBZGQgYW4gYXJndW1lbnQgdG8gdHlwaW5nQWRkZWRUb09wZW5D b21tYW5kKCkuCisKIDIwMTAtMDktMjggIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29nbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KSW5kZXg6IFdlYkNvcmUv ZWRpdGluZy9UeXBpbmdDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcv VHlwaW5nQ29tbWFuZC5jcHAJKHJldmlzaW9uIDY4NTQ2KQorKysgV2ViQ29yZS9lZGl0aW5nL1R5 cGluZ0NvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsNyArMjgzLDcgQEAgRWRpdEFj dGlvbiBUeXBpbmdDb21tYW5kOjplZGl0aW5nQWN0aW9uKAogICAgIHJldHVybiBFZGl0QWN0aW9u VHlwaW5nOwogfQogCi12b2lkIFR5cGluZ0NvbW1hbmQ6Om1hcmtNaXNzcGVsbGluZ3NBZnRlclR5 cGluZygpCit2b2lkIFR5cGluZ0NvbW1hbmQ6Om1hcmtNaXNzcGVsbGluZ3NBZnRlclR5cGluZyhF VHlwaW5nQ29tbWFuZCBjb21tYW5kVHlwZSkKIHsKICNpZiBQTEFURk9STShNQUMpICYmICFkZWZp bmVkKEJVSUxESU5HX09OX1RJR0VSKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKQog ICAgIGlmICghZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPmlzQ29udGludW91c1NwZWxs Q2hlY2tpbmdFbmFibGVkKCkKQEAgLTMwOCw4ICszMDgsMTAgQEAgdm9pZCBUeXBpbmdDb21tYW5k OjptYXJrTWlzc3BlbGxpbmdzQWZ0ZQogICAgICAgICBpZiAocDEgIT0gcDIpCiAgICAgICAgICAg ICBkb2N1bWVudCgpLT5mcmFtZSgpLT5lZGl0b3IoKS0+bWFya01pc3NwZWxsaW5nc0FmdGVyVHlw aW5nVG9Qb3NpdGlvbihwMSk7CiAjaWYgUExBVEZPUk0oTUFDKSAmJiAhZGVmaW5lZChCVUlMRElO R19PTl9USUdFUikgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQo QlVJTERJTkdfT05fU05PV19MRU9QQVJEKQotICAgICAgICBlbHNlCisgICAgICAgIGVsc2UgaWYg KGNvbW1hbmRUeXBlID09IFR5cGluZ0NvbW1hbmQ6Okluc2VydFRleHQpCiAgICAgICAgICAgICBk b2N1bWVudCgpLT5mcmFtZSgpLT5lZGl0b3IoKS0+c3RhcnRDb3JyZWN0aW9uUGFuZWxUaW1lcigp OworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0oY29tbWFuZFR5cGUpOwogI2VuZGlmCiAgICAgfQog fQpAQCAtMzE3LDE0ICszMTksMTQgQEAgdm9pZCBUeXBpbmdDb21tYW5kOjptYXJrTWlzc3BlbGxp bmdzQWZ0ZQogdm9pZCBUeXBpbmdDb21tYW5kOjp0eXBpbmdBZGRlZFRvT3BlbkNvbW1hbmQoRVR5 cGluZ0NvbW1hbmQgY29tbWFuZFR5cGVGb3JBZGRlZFR5cGluZykKIHsKICAgICB1cGRhdGVQcmVz ZXJ2ZXNUeXBpbmdTdHlsZShjb21tYW5kVHlwZUZvckFkZGVkVHlwaW5nKTsKLSAgICAKKwogI2lm IFBMQVRGT1JNKE1BQykgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpICYmICFkZWZpbmVk KEJVSUxESU5HX09OX0xFT1BBUkQpCiAgICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCkt PmFwcGxpZWRFZGl0aW5nKHRoaXMpOwogICAgIC8vIFNpbmNlIHRoZSBzcGVsbGNoZWNraW5nIGNv ZGUgbWF5IGFsc28gcGVyZm9ybSBjb3JyZWN0aW9ucyBhbmQgb3RoZXIgcmVwbGFjZW1lbnRzLCBp dCBzaG91bGQgaGFwcGVuIGFmdGVyIHRoZSB0eXBpbmcgY2hhbmdlcy4KLSAgICBtYXJrTWlzc3Bl bGxpbmdzQWZ0ZXJUeXBpbmcoKTsKKyAgICBtYXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmcoY29t bWFuZFR5cGVGb3JBZGRlZFR5cGluZyk7CiAjZWxzZQogICAgIC8vIFRoZSBvbGQgc3BlbGxjaGVj a2luZyBjb2RlIHJlcXVpcmVzIHRoYXQgY2hlY2tpbmcgYmUgZG9uZSBmaXJzdCwgdG8gcHJldmVu dCBpc3N1ZXMgbGlrZSB0aGF0IGluIDY4NjQwNzIsIHdoZXJlIDxkb2Vzbid0PiBpcyBtYXJrZWQg YXMgbWlzc3BlbGxlZC4KLSAgICBtYXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmcoKTsKKyAgICBt YXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmcoY29tbWFuZFR5cGVGb3JBZGRlZFR5cGluZyk7CiAg ICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ZWRpdG9yKCktPmFwcGxpZWRFZGl0aW5nKHRoaXMpOwog I2VuZGlmCiB9CkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvVHlwaW5nQ29tbWFuZC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9UeXBpbmdDb21tYW5kLmgJKHJldmlzaW9uIDY4NTQ2KQor KysgV2ViQ29yZS9lZGl0aW5nL1R5cGluZ0NvbW1hbmQuaAkod29ya2luZyBjb3B5KQpAQCAtODIs MTAgKzgyLDEwIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIHByZXNlcnZlc1R5cGluZ1N0 eWxlKCkgY29uc3QgeyByZXR1cm4gbV9wcmVzZXJ2ZXNUeXBpbmdTdHlsZTsgfQogCiAgICAgdm9p ZCB1cGRhdGVQcmVzZXJ2ZXNUeXBpbmdTdHlsZShFVHlwaW5nQ29tbWFuZCk7Ci0gICAgdm9pZCBt YXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmcoKTsKKyAgICB2b2lkIG1hcmtNaXNzcGVsbGluZ3NB ZnRlclR5cGluZyhFVHlwaW5nQ29tbWFuZCk7CiAgICAgdm9pZCB0eXBpbmdBZGRlZFRvT3BlbkNv bW1hbmQoRVR5cGluZ0NvbW1hbmQpOwogICAgIGJvb2wgbWFrZUVkaXRhYmxlUm9vdEVtcHR5KCk7 Ci0gICAgCisKICAgICBFVHlwaW5nQ29tbWFuZCBtX2NvbW1hbmRUeXBlOwogICAgIFN0cmluZyBt X3RleHRUb0luc2VydDsKICAgICBib29sIG1fb3BlbkZvck1vcmVUeXBpbmc7Cg==