129437 2014-02-27 10:44:57 -0800 [iOS] selectionImageForcingBlackText should return autoreleased object 2014-03-01 15:25:42 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 psolanki psolanki andersca darin mitz psolanki simon.fraser oldest_to_newest 985247 0 psolanki 2014-02-27 10:44:57 -0800 [WebHTMLView(WebDocumentPrivateProtocols) selectionImageForcingBlackText:] returns a retained CGImageRef on iOS. It should return an autoreleased object like we do on OS X. 985248 1 psolanki 2014-02-27 10:45:10 -0800 <rdar://problem/15810384> 985251 2 225393 psolanki 2014-02-27 10:46:23 -0800 Created attachment 225393 Patch 985252 3 225393 psolanki 2014-02-27 10:48:15 -0800 Comment on attachment 225393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225393&action=review > Source/WebKit/mac/WebView/WebHTMLView.mm:6572 > + return (CGImageRef)CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef()); I know C-style cast is frowned upon, but static_cast didn't work for me here. /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6572:12: error: cannot cast from type 'id' to pointer type 'CGImageRef' (aka 'CGImage *') return static_cast<CGImageRef>(CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef())); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Let me know if there's something better I could do here. 985304 4 225393 darin 2014-02-27 12:21:22 -0800 Comment on attachment 225393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225393&action=review >> Source/WebKit/mac/WebView/WebHTMLView.mm:6572 >> + return (CGImageRef)CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef()); > > I know C-style cast is frowned upon, but static_cast didn't work for me here. > > /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6572:12: error: cannot cast from type 'id' to pointer type 'CGImageRef' (aka 'CGImage *') > return static_cast<CGImageRef>(CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef())); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > Let me know if there's something better I could do here. I think we should prefer CFAutorelease here instead of CFBridgingRelease. CFBridgingRelease is good when we want to turn a CF object into an autoreleased NS object, but when we just want to do a CF autorelease, CFAutorelease seems a better choice. If we did that, then the static_cast would probably work, or might not be needed at all. 985470 5 225393 psolanki 2014-02-27 22:47:55 -0800 Comment on attachment 225393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225393&action=review >>> Source/WebKit/mac/WebView/WebHTMLView.mm:6572 >>> + return (CGImageRef)CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef()); >> >> I know C-style cast is frowned upon, but static_cast didn't work for me here. >> >> /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6572:12: error: cannot cast from type 'id' to pointer type 'CGImageRef' (aka 'CGImage *') >> return static_cast<CGImageRef>(CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef())); >> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> 1 error generated. >> >> Let me know if there's something better I could do here. > > I think we should prefer CFAutorelease here instead of CFBridgingRelease. CFBridgingRelease is good when we want to turn a CF object into an autoreleased NS object, but when we just want to do a CF autorelease, CFAutorelease seems a better choice. > > If we did that, then the static_cast would probably work, or might not be needed at all. So I tried CFAutorelease. Since CFAutorelease will crash if passed null, I wrote the code as CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); return dragImage ? CFAutorelease(dragImage) : nil; clang didn't like that /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6573:12: error: cannot initialize return object of type 'CGImageRef' (aka 'CGImage *') with an rvalue of type 'CFTypeRef' (aka 'const void *') return dragImage ? CFAutorelease(dragImage) : nil; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Next up, static_cast /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6573:24: error: static_cast from 'CFTypeRef' (aka 'const void *') to 'CGImageRef' (aka 'CGImage *') casts away qualifiers return dragImage ? static_cast<CGImageRef>(CFAutorelease(dragImage)) : nil; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Do I need a const_cast? return dragImage ? static_cast<CGImageRef>(const_cast<void *>(CFAutorelease(dragImage))) : nil; That seems ugly... 985555 6 225393 darin 2014-02-28 07:47:33 -0800 Comment on attachment 225393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225393&action=review >>>> Source/WebKit/mac/WebView/WebHTMLView.mm:6572 >>>> + return (CGImageRef)CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef()); >>> >>> I know C-style cast is frowned upon, but static_cast didn't work for me here. >>> >>> /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6572:12: error: cannot cast from type 'id' to pointer type 'CGImageRef' (aka 'CGImage *') >>> return static_cast<CGImageRef>(CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef())); >>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>> 1 error generated. >>> >>> Let me know if there's something better I could do here. >> >> I think we should prefer CFAutorelease here instead of CFBridgingRelease. CFBridgingRelease is good when we want to turn a CF object into an autoreleased NS object, but when we just want to do a CF autorelease, CFAutorelease seems a better choice. >> >> If we did that, then the static_cast would probably work, or might not be needed at all. > > So I tried CFAutorelease. Since CFAutorelease will crash if passed null, I wrote the code as > > CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); > return dragImage ? CFAutorelease(dragImage) : nil; > > clang didn't like that > > /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6573:12: error: cannot initialize return object of type 'CGImageRef' (aka 'CGImage *') with an rvalue of type 'CFTypeRef' (aka 'const void *') > return dragImage ? CFAutorelease(dragImage) : nil; > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > Next up, static_cast > > /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6573:24: error: static_cast from 'CFTypeRef' (aka 'const void *') to 'CGImageRef' (aka 'CGImage *') casts away qualifiers > return dragImage ? static_cast<CGImageRef>(CFAutorelease(dragImage)) : nil; > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > Do I need a const_cast? > > return dragImage ? static_cast<CGImageRef>(const_cast<void *>(CFAutorelease(dragImage))) : nil; > > That seems ugly... OK, how about this? CFDragImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); if (dragImage) CFAutorelease(dragImage); return dragImage; I suppose this is really interim code. When bug 125241 is fixed, this should be changed to: return createDragImageForSelection(*coreFrame, forceBlackText).autorelease(); Or whatever name we choose for the autorelease member function. 985556 7 225393 darin 2014-02-28 07:51:09 -0800 Comment on attachment 225393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225393&action=review >>>>> Source/WebKit/mac/WebView/WebHTMLView.mm:6572 >>>>> + return (CGImageRef)CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef()); >>>> >>>> I know C-style cast is frowned upon, but static_cast didn't work for me here. >>>> >>>> /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6572:12: error: cannot cast from type 'id' to pointer type 'CGImageRef' (aka 'CGImage *') >>>> return static_cast<CGImageRef>(CFBridgingRelease(createDragImageForSelection(*coreFrame, forceBlackText).leakRef())); >>>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>>> 1 error generated. >>>> >>>> Let me know if there's something better I could do here. >>> >>> I think we should prefer CFAutorelease here instead of CFBridgingRelease. CFBridgingRelease is good when we want to turn a CF object into an autoreleased NS object, but when we just want to do a CF autorelease, CFAutorelease seems a better choice. >>> >>> If we did that, then the static_cast would probably work, or might not be needed at all. >> >> So I tried CFAutorelease. Since CFAutorelease will crash if passed null, I wrote the code as >> >> CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); >> return dragImage ? CFAutorelease(dragImage) : nil; >> >> clang didn't like that >> >> /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6573:12: error: cannot initialize return object of type 'CGImageRef' (aka 'CGImage *') with an rvalue of type 'CFTypeRef' (aka 'const void *') >> return dragImage ? CFAutorelease(dragImage) : nil; >> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> 1 error generated. >> >> Next up, static_cast >> >> /Volumes/Data/psolanki/sources/Safari/OpenSource/Source/WebKit/mac/WebView/WebHTMLView.mm:6573:24: error: static_cast from 'CFTypeRef' (aka 'const void *') to 'CGImageRef' (aka 'CGImage *') casts away qualifiers >> return dragImage ? static_cast<CGImageRef>(CFAutorelease(dragImage)) : nil; >> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> 1 error generated. >> >> Do I need a const_cast? >> >> return dragImage ? static_cast<CGImageRef>(const_cast<void *>(CFAutorelease(dragImage))) : nil; >> >> That seems ugly... > > OK, how about this? > > CFDragImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); > if (dragImage) > CFAutorelease(dragImage); > return dragImage; > > I suppose this is really interim code. When bug 125241 is fixed, this should be changed to: > > return createDragImageForSelection(*coreFrame, forceBlackText).autorelease(); > > Or whatever name we choose for the autorelease member function. Or we could do this: CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); return dragImage ? (CFImageRef)CFAutorelease(dragImage) : nil; That is still better than CFBridgingRelease, since that function is for a different purpose, and there is a difference between CFRelease and CFBridgingRelease under ARC and we may wish to convert one day. 985709 8 psolanki 2014-02-28 14:11:43 -0800 (In reply to comment #7) > (From update of attachment 225393 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=225393&action=review > Or we could do this: > > CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef(); > return dragImage ? (CFImageRef)CFAutorelease(dragImage) : nil; > > That is still better than CFBridgingRelease, since that function is for a different purpose, and there is a difference between CFRelease and CFBridgingRelease under ARC and we may wish to convert one day. I think I will just go with this approach. I found another place where we had the exact same issue. New patch coming up. 985711 9 225491 psolanki 2014-02-28 14:15:31 -0800 Created attachment 225491 Patch 985735 10 225495 psolanki 2014-02-28 15:15:21 -0800 Created attachment 225495 Patch 985958 11 225495 darin 2014-03-01 12:59:39 -0800 Comment on attachment 225495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225495&action=review > Source/WebCore/bindings/objc/DOM.mm:615 > + return dragImage ? (CGImageRef)(CFAutorelease(dragImage)) : nil; No need for these extra parentheses here. 986000 12 psolanki 2014-03-01 15:25:42 -0800 Committed r164931: <http://trac.webkit.org/changeset/164931> 225393 2014-02-27 10:46:23 -0800 2014-02-28 14:15:29 -0800 Patch bug-129437-20140227104623.patch text/plain 1458 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNjhkYTljMjk4 MzA0YTQyMmFmMjlkZWRjMDU3ODg3ODkwNzdiYTU2ZS4uMzVjMzMzMTEwYjExZTdkYjZiYTFjMTAx MGZiMjFjOTEzZjFkOTlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0 LTAyLTI3ICBQcmF0aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBb aU9TXSBzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1RleHQgc2hvdWxkIHJldHVybiBhdXRvcmVs ZWFzZWQgb2JqZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjk0MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNl bGVjdGlvbkltYWdlRm9yY2luZ0JsYWNrVGV4dDpzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1Rl eHQ6XSk6CisKIDIwMTQtMDItMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBHZXQgcmlkIG9mIFZpc2l0ZWRMaW5rU3RyYXRlZ3kKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCmluZGV4IDRjMTA2ZGM5NTNkMTlmYjVkZjhlN2Y5 MGYzMGRkNzFhNDkyNmRkNmYuLmM0ZmVjYTY5NTE1OWU4OWIyYTAxYWRhY2U4ZjlhYmQwMjgzNmZi MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0K KysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQpAQCAtNjU2OSw3 ICs2NTY5LDcgQEAgc3RhdGljIHZvaWQgZXh0cmFjdFVuZGVybGluZXMoTlNBdHRyaWJ1dGVkU3Ry aW5nICpzdHJpbmcsIFZlY3RvcjxDb21wb3NpdGlvblVuZGUKICAgICAgICAgcmV0dXJuIG5pbDsK IAogI2lmIFBMQVRGT1JNKElPUykKLSAgICByZXR1cm4gY3JlYXRlRHJhZ0ltYWdlRm9yU2VsZWN0 aW9uKCpjb3JlRnJhbWUsIGZvcmNlQmxhY2tUZXh0KS5sZWFrUmVmKCk7CisgICAgcmV0dXJuIChD R0ltYWdlUmVmKUNGQnJpZGdpbmdSZWxlYXNlKGNyZWF0ZURyYWdJbWFnZUZvclNlbGVjdGlvbigq Y29yZUZyYW1lLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpKTsKICNlbHNlCiAgICAgcmV0dXJu IFtjcmVhdGVEcmFnSW1hZ2VGb3JTZWxlY3Rpb24oKmNvcmVGcmFtZSwgZm9yY2VCbGFja1RleHQp LmxlYWtSZWYoKSBhdXRvcmVsZWFzZV07CiAjZW5kaWYK 225491 2014-02-28 14:15:31 -0800 2014-02-28 15:15:16 -0800 Patch bug-129437-20140228141531.patch text/plain 2965 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRiZGMxNjU5OGUwMTY1 OGQ3Njc1NDI4ZDVhZWE1NDM4ODU1NjA0Zi4uNjU0YjcwOWQyYWQwZThlNTQwNmY0YzU3ZTVjMWI2 ZmFhMDJlZjMwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAyLTI4ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBzZWxlY3Rp b25JbWFnZUZvcmNpbmdCbGFja1RleHQgc2hvdWxkIHJldHVybiBhdXRvcmVsZWFzZWQgb2JqZWN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRp bmdzL29iamMvRE9NLm1tOgorICAgICAgICAoLVtET01SYW5nZSByZW5kZXJlZEltYWdlRm9yY2lu Z0JsYWNrVGV4dDpyZW5kZXJlZEltYWdlRm9yY2luZ0JsYWNrVGV4dDpdKToKKwogMjAxNC0wMi0y NiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IFJlbW92ZSBjb25zb2xlLnByb2ZpbGVzIGZyb20gd2luZG93LmNvbnNvbGUgQVBJ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKaW5kZXggNjhkYTljMjk4MzA0YTQyMmFmMjlkZWRjMDU3ODg3ODkwNzdi YTU2ZS4uYjdjOTQ2ZWIxOGU0NWNiNzE5ODdiNjFlZWQ1YmYzZjBlZmY4Nzg2OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAyLTI4ICBQcmF0aWsgU29sYW5raSAgPHBz b2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBzZWxlY3Rpb25JbWFnZUZvcmNpbmdC bGFja1RleHQgc2hvdWxkIHJldHVybiBhdXRvcmVsZWFzZWQgb2JqZWN0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcu bW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNlbGVjdGlvbkltYWdlRm9yY2luZ0JsYWNrVGV4 dDpzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1RleHQ6XSk6CisKIDIwMTQtMDItMjUgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIFZp c2l0ZWRMaW5rU3RyYXRlZ3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL29i amMvRE9NLm1tIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET00ubW0KaW5kZXggZGVl YWM3NGYxOWFlZTMyMDk3YTBlYzRmOTJlY2QyMDk5NTkxYjhlNi4uZjk0MDYxOWQwMzg4OTA2YWI3 NTZmMTNhMTVkMjE4ZWEzNDQwMTE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvb2JqYy9ET00ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET00ubW0K QEAgLTYxMSw3ICs2MTEsOCBAQCBpZCA8RE9NRXZlbnRUYXJnZXQ+IGtpdChXZWJDb3JlOjpFdmVu dFRhcmdldCogZXZlbnRUYXJnZXQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKICNpZiBQTEFURk9S TShJT1MpCi0gICAgcmV0dXJuIGNyZWF0ZURyYWdJbWFnZUZvclJhbmdlKCpmcmFtZSwgKnJhbmdl LCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpOworICAgIENHSW1hZ2VSZWYgZHJhZ0ltYWdlID0g Y3JlYXRlRHJhZ0ltYWdlRm9yUmFuZ2UoKmZyYW1lLCAqcmFuZ2UsIGZvcmNlQmxhY2tUZXh0KS5s ZWFrUmVmKCk7CisgICAgcmV0dXJuIGRyYWdJbWFnZSA/IChDR0ltYWdlUmVmKShDRkF1dG9yZWxl YXNlKGRyYWdJbWFnZSkpIDogbmlsOwogI2Vsc2UKICAgICByZXR1cm4gW2NyZWF0ZURyYWdJbWFn ZUZvclJhbmdlKCpmcmFtZSwgKnJhbmdlLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpIGF1dG9y ZWxlYXNlXTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0K aW5kZXggNGMxMDZkYzk1M2QxOWZiNWRmOGU3ZjkwZjMwZGQ3MWE0OTI2ZGQ2Zi4uMTY3ZjYyZjc2 OWIzYTY4ZDNhZDc3NmY0M2UzYzM2OWNlMmQ0Nzc3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC02NTY5LDcgKzY1NjksOCBAQCBzdGF0aWMgdm9pZCBleHRy YWN0VW5kZXJsaW5lcyhOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0cmluZywgVmVjdG9yPENvbXBvc2l0 aW9uVW5kZQogICAgICAgICByZXR1cm4gbmlsOwogCiAjaWYgUExBVEZPUk0oSU9TKQotICAgIHJl dHVybiBjcmVhdGVEcmFnSW1hZ2VGb3JTZWxlY3Rpb24oKmNvcmVGcmFtZSwgZm9yY2VCbGFja1Rl eHQpLmxlYWtSZWYoKTsKKyAgICBDR0ltYWdlUmVmIGRyYWdJbWFnZSA9IGNyZWF0ZURyYWdJbWFn ZUZvclNlbGVjdGlvbigqY29yZUZyYW1lLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpOworICAg IHJldHVybiBkcmFnSW1hZ2UgPyAoQ0ZJbWFnZVJlZilDRkF1dG9yZWxlYXNlKGRyYWdJbWFnZSkg OiBuaWw7CiAjZWxzZQogICAgIHJldHVybiBbY3JlYXRlRHJhZ0ltYWdlRm9yU2VsZWN0aW9uKCpj b3JlRnJhbWUsIGZvcmNlQmxhY2tUZXh0KS5sZWFrUmVmKCkgYXV0b3JlbGVhc2VdOwogI2VuZGlm Cg== 225495 2014-02-28 15:15:21 -0800 2014-03-01 12:59:39 -0800 Patch bug-129437-20140228151519.patch text/plain 2965 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRiZGMxNjU5OGUwMTY1 OGQ3Njc1NDI4ZDVhZWE1NDM4ODU1NjA0Zi4uNjU0YjcwOWQyYWQwZThlNTQwNmY0YzU3ZTVjMWI2 ZmFhMDJlZjMwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAyLTI4ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBzZWxlY3Rp b25JbWFnZUZvcmNpbmdCbGFja1RleHQgc2hvdWxkIHJldHVybiBhdXRvcmVsZWFzZWQgb2JqZWN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRp bmdzL29iamMvRE9NLm1tOgorICAgICAgICAoLVtET01SYW5nZSByZW5kZXJlZEltYWdlRm9yY2lu Z0JsYWNrVGV4dDpyZW5kZXJlZEltYWdlRm9yY2luZ0JsYWNrVGV4dDpdKToKKwogMjAxNC0wMi0y NiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IFJlbW92ZSBjb25zb2xlLnByb2ZpbGVzIGZyb20gd2luZG93LmNvbnNvbGUgQVBJ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKaW5kZXggNjhkYTljMjk4MzA0YTQyMmFmMjlkZWRjMDU3ODg3ODkwNzdi YTU2ZS4uYjdjOTQ2ZWIxOGU0NWNiNzE5ODdiNjFlZWQ1YmYzZjBlZmY4Nzg2OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAyLTI4ICBQcmF0aWsgU29sYW5raSAgPHBz b2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBzZWxlY3Rpb25JbWFnZUZvcmNpbmdC bGFja1RleHQgc2hvdWxkIHJldHVybiBhdXRvcmVsZWFzZWQgb2JqZWN0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcu bW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNlbGVjdGlvbkltYWdlRm9yY2luZ0JsYWNrVGV4 dDpzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1RleHQ6XSk6CisKIDIwMTQtMDItMjUgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIFZp c2l0ZWRMaW5rU3RyYXRlZ3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL29i amMvRE9NLm1tIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET00ubW0KaW5kZXggZGVl YWM3NGYxOWFlZTMyMDk3YTBlYzRmOTJlY2QyMDk5NTkxYjhlNi4uZjk0MDYxOWQwMzg4OTA2YWI3 NTZmMTNhMTVkMjE4ZWEzNDQwMTE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvb2JqYy9ET00ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET00ubW0K QEAgLTYxMSw3ICs2MTEsOCBAQCBpZCA8RE9NRXZlbnRUYXJnZXQ+IGtpdChXZWJDb3JlOjpFdmVu dFRhcmdldCogZXZlbnRUYXJnZXQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKICNpZiBQTEFURk9S TShJT1MpCi0gICAgcmV0dXJuIGNyZWF0ZURyYWdJbWFnZUZvclJhbmdlKCpmcmFtZSwgKnJhbmdl LCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpOworICAgIENHSW1hZ2VSZWYgZHJhZ0ltYWdlID0g Y3JlYXRlRHJhZ0ltYWdlRm9yUmFuZ2UoKmZyYW1lLCAqcmFuZ2UsIGZvcmNlQmxhY2tUZXh0KS5s ZWFrUmVmKCk7CisgICAgcmV0dXJuIGRyYWdJbWFnZSA/IChDR0ltYWdlUmVmKShDRkF1dG9yZWxl YXNlKGRyYWdJbWFnZSkpIDogbmlsOwogI2Vsc2UKICAgICByZXR1cm4gW2NyZWF0ZURyYWdJbWFn ZUZvclJhbmdlKCpmcmFtZSwgKnJhbmdlLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpIGF1dG9y ZWxlYXNlXTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0K aW5kZXggNGMxMDZkYzk1M2QxOWZiNWRmOGU3ZjkwZjMwZGQ3MWE0OTI2ZGQ2Zi4uYjdhYWMzMmMz ZjRmNzgzODgzNmRmNmY3NTQ3YTU0MzAyMzQ2YjE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC02NTY5LDcgKzY1NjksOCBAQCBzdGF0aWMgdm9pZCBleHRy YWN0VW5kZXJsaW5lcyhOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0cmluZywgVmVjdG9yPENvbXBvc2l0 aW9uVW5kZQogICAgICAgICByZXR1cm4gbmlsOwogCiAjaWYgUExBVEZPUk0oSU9TKQotICAgIHJl dHVybiBjcmVhdGVEcmFnSW1hZ2VGb3JTZWxlY3Rpb24oKmNvcmVGcmFtZSwgZm9yY2VCbGFja1Rl eHQpLmxlYWtSZWYoKTsKKyAgICBDR0ltYWdlUmVmIGRyYWdJbWFnZSA9IGNyZWF0ZURyYWdJbWFn ZUZvclNlbGVjdGlvbigqY29yZUZyYW1lLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpOworICAg IHJldHVybiBkcmFnSW1hZ2UgPyAoQ0dJbWFnZVJlZilDRkF1dG9yZWxlYXNlKGRyYWdJbWFnZSkg OiBuaWw7CiAjZWxzZQogICAgIHJldHVybiBbY3JlYXRlRHJhZ0ltYWdlRm9yU2VsZWN0aW9uKCpj b3JlRnJhbWUsIGZvcmNlQmxhY2tUZXh0KS5sZWFrUmVmKCkgYXV0b3JlbGVhc2VdOwogI2VuZGlm Cg==