140564 2015-01-16 14:17:28 -0800 [Mac] Correct infinite loop in Wheel Handler code in EventHandlerMac 2015-01-16 17:50:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 139914 1 bfulgham bfulgham bfulgham webkit-bug-importer oldest_to_newest 1061963 0 bfulgham 2015-01-16 14:17:28 -0800 A bug was introduced in Bug 139914 due to a typo when converting the while() loop in the patch to a for() loop. 1061965 1 bfulgham 2015-01-16 14:18:07 -0800 <rdar://problem/19386426> 1062056 2 bfulgham 2015-01-16 17:25:16 -0800 Index: mac/EventHandlerMac.mm =================================================================== --- mac/EventHandlerMac.mm (revision 178590) +++ mac/EventHandlerMac.mm (working copy) @@ -834,7 +834,7 @@ if (&frame == latchedState->frame()) return false; - for (Frame* ancestor = frame.tree().parent(); ancestor; ancestor->tree().parent()) { + for (Frame* ancestor = frame.tree().parent(); ancestor; ancestor = ancestor->tree().parent()) { if (ancestor == latchedState->frame()) return true; } 1062057 3 244823 bfulgham 2015-01-16 17:31:50 -0800 Created attachment 244823 Patch 1062060 4 bfulgham 2015-01-16 17:49:48 -0800 Committed r178617: <http://trac.webkit.org/changeset/178617> 244823 2015-01-16 17:31:50 -0800 2015-01-16 17:38:11 -0800 Patch bug-140564-20150116173900.patch text/plain 1402 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3ODYxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTAxLTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENvcnJlY3QgaW5m aW5pdGUgbG9vcCBpbiBXaGVlbCBIYW5kbGVyIGNvZGUgaW4gRXZlbnRIYW5kbGVyTWFjCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA1NjQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE5Mzg2NDI2LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6bGF0Y2hpbmdJc0xvY2tlZFRvQW5jZXN0b3JPZlRoaXNGcmFtZSk6IFB1 dCBtaXNzaW5nIGFzc2lnbm1lbnQKKyAgICAgICAgYmFjayBpbnRvIHRoZSBsb29wIQorCiAyMDE1 LTAxLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2hlbiBi b3JkZXItcmFkaXVzIGlzIHByZXNlbnQsIGluc2V0L291dHNldC9ncm9vdmUvcmlkZ2UgYm9yZGVy IGNvbG9yIGNoYW5nZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRs ZXJNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5k bGVyTWFjLm1tCShyZXZpc2lvbiAxNzg1OTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9F dmVudEhhbmRsZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTgzNCw3ICs4MzQsNyBAQCBzdGF0 aWMgYm9vbCBsYXRjaGluZ0lzTG9ja2VkVG9BbmNlc3Rvck9mCiAgICAgaWYgKCZmcmFtZSA9PSBs YXRjaGVkU3RhdGUtPmZyYW1lKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGZvciAo RnJhbWUqIGFuY2VzdG9yID0gZnJhbWUudHJlZSgpLnBhcmVudCgpOyBhbmNlc3RvcjsgYW5jZXN0 b3ItPnRyZWUoKS5wYXJlbnQoKSkgeworICAgIGZvciAoRnJhbWUqIGFuY2VzdG9yID0gZnJhbWUu dHJlZSgpLnBhcmVudCgpOyBhbmNlc3RvcjsgYW5jZXN0b3IgPSBhbmNlc3Rvci0+dHJlZSgpLnBh cmVudCgpKSB7CiAgICAgICAgIGlmIChhbmNlc3RvciA9PSBsYXRjaGVkU3RhdGUtPmZyYW1lKCkp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9Cg==