57321 2011-03-29 02:57:34 -0700 Rename InlineIterator::block to m_block to match modern style 2011-03-29 07:07:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 50912 1 eric eric abarth commit-queue rniwa oldest_to_newest 375142 0 eric 2011-03-29 02:57:34 -0700 Rename InlineIterator::block to m_block to match modern style 375143 1 87288 eric 2011-03-29 02:58:42 -0700 Created attachment 87288 Patch 375147 2 rniwa 2011-03-29 03:02:49 -0700 Maybe your checkout is out of date? 375149 3 rniwa 2011-03-29 03:05:15 -0700 It seems like the change log change in your patch to rename obj is interfering with this one. 375153 4 87288 eric 2011-03-29 03:15:29 -0700 Comment on attachment 87288 Patch Again svn-apply knows how to handle this case. 375221 5 87288 commit-queue 2011-03-29 05:58:02 -0700 Comment on attachment 87288 Patch Rejecting attachment 87288 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2 Last 500 characters of output: ceeded at 1 with fuzz 3. patching file Source/WebCore/rendering/InlineIterator.h Hunk #1 FAILED at 34. Hunk #2 FAILED at 42. Hunk #3 FAILED at 55. Hunk #4 FAILED at 186. Hunk #5 succeeded at 240 with fuzz 1. 4 out of 5 hunks FAILED -- saving rejects to file Source/WebCore/rendering/InlineIterator.h.rej patching file Source/WebCore/rendering/RenderBlockLineLayout.cpp Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Ryosuke Niwa', u'--for..." exit_code: 1 Full output: http://queues.webkit.org/results/8280257 375275 6 87288 commit-queue 2011-03-29 07:07:06 -0700 Comment on attachment 87288 Patch Clearing flags on attachment: 87288 Committed r82245: <http://trac.webkit.org/changeset/82245> 375276 7 commit-queue 2011-03-29 07:07:12 -0700 All reviewed patches have been landed. Closing bug. 87288 2011-03-29 02:58:42 -0700 2011-03-29 07:07:06 -0700 Patch bug-57321-20110329115840.patch text/plain 4094 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyMTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MTAzMDE2YWM0ZGY5MWJh YzdmZDI0NjgzMGY1OTBmMzYzNmNkM2NmLi4xNmVjN2Q4YzAyYzU5NjhmZWI4OGI4MWM2YWIwOTBi MTRmYmUyYTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjQgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgSW5saW5lSXRlcmF0b3I6OmJs b2NrIHRvIG1fYmxvY2sgdG8gbWF0Y2ggbW9kZXJuIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzMyMQorCisgICAgICAgIEkgY291bGQgaGF2 ZSBtYWRlIG1fYmxvY2sgcHJpdmF0ZSwgc2luY2UgaXQncyBvbmx5IGFjY2Vzc2VkIGluCisgICAg ICAgIG9uZSBwbGFjZSBvdXRzaWRlIG9mIElubGluZUl0ZXJhdG9yIChmb3IgYW4gQVNTRVJUKS4g IEJ1dCBJIGNob3NlCisgICAgICAgIG5vdCB0byBkbyBzbyBpbiB0aGlzIGNoYW5nZS4KKworICAg ICAgICAqIHJlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6SW5s aW5lSXRlcmF0b3I6OklubGluZUl0ZXJhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0 ZXJhdG9yOjppbmNyZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lQmlkaVJlc29sdmVy OjphcHBlbmRSdW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKToK KworMjAxMS0wMy0yOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgUmVuYW1lIElubGluZUl0ZXJh dG9yOjpvYmogdG8gbV9vYmogdG8gbWF0Y2ggbW9kZXJuIHN0eWxlCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzMxOQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCmluZGV4IDBhZTEyYzBlOGI1MThlMWUzYWY3MTA5MmY4 OGEzOWM1NDkzNjk0MDEuLjQyMTQxMzQ0MzFhZGVmYzM1ZmMzOWYwYmJjNDc1NTIxMDVmMTg0ZGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCkBAIC0zNCw3ICsz NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIElubGluZUl0ZXJhdG9yIHsKIHB1Ymxp YzoKICAgICBJbmxpbmVJdGVyYXRvcigpCi0gICAgICAgIDogYmxvY2soMCkKKyAgICAgICAgOiBt X2Jsb2NrKDApCiAgICAgICAgICwgbV9vYmooMCkKICAgICAgICAgLCBwb3MoMCkKICAgICAgICAg LCBuZXh0QnJlYWthYmxlUG9zaXRpb24oLTEpCkBAIC00Miw3ICs0Miw3IEBAIHB1YmxpYzoKICAg ICB9CiAKICAgICBJbmxpbmVJdGVyYXRvcihSZW5kZXJCbG9jayogYiwgUmVuZGVyT2JqZWN0KiBv LCB1bnNpZ25lZCBwKQotICAgICAgICA6IGJsb2NrKGIpCisgICAgICAgIDogbV9ibG9jayhiKQog ICAgICAgICAsIG1fb2JqKG8pCiAgICAgICAgICwgcG9zKHApCiAgICAgICAgICwgbmV4dEJyZWFr YWJsZVBvc2l0aW9uKC0xKQpAQCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6CiAgICAgVUNoYXIgY3Vy cmVudCgpIGNvbnN0OwogICAgIEFMV0FZU19JTkxJTkUgV1RGOjpVbmljb2RlOjpEaXJlY3Rpb24g ZGlyZWN0aW9uKCkgY29uc3Q7CiAKLSAgICBSZW5kZXJCbG9jayogYmxvY2s7CisgICAgUmVuZGVy QmxvY2sqIG1fYmxvY2s7CiAgICAgUmVuZGVyT2JqZWN0KiBtX29iajsKICAgICB1bnNpZ25lZCBw b3M7CiAgICAgaW50IG5leHRCcmVha2FibGVQb3NpdGlvbjsKQEAgLTE4NiwxMiArMTg2LDEyIEBA IGlubGluZSB2b2lkIElubGluZUl0ZXJhdG9yOjppbmNyZW1lbnQoSW5saW5lQmlkaVJlc29sdmVy KiByZXNvbHZlcikKICAgICBpZiAobV9vYmotPmlzVGV4dCgpKSB7CiAgICAgICAgIHBvcysrOwog ICAgICAgICBpZiAocG9zID49IHRvUmVuZGVyVGV4dChtX29iaiktPnRleHRMZW5ndGgoKSkgewot ICAgICAgICAgICAgbV9vYmogPSBiaWRpTmV4dChibG9jaywgbV9vYmosIHJlc29sdmVyKTsKKyAg ICAgICAgICAgIG1fb2JqID0gYmlkaU5leHQobV9ibG9jaywgbV9vYmosIHJlc29sdmVyKTsKICAg ICAgICAgICAgIHBvcyA9IDA7CiAgICAgICAgICAgICBuZXh0QnJlYWthYmxlUG9zaXRpb24gPSAt MTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fb2JqID0gYmlkaU5leHQoYmxv Y2ssIG1fb2JqLCByZXNvbHZlcik7CisgICAgICAgIG1fb2JqID0gYmlkaU5leHQobV9ibG9jaywg bV9vYmosIHJlc29sdmVyKTsKICAgICAgICAgcG9zID0gMDsKICAgICAgICAgbmV4dEJyZWFrYWJs ZVBvc2l0aW9uID0gLTE7CiAgICAgfQpAQCAtMjQwLDcgKzI0MCw3IEBAIGlubGluZSB2b2lkIElu bGluZUJpZGlSZXNvbHZlcjo6YXBwZW5kUnVuKCkKICAgICAgICAgd2hpbGUgKG9iaiAmJiBvYmog IT0gZW9yLm1fb2JqICYmIG9iaiAhPSBlbmRPZkxpbmUubV9vYmopIHsKICAgICAgICAgICAgIFJl bmRlckJsb2NrOjphcHBlbmRSdW5zRm9yT2JqZWN0KHN0YXJ0LCBvYmotPmxlbmd0aCgpLCBvYmos ICp0aGlzKTsgICAgICAgIAogICAgICAgICAgICAgc3RhcnQgPSAwOwotICAgICAgICAgICAgb2Jq ID0gYmlkaU5leHQoc29yLmJsb2NrLCBvYmopOworICAgICAgICAgICAgb2JqID0gYmlkaU5leHQo c29yLm1fYmxvY2ssIG9iaik7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG9iaikgewogICAgICAg ICAgICAgdW5zaWduZWQgcG9zID0gb2JqID09IGVvci5tX29iaiA/IGVvci5wb3MgOiBVSU5UX01B WDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91 dC5jcHAKaW5kZXggZGMxMWYyNjAyOGQ5ODUwN2U5MDBhYTUwNzlkNGY3YjcxNjViZDRhMS4uODY0 ZTI4OGQ5ZTk0MzE3ZWNhMzk3MTVjMmY0NjY4Y2E5YTYwZjBmMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAgLTE1MTMsNyAr MTUxMyw3IEBAIHN0YXRpYyB2b2lkIHRyeUh5cGhlbmF0aW5nKFJlbmRlclRleHQqIHRleHQsIGNv bnN0IEZvbnQmIGZvbnQsIGNvbnN0IEF0b21pY1N0cmluCiBJbmxpbmVJdGVyYXRvciBSZW5kZXJC bG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9v bCBmaXJzdExpbmUsIGJvb2wmIGlzTGluZUVtcHR5LCBMaW5lQnJlYWtJdGVyYXRvckluZm8mIGxp bmVCcmVha0l0ZXJhdG9ySW5mbywgYm9vbCYgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5LCAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sJiBoeXBoZW5h dGVkLCBFQ2xlYXIqIGNsZWFyLCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZpb3Vz TGluZSwgVmVjdG9yPFJlbmRlckJveCo+JiBwb3NpdGlvbmVkQm94ZXMpCiB7Ci0gICAgQVNTRVJU KHJlc29sdmVyLnBvc2l0aW9uKCkuYmxvY2sgPT0gdGhpcyk7CisgICAgQVNTRVJUKHJlc29sdmVy LnBvc2l0aW9uKCkubV9ibG9jayA9PSB0aGlzKTsKIAogICAgIGJvb2wgYXBwbGllZFN0YXJ0V2lk dGggPSByZXNvbHZlci5wb3NpdGlvbigpLnBvcyA+IDA7CiAgICAgTGluZU1pZHBvaW50U3RhdGUm IGxpbmVNaWRwb2ludFN0YXRlID0gcmVzb2x2ZXIubWlkcG9pbnRTdGF0ZSgpOwo=