114394 2013-04-10 16:58:57 -0700 [GTK] [WebKit2] Add a setting to control whether or not accelerated 2D canvas is enabled 2013-05-01 11:10:07 -0700 1 1 1 Unclassified WebKit WebKitGTK 523.x (Safari 3) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson andersca cgarcia commit-queue gustavo gyuyoung.kim rakuco sam oldest_to_newest 873375 0 mrobinson 2013-04-10 16:58:57 -0700 Accelerated 2D canvas controls whether or not 2D canvas is potentially drawn with hardware acceleration. 873380 1 197451 mrobinson 2013-04-10 17:04:10 -0700 Created attachment 197451 Patch 873382 2 commit-queue 2013-04-10 17:06:42 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 873580 3 197451 cgarcia 2013-04-10 23:40:05 -0700 Comment on attachment 197451 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197451&action=review Looks great, thanks! You need the approval of another GTK+ reviewer and a webkit2 owner. I also think we shouldn't add new API until we have trunk in sync with the stale branch, it would be weird to include API for 2.2 before the one already released in 2.0 > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1088 > + * if WebKitGTK+ was compiled with a version of Cairo including the unstable CairoGL API. What's the first version of cairo with a reasonable support of GL? Maybe it's worth mentioning a cairo version here. > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1091 > + */ Since: 2.2 > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1097 > + g_param_spec_boolean("enable-accelerated-2d-canvas", > + _("Enable accelerated 2D canvas"), > + _("Whether to enable accelerated 2D canvas"), > + FALSE, > + readWriteConstructParamFlags)); I think we need to agree on a way to define properties and signals in a consistent way and making happy the style checker at the same time. I prefer to move the first argument to a new line to make sure all arguments are lined up, but I'm not opposed to this approach, we just need to decide. > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:2693 > + */ Since: 2.2 > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:2707 > + */ Ditto. 873972 4 197637 mrobinson 2013-04-11 10:22:43 -0700 Created attachment 197637 Patch 873974 5 mrobinson 2013-04-11 10:25:23 -0700 (In reply to comment #3) > > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1088 > > + * if WebKitGTK+ was compiled with a version of Cairo including the unstable CairoGL API. > > What's the first version of cairo with a reasonable support of GL? Maybe it's worth mentioning a cairo version here. There's no timetable for when CairoGL will be stable, so I cannot provide much more information sadly. One thing to consider is that in the future we may be able to accelerated canvas with XRender -- but I'm not entirely sure of the likelihood/usefulness of that either. > > > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1091 > > + */ > > Since: 2.2 Oh, right! > > > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1097 > > + g_param_spec_boolean("enable-accelerated-2d-canvas", > > + _("Enable accelerated 2D canvas"), > > + _("Whether to enable accelerated 2D canvas"), > > + FALSE, > > + readWriteConstructParamFlags)); > > I think we need to agree on a way to define properties and signals in a consistent way and making happy the style checker at the same time. I prefer to move the first argument to a new line to make sure all arguments are lined up, but I'm not opposed to this approach, we just need to decide. I don't feel a personal necessity for this degree of consistency, but I certainly don't mind providing it. :) 876569 6 197637 xan.lopez 2013-04-16 09:15:31 -0700 Comment on attachment 197637 Patch Looks good! 876571 7 197637 xan.lopez 2013-04-16 09:18:12 -0700 Comment on attachment 197637 Patch Removing r+, since this is WebKit2, but looks perfect to me. 876573 8 cgarcia 2013-04-16 09:19:20 -0700 (In reply to comment #7) > (From update of attachment 197637 [details]) > Removing r+, since this is WebKit2, but looks perfect to me. I think we should also try to get trunk in sync with the stable branch before landing patches adding new api. 876575 9 mrobinson 2013-04-16 09:23:56 -0700 CCing some WebKit2 owners. Two GTK+ reviewers have approved this patch and it's deadly simple. It just connects a WebKit2 preference to the GTK+ API equivalent. 876582 10 mrobinson 2013-04-16 09:43:19 -0700 (In reply to comment #8) > I think we should also try to get trunk in sync with the stable branch before landing patches adding new api. I talked with cgarcia and he doesn't have have any direct objection to landing this patch now, but an aesthetic preference for landing pending patches earlier. The GTK+ port can work out the order of landing patches, so this is just waiting on owner review. 883465 11 197637 commit-queue 2013-05-01 11:10:02 -0700 Comment on attachment 197637 Patch Clearing flags on attachment: 197637 Committed r149440: <http://trac.webkit.org/changeset/149440> 883466 12 commit-queue 2013-05-01 11:10:07 -0700 All reviewed patches have been landed. Closing bug. 197451 2013-04-10 17:04:10 -0700 2013-04-11 10:22:40 -0700 Patch bug-114394-20130410170351.patch text/plain 8309 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGQwYTliMzI0MjE5NjFk MDkyZDcwM2Y0NjcyYjNiMDkyYmJlYzkwOS4uNzJlNTkzOThmNjM0OTI1OTVlOTU0ZTI1NDA0NjQz OWY0ZWY3MDY1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTEwICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBbV2Vi S2l0Ml0gQWRkIGEgc2V0dGluZyB0byBjb250cm9sIHdoZXRoZXIgb3Igbm90IGFjY2VsZXJhdGVk IDJEIGNhbnZhcyBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTQzOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgYSBzZXR0aW5nIHRvIGNvbnRyb2wgYWNjZWxlcmF0ZWQgMkQgY2Fu dmFzLCB3aGljaCBkZXRlcm1pbmVzIHdoZXRoZXIKKyAgICAgICAgb3Igbm90IHRvIGNvbnNpZGVy IHJlbmRlcmluZyBIVE1MIGNhbnZhcyB3aXRoIGhhcmR3YXJlIGFjY2VsZXJhdGlvbi4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcDoKKyAgICAgICAgKHdl YktpdFNldHRpbmdzU2V0UHJvcGVydHkpOiBBZGRlZCBzdXBwb3J0IGZvciBlbmFibGUtYWNjZWxl cmF0ZWQtMmQtY2FudmFzIHByb3BlcnR5LgorICAgICAgICAod2ViS2l0U2V0dGluZ3NHZXRQcm9w ZXJ0eSk6IEFkZGVkIHN1cHBvcnQgZm9yIGVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgcHJv cGVydHkuCisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdCk6IEFkZGVkIHN1cHBv cnQgZm9yIGVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgcHJvcGVydHkuCisgICAgICAgICh3 ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMpOiBBZGRlZC4K KyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZh cyk6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmg6 IE5ldyBtZXRob2RzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0 ay1zZWN0aW9ucy50eHQ6IEFkZGVkIG5ldyBtZXRob2RzIHRvIHRoZSBkb2N1bWVudGF0aW9uLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHA6 CisgICAgICAgICh0ZXN0V2ViS2l0U2V0dGluZ3MpOiBBZGRlZCBhIHNpbXBsZSB0ZXN0IGZvciB0 aGUgc2V0dGluZy4KKwogMjAxMy0wNC0xMCAgVG9iaWFzIE11ZWxsZXIgIDx0b2JpYXNtdWVAZ25v bWUub3JnPgogCiAgICAgICAgIEZpeGVkIGJ1aWxkIGZhaWx1cmUgaW4gUGx1Z2luLmg6IEZsb2F0 UG9pbnQgd2FzIG5vdCBpbiBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCmluZGV4IGVkZGUyODlkZWRi NGY3MzUwNGFmYTcxN2JhZmZlYjYyNDZhYzJjNzAuLmUyMmQwNzJhOTQyMGI4MWNhZTVmNjE5MjNl Yjc5MDQ4MWNkMDVkNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFNldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKQEAgLTEzNCw3ICsxMzQsOCBAQCBlbnVtIHsKICAgICBQ Uk9QX0VOQUJMRV9TSVRFX1NQRUNJRklDX1FVSVJLUywKICAgICBQUk9QX0VOQUJMRV9QQUdFX0NB Q0hFLAogICAgIFBST1BfVVNFUl9BR0VOVCwKLSAgICBQUk9QX0VOQUJMRV9TTU9PVEhfU0NST0xM SU5HCisgICAgUFJPUF9FTkFCTEVfU01PT1RIX1NDUk9MTElORywKKyAgICBQUk9QX0VOQUJMRV9B Q0NFTEVSQVRFRF8yRF9DQU5WQVMKIH07CiAKIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzU2V0 UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1ZSogdmFs dWUsIEdQYXJhbVNwZWMqIHBhcmFtU3BlYykKQEAgLTI3Nyw2ICsyNzgsOSBAQCBzdGF0aWMgdm9p ZCB3ZWJLaXRTZXR0aW5nc1NldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElk LCBjb25zdCBHVmFsdQogICAgIGNhc2UgUFJPUF9FTkFCTEVfU01PT1RIX1NDUk9MTElORzoKICAg ICAgICAgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZyhzZXR0aW5n cywgZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSkpOwogICAgICAgICBicmVhazsKKyAgICBjYXNl IFBST1BfRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUzoKKyAgICAgICAgd2Via2l0X3NldHRp bmdzX3NldF9lbmFibGVfYWNjZWxlcmF0ZWRfMmRfY2FudmFzKHNldHRpbmdzLCBnX3ZhbHVlX2dl dF9ib29sZWFuKHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAg IEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJZCwgcGFyYW1T cGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC00MTcsNiArNDIxLDkgQEAgc3RhdGljIHZvaWQgd2Vi S2l0U2V0dGluZ3NHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJZCwgR1Zh bHVlKiB2YWwKICAgICBjYXNlIFBST1BfRU5BQkxFX1NNT09USF9TQ1JPTExJTkc6CiAgICAgICAg IGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX3Nt b290aF9zY3JvbGxpbmcoc2V0dGluZ3MpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9Q X0VOQUJMRV9BQ0NFTEVSQVRFRF8yRF9DQU5WQVM6CisgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xl YW4odmFsdWUsIHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZh cyhzZXR0aW5ncykpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09C SkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7 CiAgICAgICAgIGJyZWFrOwpAQCAtMTA3Myw2ICsxMDgwLDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtp dF9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiV2hl dGhlciB0byBlbmFibGUgc21vb3RoIHNjcm9sbGluZyIpLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFMU0UsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFkV3JpdGVDb25z dHJ1Y3RQYXJhbUZsYWdzKSk7CisKKyAgICAvKioKKyAgICAgKiBXZWJLaXRTZXR0aW5nczplbmFi bGUtYWNjZWxlcmF0ZWQtMmQtY2FudmFzOgorICAgICAqCisgICAgICogRW5hYmxlIG9yIGRpc2Fi bGUgYWNjZWxlcmF0ZWQgMkQgY2FudmFzLiBBY2NlbGVyYXRlZCAyRCBjYW52YXMgaXMgb25seSBh dmFpbGFibGUKKyAgICAgKiBpZiBXZWJLaXRHVEsrIHdhcyBjb21waWxlZCB3aXRoIGEgdmVyc2lv biBvZiBDYWlybyBpbmNsdWRpbmcgdGhlIHVuc3RhYmxlIENhaXJvR0wgQVBJLgorICAgICAqIFdo ZW4gYWNjZWxlcmF0ZWQgMkQgY2FudmFzIGlzIGVuYWJsZWQsIFdlYktpdCBtYXkgcmVuZGVyIHNv bWUgMkQgY2FudmFzIGNvbnRlbnQKKyAgICAgKiB1c2luZyBoYXJkd2FyZSBhY2NlbGVyYXRlZCBk cmF3aW5nIG9wZXJhdGlvbnMuCisgICAgICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9w cm9wZXJ0eShnT2JqZWN0Q2xhc3MsIFBST1BfRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUywK KyAgICAgICAgZ19wYXJhbV9zcGVjX2Jvb2xlYW4oImVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52 YXMiLAorICAgICAgICAgICAgXygiRW5hYmxlIGFjY2VsZXJhdGVkIDJEIGNhbnZhcyIpLAorICAg ICAgICAgICAgXygiV2hldGhlciB0byBlbmFibGUgYWNjZWxlcmF0ZWQgMkQgY2FudmFzIiksCisg ICAgICAgICAgICBGQUxTRSwKKyAgICAgICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxh Z3MpKTsKIH0KIAogdm9pZCB3ZWJraXRTZXR0aW5nc0F0dGFjaFNldHRpbmdzVG9QYWdlKFdlYktp dFNldHRpbmdzKiBzZXR0aW5ncywgV2ViUGFnZVByb3h5KiBwYWdlKQpAQCAtMjY2MCwzICsyNjgy LDM3IEBAIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZyhX ZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sCiAgICAgcHJpdi0+cHJlZmVyZW5jZXMtPnNl dFNjcm9sbEFuaW1hdG9yRW5hYmxlZChlbmFibGVkKTsKICAgICBnX29iamVjdF9ub3RpZnkoR19P QkpFQ1Qoc2V0dGluZ3MpLCAiZW5hYmxlLXNtb290aC1zY3JvbGxpbmciKTsKIH0KKworLyoqCisg KiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXM6CisgKiBA c2V0dGluZ3M6IGEgI1dlYktpdFNldHRpbmdzCisgKgorICogR2V0IHRoZSAjV2ViS2l0U2V0dGlu Z3M6ZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZhcyBwcm9wZXJ0eS4KKyAqCisgKiBSZXR1cm5z OiAlVFJVRSBpZiBhY2NlbGVyYXRlZCAyRCBjYW52YXMgaXMgZW5hYmxlZCBvciAlRkFMU0Ugb3Ro ZXJ3aXNlLgorICovCitnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVy YXRlZF8yZF9jYW52YXMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQoreworICAgIGdfcmV0dXJu X3ZhbF9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncyksIEZBTFNFKTsKKworICAg IHJldHVybiBzZXR0aW5ncy0+cHJpdi0+cHJlZmVyZW5jZXMtPmFjY2VsZXJhdGVkMmRDYW52YXNF bmFibGVkKCk7Cit9CisKKy8qKgorICogd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfYWNjZWxl cmF0ZWRfMmRfY2FudmFzOgorICogQHNldHRpbmdzOiBhICNXZWJLaXRTZXR0aW5ncworICogQGVu YWJsZWQ6IFZhbHVlIHRvIGJlIHNldAorICoKKyAqIFNldCB0aGUgI1dlYktpdFNldHRpbmdzOmVu YWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgcHJvcGVydHkuCisgKi8KK3ZvaWQgd2Via2l0X3Nl dHRpbmdzX3NldF9lbmFibGVfYWNjZWxlcmF0ZWRfMmRfY2FudmFzKFdlYktpdFNldHRpbmdzKiBz ZXR0aW5ncywgZ2Jvb2xlYW4gZW5hYmxlZCkKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJ VF9JU19TRVRUSU5HUyhzZXR0aW5ncykpOworCisgICAgV2ViS2l0U2V0dGluZ3NQcml2YXRlKiBw cml2ID0gc2V0dGluZ3MtPnByaXY7CisgICAgaWYgKHByaXYtPnByZWZlcmVuY2VzLT5hY2NlbGVy YXRlZDJkQ2FudmFzRW5hYmxlZCgpID09IGVuYWJsZWQpCisgICAgICAgIHJldHVybjsKKworICAg IHByaXYtPnByZWZlcmVuY2VzLT5zZXRBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChlbmFibGVk KTsKKyAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qoc2V0dGluZ3MpLCAiZW5hYmxlLWFjY2Vs ZXJhdGVkLTJkLWNhbnZhcyIpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFNldHRpbmdzLmgKaW5kZXggYTlmZTg2YTMwZjZhMWQ5MTE4N2UwOWY1ZTBh MDdlNDY5ZGUwYmRhNC4uNDZkNTA3MTdhOWQ5NTlkOTE5ZTk2MzE0NTNiNmMwMDE0YjI3NzQ5YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGlu Z3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5n cy5oCkBAIC0zODAsNiArMzgwLDEzIEBAIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3NldHRpbmdz X3NldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZyAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNl dHRpbmdzICpzZXR0aW5ncywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiAgICAgICAgZW5hYmxlZCk7CiAKK1dF QktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2FjY2VsZXJhdGVk XzJkX2NhbnZhcyAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MpOworCitX RUJLSVRfQVBJIHZvaWQKK3dlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJk X2NhbnZhcyAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z2Jvb2xlYW4gICAgICAgIGVuYWJsZWQpOworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYgLyogV2Vi S2l0U2V0dGluZ3NfaCAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKaW5kZXggZjZlOGE4NDc3 N2JlMjdiNDViZWRlMzAzNjViMjQ0MDlmYjJhMjljYS4uZjAxMDgzODkyYjI1NGZlODFlMGZkYzQ0 NTU1MjEwOTBjMDUyN2E3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0CkBAIC0zMTAsNiAr MzEwLDggQEAgd2Via2l0X3NldHRpbmdzX3NldF91c2VyX2FnZW50CiB3ZWJraXRfc2V0dGluZ3Nf c2V0X3VzZXJfYWdlbnRfd2l0aF9hcHBsaWNhdGlvbl9kZXRhaWxzCiB3ZWJraXRfc2V0dGluZ3Nf Z2V0X2VuYWJsZV9zbW9vdGhfc2Nyb2xsaW5nCiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9z bW9vdGhfc2Nyb2xsaW5nCit3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8y ZF9jYW52YXMKK3dlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZh cwogCiA8U1VCU0VDVElPTiBTdGFuZGFyZD4KIFdlYktpdFNldHRpbmdzQ2xhc3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0 aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2Vi S2l0U2V0dGluZ3MuY3BwCmluZGV4IGY1YTQ1ZDU3YzZhOTdlOGMwMjJmMGY2NjRiYjUzNjczMTMw OWU4MTQuLjU0NDIwMGRmM2RiZmM5ZmMzZTI0MmI5ZTJiNDI0MGE2NDM0NGNlNjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0 aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dFdlYktpdFNldHRpbmdzLmNwcApAQCAtMjQ4LDYgKzI0OCwxMSBAQCBzdGF0aWMgdm9pZCB0ZXN0 V2ViS2l0U2V0dGluZ3MoVGVzdCosIGdjb25zdHBvaW50ZXIpCiAgICAgd2Via2l0X3NldHRpbmdz X3NldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZyhzZXR0aW5ncywgVFJVRSk7CiAgICAgZ19hc3Nl cnQod2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZyhzZXR0aW5ncykp OwogCisgICAgLy8gQnkgZGVmYXVsdCwgYWNjZWxlcmF0ZWQgMkQgY2FudmFzIGlzIGRpc2FibGVk LgorICAgIGdfYXNzZXJ0KCF3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8y ZF9jYW52YXMoc2V0dGluZ3MpKTsKKyAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9hY2Nl bGVyYXRlZF8yZF9jYW52YXMoc2V0dGluZ3MsIFRSVUUpOworICAgIGdfYXNzZXJ0KHdlYmtpdF9z ZXR0aW5nc19nZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZhcyhzZXR0aW5ncykpOworCiAg ICAgZ19vYmplY3RfdW5yZWYoR19PQkpFQ1Qoc2V0dGluZ3MpKTsKIH0KIAo= 197637 2013-04-11 10:22:43 -0700 2013-05-01 11:10:02 -0700 Patch bug-114394-20130411102222.patch text/plain 8346 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODc1OTEwNzhkMDE2ZDc3 MjRhYmNhOTI0YWU4ZDk3OGZkZWIyMzEwNi4uMDg4ZmM3N2YzYzQxMWEwMmRlYjgxYzUwMTkwNGI1 OWIyODFmMDcxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTExICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBbV2Vi S2l0Ml0gQWRkIGEgc2V0dGluZyB0byBjb250cm9sIHdoZXRoZXIgb3Igbm90IGFjY2VsZXJhdGVk IDJEIGNhbnZhcyBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTQzOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgYSBzZXR0aW5nIHRvIGNvbnRyb2wgYWNjZWxlcmF0ZWQgMkQgY2Fu dmFzLCB3aGljaCBkZXRlcm1pbmVzIHdoZXRoZXIKKyAgICAgICAgb3Igbm90IHRvIGNvbnNpZGVy IHJlbmRlcmluZyBIVE1MIGNhbnZhcyB3aXRoIGhhcmR3YXJlIGFjY2VsZXJhdGlvbi4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcDoKKyAgICAgICAgKHdl YktpdFNldHRpbmdzU2V0UHJvcGVydHkpOiBBZGRlZCBzdXBwb3J0IGZvciBlbmFibGUtYWNjZWxl cmF0ZWQtMmQtY2FudmFzIHByb3BlcnR5LgorICAgICAgICAod2ViS2l0U2V0dGluZ3NHZXRQcm9w ZXJ0eSk6IEFkZGVkIHN1cHBvcnQgZm9yIGVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgcHJv cGVydHkuCisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdCk6IEFkZGVkIHN1cHBv cnQgZm9yIGVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgcHJvcGVydHkuCisgICAgICAgICh3 ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMpOiBBZGRlZC4K KyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZh cyk6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmg6 IE5ldyBtZXRob2RzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0 ay1zZWN0aW9ucy50eHQ6IEFkZGVkIG5ldyBtZXRob2RzIHRvIHRoZSBkb2N1bWVudGF0aW9uLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHA6 CisgICAgICAgICh0ZXN0V2ViS2l0U2V0dGluZ3MpOiBBZGRlZCBhIHNpbXBsZSB0ZXN0IGZvciB0 aGUgc2V0dGluZy4KKwogMjAxMy0wNC0xMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBSZXNvdXJjZUhhbmRsZS5oIGluY2x1ZGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5n cy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5j cHAKaW5kZXggZWRkZTI4OWRlZGI0ZjczNTA0YWZhNzE3YmFmZmViNjI0NmFjMmM3MC4uMTNkZTk4 MzQ3MmNhYWI4MzU5ZThiYjNmNjQ5ZjNmODI5OGYxZmM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcApAQCAtMTM0LDcgKzEz NCw4IEBAIGVudW0gewogICAgIFBST1BfRU5BQkxFX1NJVEVfU1BFQ0lGSUNfUVVJUktTLAogICAg IFBST1BfRU5BQkxFX1BBR0VfQ0FDSEUsCiAgICAgUFJPUF9VU0VSX0FHRU5ULAotICAgIFBST1Bf RU5BQkxFX1NNT09USF9TQ1JPTExJTkcKKyAgICBQUk9QX0VOQUJMRV9TTU9PVEhfU0NST0xMSU5H LAorICAgIFBST1BfRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUwogfTsKIAogc3RhdGljIHZv aWQgd2ViS2l0U2V0dGluZ3NTZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJ ZCwgY29uc3QgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcGFyYW1TcGVjKQpAQCAtMjc3LDYg KzI3OCw5IEBAIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzU2V0UHJvcGVydHkoR09iamVjdCog b2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1CiAgICAgY2FzZSBQUk9QX0VOQUJMRV9T TU9PVEhfU0NST0xMSU5HOgogICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9zbW9v dGhfc2Nyb2xsaW5nKHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVlKSk7CiAgICAg ICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9FTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTOgor ICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMo c2V0dGluZ3MsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKTsKKyAgICAgICAgYnJlYWs7CiAg ICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9i amVjdCwgcHJvcElkLCBwYXJhbVNwZWMpOwogICAgICAgICBicmVhazsKQEAgLTQxNyw2ICs0MjEs OSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KEdPYmplY3QqIG9iamVj dCwgZ3VpbnQgcHJvcElkLCBHVmFsdWUqIHZhbAogICAgIGNhc2UgUFJPUF9FTkFCTEVfU01PT1RI X1NDUk9MTElORzoKICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3Nl dHRpbmdzX2dldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZyhzZXR0aW5ncykpOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIFBST1BfRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUzoKKyAgICAg ICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVf YWNjZWxlcmF0ZWRfMmRfY2FudmFzKHNldHRpbmdzKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRl ZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3Qs IHByb3BJZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0xMDczLDYgKzEwODAsMjQg QEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0U2V0dGluZ3ND bGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBfKCJXaGV0aGVyIHRvIGVuYWJsZSBzbW9vdGggc2Nyb2xsaW5nIiksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBG QUxTRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxhZ3MpKTsKKworICAgIC8qKgorICAgICAq IFdlYktpdFNldHRpbmdzOmVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXM6CisgICAgICoKKyAg ICAgKiBFbmFibGUgb3IgZGlzYWJsZSBhY2NlbGVyYXRlZCAyRCBjYW52YXMuIEFjY2VsZXJhdGVk IDJEIGNhbnZhcyBpcyBvbmx5IGF2YWlsYWJsZQorICAgICAqIGlmIFdlYktpdEdUSysgd2FzIGNv bXBpbGVkIHdpdGggYSB2ZXJzaW9uIG9mIENhaXJvIGluY2x1ZGluZyB0aGUgdW5zdGFibGUgQ2Fp cm9HTCBBUEkuCisgICAgICogV2hlbiBhY2NlbGVyYXRlZCAyRCBjYW52YXMgaXMgZW5hYmxlZCwg V2ViS2l0IG1heSByZW5kZXIgc29tZSAyRCBjYW52YXMgY29udGVudAorICAgICAqIHVzaW5nIGhh cmR3YXJlIGFjY2VsZXJhdGVkIGRyYXdpbmcgb3BlcmF0aW9ucy4KKyAgICAgKgorICAgICAqIFNp bmNlOiAyLjIKKyAgICAgKi8KKyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdP YmplY3RDbGFzcywKKyAgICAgICAgUFJPUF9FTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTLAor ICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigiZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZh cyIsCisgICAgICAgICAgICBfKCJFbmFibGUgYWNjZWxlcmF0ZWQgMkQgY2FudmFzIiksCisgICAg ICAgICAgICBfKCJXaGV0aGVyIHRvIGVuYWJsZSBhY2NlbGVyYXRlZCAyRCBjYW52YXMiKSwKKyAg ICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFn cykpOwogfQogCiB2b2lkIHdlYmtpdFNldHRpbmdzQXR0YWNoU2V0dGluZ3NUb1BhZ2UoV2ViS2l0 U2V0dGluZ3MqIHNldHRpbmdzLCBXZWJQYWdlUHJveHkqIHBhZ2UpCkBAIC0yNjYwLDMgKzI2ODUs NDEgQEAgdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9zbW9vdGhfc2Nyb2xsaW5nKFdl YktpdFNldHRpbmdzKiBzZXR0aW5ncywgZ2Jvb2wKICAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0 U2Nyb2xsQW5pbWF0b3JFbmFibGVkKGVuYWJsZWQpOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09C SkVDVChzZXR0aW5ncyksICJlbmFibGUtc21vb3RoLXNjcm9sbGluZyIpOwogfQorCisvKioKKyAq IHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2FjY2VsZXJhdGVkXzJkX2NhbnZhczoKKyAqIEBz ZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAqCisgKiBHZXQgdGhlICNXZWJLaXRTZXR0aW5n czplbmFibGUtYWNjZWxlcmF0ZWQtMmQtY2FudmFzIHByb3BlcnR5LgorICoKKyAqIFJldHVybnM6 ICVUUlVFIGlmIGFjY2VsZXJhdGVkIDJEIGNhbnZhcyBpcyBlbmFibGVkIG9yICVGQUxTRSBvdGhl cndpc2UuCisgKgorICogU2luY2U6IDIuMgorICovCitnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3Nf Z2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdz KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5n cyksIEZBTFNFKTsKKworICAgIHJldHVybiBzZXR0aW5ncy0+cHJpdi0+cHJlZmVyZW5jZXMtPmFj Y2VsZXJhdGVkMmRDYW52YXNFbmFibGVkKCk7Cit9CisKKy8qKgorICogd2Via2l0X3NldHRpbmdz X3NldF9lbmFibGVfYWNjZWxlcmF0ZWRfMmRfY2FudmFzOgorICogQHNldHRpbmdzOiBhICNXZWJL aXRTZXR0aW5ncworICogQGVuYWJsZWQ6IFZhbHVlIHRvIGJlIHNldAorICoKKyAqIFNldCB0aGUg I1dlYktpdFNldHRpbmdzOmVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgcHJvcGVydHkuCisg KgorICogU2luY2U6IDIuMgorICovCit2b2lkIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2Fj Y2VsZXJhdGVkXzJkX2NhbnZhcyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFuIGVu YWJsZWQpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGlu Z3MpKTsKKworICAgIFdlYktpdFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdzLT5wcml2 OworICAgIGlmIChwcml2LT5wcmVmZXJlbmNlcy0+YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQo KSA9PSBlbmFibGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBwcml2LT5wcmVmZXJlbmNlcy0+ c2V0QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoZW5hYmxlZCk7CisgICAgZ19vYmplY3Rfbm90 aWZ5KEdfT0JKRUNUKHNldHRpbmdzKSwgImVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMiKTsK K30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNl dHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5n cy5oCmluZGV4IGE5ZmU4NmEzMGY2YTFkOTExODdlMDlmNWUwYTA3ZTQ2OWRlMGJkYTQuLjQ2ZDUw NzE3YTlkOTU5ZDkxOWU5NjMxNDUzYjZjMDAxNGIyNzc0OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaApAQCAtMzgwLDYgKzM4MCwx MyBAQCBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX3Ntb290aF9z Y3JvbGxpbmcgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ2Jvb2xlYW4gICAgICAgIGVuYWJsZWQpOwogCitXRUJLSVRfQVBJIGdib29sZWFuCit3 ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMgICAgICAgICAg ICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJr aXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMgICAgICAgICAgICAg ICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICAgICAgICBlbmFi bGVkKTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmIC8qIFdlYktpdFNldHRpbmdzX2ggKi8KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0 ay1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dl YmtpdDJndGstc2VjdGlvbnMudHh0CmluZGV4IGY2ZThhODQ3NzdiZTI3YjQ1YmVkZTMwMzY1YjI0 NDA5ZmIyYTI5Y2EuLmYwMTA4Mzg5MmIyNTRmZTgxZTBmZGM0NDU1NTIxMDkwYzA1MjdhN2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0 ay1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9j cy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dApAQCAtMzEwLDYgKzMxMCw4IEBAIHdlYmtpdF9zZXR0 aW5nc19zZXRfdXNlcl9hZ2VudAogd2Via2l0X3NldHRpbmdzX3NldF91c2VyX2FnZW50X3dpdGhf YXBwbGljYXRpb25fZGV0YWlscwogd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfc21vb3RoX3Nj cm9sbGluZwogd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfc21vb3RoX3Njcm9sbGluZword2Vi a2l0X3NldHRpbmdzX2dldF9lbmFibGVfYWNjZWxlcmF0ZWRfMmRfY2FudmFzCit3ZWJraXRfc2V0 dGluZ3Nfc2V0X2VuYWJsZV9hY2NlbGVyYXRlZF8yZF9jYW52YXMKIAogPFNVQlNFQ1RJT04gU3Rh bmRhcmQ+CiBXZWJLaXRTZXR0aW5nc0NsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0U2V0dGluZ3MuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFNldHRpbmdzLmNwcAppbmRl eCBmNWE0NWQ1N2M2YTk3ZThjMDIyZjBmNjY0YmI1MzY3MzEzMDllODE0Li41NDQyMDBkZjNkYmZj OWZjM2UyNDJiOWUyYjQyNDBhNjQzNDRjZTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0U2V0dGluZ3MuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAK QEAgLTI0OCw2ICsyNDgsMTEgQEAgc3RhdGljIHZvaWQgdGVzdFdlYktpdFNldHRpbmdzKFRlc3Qq LCBnY29uc3Rwb2ludGVyKQogICAgIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX3Ntb290aF9z Y3JvbGxpbmcoc2V0dGluZ3MsIFRSVUUpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF9zZXR0aW5nc19n ZXRfZW5hYmxlX3Ntb290aF9zY3JvbGxpbmcoc2V0dGluZ3MpKTsKIAorICAgIC8vIEJ5IGRlZmF1 bHQsIGFjY2VsZXJhdGVkIDJEIGNhbnZhcyBpcyBkaXNhYmxlZC4KKyAgICBnX2Fzc2VydCghd2Vi a2l0X3NldHRpbmdzX2dldF9lbmFibGVfYWNjZWxlcmF0ZWRfMmRfY2FudmFzKHNldHRpbmdzKSk7 CisgICAgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfYWNjZWxlcmF0ZWRfMmRfY2FudmFzKHNl dHRpbmdzLCBUUlVFKTsKKyAgICBnX2Fzc2VydCh3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9h Y2NlbGVyYXRlZF8yZF9jYW52YXMoc2V0dGluZ3MpKTsKKwogICAgIGdfb2JqZWN0X3VucmVmKEdf T0JKRUNUKHNldHRpbmdzKSk7CiB9CiAK