129362 2014-02-25 21:54:20 -0800 [iOS] Remove some erroneously captured blocks 2014-02-26 10:09:47 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca commit-queue enrica sam oldest_to_newest 984625 0 ap 2014-02-25 21:54:20 -0800 In <http://trac.webkit.org/r164409>, I added some code that captures Objective-C blocks in a C++ lambda. But 1. This doesn't work, you can't simply capture a block. 2. These blocks are not used in completion function anyway. 984626 1 225220 ap 2014-02-25 21:56:33 -0800 Created attachment 225220 proposed patch 984784 2 225220 commit-queue 2014-02-26 10:09:45 -0800 Comment on attachment 225220 proposed patch Clearing flags on attachment: 225220 Committed r164721: <http://trac.webkit.org/changeset/164721> 984785 3 commit-queue 2014-02-26 10:09:47 -0800 All reviewed patches have been landed. Closing bug. 225220 2014-02-25 21:56:33 -0800 2014-02-26 10:09:45 -0800 proposed patch BadCapture.txt text/plain 2970 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDY5NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAyLTI1ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFJlbW92ZSBzb21l IGVycm9uZW91c2x5IGNhcHR1cmVkIGJsb2NrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MzYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBjYXB0dXJlZCBPYmplY3RpdmUtQyBi bG9jayB2YXJpYWJsZXMgKGNhcHR1cmluZyB0aGVzZSBkb2Vzbid0IHdvcmsgYW55d2F5KS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IHJlcXVlc3RBdXRvY29ycmVjdGlvblJlY3RzRm9yU3RyaW5n OndpdGhDb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyByZXF1 ZXN0QXV0b2NvcnJlY3Rpb25Db250ZXh0V2l0aENvbXBsZXRpb25IYW5kbGVyOl0pOgorCiAyMDE0 LTAyLTI1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVuYW1lIFdlYkNvcmU6OlZpc2l0ZWRMaW5rUHJvdmlkZXIgdG8gV2ViQ29yZTo6VmlzaXRlZExp bmtTdG9yZQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHJldmlzaW9uIDE2NDY2OCkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTQwLDcgKzExNDAsNyBAQCAtICh2b2lkKXJlcXVlc3RBdXRvY29ycmVj dGlvblJlY3RzRm9yU3RyCiAgICAgfQogCiAgICAgX2F1dG9jb3JyZWN0aW9uRGF0YS5hdXRvY29y cmVjdGlvbkhhbmRsZXIgPSBbY29tcGxldGlvbkhhbmRsZXIgY29weV07Ci0gICAgX3BhZ2UtPnJl cXVlc3RBdXRvY29ycmVjdGlvbkRhdGEoaW5wdXQsIEF1dG9jb3JyZWN0aW9uRGF0YUNhbGxiYWNr OjpjcmVhdGUoW3NlbGYsIGNvbXBsZXRpb25IYW5kbGVyXShib29sLCBjb25zdCBWZWN0b3I8Rmxv YXRSZWN0PiYgcmVjdHMsIGNvbnN0IFN0cmluZyYgZm9udE5hbWUsIGRvdWJsZSBmb250U2l6ZSwg dWludDY0X3QgdHJhaXRzKSB7CisgICAgX3BhZ2UtPnJlcXVlc3RBdXRvY29ycmVjdGlvbkRhdGEo aW5wdXQsIEF1dG9jb3JyZWN0aW9uRGF0YUNhbGxiYWNrOjpjcmVhdGUoW3NlbGZdKGJvb2wsIGNv bnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiByZWN0cywgY29uc3QgU3RyaW5nJiBmb250TmFtZSwgZG91 YmxlIGZvbnRTaXplLCB1aW50NjRfdCB0cmFpdHMpIHsKICAgICAgICAgQ0dSZWN0IGZpcnN0UmVj dCA9IENHUmVjdFplcm87CiAgICAgICAgIENHUmVjdCBsYXN0UmVjdCA9IENHUmVjdFplcm87CiAg ICAgICAgIGlmIChyZWN0cy5zaXplKCkpIHsKQEAgLTExOTcsNyArMTE5Nyw3IEBAIC0gKHZvaWQp cmVxdWVzdEF1dG9jb3JyZWN0aW9uQ29udGV4dFdpdGgKICAgICAgICAgY29tcGxldGlvbkhhbmRs ZXIoW1dLQXV0b2NvcnJlY3Rpb25Db250ZXh0IGF1dG9jb3JyZWN0aW9uQ29udGV4dFdpdGhEYXRh OmJlZm9yZVRleHQgbWFya2VkVGV4dDptYXJrZWRUZXh0IHNlbGVjdGVkVGV4dDpzZWxlY3RlZFRl eHQgYWZ0ZXJUZXh0OmFmdGVyVGV4dCBzZWxlY3RlZFJhbmdlSW5NYXJrZWRUZXh0Ok5TTWFrZVJh bmdlKGxvY2F0aW9uLCBsZW5ndGgpXSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgX2F1dG9jb3Jy ZWN0aW9uRGF0YS5hdXRvY29ycmVjdGlvbkNvbnRleHRIYW5kbGVyID0gW2NvbXBsZXRpb25IYW5k bGVyIGNvcHldOwotICAgICAgICBfcGFnZS0+cmVxdWVzdEF1dG9jb3JyZWN0aW9uQ29udGV4dChB dXRvY29ycmVjdGlvbkNvbnRleHRDYWxsYmFjazo6Y3JlYXRlKFtzZWxmLCBjb21wbGV0aW9uSGFu ZGxlcl0oYm9vbCAvKmVycm9yKi8sIGNvbnN0IFN0cmluZyYgYmVmb3JlVGV4dCwgY29uc3QgU3Ry aW5nJiBtYXJrZWRUZXh0LCBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCwgY29uc3QgU3RyaW5n JiBhZnRlclRleHQsIHVpbnQ2NF90IGxvY2F0aW9uLCB1aW50NjRfdCBsZW5ndGgpIHsKKyAgICAg ICAgX3BhZ2UtPnJlcXVlc3RBdXRvY29ycmVjdGlvbkNvbnRleHQoQXV0b2NvcnJlY3Rpb25Db250 ZXh0Q2FsbGJhY2s6OmNyZWF0ZShbc2VsZl0oYm9vbCAvKmVycm9yKi8sIGNvbnN0IFN0cmluZyYg YmVmb3JlVGV4dCwgY29uc3QgU3RyaW5nJiBtYXJrZWRUZXh0LCBjb25zdCBTdHJpbmcmIHNlbGVj dGVkVGV4dCwgY29uc3QgU3RyaW5nJiBhZnRlclRleHQsIHVpbnQ2NF90IGxvY2F0aW9uLCB1aW50 NjRfdCBsZW5ndGgpIHsKICAgICAgICAgICAgIF9hdXRvY29ycmVjdGlvbkRhdGEuYXV0b2NvcnJl Y3Rpb25Db250ZXh0SGFuZGxlcihbV0tBdXRvY29ycmVjdGlvbkNvbnRleHQgYXV0b2NvcnJlY3Rp b25Db250ZXh0V2l0aERhdGE6YmVmb3JlVGV4dCBtYXJrZWRUZXh0Om1hcmtlZFRleHQgc2VsZWN0 ZWRUZXh0OnNlbGVjdGVkVGV4dCBhZnRlclRleHQ6YWZ0ZXJUZXh0IHNlbGVjdGVkUmFuZ2VJbk1h cmtlZFRleHQ6TlNNYWtlUmFuZ2UobG9jYXRpb24sIGxlbmd0aCldKTsKICAgICAgICAgfSkpOwog ICAgIH0K