83772 2012-04-12 05:19:04 -0700 [BlackBerry] Set referrer for plugin load if needed. 2014-01-28 08:15:15 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED INVALID P2 Normal --- 83360 1 charles.wei charles.wei andersca gustavo manyoso pnormand rwlbuis staikos tonikitoo xan.lopez oldest_to_newest 601119 0 charles.wei 2012-04-12 05:19:04 -0700 Set referrer for resources requested by plugin. 601122 1 136883 charles.wei 2012-04-12 05:24:59 -0700 Created attachment 136883 Patch 601125 2 136883 rwlbuis 2012-04-12 05:27:10 -0700 Comment on attachment 136883 Patch Looks ideal for a helper method :) 601132 3 charles.wei 2012-04-12 05:46:05 -0700 (In reply to comment #2) > (From update of attachment 136883 [details]) > Looks ideal for a helper method :) Good suggestion. That makes less code. 601158 4 136891 charles.wei 2012-04-12 06:30:42 -0700 Created attachment 136891 Patch 601169 5 136891 webkit-ews 2012-04-12 06:43:08 -0700 Comment on attachment 136891 Patch Attachment 136891 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12390428 601175 6 136891 pnormand 2012-04-12 06:46:15 -0700 Comment on attachment 136891 Patch Attachment 136891 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/12390426 601177 7 136891 buildbot 2012-04-12 06:46:59 -0700 Comment on attachment 136891 Patch Attachment 136891 did not pass win-ews (win): Output: http://queues.webkit.org/results/12387728 601189 8 136891 charles.wei 2012-04-12 06:59:37 -0700 Comment on attachment 136891 Patch typo in the patch, and revoke the review request. 601197 9 136902 charles.wei 2012-04-12 07:09:20 -0700 Created attachment 136902 Patch 601198 10 136902 pnormand 2012-04-12 07:13:24 -0700 Comment on attachment 136902 Patch Attachment 136902 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/12395263 601202 11 136902 webkit-ews 2012-04-12 07:14:10 -0700 Comment on attachment 136902 Patch Attachment 136902 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12393383 601216 12 136902 buildbot 2012-04-12 07:34:58 -0700 Comment on attachment 136902 Patch Attachment 136902 did not pass win-ews (win): Output: http://queues.webkit.org/results/12389542 601223 13 136902 tonikitoo 2012-04-12 07:51:19 -0700 Comment on attachment 136902 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136902&action=review > Source/WebCore/ChangeLog:8 > + No new tests, initial upstream of BlackBerry porting. plePlease say what it fixes, and why others might not need this. > Source/WebCore/plugins/PluginView.cpp:127 > +static void setReferrerIfNeeded(FrameLoaderRequest request, const Frame* parentFrame) > +{ > +#if PLATFORM(BLACKBERRY) > + if (!SecurityPolicy::shouldHideReferrer(request.resourceRequest().url(), parentFrame->document()->baseURL())) > + request.resourceRequest().setHTTPReferrer(parentFrame->loader()->outgoingReferrer()); > +#endif > +} use param_unused in a #else block, please. 136883 2012-04-12 05:24:59 -0700 2012-04-12 06:30:29 -0700 Patch bug-83772-20120412203054.patch text/plain 3734 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE1Nzg2NDg5Zjg4YmIw MTc2MWMzNTU0MWEyN2RiYzI1ZWE0OGExNi4uNTA0M2EyYmRiZDJmMTVmNDdjODJlNmQ3YTg3MGY5 ODE1ZjU3MTA0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTEyICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gU2V0IHJlZmVycmVyIGZvciBwbHVnaW4gbG9hZCBpZiBuZWVkZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzc3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgaW5p dGlhbCB1cHN0cmVhbSBvZiBCbGFja0JlcnJ5IHBvcnRpbmcuCisKKyAgICAgICAgKiBwbHVnaW5z L1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6c3RhcnQpOgor ICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6Z2V0VVJMTm90aWZ5KToKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpblZpZXc6OmdldFVSTCk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3 OjpoYW5kbGVQb3N0KToKKwogMjAxMi0wNC0xMiAgWmFsYW4gQnVqdGFzICA8emJ1anRhc0BnbWFp bC5jb20+CiAKICAgICAgICAgW1F0XVtXSzJdIFpvb20gZ2VzdHVyZSB3aXRoIGRvdWJsZSB0YXAg Y3Jhc2hlcyBvbiBpZnJhbWUgd2hlbiBtYWluIGZyYW1lIGhhcyBzY3JvbGwgb2Zmc2V0LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAKaW5kZXggNzQ5ZjYwOTc5ZjdlZTlhOTg4YTkz NWFlZWMxNWEzM2EzZjQ1Y2VhOS4uNGE0NTBlZTljNmEwZGI1YzNkNWJlZTRhYzM0N2FiMjFlODk5 NzNkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC02MSw2ICs2MSwx MSBAQAogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgi CiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKKworI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkp CisjaW5jbHVkZSAiU2VjdXJpdHlQb2xpY3kuaCIKKyNlbmRpZgorCiAjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgogI2luY2x1ZGUgPHd0Zi9BU0NJSUNU eXBlLmg+CkBAIC0yNjIsNiArMjY3LDEyIEBAIGJvb2wgUGx1Z2luVmlldzo6c3RhcnQoKQogICAg ICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3QobV9wYXJlbnRGcmFtZS0+ZG9j dW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSk7CiAgICAgICAgIGZyYW1lTG9hZFJlcXVlc3QucmVz b3VyY2VSZXF1ZXN0KCkuc2V0SFRUUE1ldGhvZCgiR0VUIik7CiAgICAgICAgIGZyYW1lTG9hZFJl cXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0VVJMKG1fdXJsKTsKKworI2lmIFBMQVRGT1JNKEJM QUNLQkVSUlkpCisgICAgICAgIGlmICghU2VjdXJpdHlQb2xpY3k6OnNob3VsZEhpZGVSZWZlcnJl cihtX3VybCwgbV9wYXJlbnRGcmFtZS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpKSkKKyAgICAgICAg ICAgIGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0SFRUUFJlZmVycmVyKG1f cGFyZW50RnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOworI2VuZGlmCisKICAg ICAgICAgbG9hZChmcmFtZUxvYWRSZXF1ZXN0LCBmYWxzZSwgMCk7CiAgICAgfQogCkBAIC01NjQs NiArNTc1LDExIEBAIE5QRXJyb3IgUGx1Z2luVmlldzo6Z2V0VVJMTm90aWZ5KGNvbnN0IGNoYXIq IHVybCwgY29uc3QgY2hhciogdGFyZ2V0LCB2b2lkKiBub3RpCiAgICAgZnJhbWVMb2FkUmVxdWVz dC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRIVFRQTWV0aG9kKCJHRVQiKTsKICAgICBmcmFtZUxvYWRS ZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldFVSTChtYWtlVVJMKG1fcGFyZW50RnJhbWUtPmRv Y3VtZW50KCktPmJhc2VVUkwoKSwgdXJsKSk7CiAKKyNpZiBQTEFURk9STShCTEFDS0JFUlJZKQor ICAgIGlmICghU2VjdXJpdHlQb2xpY3k6OnNob3VsZEhpZGVSZWZlcnJlcihmcmFtZUxvYWRSZXF1 ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpLCBtX3BhcmVudEZyYW1lLT5kb2N1bWVudCgpLT5i YXNlVVJMKCkpKQorICAgICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNl dEhUVFBSZWZlcnJlcihtX3BhcmVudEZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigp KTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIGxvYWQoZnJhbWVMb2FkUmVxdWVzdCwgdHJ1ZSwgbm90 aWZ5RGF0YSk7CiB9CiAKQEAgLTU3NSw2ICs1OTEsMTEgQEAgTlBFcnJvciBQbHVnaW5WaWV3Ojpn ZXRVUkwoY29uc3QgY2hhciogdXJsLCBjb25zdCBjaGFyKiB0YXJnZXQpCiAgICAgZnJhbWVMb2Fk UmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRIVFRQTWV0aG9kKCJHRVQiKTsKICAgICBmcmFt ZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldFVSTChtYWtlVVJMKG1fcGFyZW50RnJh bWUtPmRvY3VtZW50KCktPmJhc2VVUkwoKSwgdXJsKSk7CiAKKyNpZiBQTEFURk9STShCTEFDS0JF UlJZKQorICAgIGlmICghU2VjdXJpdHlQb2xpY3k6OnNob3VsZEhpZGVSZWZlcnJlcihmcmFtZUxv YWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpLCBtX3BhcmVudEZyYW1lLT5kb2N1bWVu dCgpLT5iYXNlVVJMKCkpKQorICAgICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVz dCgpLnNldEhUVFBSZWZlcnJlcihtX3BhcmVudEZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZl cnJlcigpKTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIGxvYWQoZnJhbWVMb2FkUmVxdWVzdCwgZmFs c2UsIDApOwogfQogCkBAIC0xMjA0LDYgKzEyMjUsMTEgQEAgTlBFcnJvciBQbHVnaW5WaWV3Ojpo YW5kbGVQb3N0KGNvbnN0IGNoYXIqIHVybCwgY29uc3QgY2hhciogdGFyZ2V0LCB1aW50MzJfdCBs ZW4KICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldEhUVFBCb2R5KEZv cm1EYXRhOjpjcmVhdGUocG9zdERhdGEsIHBvc3REYXRhTGVuZ3RoKSk7CiAgICAgZnJhbWVMb2Fk UmVxdWVzdC5zZXRGcmFtZU5hbWUodGFyZ2V0KTsKIAorI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkp CisgICAgaWYgKCFTZWN1cml0eVBvbGljeTo6c2hvdWxkSGlkZVJlZmVycmVyKGZyYW1lTG9hZFJl cXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkudXJsKCksIG1fcGFyZW50RnJhbWUtPmRvY3VtZW50KCkt PmJhc2VVUkwoKSkpCisgICAgICAgIGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCku c2V0SFRUUFJlZmVycmVyKG1fcGFyZW50RnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVy KCkpOworI2VuZGlmCisKICAgICByZXR1cm4gbG9hZChmcmFtZUxvYWRSZXF1ZXN0LCBzZW5kTm90 aWZpY2F0aW9uLCBub3RpZnlEYXRhKTsKIH0KIAo= 136891 2012-04-12 06:30:42 -0700 2012-04-12 07:08:59 -0700 Patch bug-83772-20120412213636.patch text/plain 3748 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE1Nzg2NDg5Zjg4YmIw MTc2MWMzNTU0MWEyN2RiYzI1ZWE0OGExNi4uOTExZjdiNjZhMDBiMmJhN2UxODI4YmRlZmZlOGQw YmZjM2M1YzQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTEyICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gU2V0IHJlZmVycmVyIGZvciBwbHVnaW4gbG9hZCBpZiBuZWVkZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzc3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgaW5p dGlhbCB1cHN0cmVhbSBvZiBCbGFja0JlcnJ5IHBvcnRpbmcuCisKKyAgICAgICAgKiBwbHVnaW5z L1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0UmVmZXJyZXJJZk5lZWRlZCk6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnN0YXJ0 KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmdldFVSTE5vdGlmeSk6CisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5WaWV3OjpnZXRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6aGFuZGxlUG9zdCk6CisKIDIwMTItMDQtMTIgIFphbGFuIEJ1anRhcyAgPHpidWp0YXNA Z21haWwuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBab29tIGdlc3R1cmUgd2l0aCBkb3VibGUg dGFwIGNyYXNoZXMgb24gaWZyYW1lIHdoZW4gbWFpbiBmcmFtZSBoYXMgc2Nyb2xsIG9mZnNldC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IDc0OWY2MDk3OWY3ZWU5YTk4 OGE5MzVhZWVjMTVhMzNhM2Y0NWNlYTkuLjVkYjY4Yjc3ZWQwMDQ3YjBkYjhlNmRhMzQ4YjhhMjg3 OWQ5ZTc1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtNjEsNiAr NjEsMTEgQEAKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKICNpbmNsdWRlICJTY3JpcHRWYWx1 ZS5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCisKKyNpZiBQTEFURk9STShCTEFDS0JF UlJZKQorI2luY2x1ZGUgIlNlY3VyaXR5UG9saWN5LmgiCisjZW5kaWYKKwogI2luY2x1ZGUgIlNl dHRpbmdzLmgiCiAjaW5jbHVkZSAibnBydW50aW1lX2ltcGwuaCIKICNpbmNsdWRlIDx3dGYvQVND SUlDVHlwZS5oPgpAQCAtMTEzLDYgKzExOCwxNCBAQCBzdGF0aWMgU3RyaW5nIHNjcmlwdFN0cmlu Z0lmSmF2YVNjcmlwdFVSTChjb25zdCBLVVJMJiB1cmwpCiAgICAgcmV0dXJuIGRlY29kZVVSTEVz Y2FwZVNlcXVlbmNlcyh1cmwuc3RyaW5nKCkuc3Vic3RyaW5nKDExKSk7CiB9CiAKK3N0YXRpYyB2 b2lkIHNldFJlZmVycmVySWZOZWVkZWQoRnJhbWVMb2FkZXJSZXF1ZXN0IHJlcXVlc3QsIGNvbnN0 IEZyYW1lKiBwYXJlbnRGcmFtZSkKK3sKKyNpZiBQTEFSRk9STShCTEFDS0JFUlJZKQorICAgIGlm ICghU2VjdXJpdHlQb2xpY3k6OnNob3VsZEhpZGVSZWZlcnJlcihyZXF1ZXN0LnJlc291cmNlUmVx dWVzdCgpLnVybCgpLCBwYXJlbnRGcmFtZS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpKSkKKyAgICAg ICAgcmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRIVFRQUmVmZXJyZXIocGFyZW50RnJhbWUt PmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOworI2VuZGlmCit9CisKIFBsdWdpblZpZXcq IFBsdWdpblZpZXc6OnNfY3VycmVudFBsdWdpblZpZXcgPSAwOwogCiB2b2lkIFBsdWdpblZpZXc6 OnBvcFBvcHVwc1N0YXRlVGltZXJGaXJlZChUaW1lcjxQbHVnaW5WaWV3PiopCkBAIC0yNjIsNiAr Mjc1LDggQEAgYm9vbCBQbHVnaW5WaWV3OjpzdGFydCgpCiAgICAgICAgIEZyYW1lTG9hZFJlcXVl c3QgZnJhbWVMb2FkUmVxdWVzdChtX3BhcmVudEZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9y aWdpbigpKTsKICAgICAgICAgZnJhbWVMb2FkUmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRI VFRQTWV0aG9kKCJHRVQiKTsKICAgICAgICAgZnJhbWVMb2FkUmVxdWVzdC5yZXNvdXJjZVJlcXVl c3QoKS5zZXRVUkwobV91cmwpOworICAgICAgICBzZXRSZWZlcnJlcklmTmVlZGVkKGZyYW1lTG9h ZFJlcXVlc3QsIG1fcGFyZW50RnJhbWUpOworCiAgICAgICAgIGxvYWQoZnJhbWVMb2FkUmVxdWVz dCwgZmFsc2UsIDApOwogICAgIH0KIApAQCAtNTYzLDYgKzU3OCw3IEBAIE5QRXJyb3IgUGx1Z2lu Vmlldzo6Z2V0VVJMTm90aWZ5KGNvbnN0IGNoYXIqIHVybCwgY29uc3QgY2hhciogdGFyZ2V0LCB2 b2lkKiBub3RpCiAgICAgZnJhbWVMb2FkUmVxdWVzdC5zZXRGcmFtZU5hbWUodGFyZ2V0KTsKICAg ICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldEhUVFBNZXRob2QoIkdFVCIp OwogICAgIGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0VVJMKG1ha2VVUkwo bV9wYXJlbnRGcmFtZS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLCB1cmwpKTsKKyAgICBzZXRSZWZl cnJlcklmTmVlZGVkKGZyYW1lTG9hZFJlcXVlc3QsIG1fcGFyZW50RnJhbWUpOwogCiAgICAgcmV0 dXJuIGxvYWQoZnJhbWVMb2FkUmVxdWVzdCwgdHJ1ZSwgbm90aWZ5RGF0YSk7CiB9CkBAIC01NzQs NiArNTkwLDcgQEAgTlBFcnJvciBQbHVnaW5WaWV3OjpnZXRVUkwoY29uc3QgY2hhciogdXJsLCBj b25zdCBjaGFyKiB0YXJnZXQpCiAgICAgZnJhbWVMb2FkUmVxdWVzdC5zZXRGcmFtZU5hbWUodGFy Z2V0KTsKICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldEhUVFBNZXRo b2QoIkdFVCIpOwogICAgIGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0VVJM KG1ha2VVUkwobV9wYXJlbnRGcmFtZS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLCB1cmwpKTsKKyAg ICBzZXRSZWZlcnJlcklmTmVlZGVkKGZyYW1lTG9hZFJlcXVlc3QsIG1fcGFyZW50RnJhbWUpOwog CiAgICAgcmV0dXJuIGxvYWQoZnJhbWVMb2FkUmVxdWVzdCwgZmFsc2UsIDApOwogfQpAQCAtMTIw Myw2ICsxMjIwLDcgQEAgTlBFcnJvciBQbHVnaW5WaWV3OjpoYW5kbGVQb3N0KGNvbnN0IGNoYXIq IHVybCwgY29uc3QgY2hhciogdGFyZ2V0LCB1aW50MzJfdCBsZW4KICAgICBmcmFtZUxvYWRSZXF1 ZXN0LnJlc291cmNlUmVxdWVzdCgpLmFkZEhUVFBIZWFkZXJGaWVsZHMoaGVhZGVyRmllbGRzKTsK ICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldEhUVFBCb2R5KEZvcm1E YXRhOjpjcmVhdGUocG9zdERhdGEsIHBvc3REYXRhTGVuZ3RoKSk7CiAgICAgZnJhbWVMb2FkUmVx dWVzdC5zZXRGcmFtZU5hbWUodGFyZ2V0KTsKKyAgICBzZXRSZWZlcnJlcklmTmVlZGVkKGZyYW1l TG9hZFJlcXVlc3QsIG1fcGFyZW50RnJhbWUpOwogCiAgICAgcmV0dXJuIGxvYWQoZnJhbWVMb2Fk UmVxdWVzdCwgc2VuZE5vdGlmaWNhdGlvbiwgbm90aWZ5RGF0YSk7CiB9Cg== 136902 2012-04-12 07:09:20 -0700 2012-04-12 07:51:19 -0700 Patch bug-83772-20120412221517.patch text/plain 3744 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYwZTExZGNjZTczMmY1 ZTlmMzJmMDkyYWJjYTRkNDQ5MTQ2NDEwOS4uOTY1ZTg1YTM5MmYxODY4NjJkYzUyOWY3YzU2Zjlj MTA1NmFjODkzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTEyICBDaGFy bGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gU2V0IHJlZmVycmVyIGZvciBwbHVnaW4gbG9hZCBpZiBuZWVkZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzc3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgaW5p dGlhbCB1cHN0cmVhbSBvZiBCbGFja0JlcnJ5IHBvcnRpbmcuCisKKyAgICAgICAgKiBwbHVnaW5z L1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0UmVmZXJyZXJJZk5lZWRlZCk6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnN0YXJ0 KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmdldFVSTE5vdGlmeSk6CisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5WaWV3OjpnZXRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6aGFuZGxlUG9zdCk6CisKIDIwMTItMDQtMTIgIFNhbSBEICA8ZHNhbTI5MTJAZ21haWwu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5vZGUgVmFsdWUgc2hvdWxkIG5vdCBnZXQg Y29ycnVwdCB3aGlsZSBqdW1wIG92ZXIgZGlmZmVyZW50IG1hdGNoZXMgaW4gc2VhcmNoLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAKaW5kZXggNzQ5ZjYwOTc5ZjdlZTlhOTg4YTkz NWFlZWMxNWEzM2EzZjQ1Y2VhOS4uMGVlOTI1ZmNjZGMzOTdjNWNlNTI3MGU4NjcxYzY1ZTU5Y2Zm YTgyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC02MSw2ICs2MSwx MSBAQAogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgi CiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKKworI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkp CisjaW5jbHVkZSAiU2VjdXJpdHlQb2xpY3kuaCIKKyNlbmRpZgorCiAjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgogI2luY2x1ZGUgPHd0Zi9BU0NJSUNU eXBlLmg+CkBAIC0xMTMsNiArMTE4LDE0IEBAIHN0YXRpYyBTdHJpbmcgc2NyaXB0U3RyaW5nSWZK YXZhU2NyaXB0VVJMKGNvbnN0IEtVUkwmIHVybCkKICAgICByZXR1cm4gZGVjb2RlVVJMRXNjYXBl U2VxdWVuY2VzKHVybC5zdHJpbmcoKS5zdWJzdHJpbmcoMTEpKTsKIH0KIAorc3RhdGljIHZvaWQg c2V0UmVmZXJyZXJJZk5lZWRlZChGcmFtZUxvYWRlclJlcXVlc3QgcmVxdWVzdCwgY29uc3QgRnJh bWUqIHBhcmVudEZyYW1lKQoreworI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpCisgICAgaWYgKCFT ZWN1cml0eVBvbGljeTo6c2hvdWxkSGlkZVJlZmVycmVyKHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0 KCkudXJsKCksIHBhcmVudEZyYW1lLT5kb2N1bWVudCgpLT5iYXNlVVJMKCkpKQorICAgICAgICBy ZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldEhUVFBSZWZlcnJlcihwYXJlbnRGcmFtZS0+bG9h ZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSk7CisjZW5kaWYKK30KKwogUGx1Z2luVmlldyogUGx1 Z2luVmlldzo6c19jdXJyZW50UGx1Z2luVmlldyA9IDA7CiAKIHZvaWQgUGx1Z2luVmlldzo6cG9w UG9wdXBzU3RhdGVUaW1lckZpcmVkKFRpbWVyPFBsdWdpblZpZXc+KikKQEAgLTI2Miw2ICsyNzUs OCBAQCBib29sIFBsdWdpblZpZXc6OnN0YXJ0KCkKICAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBm cmFtZUxvYWRSZXF1ZXN0KG1fcGFyZW50RnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2lu KCkpOwogICAgICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnNldEhUVFBN ZXRob2QoIkdFVCIpOwogICAgICAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgp LnNldFVSTChtX3VybCk7CisgICAgICAgIHNldFJlZmVycmVySWZOZWVkZWQoZnJhbWVMb2FkUmVx dWVzdCwgbV9wYXJlbnRGcmFtZSk7CisKICAgICAgICAgbG9hZChmcmFtZUxvYWRSZXF1ZXN0LCBm YWxzZSwgMCk7CiAgICAgfQogCkBAIC01NjMsNiArNTc4LDcgQEAgTlBFcnJvciBQbHVnaW5WaWV3 OjpnZXRVUkxOb3RpZnkoY29uc3QgY2hhciogdXJsLCBjb25zdCBjaGFyKiB0YXJnZXQsIHZvaWQq IG5vdGkKICAgICBmcmFtZUxvYWRSZXF1ZXN0LnNldEZyYW1lTmFtZSh0YXJnZXQpOwogICAgIGZy YW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0SFRUUE1ldGhvZCgiR0VUIik7CiAg ICAgZnJhbWVMb2FkUmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRVUkwobWFrZVVSTChtX3Bh cmVudEZyYW1lLT5kb2N1bWVudCgpLT5iYXNlVVJMKCksIHVybCkpOworICAgIHNldFJlZmVycmVy SWZOZWVkZWQoZnJhbWVMb2FkUmVxdWVzdCwgbV9wYXJlbnRGcmFtZSk7CiAKICAgICByZXR1cm4g bG9hZChmcmFtZUxvYWRSZXF1ZXN0LCB0cnVlLCBub3RpZnlEYXRhKTsKIH0KQEAgLTU3NCw2ICs1 OTAsNyBAQCBOUEVycm9yIFBsdWdpblZpZXc6OmdldFVSTChjb25zdCBjaGFyKiB1cmwsIGNvbnN0 IGNoYXIqIHRhcmdldCkKICAgICBmcmFtZUxvYWRSZXF1ZXN0LnNldEZyYW1lTmFtZSh0YXJnZXQp OwogICAgIGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0SFRUUE1ldGhvZCgi R0VUIik7CiAgICAgZnJhbWVMb2FkUmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRVUkwobWFr ZVVSTChtX3BhcmVudEZyYW1lLT5kb2N1bWVudCgpLT5iYXNlVVJMKCksIHVybCkpOworICAgIHNl dFJlZmVycmVySWZOZWVkZWQoZnJhbWVMb2FkUmVxdWVzdCwgbV9wYXJlbnRGcmFtZSk7CiAKICAg ICByZXR1cm4gbG9hZChmcmFtZUxvYWRSZXF1ZXN0LCBmYWxzZSwgMCk7CiB9CkBAIC0xMjAzLDYg KzEyMjAsNyBAQCBOUEVycm9yIFBsdWdpblZpZXc6OmhhbmRsZVBvc3QoY29uc3QgY2hhciogdXJs LCBjb25zdCBjaGFyKiB0YXJnZXQsIHVpbnQzMl90IGxlbgogICAgIGZyYW1lTG9hZFJlcXVlc3Qu cmVzb3VyY2VSZXF1ZXN0KCkuYWRkSFRUUEhlYWRlckZpZWxkcyhoZWFkZXJGaWVsZHMpOwogICAg IGZyYW1lTG9hZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkuc2V0SFRUUEJvZHkoRm9ybURhdGE6 OmNyZWF0ZShwb3N0RGF0YSwgcG9zdERhdGFMZW5ndGgpKTsKICAgICBmcmFtZUxvYWRSZXF1ZXN0 LnNldEZyYW1lTmFtZSh0YXJnZXQpOworICAgIHNldFJlZmVycmVySWZOZWVkZWQoZnJhbWVMb2Fk UmVxdWVzdCwgbV9wYXJlbnRGcmFtZSk7CiAKICAgICByZXR1cm4gbG9hZChmcmFtZUxvYWRSZXF1 ZXN0LCBzZW5kTm90aWZpY2F0aW9uLCBub3RpZnlEYXRhKTsKIH0K