105686 2012-12-23 06:19:13 -0800 [Qt][Mac] Fix the build after r138413 2012-12-23 09:06:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 105676 1 ossy tony ap hausmann japhet ossy philn sam tony webkit-ews webkit.review.bot xan.lopez zeno oldest_to_newest 796737 0 ossy 2012-12-23 06:19:13 -0800 Here is the build log from the Qt Lion bot on build.webkit.org: ---------------------------------------------------------------- /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:73:67: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor return platformStrategies()->cookiesStrategy()->cookiesForDOM(SESSION(document), document->firstPartyForCookies(), url); ^~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:67:27: note: expanded from macro 'SESSION' #define SESSION(document) NetworkStorageSession(networkingContext(document)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/platform/network/NetworkStorageSession.h:42:26: note: function has been explicitly marked deleted here WTF_MAKE_NONCOPYABLE(NetworkStorageSession); WTF_MAKE_FAST_ALLOCATED; ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WTF/wtf/Noncopyable.h:29:13: note: expanded from macro 'WTF_MAKE_NONCOPYABLE' ClassName(const ClassName&) = delete; \ ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:82:64: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor platformStrategies()->cookiesStrategy()->setCookiesFromDOM(SESSION(document), document->firstPartyForCookies(), url, cookieString); ^~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:67:27: note: expanded from macro 'SESSION' #define SESSION(document) NetworkStorageSession(networkingContext(document)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/platform/network/NetworkStorageSession.h:42:26: note: function has been explicitly marked deleted here WTF_MAKE_NONCOPYABLE(NetworkStorageSession); WTF_MAKE_FAST_ALLOCATED; ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WTF/wtf/Noncopyable.h:29:13: note: expanded from macro 'WTF_MAKE_NONCOPYABLE' ClassName(const ClassName&) = delete; \ ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:91:68: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor return platformStrategies()->cookiesStrategy()->cookiesEnabled(SESSION(document), document->firstPartyForCookies(), document->cookieURL()); ^~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:67:27: note: expanded from macro 'SESSION' #define SESSION(document) NetworkStorageSession(networkingContext(document)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/platform/network/NetworkStorageSession.h:42:26: note: function has been explicitly marked deleted here WTF_MAKE_NONCOPYABLE(NetworkStorageSession); WTF_MAKE_FAST_ALLOCATED; ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WTF/wtf/Noncopyable.h:29:13: note: expanded from macro 'WTF_MAKE_NONCOPYABLE' ClassName(const ClassName&) = delete; \ ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:100:83: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor return platformStrategies()->cookiesStrategy()->cookieRequestHeaderFieldValue(SESSION(document), document->firstPartyForCookies(), url); ^~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:67:27: note: expanded from macro 'SESSION' #define SESSION(document) NetworkStorageSession(networkingContext(document)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/platform/network/NetworkStorageSession.h:42:26: note: function has been explicitly marked deleted here WTF_MAKE_NONCOPYABLE(NetworkStorageSession); WTF_MAKE_FAST_ALLOCATED; ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WTF/wtf/Noncopyable.h:29:13: note: expanded from macro 'WTF_MAKE_NONCOPYABLE' ClassName(const ClassName&) = delete; \ ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:109:67: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor return platformStrategies()->cookiesStrategy()->getRawCookies(SESSION(document), document->firstPartyForCookies(), url, cookies); ^~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:67:27: note: expanded from macro 'SESSION' #define SESSION(document) NetworkStorageSession(networkingContext(document)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/platform/network/NetworkStorageSession.h:42:26: note: function has been explicitly marked deleted here WTF_MAKE_NONCOPYABLE(NetworkStorageSession); WTF_MAKE_FAST_ALLOCATED; ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WTF/wtf/Noncopyable.h:29:13: note: expanded from macro 'WTF_MAKE_NONCOPYABLE' ClassName(const ClassName&) = delete; \ ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:118:59: error: copying parameter of type 'WebCore::NetworkStorageSession' invokes deleted constructor platformStrategies()->cookiesStrategy()->deleteCookie(SESSION(document), url, cookieName); ^~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/loader/CookieJar.cpp:67:27: note: expanded from macro 'SESSION' #define SESSION(document) NetworkStorageSession(networkingContext(document)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WebCore/platform/network/NetworkStorageSession.h:42:26: note: function has been explicitly marked deleted here WTF_MAKE_NONCOPYABLE(NetworkStorageSession); WTF_MAKE_FAST_ALLOCATED; ^ /Users/indt/Development/build-slaves/indt-mountainlion/qt-mountainlion-release/build/Source/WTF/wtf/Noncopyable.h:29:13: note: expanded from macro 'WTF_MAKE_NONCOPYABLE' ClassName(const ClassName&) = delete; \ ^ 6 errors generated. make[2]: *** [.obj/release-shared/loader/CookieJar.o] Error 1 796738 1 ossy 2012-12-23 06:21:06 -0800 Could you check and fix it, please? I can't help fixing it without Mac and in the middle of Xmas holiday. 796754 2 tony 2012-12-23 07:55:43 -0800 I think it's because you can make a copy when binding a temporary to a const reference: http://stackoverflow.com/questions/760578/const-reference-to-temporary I'll commit a build fix. 796755 3 180621 tony 2012-12-23 07:59:54 -0800 Created attachment 180621 Patch 796756 4 180621 webkit-ews 2012-12-23 08:03:38 -0800 Comment on attachment 180621 Patch Attachment 180621 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/15507126 796757 5 180621 eflews.bot 2012-12-23 08:04:36 -0800 Comment on attachment 180621 Patch Attachment 180621 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/15491181 796758 6 180621 webkit-ews 2012-12-23 08:05:38 -0800 Comment on attachment 180621 Patch Attachment 180621 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15507129 796759 7 tony 2012-12-23 08:06:43 -0800 (In reply to comment #4) > (From update of attachment 180621 [details]) > Attachment 180621 [details] did not pass qt-ews (qt): > Output: http://queues.webkit.org/results/15507126 Oops, good thing I used the commit queue. Trying something else. 796760 8 180622 tony 2012-12-23 08:31:17 -0800 Created attachment 180622 Patch 796762 9 180622 webkit.review.bot 2012-12-23 09:06:05 -0800 Comment on attachment 180622 Patch Clearing flags on attachment: 180622 Committed r138421: <http://trac.webkit.org/changeset/138421> 796763 10 webkit.review.bot 2012-12-23 09:06:10 -0800 All reviewed patches have been landed. Closing bug. 180621 2012-12-23 07:59:54 -0800 2012-12-23 08:31:14 -0800 Patch bug-105686-20121223155709.patch text/plain 5056 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzAzYzI1YzExZTY1ZDdh NjJiMDZkYTNlYTFkNjE1ZTNhYWI1YjU2YS4uN2U4MGJkM2ZkZGJiYTQ2NzkzYTBiYTFiYjU0MzU2 MjA4YWE0OWQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTIzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIFVucmV2aWV3 ZWQgZml4IHRoZSBidWlsZCBhZnRlciByMTM4NDEzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU2ODYKKworICAgICAgICBEb24ndCB1c2UgYSB0ZW1w b3JhcnkgY29uc3QgcmVmZXJlbmNlIHNvIHRoZSBjb21waWxlciBkb2Vzbid0IG1ha2UgYSBjb3B5 LgorICAgICAgICBBbiBleGFtcGxlIGNvbXBpbGUgZXJyb3IgKGNsYW5nKToKKyAgICAgICAgU291 cmNlL1dlYkNvcmUvbG9hZGVyL0Nvb2tpZUphci5jcHA6NzM6Njc6IGVycm9yOiBjb3B5aW5nIHBh cmFtZXRlciBvZiB0eXBlICdXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24nIGludm9rZXMg ZGVsZXRlZCBjb25zdHJ1Y3RvcgorICAgICAgICAgICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2ll cygpLT5jb29raWVzU3RyYXRlZ3koKS0+Y29va2llc0ZvckRPTShTRVNTSU9OKGRvY3VtZW50KSwg ZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCk7CisKKyAgICAgICAgKiBsb2Fk ZXIvQ29va2llSmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZXMpOgorICAgICAgICAo V2ViQ29yZTo6c2V0Q29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVzRW5hYmxlZCk6 CisgICAgICAgIChXZWJDb3JlOjpjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZSk6CisgICAg ICAgIChXZWJDb3JlOjpnZXRSYXdDb29raWVzKToKKyAgICAgICAgKFdlYkNvcmU6OmRlbGV0ZUNv b2tpZSk6CisKIDIwMTItMTItMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIGEgc2VwYXJhdGUgY2xhc3MgZm9yIG5ldHdvcmtpbmcgcmVsYXRlZCBz dG9yYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ29va2llSmFyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIuY3BwCmluZGV4IDM0YWE5ZGI1YWVhMWU2 NzM3YmM0YWJlM2QyMWRiNzk4YzA5YWVjODQuLjQ2NmE4OTAxYzAyMTcxYjU1ZjE1ZWY1YWI2MGQ3 MWZiMzlkMjQ2ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIuY3BwCkBAIC02Myw4ICs2 Myw2IEBAIGlubGluZSBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHN0b3JhZ2VTZXNzaW9uKGNvbnN0 IERvY3VtZW50KiBkb2N1bWVudCkKICAgICByZXR1cm4gY29udGV4dCA/IGNvbnRleHQtPnN0b3Jh Z2VTZXNzaW9uKCkgOiBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lv bigpOwogfQogI2RlZmluZSBTRVNTSU9OKGRvY3VtZW50KSBzdG9yYWdlU2Vzc2lvbihkb2N1bWVu dCkKLSNlbHNlCi0jZGVmaW5lIFNFU1NJT04oZG9jdW1lbnQpIE5ldHdvcmtTdG9yYWdlU2Vzc2lv bihuZXR3b3JraW5nQ29udGV4dChkb2N1bWVudCkpCiAjZW5kaWYKIAogU3RyaW5nIGNvb2tpZXMo Y29uc3QgRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBLVVJMJiB1cmwpCkBAIC03Miw3ICs3MCw4 IEBAIFN0cmluZyBjb29raWVzKGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VSTCYg dXJsKQogI2lmIFVTRShQTEFURk9STV9TVFJBVEVHSUVTKQogICAgIHJldHVybiBwbGF0Zm9ybVN0 cmF0ZWdpZXMoKS0+Y29va2llc1N0cmF0ZWd5KCktPmNvb2tpZXNGb3JET00oU0VTU0lPTihkb2N1 bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmwpOwogI2Vsc2UKLSAg ICByZXR1cm4gY29va2llc0ZvckRPTShTRVNTSU9OKGRvY3VtZW50KSwgZG9jdW1lbnQtPmZpcnN0 UGFydHlGb3JDb29raWVzKCksIHVybCk7CisgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uIG5ldHdv cmtTdG9yYWdlU2Vzc2lvbihuZXR3b3JraW5nQ29udGV4dChkb2N1bWVudCkpOworICAgIHJldHVy biBjb29raWVzRm9yRE9NKG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiwgZG9jdW1lbnQtPmZpcnN0UGFy dHlGb3JDb29raWVzKCksIHVybCk7CiAjZW5kaWYKIH0KIApAQCAtODEsNyArODAsOCBAQCB2b2lk IHNldENvb2tpZXMoRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0 cmluZyYgY29va2llU3RyaW5nKQogI2lmIFVTRShQTEFURk9STV9TVFJBVEVHSUVTKQogICAgIHBs YXRmb3JtU3RyYXRlZ2llcygpLT5jb29raWVzU3RyYXRlZ3koKS0+c2V0Q29va2llc0Zyb21ET00o U0VTU0lPTihkb2N1bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmws IGNvb2tpZVN0cmluZyk7CiAjZWxzZQotICAgIHNldENvb2tpZXNGcm9tRE9NKFNFU1NJT04oZG9j dW1lbnQpLCBkb2N1bWVudC0+Zmlyc3RQYXJ0eUZvckNvb2tpZXMoKSwgdXJsLCBjb29raWVTdHJp bmcpOworICAgIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiBuZXR3b3JrU3RvcmFnZVNlc3Npb24obmV0 d29ya2luZ0NvbnRleHQoZG9jdW1lbnQpKTsKKyAgICBzZXRDb29raWVzRnJvbURPTShuZXR3b3Jr U3RvcmFnZVNlc3Npb24sIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmwsIGNv b2tpZVN0cmluZyk7CiAjZW5kaWYKIH0KIApAQCAtOTAsNyArOTAsOCBAQCBib29sIGNvb2tpZXNF bmFibGVkKGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCkKICNpZiBVU0UoUExBVEZPUk1fU1RSQVRF R0lFUykKICAgICByZXR1cm4gcGxhdGZvcm1TdHJhdGVnaWVzKCktPmNvb2tpZXNTdHJhdGVneSgp LT5jb29raWVzRW5hYmxlZChTRVNTSU9OKGRvY3VtZW50KSwgZG9jdW1lbnQtPmZpcnN0UGFydHlG b3JDb29raWVzKCksIGRvY3VtZW50LT5jb29raWVVUkwoKSk7CiAjZWxzZQotICAgIHJldHVybiBj b29raWVzRW5hYmxlZChTRVNTSU9OKGRvY3VtZW50KSwgZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JD b29raWVzKCksIGRvY3VtZW50LT5jb29raWVVUkwoKSk7CisgICAgTmV0d29ya1N0b3JhZ2VTZXNz aW9uIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbihuZXR3b3JraW5nQ29udGV4dChkb2N1bWVudCkpOwor ICAgIHJldHVybiBjb29raWVzRW5hYmxlZChuZXR3b3JrU3RvcmFnZVNlc3Npb24sIGRvY3VtZW50 LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCBkb2N1bWVudC0+Y29va2llVVJMKCkpOwogI2VuZGlm CiB9CiAKQEAgLTk5LDcgKzEwMCw4IEBAIFN0cmluZyBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRW YWx1ZShjb25zdCBEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IEtVUkwmIHVybCkKICNpZiBVU0Uo UExBVEZPUk1fU1RSQVRFR0lFUykKICAgICByZXR1cm4gcGxhdGZvcm1TdHJhdGVnaWVzKCktPmNv b2tpZXNTdHJhdGVneSgpLT5jb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShTRVNTSU9OKGRv Y3VtZW50KSwgZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCk7CiAjZWxzZQot ICAgIHJldHVybiBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShTRVNTSU9OKGRvY3VtZW50 KSwgZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCk7CisgICAgTmV0d29ya1N0 b3JhZ2VTZXNzaW9uIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbihuZXR3b3JraW5nQ29udGV4dChkb2N1 bWVudCkpOworICAgIHJldHVybiBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShuZXR3b3Jr U3RvcmFnZVNlc3Npb24sIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmwpOwog I2VuZGlmCiB9CiAKQEAgLTEwOCw3ICsxMTAsOCBAQCBib29sIGdldFJhd0Nvb2tpZXMoY29uc3Qg RG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBLVVJMJiB1cmwsIFZlY3RvcjxDb29raWU+JiBjbwog I2lmIFVTRShQTEFURk9STV9TVFJBVEVHSUVTKQogICAgIHJldHVybiBwbGF0Zm9ybVN0cmF0ZWdp ZXMoKS0+Y29va2llc1N0cmF0ZWd5KCktPmdldFJhd0Nvb2tpZXMoU0VTU0lPTihkb2N1bWVudCks IGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmwsIGNvb2tpZXMpOwogI2Vsc2UK LSAgICByZXR1cm4gZ2V0UmF3Q29va2llcyhTRVNTSU9OKGRvY3VtZW50KSwgZG9jdW1lbnQtPmZp cnN0UGFydHlGb3JDb29raWVzKCksIHVybCwgY29va2llcyk7CisgICAgTmV0d29ya1N0b3JhZ2VT ZXNzaW9uIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbihuZXR3b3JraW5nQ29udGV4dChkb2N1bWVudCkp OworICAgIHJldHVybiBnZXRSYXdDb29raWVzKG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiwgZG9jdW1l bnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCwgY29va2llcyk7CiAjZW5kaWYKIH0KIApA QCAtMTE3LDcgKzEyMCw4IEBAIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0IERvY3VtZW50KiBkb2N1 bWVudCwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIGNvb2tpCiAjaWYgVVNFKFBMQVRG T1JNX1NUUkFURUdJRVMpCiAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmNvb2tpZXNTdHJhdGVn eSgpLT5kZWxldGVDb29raWUoU0VTU0lPTihkb2N1bWVudCksIHVybCwgY29va2llTmFtZSk7CiAj ZWxzZQotICAgIGRlbGV0ZUNvb2tpZShTRVNTSU9OKGRvY3VtZW50KSwgdXJsLCBjb29raWVOYW1l KTsKKyAgICBOZXR3b3JrU3RvcmFnZVNlc3Npb24gbmV0d29ya1N0b3JhZ2VTZXNzaW9uKG5ldHdv cmtpbmdDb250ZXh0KGRvY3VtZW50KSk7CisgICAgZGVsZXRlQ29va2llKG5ldHdvcmtTdG9yYWdl U2Vzc2lvbiwgdXJsLCBjb29raWVOYW1lKTsKICNlbmRpZgogfQogCg== 180622 2012-12-23 08:31:17 -0800 2012-12-23 09:06:05 -0800 Patch bug-105686-20121223162831.patch text/plain 5507 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzAzYzI1YzExZTY1ZDdh NjJiMDZkYTNlYTFkNjE1ZTNhYWI1YjU2YS4uN2U4MGJkM2ZkZGJiYTQ2NzkzYTBiYTFiYjU0MzU2 MjA4YWE0OWQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTIzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIFVucmV2aWV3 ZWQgZml4IHRoZSBidWlsZCBhZnRlciByMTM4NDEzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU2ODYKKworICAgICAgICBEb24ndCB1c2UgYSB0ZW1w b3JhcnkgY29uc3QgcmVmZXJlbmNlIHNvIHRoZSBjb21waWxlciBkb2Vzbid0IG1ha2UgYSBjb3B5 LgorICAgICAgICBBbiBleGFtcGxlIGNvbXBpbGUgZXJyb3IgKGNsYW5nKToKKyAgICAgICAgU291 cmNlL1dlYkNvcmUvbG9hZGVyL0Nvb2tpZUphci5jcHA6NzM6Njc6IGVycm9yOiBjb3B5aW5nIHBh cmFtZXRlciBvZiB0eXBlICdXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24nIGludm9rZXMg ZGVsZXRlZCBjb25zdHJ1Y3RvcgorICAgICAgICAgICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2ll cygpLT5jb29raWVzU3RyYXRlZ3koKS0+Y29va2llc0ZvckRPTShTRVNTSU9OKGRvY3VtZW50KSwg ZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCk7CisKKyAgICAgICAgKiBsb2Fk ZXIvQ29va2llSmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZXMpOgorICAgICAgICAo V2ViQ29yZTo6c2V0Q29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVzRW5hYmxlZCk6 CisgICAgICAgIChXZWJDb3JlOjpjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZSk6CisgICAg ICAgIChXZWJDb3JlOjpnZXRSYXdDb29raWVzKToKKyAgICAgICAgKFdlYkNvcmU6OmRlbGV0ZUNv b2tpZSk6CisKIDIwMTItMTItMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIGEgc2VwYXJhdGUgY2xhc3MgZm9yIG5ldHdvcmtpbmcgcmVsYXRlZCBz dG9yYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ29va2llSmFyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIuY3BwCmluZGV4IDM0YWE5ZGI1YWVhMWU2 NzM3YmM0YWJlM2QyMWRiNzk4YzA5YWVjODQuLjVmMTVhNTRlMTc0NjQ0MzQ5Nzc1ODk1OGY3MzYw MjQ2MzY3ZWY3NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIuY3BwCkBAIC02Miw2MiAr NjIsNjggQEAgaW5saW5lIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc3RvcmFnZVNlc3Npb24oY29u c3QgRG9jdW1lbnQqIGRvY3VtZW50KQogICAgIE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXh0ID0g bmV0d29ya2luZ0NvbnRleHQoZG9jdW1lbnQpOwogICAgIHJldHVybiBjb250ZXh0ID8gY29udGV4 dC0+c3RvcmFnZVNlc3Npb24oKSA6IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6ZGVmYXVsdFN0b3Jh Z2VTZXNzaW9uKCk7CiB9Ci0jZGVmaW5lIFNFU1NJT04oZG9jdW1lbnQpIHN0b3JhZ2VTZXNzaW9u KGRvY3VtZW50KQorI2RlZmluZSBMT0NBTF9TRVNTSU9OKGRvY3VtZW50KSBOZXR3b3JrU3RvcmFn ZVNlc3Npb24mIHNlc3Npb24gPSBzdG9yYWdlU2Vzc2lvbihkb2N1bWVudCk7CiAjZWxzZQotI2Rl ZmluZSBTRVNTSU9OKGRvY3VtZW50KSBOZXR3b3JrU3RvcmFnZVNlc3Npb24obmV0d29ya2luZ0Nv bnRleHQoZG9jdW1lbnQpKQorI2RlZmluZSBMT0NBTF9TRVNTSU9OKGRvY3VtZW50KSBOZXR3b3Jr U3RvcmFnZVNlc3Npb24gc2Vzc2lvbihuZXR3b3JraW5nQ29udGV4dChkb2N1bWVudCkpOwogI2Vu ZGlmCiAKIFN0cmluZyBjb29raWVzKGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VS TCYgdXJsKQogeworICAgIExPQ0FMX1NFU1NJT04oZG9jdW1lbnQpCiAjaWYgVVNFKFBMQVRGT1JN X1NUUkFURUdJRVMpCi0gICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5jb29raWVzU3Ry YXRlZ3koKS0+Y29va2llc0ZvckRPTShTRVNTSU9OKGRvY3VtZW50KSwgZG9jdW1lbnQtPmZpcnN0 UGFydHlGb3JDb29raWVzKCksIHVybCk7CisgICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2llcygp LT5jb29raWVzU3RyYXRlZ3koKS0+Y29va2llc0ZvckRPTShzZXNzaW9uLCBkb2N1bWVudC0+Zmly c3RQYXJ0eUZvckNvb2tpZXMoKSwgdXJsKTsKICNlbHNlCi0gICAgcmV0dXJuIGNvb2tpZXNGb3JE T00oU0VTU0lPTihkb2N1bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1 cmwpOworICAgIHJldHVybiBjb29raWVzRm9yRE9NKHNlc3Npb24sIGRvY3VtZW50LT5maXJzdFBh cnR5Rm9yQ29va2llcygpLCB1cmwpOwogI2VuZGlmCiB9CiAKIHZvaWQgc2V0Q29va2llcyhEb2N1 bWVudCogZG9jdW1lbnQsIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBjb29raWVTdHJp bmcpCiB7CisgICAgTE9DQUxfU0VTU0lPTihkb2N1bWVudCkKICNpZiBVU0UoUExBVEZPUk1fU1RS QVRFR0lFUykKLSAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+Y29va2llc1N0cmF0ZWd5KCktPnNl dENvb2tpZXNGcm9tRE9NKFNFU1NJT04oZG9jdW1lbnQpLCBkb2N1bWVudC0+Zmlyc3RQYXJ0eUZv ckNvb2tpZXMoKSwgdXJsLCBjb29raWVTdHJpbmcpOworICAgIHBsYXRmb3JtU3RyYXRlZ2llcygp LT5jb29raWVzU3RyYXRlZ3koKS0+c2V0Q29va2llc0Zyb21ET00oc2Vzc2lvbiwgZG9jdW1lbnQt PmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCwgY29va2llU3RyaW5nKTsKICNlbHNlCi0gICAg c2V0Q29va2llc0Zyb21ET00oU0VTU0lPTihkb2N1bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5 Rm9yQ29va2llcygpLCB1cmwsIGNvb2tpZVN0cmluZyk7CisgICAgc2V0Q29va2llc0Zyb21ET00o c2Vzc2lvbiwgZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCwgY29va2llU3Ry aW5nKTsKICNlbmRpZgogfQogCiBib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50KiBk b2N1bWVudCkKIHsKKyAgICBMT0NBTF9TRVNTSU9OKGRvY3VtZW50KQogI2lmIFVTRShQTEFURk9S TV9TVFJBVEVHSUVTKQotICAgIHJldHVybiBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+Y29va2llc1N0 cmF0ZWd5KCktPmNvb2tpZXNFbmFibGVkKFNFU1NJT04oZG9jdW1lbnQpLCBkb2N1bWVudC0+Zmly c3RQYXJ0eUZvckNvb2tpZXMoKSwgZG9jdW1lbnQtPmNvb2tpZVVSTCgpKTsKKyAgICByZXR1cm4g cGxhdGZvcm1TdHJhdGVnaWVzKCktPmNvb2tpZXNTdHJhdGVneSgpLT5jb29raWVzRW5hYmxlZChz ZXNzaW9uLCBkb2N1bWVudC0+Zmlyc3RQYXJ0eUZvckNvb2tpZXMoKSwgZG9jdW1lbnQtPmNvb2tp ZVVSTCgpKTsKICNlbHNlCi0gICAgcmV0dXJuIGNvb2tpZXNFbmFibGVkKFNFU1NJT04oZG9jdW1l bnQpLCBkb2N1bWVudC0+Zmlyc3RQYXJ0eUZvckNvb2tpZXMoKSwgZG9jdW1lbnQtPmNvb2tpZVVS TCgpKTsKKyAgICByZXR1cm4gY29va2llc0VuYWJsZWQoc2Vzc2lvbiwgZG9jdW1lbnQtPmZpcnN0 UGFydHlGb3JDb29raWVzKCksIGRvY3VtZW50LT5jb29raWVVUkwoKSk7CiAjZW5kaWYKIH0KIAog U3RyaW5nIGNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKGNvbnN0IERvY3VtZW50KiBkb2N1 bWVudCwgY29uc3QgS1VSTCYgdXJsKQogeworICAgIExPQ0FMX1NFU1NJT04oZG9jdW1lbnQpCiAj aWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpCi0gICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2ll cygpLT5jb29raWVzU3RyYXRlZ3koKS0+Y29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoU0VT U0lPTihkb2N1bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmwpOwor ICAgIHJldHVybiBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+Y29va2llc1N0cmF0ZWd5KCktPmNvb2tp ZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKHNlc3Npb24sIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9y Q29va2llcygpLCB1cmwpOwogI2Vsc2UKLSAgICByZXR1cm4gY29va2llUmVxdWVzdEhlYWRlckZp ZWxkVmFsdWUoU0VTU0lPTihkb2N1bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2ll cygpLCB1cmwpOworICAgIHJldHVybiBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShzZXNz aW9uLCBkb2N1bWVudC0+Zmlyc3RQYXJ0eUZvckNvb2tpZXMoKSwgdXJsKTsKICNlbmRpZgogfQog CiBib29sIGdldFJhd0Nvb2tpZXMoY29uc3QgRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBLVVJM JiB1cmwsIFZlY3RvcjxDb29raWU+JiBjb29raWVzKQogeworICAgIExPQ0FMX1NFU1NJT04oZG9j dW1lbnQpCiAjaWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpCi0gICAgcmV0dXJuIHBsYXRmb3Jt U3RyYXRlZ2llcygpLT5jb29raWVzU3RyYXRlZ3koKS0+Z2V0UmF3Q29va2llcyhTRVNTSU9OKGRv Y3VtZW50KSwgZG9jdW1lbnQtPmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCwgY29va2llcyk7 CisgICAgcmV0dXJuIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5jb29raWVzU3RyYXRlZ3koKS0+Z2V0 UmF3Q29va2llcyhzZXNzaW9uLCBkb2N1bWVudC0+Zmlyc3RQYXJ0eUZvckNvb2tpZXMoKSwgdXJs LCBjb29raWVzKTsKICNlbHNlCi0gICAgcmV0dXJuIGdldFJhd0Nvb2tpZXMoU0VTU0lPTihkb2N1 bWVudCksIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpLCB1cmwsIGNvb2tpZXMpOwor ICAgIHJldHVybiBnZXRSYXdDb29raWVzKHNlc3Npb24sIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9y Q29va2llcygpLCB1cmwsIGNvb2tpZXMpOwogI2VuZGlmCiB9CiAKIHZvaWQgZGVsZXRlQ29va2ll KGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcm IGNvb2tpZU5hbWUpCiB7CisgICAgTE9DQUxfU0VTU0lPTihkb2N1bWVudCkKICNpZiBVU0UoUExB VEZPUk1fU1RSQVRFR0lFUykKLSAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+Y29va2llc1N0cmF0 ZWd5KCktPmRlbGV0ZUNvb2tpZShTRVNTSU9OKGRvY3VtZW50KSwgdXJsLCBjb29raWVOYW1lKTsK KyAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+Y29va2llc1N0cmF0ZWd5KCktPmRlbGV0ZUNvb2tp ZShzZXNzaW9uLCB1cmwsIGNvb2tpZU5hbWUpOwogI2Vsc2UKLSAgICBkZWxldGVDb29raWUoU0VT U0lPTihkb2N1bWVudCksIHVybCwgY29va2llTmFtZSk7CisgICAgZGVsZXRlQ29va2llKHNlc3Np b24sIHVybCwgY29va2llTmFtZSk7CiAjZW5kaWYKIH0KIAo=