106589 2013-01-10 11:47:57 -0800 [chromium] Use new-style gesture scrolling events for fling. 2013-01-18 11:08:20 -0800 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103952 1 rjkroege rjkroege jamesr rjkroege tdanderson webkit.review.bot oldest_to_newest 804596 0 rjkroege 2013-01-10 11:47:57 -0800 https://bugs.webkit.org/show_bug.cgi?id=103952 brings new subtypes of PlatformGestureEvent that provide a superior scroll implementation. Use these from the chromium WebKit layer for flings. 804646 1 182192 rjkroege 2013-01-10 12:38:51 -0800 Created attachment 182192 Patch 808567 2 183012 rjkroege 2013-01-16 11:29:59 -0800 Created attachment 183012 Patch 809030 3 183012 jamesr 2013-01-16 20:42:02 -0800 Comment on attachment 183012 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183012&action=review > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:790 > + WebMouseWheelEventBuilder wheelEvent(this, m_element->renderer(), *event); copying feedback from bug 103952 so it's here in context: No - this isn't right. We never want to synthesize mousewheels for plugins (I checked with cpu and brettw). There are a few cases for plugins we care about in chromium: Plugins that use the WebScrollbarGroup system (pdf, for instance). Detect these by checking if m_scrollGroup is NULL. If the m_scrollbarGroup is not null, we should handle the scroll directly in this file by adjusting the appropriate scrollbar offset(s). That's all the pdf plugin actually ends up doing with mousewheel events. Plugins that don't use this system - for these, we want to pass the touch events to the plugin but not pass any gesture or wheel events for scrolling. Flash, for instance, never handles mousewheels. 809573 4 183233 rjkroege 2013-01-17 11:48:14 -0800 Created attachment 183233 Patch 809578 5 183233 rjkroege 2013-01-17 11:51:06 -0800 Comment on attachment 183233 Patch I modified the patch to use scroll to scroll the plugin contents. Please take a look. 809643 6 183233 jamesr 2013-01-17 12:40:24 -0800 Comment on attachment 183233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183233&action=review > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:799 > + ScrollbarGroup* scroller = scrollbarGroup(); if you read the ::scrollbarGroup() you'll see that it constructs a group if one isn't already there. You don't want this function to create a new scrollbar group! Just check m_scrollbarGroup 809761 7 183233 rjkroege 2013-01-17 14:10:21 -0800 Comment on attachment 183233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183233&action=review >> Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:799 >> + ScrollbarGroup* scroller = scrollbarGroup(); > > if you read the ::scrollbarGroup() you'll see that it constructs a group if one isn't already there. You don't want this function to create a new scrollbar group! Just check m_scrollbarGroup Thanks. Done in p4. 809762 8 183275 rjkroege 2013-01-17 14:11:47 -0800 Created attachment 183275 Patch 809763 9 183275 rjkroege 2013-01-17 14:12:17 -0800 Comment on attachment 183275 Patch Ptal. 809769 10 183275 jamesr 2013-01-17 14:17:11 -0800 Comment on attachment 183275 Patch r=me 810849 11 183275 webkit.review.bot 2013-01-18 11:08:16 -0800 Comment on attachment 183275 Patch Clearing flags on attachment: 183275 Committed r140183: <http://trac.webkit.org/changeset/140183> 810850 12 webkit.review.bot 2013-01-18 11:08:20 -0800 All reviewed patches have been landed. Closing bug. 182192 2013-01-10 12:38:51 -0800 2013-01-16 11:29:57 -0800 Patch bug-106589-20130110153554.patch text/plain 9648 rjkroege U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDQ5OTViMTk3NTExYzcyYzljNTIwM2YwYTFiMWNjNmVlODE1NmYxY2QuLjZmMGEwYmIyODFhMGEy OGYzMDU1YWY0OTc1OGI5ZjMxODE1N2YxMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTMtMDEtMTAgIFJvYmVydCBLcm9lZ2VyICA8cmprcm9lZ2VAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNlIG5ldy1zdHlsZSBnZXN0dXJlIHNj cm9sbGluZyBldmVudHMgZm9yIGZsaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NTg5CisKKyAgICAgICAgVXNlIHRoZSB0b3VjaCBzY3JvbGxp bmcgZXZlbnRzIHRoYXQgZG8gbm90IHByb2R1Y2Ugd2hlZWwgZXZlbnRzIHRoYXQKKyAgICAgICAg d2VyZSBhZGRlZCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAz OTUyIHRvCisgICAgICAgIGltcGxlbWVudCBmbGluZy4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJJbnB1dEV2ZW50Lmg6CisgICAg ICAgICogc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIp OgorICAgICAgICAqIHNyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUG9wdXBNZW51SW1wbDo6aGFuZGxlSW5wdXRFdmVudCk6CisgICAgICAgICogc3JjL1dlYlZp ZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbEJ5KTogYXVn bWVudGVkIHRvIGdlbmVyYXRlIHRoZSBhcHByb3BpYXRlCisgICAgICAgIGtpbmQgb2Ygc2Nyb2xs IGV2ZW50OiB3aGVlbHMgZm9yIHRvdWNocGFkIGFuZCBnZXN0dXJlIHNjcm9sbHMgZm9yIHRvdWNo IHNjcmVlbi4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVu dCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0cmFuc2ZlckFjdGl2ZVdoZWVsRmxp bmdBbmltYXRpb24pOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEzLTAxLTA5 ICBTdGVwaGVuIENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRq dXN0IFNraWEgYnVpbGQgZmxhZ3MgdG8gV2ViS2l0IHNraWEgZ3lwCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEV2ZW50LmgKaW5kZXggOGU1OTVkYzJkM2JhN2YyNDAw MGYzYWQ3MDAxNDUzNDMwMWM1OWY2OC4uOGE1YTZlZmU3YjU5ZGNhYTY2ZmIyNjc4ZjY5YzM2YTM3 ZjhlMzY3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5w dXRFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklucHV0RXZl bnQuaApAQCAtMTE1LDYgKzExNSw3IEBAIHB1YmxpYzoKICAgICAgICAgR2VzdHVyZVNjcm9sbEJl Z2luLAogICAgICAgICBHZXN0dXJlU2Nyb2xsRW5kLAogICAgICAgICBHZXN0dXJlU2Nyb2xsVXBk YXRlLAorICAgICAgICBHZXN0dXJlU2Nyb2xsVXBkYXRlV2l0aG91dFByb3BhZ2F0aW9uLAogICAg ICAgICBHZXN0dXJlRmxpbmdTdGFydCwKICAgICAgICAgR2VzdHVyZUZsaW5nQ2FuY2VsLAogICAg ICAgICBHZXN0dXJlVGFwLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwCmluZGV4IDVlMWIzMDMzZGNhYzk2MTI5ODVjNGQ3 NDhiZjZmYTFlMTIxOGEyNTAuLmY4MmM1MGIxNTFhNDY0NzgxYzRjZDVjZWEwY2Y0NGZkNjI3N2E0 ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRD b252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2 ZW50Q29udmVyc2lvbi5jcHAKQEAgLTE1Myw2ICsxNTMsMTEgQEAgUGxhdGZvcm1HZXN0dXJlRXZl bnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQsIGNv bnN0IFcKICAgICAgICAgbV9kZWx0YVggPSBlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWDsKICAg ICAgICAgbV9kZWx0YVkgPSBlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWTsKICAgICAgICAgYnJl YWs7CisgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsVXBkYXRlV2l0aG91dFBy b3BhZ2F0aW9uOgorICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlU2Nyb2xs VXBkYXRlTm90UHJvcGFnYXRlZDsKKyAgICAgICAgbV9kZWx0YVggPSBlLmRhdGEuc2Nyb2xsVXBk YXRlLmRlbHRhWDsKKyAgICAgICAgbV9kZWx0YVkgPSBlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRh WTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlVGFwOgog ICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlVGFwOwogICAgICAgICBtX2Fy ZWEgPSBJbnRTaXplKGUuZGF0YS50YXAud2lkdGgsIGUuZGF0YS50YXAuaGVpZ2h0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKaW5kZXggMTA4 MjA0ZjAyMjU4NTVmZTEyNGE5NzQ5NTc5ZmYzNjBhN2M3MGM3ZS4uODM0NDg2M2ZhY2NlZDM4OTlk Nzk5NmQzNWIwZmRiZjA2YjMyNTY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKQEAgLTI3Myw2ICsyNzMsNyBAQCBib29sIFdlYlBvcHVw TWVudUltcGw6OmhhbmRsZUlucHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYgaW5wdXRFdmVu dCkKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxCZWdpbjoKICAgICBjYXNl IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxFbmQ6CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50 OjpHZXN0dXJlU2Nyb2xsVXBkYXRlOgorICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNj cm9sbFVwZGF0ZVdpdGhvdXRQcm9wYWdhdGlvbjoKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdl c3R1cmVGbGluZ1N0YXJ0OgogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZUZsaW5nQ2Fu Y2VsOgogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVRhcDoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBiOTJhZTNiY2ZiZDEzNTI3NGNmMGM1 Y2VlNzNlYWZlYjQwOWFhYzZjLi5kZWVjNDk3ZjViMmVlMzg1NTUxMjgzZmJlM2I1MDczN2VjN2E5 NGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC02 NTUsMjIgKzY1NSwzOSBAQCBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVNb3VzZVdoZWVsKEZyYW1l JiBtYWluRnJhbWUsIGNvbnN0IFdlYk1vdXNlV2hlZWxFdmVudCYgZQogCiB2b2lkIFdlYlZpZXdJ bXBsOjpzY3JvbGxCeShjb25zdCBXZWJQb2ludCYgZGVsdGEpCiB7Ci0gICAgV2ViTW91c2VXaGVl bEV2ZW50IHN5bnRoZXRpY1doZWVsOwotICAgIGNvbnN0IGZsb2F0IHRpY2tEaXZpc29yID0gV2Vi Q29yZTo6V2hlZWxFdmVudDo6dGlja011bHRpcGxpZXI7Ci0KLSAgICBzeW50aGV0aWNXaGVlbC5k ZWx0YVggPSBkZWx0YS54OwotICAgIHN5bnRoZXRpY1doZWVsLmRlbHRhWSA9IGRlbHRhLnk7Ci0g ICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1ggPSBkZWx0YS54IC8gdGlja0Rpdmlzb3I7Ci0g ICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1kgPSBkZWx0YS55IC8gdGlja0Rpdmlzb3I7Ci0g ICAgc3ludGhldGljV2hlZWwuaGFzUHJlY2lzZVNjcm9sbGluZ0RlbHRhcyA9IHRydWU7Ci0gICAg c3ludGhldGljV2hlZWwueCA9IG1fbGFzdFdoZWVsUG9zaXRpb24ueDsKLSAgICBzeW50aGV0aWNX aGVlbC55ID0gbV9sYXN0V2hlZWxQb3NpdGlvbi55OwotICAgIHN5bnRoZXRpY1doZWVsLmdsb2Jh bFggPSBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0aW9uLng7Ci0gICAgc3ludGhldGljV2hlZWwuZ2xv YmFsWSA9IG1fbGFzdFdoZWVsR2xvYmFsUG9zaXRpb24ueTsKLSAgICBzeW50aGV0aWNXaGVlbC5t b2RpZmllcnMgPSBtX2ZsaW5nTW9kaWZpZXI7Ci0KLSAgICBpZiAobV9wYWdlICYmIG1fcGFnZS0+ bWFpbkZyYW1lKCkgJiYgbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpKQotICAgICAgICBoYW5k bGVNb3VzZVdoZWVsKCptX3BhZ2UtPm1haW5GcmFtZSgpLCBzeW50aGV0aWNXaGVlbCk7CisgICAg aWYgKG1fZmxpbmdTb3VyY2VEZXZpY2UgPT0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZCkgewor ICAgICAgICBXZWJNb3VzZVdoZWVsRXZlbnQgc3ludGhldGljV2hlZWw7CisgICAgICAgIGNvbnN0 IGZsb2F0IHRpY2tEaXZpc29yID0gV2ViQ29yZTo6V2hlZWxFdmVudDo6dGlja011bHRpcGxpZXI7 CisKKyAgICAgICAgc3ludGhldGljV2hlZWwuZGVsdGFYID0gZGVsdGEueDsKKyAgICAgICAgc3lu dGhldGljV2hlZWwuZGVsdGFZID0gZGVsdGEueTsKKyAgICAgICAgc3ludGhldGljV2hlZWwud2hl ZWxUaWNrc1ggPSBkZWx0YS54IC8gdGlja0Rpdmlzb3I7CisgICAgICAgIHN5bnRoZXRpY1doZWVs LndoZWVsVGlja3NZID0gZGVsdGEueSAvIHRpY2tEaXZpc29yOworICAgICAgICBzeW50aGV0aWNX aGVlbC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVsdGFzID0gdHJ1ZTsKKyAgICAgICAgc3ludGhldGlj V2hlZWwueCA9IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAgICAgICAgc3ludGhldGljV2hl ZWwueSA9IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQueTsKKyAgICAgICAgc3ludGhldGljV2hlZWwu Z2xvYmFsWCA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAgICAgICAgc3ludGhl dGljV2hlZWwuZ2xvYmFsWSA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3RhcnQueTsKKyAgICAg ICAgc3ludGhldGljV2hlZWwubW9kaWZpZXJzID0gbV9mbGluZ01vZGlmaWVyOworCisgICAgICAg IGlmIChtX3BhZ2UgJiYgbV9wYWdlLT5tYWluRnJhbWUoKSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgp LT52aWV3KCkpCisgICAgICAgICAgICBoYW5kbGVNb3VzZVdoZWVsKCptX3BhZ2UtPm1haW5GcmFt ZSgpLCBzeW50aGV0aWNXaGVlbCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgV2ViR2VzdHVyZUV2 ZW50IHN5bnRoZXRpY0dlc3R1cmVFdmVudDsKKworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZl bnQudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGVXaXRob3V0UHJvcGFn YXRpb247CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5kYXRhLnNjcm9sbFVwZGF0ZS5k ZWx0YVggPSBkZWx0YS54OworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZlbnQuZGF0YS5zY3Jv bGxVcGRhdGUuZGVsdGFZID0gZGVsdGEueTsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50 LnggPSBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0Lng7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVF dmVudC55ID0gbV9wb3NpdGlvbk9uRmxpbmdTdGFydC55OworICAgICAgICBzeW50aGV0aWNHZXN0 dXJlRXZlbnQuZ2xvYmFsWCA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAgICAg ICAgc3ludGhldGljR2VzdHVyZUV2ZW50Lmdsb2JhbFkgPSBtX2dsb2JhbFBvc2l0aW9uT25GbGlu Z1N0YXJ0Lnk7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5tb2RpZmllcnMgPSBtX2Zs aW5nTW9kaWZpZXI7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5zb3VyY2VEZXZpY2Ug PSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNoc2NyZWVuOworCisgICAgICAgIGlmIChtX3BhZ2UgJiYg bV9wYWdlLT5tYWluRnJhbWUoKSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCkpCisgICAg ICAgICAgICBoYW5kbGVHZXN0dXJlRXZlbnQoc3ludGhldGljR2VzdHVyZUV2ZW50KTsKKyAgICB9 CiB9CiAKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCkBAIC03MDMsOSArNzIwLDEwIEBAIGJv b2wgV2ViVmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVudChjb25zdCBXZWJHZXN0dXJlRXZlbnQm IGV2ZW50KQogICAgICAgICBpZiAobWFpbkZyYW1lSW1wbCgpLT5mcmFtZSgpLT5ldmVudEhhbmRs ZXIoKS0+aXNTY3JvbGxiYXJIYW5kbGluZ0dlc3R1cmVzKCkpCiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgbV9jbGllbnQtPmNhbmNlbFNjaGVkdWxlZENvbnRlbnRJbnRlbnRzKCk7Ci0gICAg ICAgIG1fbGFzdFdoZWVsUG9zaXRpb24gPSBXZWJQb2ludChldmVudC54LCBldmVudC55KTsKLSAg ICAgICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50Lmdsb2JhbFgs IGV2ZW50Lmdsb2JhbFkpOworICAgICAgICBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0ID0gV2ViUG9p bnQoZXZlbnQueCwgZXZlbnQueSk7CisgICAgICAgIG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3Rh cnQgPSBXZWJQb2ludChldmVudC5nbG9iYWxYLCBldmVudC5nbG9iYWxZKTsKICAgICAgICAgbV9m bGluZ01vZGlmaWVyID0gZXZlbnQubW9kaWZpZXJzOworICAgICAgICBtX2ZsaW5nU291cmNlRGV2 aWNlID0gZXZlbnQuc291cmNlRGV2aWNlOwogICAgICAgICBPd25QdHI8V2ViR2VzdHVyZUN1cnZl PiBmbGluZ0N1cnZlID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlRmxpbmdB bmltYXRpb25DdXJ2ZShldmVudC5zb3VyY2VEZXZpY2UsIFdlYkZsb2F0UG9pbnQoZXZlbnQuZGF0 YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WCwgZXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSks IFdlYlNpemUoKSkpOwogICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBXZWJBY3RpdmVHZXN0 dXJlQW5pbWF0aW9uOjpjcmVhdGVBdEFuaW1hdGlvblN0YXJ0KGZsaW5nQ3VydmUucmVsZWFzZSgp LCB0aGlzKTsKICAgICAgICAgc2NoZWR1bGVBbmltYXRpb24oKTsKQEAgLTc5MCw2ICs4MDgsNyBA QCBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQoY29uc3QgV2ViR2VzdHVyZUV2 ZW50JiBldmVudCkKICAgICAgICAgbV9jbGllbnQtPmNhbmNlbFNjaGVkdWxlZENvbnRlbnRJbnRl bnRzKCk7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsRW5kOgogICAgIGNh c2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZToKKyAgICBjYXNlIFdlYklucHV0 RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGVXaXRob3V0UHJvcGFnYXRpb246CiAgICAgY2FzZSBX ZWJJbnB1dEV2ZW50OjpHZXN0dXJlVGFwQ2FuY2VsOgogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6 R2VzdHVyZVBpbmNoRW5kOgogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVBpbmNoVXBk YXRlOiB7CkBAIC04MDgsOCArODI3LDggQEAgdm9pZCBXZWJWaWV3SW1wbDo6dHJhbnNmZXJBY3Rp dmVXaGVlbEZsaW5nQW5pbWF0aW9uKGNvbnN0IFdlYkFjdGl2ZVdoZWVsRmxpbmdQYXIKIHsKICAg ICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJWaWV3SW1wbDo6dHJhbnNmZXJBY3RpdmVXaGVl bEZsaW5nQW5pbWF0aW9uIik7CiAgICAgQVNTRVJUKCFtX2dlc3R1cmVBbmltYXRpb24pOwotICAg IG1fbGFzdFdoZWVsUG9zaXRpb24gPSBwYXJhbWV0ZXJzLnBvaW50OwotICAgIG1fbGFzdFdoZWVs R2xvYmFsUG9zaXRpb24gPSBwYXJhbWV0ZXJzLmdsb2JhbFBvaW50OworICAgIG1fcG9zaXRpb25P bkZsaW5nU3RhcnQgPSBwYXJhbWV0ZXJzLnBvaW50OworICAgIG1fZ2xvYmFsUG9zaXRpb25PbkZs aW5nU3RhcnQgPSBwYXJhbWV0ZXJzLmdsb2JhbFBvaW50OwogICAgIG1fZmxpbmdNb2RpZmllciA9 IHBhcmFtZXRlcnMubW9kaWZpZXJzOwogICAgIE93blB0cjxXZWJHZXN0dXJlQ3VydmU+IGN1cnZl ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlRmxpbmdBbmltYXRpb25DdXJ2 ZShwYXJhbWV0ZXJzLnNvdXJjZURldmljZSwgV2ViRmxvYXRQb2ludChwYXJhbWV0ZXJzLmRlbHRh KSwgcGFyYW1ldGVycy5jdW11bGF0aXZlU2Nyb2xsKSk7CiAgICAgbV9nZXN0dXJlQW5pbWF0aW9u ID0gV2ViQWN0aXZlR2VzdHVyZUFuaW1hdGlvbjo6Y3JlYXRlV2l0aFRpbWVPZmZzZXQoY3VydmUu cmVsZWFzZSgpLCB0aGlzLCBwYXJhbWV0ZXJzLnN0YXJ0VGltZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA0MmU0ZGY2NDUyOTBmODc1MmZiZmQ1NTYxMWY0 OGEwNmE1MjEzM2ZiLi5jOTA3OTcyMGU1NWVkNWEzNmUzMDAyN2M1ZGI4MjM5Y2FmMmVjYmI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTg3Myw4ICs4NzMs OCBAQCBwcml2YXRlOgogICAgIE93blB0cjxOYXZpZ2F0b3JDb250ZW50VXRpbHNDbGllbnRJbXBs PiBtX25hdmlnYXRvckNvbnRlbnRVdGlsc0NsaWVudDsKICNlbmRpZgogICAgIE93blB0cjxXZWJB Y3RpdmVHZXN0dXJlQW5pbWF0aW9uPiBtX2dlc3R1cmVBbmltYXRpb247Ci0gICAgV2ViUG9pbnQg bV9sYXN0V2hlZWxQb3NpdGlvbjsKLSAgICBXZWJQb2ludCBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0 aW9uOworICAgIFdlYlBvaW50IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQ7CisgICAgV2ViUG9pbnQg bV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFydDsKICAgICBpbnQgbV9mbGluZ01vZGlmaWVyOwog I2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKICAgICBPd25QdHI8TGlua0hpZ2hsaWdodD4gbV9s aW5rSGlnaGxpZ2h0OwpAQCAtODg1LDYgKzg4NSw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1f c2hvd0ZQU0NvdW50ZXI7CiAgICAgYm9vbCBtX3Nob3dQYWludFJlY3RzOworICAgIFdlYkdlc3R1 cmVFdmVudDo6U291cmNlRGV2aWNlIG1fZmxpbmdTb3VyY2VEZXZpY2U7CiB9OwogCiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQK 183012 2013-01-16 11:29:59 -0800 2013-01-17 11:48:12 -0800 Patch bug-106589-20130116142700.patch text/plain 8806 rjkroege U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5ODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAKaW5kZXggMGU5MzQ5MTk0NWUy NGU4MzE4NDc4MjRlN2M5YmExYjJiNzJjMTgwNi4uYTQyZTgxMzMxZjdhNGUwY2Y2NTczN2I2MDM2 ZjhmYjYyZjk3ZDFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi SW5wdXRFdmVudENvbnZlcnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcApAQCAtNjMwLDYgKzYzMCwyNCBAQCBXZWJHZXN0 dXJlRXZlbnRCdWlsZGVyOjpXZWJHZXN0dXJlRXZlbnRCdWlsZGVyKGNvbnN0IFdpZGdldCogd2lk Z2V0LCBjb25zdCBXZWJDbwogICAgIHggPSBsb2NhbFBvaW50LngoKTsKICAgICB5ID0gbG9jYWxQ b2ludC55KCk7CiB9CisKKworV2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcjo6V2ViTW91c2VXaGVl bEV2ZW50QnVpbGRlcihjb25zdCBXaWRnZXQqIHdpZGdldCwgY29uc3QgV2ViQ29yZTo6UmVuZGVy T2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IEdlc3R1cmVFdmVudCYgZXZlbnQpCit7CisgICAg aWYgKGV2ZW50LnR5cGUoKSAhPSBldmVudE5hbWVzKCkuZ2VzdHVyZXNjcm9sbHVwZGF0ZUV2ZW50 KQorICAgICAgICByZXR1cm47CisKKyAgICB0eXBlID0gV2ViSW5wdXRFdmVudDo6TW91c2VXaGVl bDsKKyAgICB1cGRhdGVXZWJNb3VzZUV2ZW50RnJvbVdlYkNvcmVNb3VzZUV2ZW50KGV2ZW50LCAq d2lkZ2V0LCAqcmVuZGVyT2JqZWN0LCAqdGhpcyk7CisgICAgZGVsdGFYID0gZXZlbnQuZGVsdGFY KCk7CisgICAgZGVsdGFZID0gZXZlbnQuZGVsdGFZKCk7CisKKyAgICB3aGVlbFRpY2tzWCA9IGRl bHRhWCAvIFdoZWVsRXZlbnQ6OnRpY2tNdWx0aXBsaWVyOworICAgIHdoZWVsVGlja3NZID0gZGVs dGFZIC8gV2hlZWxFdmVudDo6dGlja011bHRpcGxpZXI7CisgICAgaGFzUHJlY2lzZVNjcm9sbGlu Z0RlbHRhcyA9IHRydWU7CisgICAgc2Nyb2xsQnlQYWdlID0gZmFsc2U7Cit9CisKICNlbmRpZiAv LyBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24u aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmgK aW5kZXggMTgxZDFlNWMyMjRmZWQzZTc1OGJjNDQ1ZTg2M2ZhY2ExMGY5MDhjNC4uYzZiZmNiMzQy OTc5YzkyOTRmZjA3YWE5OTY3MGU4ZWY4ZjMyNmYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5oCkBAIC0xMTMsNiArMTEz LDkgQEAgcHVibGljOgogY2xhc3MgV2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlciA6IHB1YmxpYyBX ZWJNb3VzZVdoZWVsRXZlbnQgewogcHVibGljOgogICAgIFdlYk1vdXNlV2hlZWxFdmVudEJ1aWxk ZXIoY29uc3QgV2ViQ29yZTo6V2lkZ2V0KiwgY29uc3QgV2ViQ29yZTo6UmVuZGVyT2JqZWN0Kiwg Y29uc3QgV2ViQ29yZTo6V2hlZWxFdmVudCYpOworI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykK KyAgICBXZWJNb3VzZVdoZWVsRXZlbnRCdWlsZGVyKGNvbnN0IFdlYkNvcmU6OldpZGdldCosIGNv bnN0IFdlYkNvcmU6OlJlbmRlck9iamVjdCosIGNvbnN0IFdlYkNvcmU6Okdlc3R1cmVFdmVudCYp OworI2VuZGlmIC8vIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKIH07CiAKIC8vIENvbnZlcnRzIGEg V2ViQ29yZTo6S2V5Ym9hcmRFdmVudCB0byBhIGNvcnJlc3BvbmRpbmcgV2ViS2V5Ym9hcmRFdmVu dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRh aW5lckltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFp bmVySW1wbC5jcHAKaW5kZXggNmQxZTkyZWI2M2U0OTAyMTNiNTFmMzE1Mjg4MDUyNmQ1OTMyZDM2 ZC4uMjVkMjlhMTA5NmFiY2Q2NWRkZWE0OTg3OTg1NjE0ZGUyOGU2YTgyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAK QEAgLTc4Miw4ICs3ODIsMTYgQEAgdm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVH ZXN0dXJlRXZlbnQoR2VzdHVyZUV2ZW50KiBldmVudCkKICAgICBpZiAod2ViRXZlbnQudHlwZSA9 PSBXZWJJbnB1dEV2ZW50OjpVbmRlZmluZWQpCiAgICAgICAgIHJldHVybjsKICAgICBXZWJDdXJz b3JJbmZvIGN1cnNvckluZm87Ci0gICAgaWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50 KHdlYkV2ZW50LCBjdXJzb3JJbmZvKSkKKyAgICBpZiAobV93ZWJQbHVnaW4tPmhhbmRsZUlucHV0 RXZlbnQod2ViRXZlbnQsIGN1cnNvckluZm8pKSB7CiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0 SGFuZGxlZCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgV2ViTW91c2VXaGVlbEV2 ZW50QnVpbGRlciB3aGVlbEV2ZW50KHRoaXMsIG1fZWxlbWVudC0+cmVuZGVyZXIoKSwgKmV2ZW50 KTsKKyAgICBpZiAobV93ZWJQbHVnaW4tPmhhbmRsZUlucHV0RXZlbnQod2hlZWxFdmVudCwgY3Vy c29ySW5mbykpIHsKKyAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CisgICAgICAg IHJldHVybjsKKyAgICB9CiAgICAgLy8gRklYTUU6IENhbiBhIHBsdWdpbiBjaGFuZ2UgdGhlIGN1 cnNvciBmcm9tIGEgdG91Y2gtZXZlbnQgY2FsbGJhY2s/CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBiNmM0ZDhkMzBmNWNmNjA2MjliODdjODlh OGY3YTM3NDgyZGQ0ZTczLi5jMTFhOTk4NWE2OWY5OWQ1ZDBiYjRiMDE3NTM1MTg3Y2FhZDQ2OTBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC00NTAs NiArNDUwLDcgQEAgV2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKFdlYlZpZXdDbGllbnQqIGNsaWVu dCkKICAgICAsIG1fbmF2aWdhdG9yQ29udGVudFV0aWxzQ2xpZW50KE5hdmlnYXRvckNvbnRlbnRV dGlsc0NsaWVudEltcGw6OmNyZWF0ZSh0aGlzKSkKICNlbmRpZgogICAgICwgbV9mbGluZ01vZGlm aWVyKDApCisgICAgLCBtX2ZsaW5nU291cmNlRGV2aWNlKGZhbHNlKQogICAgICwgbV92YWxpZGF0 aW9uTWVzc2FnZShWYWxpZGF0aW9uTWVzc2FnZUNsaWVudEltcGw6OmNyZWF0ZSgqY2xpZW50KSkK ICAgICAsIG1fc3VwcHJlc3NJbnZhbGlkYXRpb25zKGZhbHNlKQogICAgICwgbV9zaG93RlBTQ291 bnRlcihmYWxzZSkKQEAgLTY1OSwyMiArNjYwLDM5IEBAIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRs ZU1vdXNlV2hlZWwoRnJhbWUmIG1haW5GcmFtZSwgY29uc3QgV2ViTW91c2VXaGVlbEV2ZW50JiBl CiAKIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9sbEJ5KGNvbnN0IFdlYlBvaW50JiBkZWx0YSkKIHsK LSAgICBXZWJNb3VzZVdoZWVsRXZlbnQgc3ludGhldGljV2hlZWw7Ci0gICAgY29uc3QgZmxvYXQg dGlja0Rpdmlzb3IgPSBXZWJDb3JlOjpXaGVlbEV2ZW50Ojp0aWNrTXVsdGlwbGllcjsKLQotICAg IHN5bnRoZXRpY1doZWVsLmRlbHRhWCA9IGRlbHRhLng7Ci0gICAgc3ludGhldGljV2hlZWwuZGVs dGFZID0gZGVsdGEueTsKLSAgICBzeW50aGV0aWNXaGVlbC53aGVlbFRpY2tzWCA9IGRlbHRhLngg LyB0aWNrRGl2aXNvcjsKLSAgICBzeW50aGV0aWNXaGVlbC53aGVlbFRpY2tzWSA9IGRlbHRhLnkg LyB0aWNrRGl2aXNvcjsKLSAgICBzeW50aGV0aWNXaGVlbC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVs dGFzID0gdHJ1ZTsKLSAgICBzeW50aGV0aWNXaGVlbC54ID0gbV9sYXN0V2hlZWxQb3NpdGlvbi54 OwotICAgIHN5bnRoZXRpY1doZWVsLnkgPSBtX2xhc3RXaGVlbFBvc2l0aW9uLnk7Ci0gICAgc3lu dGhldGljV2hlZWwuZ2xvYmFsWCA9IG1fbGFzdFdoZWVsR2xvYmFsUG9zaXRpb24ueDsKLSAgICBz eW50aGV0aWNXaGVlbC5nbG9iYWxZID0gbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbi55OwotICAg IHN5bnRoZXRpY1doZWVsLm1vZGlmaWVycyA9IG1fZmxpbmdNb2RpZmllcjsKLQotICAgIGlmICht X3BhZ2UgJiYgbV9wYWdlLT5tYWluRnJhbWUoKSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3 KCkpCi0gICAgICAgIGhhbmRsZU1vdXNlV2hlZWwoKm1fcGFnZS0+bWFpbkZyYW1lKCksIHN5bnRo ZXRpY1doZWVsKTsKKyAgICBpZiAobV9mbGluZ1NvdXJjZURldmljZSA9PSBXZWJHZXN0dXJlRXZl bnQ6OlRvdWNocGFkKSB7CisgICAgICAgIFdlYk1vdXNlV2hlZWxFdmVudCBzeW50aGV0aWNXaGVl bDsKKyAgICAgICAgY29uc3QgZmxvYXQgdGlja0Rpdmlzb3IgPSBXZWJDb3JlOjpXaGVlbEV2ZW50 Ojp0aWNrTXVsdGlwbGllcjsKKworICAgICAgICBzeW50aGV0aWNXaGVlbC5kZWx0YVggPSBkZWx0 YS54OworICAgICAgICBzeW50aGV0aWNXaGVlbC5kZWx0YVkgPSBkZWx0YS55OworICAgICAgICBz eW50aGV0aWNXaGVlbC53aGVlbFRpY2tzWCA9IGRlbHRhLnggLyB0aWNrRGl2aXNvcjsKKyAgICAg ICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1kgPSBkZWx0YS55IC8gdGlja0Rpdmlzb3I7Cisg ICAgICAgIHN5bnRoZXRpY1doZWVsLmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMgPSB0cnVlOwor ICAgICAgICBzeW50aGV0aWNXaGVlbC54ID0gbV9wb3NpdGlvbk9uRmxpbmdTdGFydC54OworICAg ICAgICBzeW50aGV0aWNXaGVlbC55ID0gbV9wb3NpdGlvbk9uRmxpbmdTdGFydC55OworICAgICAg ICBzeW50aGV0aWNXaGVlbC5nbG9iYWxYID0gbV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFydC54 OworICAgICAgICBzeW50aGV0aWNXaGVlbC5nbG9iYWxZID0gbV9nbG9iYWxQb3NpdGlvbk9uRmxp bmdTdGFydC55OworICAgICAgICBzeW50aGV0aWNXaGVlbC5tb2RpZmllcnMgPSBtX2ZsaW5nTW9k aWZpZXI7CisKKyAgICAgICAgaWYgKG1fcGFnZSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgpICYmIG1f cGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKSkKKyAgICAgICAgICAgIGhhbmRsZU1vdXNlV2hlZWwo Km1fcGFnZS0+bWFpbkZyYW1lKCksIHN5bnRoZXRpY1doZWVsKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBXZWJHZXN0dXJlRXZlbnQgc3ludGhldGljR2VzdHVyZUV2ZW50OworCisgICAgICAgIHN5 bnRoZXRpY0dlc3R1cmVFdmVudC50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVw ZGF0ZTsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRl bHRhWCA9IGRlbHRhLng7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5kYXRhLnNjcm9s bFVwZGF0ZS5kZWx0YVkgPSBkZWx0YS55OworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZlbnQu eCA9IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2 ZW50LnkgPSBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0Lnk7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1 cmVFdmVudC5nbG9iYWxYID0gbV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFydC54OworICAgICAg ICBzeW50aGV0aWNHZXN0dXJlRXZlbnQuZ2xvYmFsWSA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5n U3RhcnQueTsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50Lm1vZGlmaWVycyA9IG1fZmxp bmdNb2RpZmllcjsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50LnNvdXJjZURldmljZSA9 IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hzY3JlZW47CisKKyAgICAgICAgaWYgKG1fcGFnZSAmJiBt X3BhZ2UtPm1haW5GcmFtZSgpICYmIG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKSkKKyAgICAg ICAgICAgIGhhbmRsZUdlc3R1cmVFdmVudChzeW50aGV0aWNHZXN0dXJlRXZlbnQpOworICAgIH0K IH0KIAogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKQEAgLTcwNyw5ICs3MjUsMTAgQEAgYm9v bCBXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KGNvbnN0IFdlYkdlc3R1cmVFdmVudCYg ZXZlbnQpCiAgICAgICAgIGlmIChtYWluRnJhbWVJbXBsKCktPmZyYW1lKCktPmV2ZW50SGFuZGxl cigpLT5pc1Njcm9sbGJhckhhbmRsaW5nR2VzdHVyZXMoKSkKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBtX2NsaWVudC0+Y2FuY2VsU2NoZWR1bGVkQ29udGVudEludGVudHMoKTsKLSAgICAg ICAgbV9sYXN0V2hlZWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50LngsIGV2ZW50LnkpOwotICAg ICAgICBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0aW9uID0gV2ViUG9pbnQoZXZlbnQuZ2xvYmFsWCwg ZXZlbnQuZ2xvYmFsWSk7CisgICAgICAgIG1fcG9zaXRpb25PbkZsaW5nU3RhcnQgPSBXZWJQb2lu dChldmVudC54LCBldmVudC55KTsKKyAgICAgICAgbV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFy dCA9IFdlYlBvaW50KGV2ZW50Lmdsb2JhbFgsIGV2ZW50Lmdsb2JhbFkpOwogICAgICAgICBtX2Zs aW5nTW9kaWZpZXIgPSBldmVudC5tb2RpZmllcnM7CisgICAgICAgIG1fZmxpbmdTb3VyY2VEZXZp Y2UgPSBldmVudC5zb3VyY2VEZXZpY2U7CiAgICAgICAgIE93blB0cjxXZWJHZXN0dXJlQ3VydmU+ IGZsaW5nQ3VydmUgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jcmVhdGVGbGluZ0Fu aW1hdGlvbkN1cnZlKGV2ZW50LnNvdXJjZURldmljZSwgV2ViRmxvYXRQb2ludChldmVudC5kYXRh LmZsaW5nU3RhcnQudmVsb2NpdHlYLCBldmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZKSwg V2ViU2l6ZSgpKSk7CiAgICAgICAgIG1fZ2VzdHVyZUFuaW1hdGlvbiA9IFdlYkFjdGl2ZUdlc3R1 cmVBbmltYXRpb246OmNyZWF0ZUF0QW5pbWF0aW9uU3RhcnQoZmxpbmdDdXJ2ZS5yZWxlYXNlKCks IHRoaXMpOwogICAgICAgICBzY2hlZHVsZUFuaW1hdGlvbigpOwpAQCAtODEyLDggKzgzMSw4IEBA IHZvaWQgV2ViVmlld0ltcGw6OnRyYW5zZmVyQWN0aXZlV2hlZWxGbGluZ0FuaW1hdGlvbihjb25z dCBXZWJBY3RpdmVXaGVlbEZsaW5nUGFyCiB7CiAgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAi V2ViVmlld0ltcGw6OnRyYW5zZmVyQWN0aXZlV2hlZWxGbGluZ0FuaW1hdGlvbiIpOwogICAgIEFT U0VSVCghbV9nZXN0dXJlQW5pbWF0aW9uKTsKLSAgICBtX2xhc3RXaGVlbFBvc2l0aW9uID0gcGFy YW1ldGVycy5wb2ludDsKLSAgICBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0aW9uID0gcGFyYW1ldGVy cy5nbG9iYWxQb2ludDsKKyAgICBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0ID0gcGFyYW1ldGVycy5w b2ludDsKKyAgICBtX2dsb2JhbFBvc2l0aW9uT25GbGluZ1N0YXJ0ID0gcGFyYW1ldGVycy5nbG9i YWxQb2ludDsKICAgICBtX2ZsaW5nTW9kaWZpZXIgPSBwYXJhbWV0ZXJzLm1vZGlmaWVyczsKICAg ICBPd25QdHI8V2ViR2VzdHVyZUN1cnZlPiBjdXJ2ZSA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJy ZW50KCktPmNyZWF0ZUZsaW5nQW5pbWF0aW9uQ3VydmUocGFyYW1ldGVycy5zb3VyY2VEZXZpY2Us IFdlYkZsb2F0UG9pbnQocGFyYW1ldGVycy5kZWx0YSksIHBhcmFtZXRlcnMuY3VtdWxhdGl2ZVNj cm9sbCkpOwogICAgIG1fZ2VzdHVyZUFuaW1hdGlvbiA9IFdlYkFjdGl2ZUdlc3R1cmVBbmltYXRp b246OmNyZWF0ZVdpdGhUaW1lT2Zmc2V0KGN1cnZlLnJlbGVhc2UoKSwgdGhpcywgcGFyYW1ldGVy cy5zdGFydFRpbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5k ZXggNDE1NDlhOGM1ZjI2OWQ2ODFkNWE3ZDg2NzAxMWE3ZDAwYzYwM2VlMS4uZDhjY2I0ZjRhMjhm MDYwOWNmYzE0MzlhMTQ5MmU4MDc4MTQ0NjVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5oCkBAIC04NzgsOSArODc4LDEwIEBAIHByaXZhdGU6CiAgICAgT3duUHRy PE5hdmlnYXRvckNvbnRlbnRVdGlsc0NsaWVudEltcGw+IG1fbmF2aWdhdG9yQ29udGVudFV0aWxz Q2xpZW50OwogI2VuZGlmCiAgICAgT3duUHRyPFdlYkFjdGl2ZUdlc3R1cmVBbmltYXRpb24+IG1f Z2VzdHVyZUFuaW1hdGlvbjsKLSAgICBXZWJQb2ludCBtX2xhc3RXaGVlbFBvc2l0aW9uOwotICAg IFdlYlBvaW50IG1fbGFzdFdoZWVsR2xvYmFsUG9zaXRpb247CisgICAgV2ViUG9pbnQgbV9wb3Np dGlvbk9uRmxpbmdTdGFydDsKKyAgICBXZWJQb2ludCBtX2dsb2JhbFBvc2l0aW9uT25GbGluZ1N0 YXJ0OwogICAgIGludCBtX2ZsaW5nTW9kaWZpZXI7CisgICAgYm9vbCBtX2ZsaW5nU291cmNlRGV2 aWNlOwogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKICAgICBPd25QdHI8TGlua0hpZ2hsaWdo dD4gbV9saW5rSGlnaGxpZ2h0OwogI2VuZGlmCg== 183233 2013-01-17 11:48:14 -0800 2013-01-17 14:11:44 -0800 Patch bug-106589-20130117144514.patch text/plain 9161 rjkroege U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRmYjZjZjU1NzBlZDc5NDg5MGE3OTg0NGQyNGZhYjg3YTZkMjQyMWUuLjJkNWYyZDYxZTM5OGUy NTA3OTkwZGJlOTZjMzZiN2EyNDZlYmFiNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTMtMDEtMTcgIFJvYmVydCBLcm9lZ2VyICA8cmprcm9lZ2VAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNlIG5ldy1zdHlsZSBnZXN0dXJlIHNj cm9sbGluZyBldmVudHMgZm9yIGZsaW5nIGFuZAorICAgICAgICBmb3IgcGx1Z2luIHNjcm9sbGlu ZzogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjU4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5NTIgbW9kaWZpZWQgdG91Y2hzY3JlZW4KKyAg ICAgICAgc2Nyb2xsaW5nIHRvIG5vdCB1c2Ugc3ludGhldGljIG1vdXNlIHdoZWVsIGV2ZW50cy4g VXBkYXRlIHRoZSBmbGluZyBmYWNpbGl0eQorICAgICAgICBpbiBXZWJWaWV3SW1wbCB0byB1c2Ug dGhlc2UgZXZlbnRzIGZvciB0b3VjaHNjcmVlbi1pbml0aWF0ZWQgZmxpbmdzLiBBbHNvCisgICAg ICAgIG1vZGlmeSB0aGUgV2ViUGx1Z2luQ29udGFpbmVySW1wbCB0byBzY3JvbGwgaW4gcmVzcG9u c2UgdG8gdG91Y2hzY3JlZW4KKyAgICAgICAgc2Nyb2xsIGdlc3R1cmVzIGlmIHRoZSBwbHVnaW4g ZG9lcyBub3QgaXRzZWxmIGltcGxlbWVudCBnZXN0dXJlIGV2ZW50cy4gCisKKyAgICAgICAgKiBz cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbEJ5KTogSGFuZGxlIGZsaW5nIGNhbGxiYWNr IGNvbmRpdGlvbmFsbHkgYmFzZWQKKyAgICAgICAgb24gaW5pdGlhdGluZyBkZXZpY2UuIFRvdWNo cGFkIGZsaW5ncyBnZW5lcmF0ZSB3aGVlbHMuIFRvdWNoc2NyZWVuIGZsaW5ncworICAgICAgICB1 c2UgZ2VzdHVyZSBldmVudHMuCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpoYW5kbGVH ZXN0dXJlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dHJhbnNmZXJBY3Rp dmVXaGVlbEZsaW5nQW5pbWF0aW9uKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwog MjAxMy0wMS0xNiAgVy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgTGlua0hpZ2hsaWdodCBzaG91bGQgdXNlIHRvdWNoIGFkanVzdG1lbnQgdG8gbWF0 Y2ggYWN0aXZlIHN0YXRlIG9uIEdlc3R1cmVUYXBEb3duLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAppbmRleCA2ZDFlOTJl YjYzZTQ5MDIxM2I1MWYzMTUyODgwNTI2ZDU5MzJkMzZkLi5kNzc1OWNlM2FiM2NjNTEyYzk4Njll YjQzM2E2MDk4Y2UzMTM5MjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcApAQCAtNzc2LDE0ICs3NzYsMzQgQEAgdm9p ZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVUb3VjaEV2ZW50KFRvdWNoRXZlbnQqIGV2 ZW50KQogICAgIH0KIH0KIAorc3RhdGljIGlubGluZSBib29sIGdlc3R1cmVTY3JvbGxIZWxwZXIo U2Nyb2xsYmFyR3JvdXAqIHNjcm9sbGJhckdyb3VwLCBTY3JvbGxEaXJlY3Rpb24gcG9zaXRpdmVE aXJlY3Rpb24sIFNjcm9sbERpcmVjdGlvbiBuZWdhdGl2ZURpcmVjdGlvbiwgZmxvYXQgZGVsdGEp Cit7CisgICAgaWYgKCFkZWx0YSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGZsb2F0IGFi c0RlbHRhID0gZGVsdGEgPiAwID8gZGVsdGEgOiAtZGVsdGE7CisgICAgcmV0dXJuIHNjcm9sbGJh ckdyb3VwLT5zY3JvbGwoZGVsdGEgPCAwID8gbmVnYXRpdmVEaXJlY3Rpb24gOiBwb3NpdGl2ZURp cmVjdGlvbiwgU2Nyb2xsQnlQcmVjaXNlUGl4ZWwsIGFic0RlbHRhKTsKK30KKwogdm9pZCBXZWJQ bHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQoR2VzdHVyZUV2ZW50KiBldmVu dCkKIHsKICAgICBXZWJHZXN0dXJlRXZlbnRCdWlsZGVyIHdlYkV2ZW50KHRoaXMsIG1fZWxlbWVu dC0+cmVuZGVyZXIoKSwgKmV2ZW50KTsKICAgICBpZiAod2ViRXZlbnQudHlwZSA9PSBXZWJJbnB1 dEV2ZW50OjpVbmRlZmluZWQpCiAgICAgICAgIHJldHVybjsKICAgICBXZWJDdXJzb3JJbmZvIGN1 cnNvckluZm87Ci0gICAgaWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50KHdlYkV2ZW50 LCBjdXJzb3JJbmZvKSkKKyAgICBpZiAobV93ZWJQbHVnaW4tPmhhbmRsZUlucHV0RXZlbnQod2Vi RXZlbnQsIGN1cnNvckluZm8pKSB7CiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHdlYkV2ZW50LnR5cGUgPT0gV2Vi SW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZSkgeworICAgICAgICBTY3JvbGxiYXJHcm91 cCogc2Nyb2xsZXIgPSBzY3JvbGxiYXJHcm91cCgpOworICAgICAgICBpZiAoIXNjcm9sbGVyKQor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoZ2VzdHVyZVNjcm9sbEhlbHBlcihzY3Jv bGxlciwgU2Nyb2xsTGVmdCwgU2Nyb2xsUmlnaHQsIHdlYkV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRl LmRlbHRhWCkpCisgICAgICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAg ICAgaWYgKGdlc3R1cmVTY3JvbGxIZWxwZXIoc2Nyb2xsZXIsIFNjcm9sbFVwLCBTY3JvbGxEb3du LCB3ZWJFdmVudC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkpKQorICAgICAgICAgICAgZXZlbnQt PnNldERlZmF1bHRIYW5kbGVkKCk7CisgICAgfQogICAgIC8vIEZJWE1FOiBDYW4gYSBwbHVnaW4g Y2hhbmdlIHRoZSBjdXJzb3IgZnJvbSBhIHRvdWNoLWV2ZW50IGNhbGxiYWNrPwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMDczMWFiNDRjY2Nl NjVkZTY3MzQzNDBiZDQ0MzY4Y2E1YWU0ZmY4MC4uZjBiNjU3Zjk5Mzg2NDQwMzFlNzBkMDg2NGJj YjE3MzRiNGQ2NmY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcApAQCAtNDUwLDYgKzQ1MCw3IEBAIFdlYlZpZXdJbXBsOjpXZWJWaWV3SW1wbChXZWJWaWV3 Q2xpZW50KiBjbGllbnQpCiAgICAgLCBtX25hdmlnYXRvckNvbnRlbnRVdGlsc0NsaWVudChOYXZp Z2F0b3JDb250ZW50VXRpbHNDbGllbnRJbXBsOjpjcmVhdGUodGhpcykpCiAjZW5kaWYKICAgICAs IG1fZmxpbmdNb2RpZmllcigwKQorICAgICwgbV9mbGluZ1NvdXJjZURldmljZShmYWxzZSkKICAg ICAsIG1fdmFsaWRhdGlvbk1lc3NhZ2UoVmFsaWRhdGlvbk1lc3NhZ2VDbGllbnRJbXBsOjpjcmVh dGUoKmNsaWVudCkpCiAgICAgLCBtX3N1cHByZXNzSW52YWxpZGF0aW9ucyhmYWxzZSkKICAgICAs IG1fc2hvd0ZQU0NvdW50ZXIoZmFsc2UpCkBAIC02NTksMjIgKzY2MCwzOSBAQCBib29sIFdlYlZp ZXdJbXBsOjpoYW5kbGVNb3VzZVdoZWVsKEZyYW1lJiBtYWluRnJhbWUsIGNvbnN0IFdlYk1vdXNl V2hlZWxFdmVudCYgZQogCiB2b2lkIFdlYlZpZXdJbXBsOjpzY3JvbGxCeShjb25zdCBXZWJQb2lu dCYgZGVsdGEpCiB7Ci0gICAgV2ViTW91c2VXaGVlbEV2ZW50IHN5bnRoZXRpY1doZWVsOwotICAg IGNvbnN0IGZsb2F0IHRpY2tEaXZpc29yID0gV2ViQ29yZTo6V2hlZWxFdmVudDo6dGlja011bHRp cGxpZXI7Ci0KLSAgICBzeW50aGV0aWNXaGVlbC5kZWx0YVggPSBkZWx0YS54OwotICAgIHN5bnRo ZXRpY1doZWVsLmRlbHRhWSA9IGRlbHRhLnk7Ci0gICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNr c1ggPSBkZWx0YS54IC8gdGlja0Rpdmlzb3I7Ci0gICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNr c1kgPSBkZWx0YS55IC8gdGlja0Rpdmlzb3I7Ci0gICAgc3ludGhldGljV2hlZWwuaGFzUHJlY2lz ZVNjcm9sbGluZ0RlbHRhcyA9IHRydWU7Ci0gICAgc3ludGhldGljV2hlZWwueCA9IG1fbGFzdFdo ZWVsUG9zaXRpb24ueDsKLSAgICBzeW50aGV0aWNXaGVlbC55ID0gbV9sYXN0V2hlZWxQb3NpdGlv bi55OwotICAgIHN5bnRoZXRpY1doZWVsLmdsb2JhbFggPSBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0 aW9uLng7Ci0gICAgc3ludGhldGljV2hlZWwuZ2xvYmFsWSA9IG1fbGFzdFdoZWVsR2xvYmFsUG9z aXRpb24ueTsKLSAgICBzeW50aGV0aWNXaGVlbC5tb2RpZmllcnMgPSBtX2ZsaW5nTW9kaWZpZXI7 Ci0KLSAgICBpZiAobV9wYWdlICYmIG1fcGFnZS0+bWFpbkZyYW1lKCkgJiYgbV9wYWdlLT5tYWlu RnJhbWUoKS0+dmlldygpKQotICAgICAgICBoYW5kbGVNb3VzZVdoZWVsKCptX3BhZ2UtPm1haW5G cmFtZSgpLCBzeW50aGV0aWNXaGVlbCk7CisgICAgaWYgKG1fZmxpbmdTb3VyY2VEZXZpY2UgPT0g V2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZCkgeworICAgICAgICBXZWJNb3VzZVdoZWVsRXZlbnQg c3ludGhldGljV2hlZWw7CisgICAgICAgIGNvbnN0IGZsb2F0IHRpY2tEaXZpc29yID0gV2ViQ29y ZTo6V2hlZWxFdmVudDo6dGlja011bHRpcGxpZXI7CisKKyAgICAgICAgc3ludGhldGljV2hlZWwu ZGVsdGFYID0gZGVsdGEueDsKKyAgICAgICAgc3ludGhldGljV2hlZWwuZGVsdGFZID0gZGVsdGEu eTsKKyAgICAgICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1ggPSBkZWx0YS54IC8gdGlja0Rp dmlzb3I7CisgICAgICAgIHN5bnRoZXRpY1doZWVsLndoZWVsVGlja3NZID0gZGVsdGEueSAvIHRp Y2tEaXZpc29yOworICAgICAgICBzeW50aGV0aWNXaGVlbC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVs dGFzID0gdHJ1ZTsKKyAgICAgICAgc3ludGhldGljV2hlZWwueCA9IG1fcG9zaXRpb25PbkZsaW5n U3RhcnQueDsKKyAgICAgICAgc3ludGhldGljV2hlZWwueSA9IG1fcG9zaXRpb25PbkZsaW5nU3Rh cnQueTsKKyAgICAgICAgc3ludGhldGljV2hlZWwuZ2xvYmFsWCA9IG1fZ2xvYmFsUG9zaXRpb25P bkZsaW5nU3RhcnQueDsKKyAgICAgICAgc3ludGhldGljV2hlZWwuZ2xvYmFsWSA9IG1fZ2xvYmFs UG9zaXRpb25PbkZsaW5nU3RhcnQueTsKKyAgICAgICAgc3ludGhldGljV2hlZWwubW9kaWZpZXJz ID0gbV9mbGluZ01vZGlmaWVyOworCisgICAgICAgIGlmIChtX3BhZ2UgJiYgbV9wYWdlLT5tYWlu RnJhbWUoKSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCkpCisgICAgICAgICAgICBoYW5k bGVNb3VzZVdoZWVsKCptX3BhZ2UtPm1haW5GcmFtZSgpLCBzeW50aGV0aWNXaGVlbCk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgV2ViR2VzdHVyZUV2ZW50IHN5bnRoZXRpY0dlc3R1cmVFdmVudDsK KworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZlbnQudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdl c3R1cmVTY3JvbGxVcGRhdGU7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5kYXRhLnNj cm9sbFVwZGF0ZS5kZWx0YVggPSBkZWx0YS54OworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZl bnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gZGVsdGEueTsKKyAgICAgICAgc3ludGhldGlj R2VzdHVyZUV2ZW50LnggPSBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0Lng7CisgICAgICAgIHN5bnRo ZXRpY0dlc3R1cmVFdmVudC55ID0gbV9wb3NpdGlvbk9uRmxpbmdTdGFydC55OworICAgICAgICBz eW50aGV0aWNHZXN0dXJlRXZlbnQuZ2xvYmFsWCA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3Rh cnQueDsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50Lmdsb2JhbFkgPSBtX2dsb2JhbFBv c2l0aW9uT25GbGluZ1N0YXJ0Lnk7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5tb2Rp ZmllcnMgPSBtX2ZsaW5nTW9kaWZpZXI7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5z b3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNoc2NyZWVuOworCisgICAgICAgIGlm IChtX3BhZ2UgJiYgbV9wYWdlLT5tYWluRnJhbWUoKSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgpLT52 aWV3KCkpCisgICAgICAgICAgICBoYW5kbGVHZXN0dXJlRXZlbnQoc3ludGhldGljR2VzdHVyZUV2 ZW50KTsKKyAgICB9CiB9CiAKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCkBAIC03MDcsOSAr NzI1LDEwIEBAIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVudChjb25zdCBXZWJH ZXN0dXJlRXZlbnQmIGV2ZW50KQogICAgICAgICBpZiAobWFpbkZyYW1lSW1wbCgpLT5mcmFtZSgp LT5ldmVudEhhbmRsZXIoKS0+aXNTY3JvbGxiYXJIYW5kbGluZ0dlc3R1cmVzKCkpCiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgbV9jbGllbnQtPmNhbmNlbFNjaGVkdWxlZENvbnRlbnRJbnRl bnRzKCk7Ci0gICAgICAgIG1fbGFzdFdoZWVsUG9zaXRpb24gPSBXZWJQb2ludChldmVudC54LCBl dmVudC55KTsKLSAgICAgICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2 ZW50Lmdsb2JhbFgsIGV2ZW50Lmdsb2JhbFkpOworICAgICAgICBtX3Bvc2l0aW9uT25GbGluZ1N0 YXJ0ID0gV2ViUG9pbnQoZXZlbnQueCwgZXZlbnQueSk7CisgICAgICAgIG1fZ2xvYmFsUG9zaXRp b25PbkZsaW5nU3RhcnQgPSBXZWJQb2ludChldmVudC5nbG9iYWxYLCBldmVudC5nbG9iYWxZKTsK ICAgICAgICAgbV9mbGluZ01vZGlmaWVyID0gZXZlbnQubW9kaWZpZXJzOworICAgICAgICBtX2Zs aW5nU291cmNlRGV2aWNlID0gZXZlbnQuc291cmNlRGV2aWNlOwogICAgICAgICBPd25QdHI8V2Vi R2VzdHVyZUN1cnZlPiBmbGluZ0N1cnZlID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+ Y3JlYXRlRmxpbmdBbmltYXRpb25DdXJ2ZShldmVudC5zb3VyY2VEZXZpY2UsIFdlYkZsb2F0UG9p bnQoZXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WCwgZXZlbnQuZGF0YS5mbGluZ1N0YXJ0 LnZlbG9jaXR5WSksIFdlYlNpemUoKSkpOwogICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBX ZWJBY3RpdmVHZXN0dXJlQW5pbWF0aW9uOjpjcmVhdGVBdEFuaW1hdGlvblN0YXJ0KGZsaW5nQ3Vy dmUucmVsZWFzZSgpLCB0aGlzKTsKICAgICAgICAgc2NoZWR1bGVBbmltYXRpb24oKTsKQEAgLTgx Miw4ICs4MzEsOCBAQCB2b2lkIFdlYlZpZXdJbXBsOjp0cmFuc2ZlckFjdGl2ZVdoZWVsRmxpbmdB bmltYXRpb24oY29uc3QgV2ViQWN0aXZlV2hlZWxGbGluZ1BhcgogewogICAgIFRSQUNFX0VWRU5U MCgid2Via2l0IiwgIldlYlZpZXdJbXBsOjp0cmFuc2ZlckFjdGl2ZVdoZWVsRmxpbmdBbmltYXRp b24iKTsKICAgICBBU1NFUlQoIW1fZ2VzdHVyZUFuaW1hdGlvbik7Ci0gICAgbV9sYXN0V2hlZWxQ b3NpdGlvbiA9IHBhcmFtZXRlcnMucG9pbnQ7Ci0gICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlv biA9IHBhcmFtZXRlcnMuZ2xvYmFsUG9pbnQ7CisgICAgbV9wb3NpdGlvbk9uRmxpbmdTdGFydCA9 IHBhcmFtZXRlcnMucG9pbnQ7CisgICAgbV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFydCA9IHBh cmFtZXRlcnMuZ2xvYmFsUG9pbnQ7CiAgICAgbV9mbGluZ01vZGlmaWVyID0gcGFyYW1ldGVycy5t b2RpZmllcnM7CiAgICAgT3duUHRyPFdlYkdlc3R1cmVDdXJ2ZT4gY3VydmUgPSBhZG9wdFB0cihQ bGF0Zm9ybTo6Y3VycmVudCgpLT5jcmVhdGVGbGluZ0FuaW1hdGlvbkN1cnZlKHBhcmFtZXRlcnMu c291cmNlRGV2aWNlLCBXZWJGbG9hdFBvaW50KHBhcmFtZXRlcnMuZGVsdGEpLCBwYXJhbWV0ZXJz LmN1bXVsYXRpdmVTY3JvbGwpKTsKICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBXZWJBY3RpdmVH ZXN0dXJlQW5pbWF0aW9uOjpjcmVhdGVXaXRoVGltZU9mZnNldChjdXJ2ZS5yZWxlYXNlKCksIHRo aXMsIHBhcmFtZXRlcnMuc3RhcnRUaW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5oCmluZGV4IDQxNTQ5YThjNWYyNjlkNjgxZDVhN2Q4NjcwMTFhN2QwMGM2MDNlZTEu LmQ4Y2NiNGY0YTI4ZjA2MDljZmMxNDM5YTE0OTJlODA3ODE0NDY1YTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtODc4LDkgKzg3OCwxMCBAQCBwcml2YXRl OgogICAgIE93blB0cjxOYXZpZ2F0b3JDb250ZW50VXRpbHNDbGllbnRJbXBsPiBtX25hdmlnYXRv ckNvbnRlbnRVdGlsc0NsaWVudDsKICNlbmRpZgogICAgIE93blB0cjxXZWJBY3RpdmVHZXN0dXJl QW5pbWF0aW9uPiBtX2dlc3R1cmVBbmltYXRpb247Ci0gICAgV2ViUG9pbnQgbV9sYXN0V2hlZWxQ b3NpdGlvbjsKLSAgICBXZWJQb2ludCBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0aW9uOworICAgIFdl YlBvaW50IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQ7CisgICAgV2ViUG9pbnQgbV9nbG9iYWxQb3Np dGlvbk9uRmxpbmdTdGFydDsKICAgICBpbnQgbV9mbGluZ01vZGlmaWVyOworICAgIGJvb2wgbV9m bGluZ1NvdXJjZURldmljZTsKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiAgICAgT3duUHRy PExpbmtIaWdobGlnaHQ+IG1fbGlua0hpZ2hsaWdodDsKICNlbmRpZgo= 183275 2013-01-17 14:11:47 -0800 2013-01-18 11:08:16 -0800 Patch bug-106589-20130117170847.patch text/plain 9143 rjkroege U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRmYjZjZjU1NzBlZDc5NDg5MGE3OTg0NGQyNGZhYjg3YTZkMjQyMWUuLjJkNWYyZDYxZTM5OGUy NTA3OTkwZGJlOTZjMzZiN2EyNDZlYmFiNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTMtMDEtMTcgIFJvYmVydCBLcm9lZ2VyICA8cmprcm9lZ2VAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNlIG5ldy1zdHlsZSBnZXN0dXJlIHNj cm9sbGluZyBldmVudHMgZm9yIGZsaW5nIGFuZAorICAgICAgICBmb3IgcGx1Z2luIHNjcm9sbGlu ZzogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjU4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5NTIgbW9kaWZpZWQgdG91Y2hzY3JlZW4KKyAg ICAgICAgc2Nyb2xsaW5nIHRvIG5vdCB1c2Ugc3ludGhldGljIG1vdXNlIHdoZWVsIGV2ZW50cy4g VXBkYXRlIHRoZSBmbGluZyBmYWNpbGl0eQorICAgICAgICBpbiBXZWJWaWV3SW1wbCB0byB1c2Ug dGhlc2UgZXZlbnRzIGZvciB0b3VjaHNjcmVlbi1pbml0aWF0ZWQgZmxpbmdzLiBBbHNvCisgICAg ICAgIG1vZGlmeSB0aGUgV2ViUGx1Z2luQ29udGFpbmVySW1wbCB0byBzY3JvbGwgaW4gcmVzcG9u c2UgdG8gdG91Y2hzY3JlZW4KKyAgICAgICAgc2Nyb2xsIGdlc3R1cmVzIGlmIHRoZSBwbHVnaW4g ZG9lcyBub3QgaXRzZWxmIGltcGxlbWVudCBnZXN0dXJlIGV2ZW50cy4gCisKKyAgICAgICAgKiBz cmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbEJ5KTogSGFuZGxlIGZsaW5nIGNhbGxiYWNr IGNvbmRpdGlvbmFsbHkgYmFzZWQKKyAgICAgICAgb24gaW5pdGlhdGluZyBkZXZpY2UuIFRvdWNo cGFkIGZsaW5ncyBnZW5lcmF0ZSB3aGVlbHMuIFRvdWNoc2NyZWVuIGZsaW5ncworICAgICAgICB1 c2UgZ2VzdHVyZSBldmVudHMuCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpoYW5kbGVH ZXN0dXJlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dHJhbnNmZXJBY3Rp dmVXaGVlbEZsaW5nQW5pbWF0aW9uKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwog MjAxMy0wMS0xNiAgVy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgTGlua0hpZ2hsaWdodCBzaG91bGQgdXNlIHRvdWNoIGFkanVzdG1lbnQgdG8gbWF0 Y2ggYWN0aXZlIHN0YXRlIG9uIEdlc3R1cmVUYXBEb3duLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAppbmRleCA2ZDFlOTJl YjYzZTQ5MDIxM2I1MWYzMTUyODgwNTI2ZDU5MzJkMzZkLi5hNzY4YzIwNmRmZDNmMWI4OWU5NWZl Mjc2NWJjNDU3ZjRkZDMyOGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcApAQCAtNzc2LDE0ICs3NzYsMzMgQEAgdm9p ZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVUb3VjaEV2ZW50KFRvdWNoRXZlbnQqIGV2 ZW50KQogICAgIH0KIH0KIAorc3RhdGljIGlubGluZSBib29sIGdlc3R1cmVTY3JvbGxIZWxwZXIo U2Nyb2xsYmFyR3JvdXAqIHNjcm9sbGJhckdyb3VwLCBTY3JvbGxEaXJlY3Rpb24gcG9zaXRpdmVE aXJlY3Rpb24sIFNjcm9sbERpcmVjdGlvbiBuZWdhdGl2ZURpcmVjdGlvbiwgZmxvYXQgZGVsdGEp Cit7CisgICAgaWYgKCFkZWx0YSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGZsb2F0IGFi c0RlbHRhID0gZGVsdGEgPiAwID8gZGVsdGEgOiAtZGVsdGE7CisgICAgcmV0dXJuIHNjcm9sbGJh ckdyb3VwLT5zY3JvbGwoZGVsdGEgPCAwID8gbmVnYXRpdmVEaXJlY3Rpb24gOiBwb3NpdGl2ZURp cmVjdGlvbiwgU2Nyb2xsQnlQcmVjaXNlUGl4ZWwsIGFic0RlbHRhKTsKK30KKwogdm9pZCBXZWJQ bHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQoR2VzdHVyZUV2ZW50KiBldmVu dCkKIHsKICAgICBXZWJHZXN0dXJlRXZlbnRCdWlsZGVyIHdlYkV2ZW50KHRoaXMsIG1fZWxlbWVu dC0+cmVuZGVyZXIoKSwgKmV2ZW50KTsKICAgICBpZiAod2ViRXZlbnQudHlwZSA9PSBXZWJJbnB1 dEV2ZW50OjpVbmRlZmluZWQpCiAgICAgICAgIHJldHVybjsKICAgICBXZWJDdXJzb3JJbmZvIGN1 cnNvckluZm87Ci0gICAgaWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50KHdlYkV2ZW50 LCBjdXJzb3JJbmZvKSkKKyAgICBpZiAobV93ZWJQbHVnaW4tPmhhbmRsZUlucHV0RXZlbnQod2Vi RXZlbnQsIGN1cnNvckluZm8pKSB7CiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHdlYkV2ZW50LnR5cGUgPT0gV2Vi SW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZSkgeworICAgICAgICBpZiAoIW1fc2Nyb2xs YmFyR3JvdXApCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmIChnZXN0dXJlU2Nyb2xs SGVscGVyKG1fc2Nyb2xsYmFyR3JvdXAuZ2V0KCksIFNjcm9sbExlZnQsIFNjcm9sbFJpZ2h0LCB3 ZWJFdmVudC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVgpKQorICAgICAgICAgICAgZXZlbnQtPnNl dERlZmF1bHRIYW5kbGVkKCk7CisgICAgICAgIGlmIChnZXN0dXJlU2Nyb2xsSGVscGVyKG1fc2Ny b2xsYmFyR3JvdXAuZ2V0KCksIFNjcm9sbFVwLCBTY3JvbGxEb3duLCB3ZWJFdmVudC5kYXRhLnNj cm9sbFVwZGF0ZS5kZWx0YVkpKQorICAgICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVk KCk7CisgICAgfQogICAgIC8vIEZJWE1FOiBDYW4gYSBwbHVnaW4gY2hhbmdlIHRoZSBjdXJzb3Ig ZnJvbSBhIHRvdWNoLWV2ZW50IGNhbGxiYWNrPwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMDczMWFiNDRjY2NlNjVkZTY3MzQzNDBiZDQ0MzY4 Y2E1YWU0ZmY4MC4uZjBiNjU3Zjk5Mzg2NDQwMzFlNzBkMDg2NGJjYjE3MzRiNGQ2NmY3NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNDUwLDYgKzQ1 MCw3IEBAIFdlYlZpZXdJbXBsOjpXZWJWaWV3SW1wbChXZWJWaWV3Q2xpZW50KiBjbGllbnQpCiAg ICAgLCBtX25hdmlnYXRvckNvbnRlbnRVdGlsc0NsaWVudChOYXZpZ2F0b3JDb250ZW50VXRpbHND bGllbnRJbXBsOjpjcmVhdGUodGhpcykpCiAjZW5kaWYKICAgICAsIG1fZmxpbmdNb2RpZmllcigw KQorICAgICwgbV9mbGluZ1NvdXJjZURldmljZShmYWxzZSkKICAgICAsIG1fdmFsaWRhdGlvbk1l c3NhZ2UoVmFsaWRhdGlvbk1lc3NhZ2VDbGllbnRJbXBsOjpjcmVhdGUoKmNsaWVudCkpCiAgICAg LCBtX3N1cHByZXNzSW52YWxpZGF0aW9ucyhmYWxzZSkKICAgICAsIG1fc2hvd0ZQU0NvdW50ZXIo ZmFsc2UpCkBAIC02NTksMjIgKzY2MCwzOSBAQCBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVNb3Vz ZVdoZWVsKEZyYW1lJiBtYWluRnJhbWUsIGNvbnN0IFdlYk1vdXNlV2hlZWxFdmVudCYgZQogCiB2 b2lkIFdlYlZpZXdJbXBsOjpzY3JvbGxCeShjb25zdCBXZWJQb2ludCYgZGVsdGEpCiB7Ci0gICAg V2ViTW91c2VXaGVlbEV2ZW50IHN5bnRoZXRpY1doZWVsOwotICAgIGNvbnN0IGZsb2F0IHRpY2tE aXZpc29yID0gV2ViQ29yZTo6V2hlZWxFdmVudDo6dGlja011bHRpcGxpZXI7Ci0KLSAgICBzeW50 aGV0aWNXaGVlbC5kZWx0YVggPSBkZWx0YS54OwotICAgIHN5bnRoZXRpY1doZWVsLmRlbHRhWSA9 IGRlbHRhLnk7Ci0gICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1ggPSBkZWx0YS54IC8gdGlj a0Rpdmlzb3I7Ci0gICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1kgPSBkZWx0YS55IC8gdGlj a0Rpdmlzb3I7Ci0gICAgc3ludGhldGljV2hlZWwuaGFzUHJlY2lzZVNjcm9sbGluZ0RlbHRhcyA9 IHRydWU7Ci0gICAgc3ludGhldGljV2hlZWwueCA9IG1fbGFzdFdoZWVsUG9zaXRpb24ueDsKLSAg ICBzeW50aGV0aWNXaGVlbC55ID0gbV9sYXN0V2hlZWxQb3NpdGlvbi55OwotICAgIHN5bnRoZXRp Y1doZWVsLmdsb2JhbFggPSBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0aW9uLng7Ci0gICAgc3ludGhl dGljV2hlZWwuZ2xvYmFsWSA9IG1fbGFzdFdoZWVsR2xvYmFsUG9zaXRpb24ueTsKLSAgICBzeW50 aGV0aWNXaGVlbC5tb2RpZmllcnMgPSBtX2ZsaW5nTW9kaWZpZXI7Ci0KLSAgICBpZiAobV9wYWdl ICYmIG1fcGFnZS0+bWFpbkZyYW1lKCkgJiYgbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpKQot ICAgICAgICBoYW5kbGVNb3VzZVdoZWVsKCptX3BhZ2UtPm1haW5GcmFtZSgpLCBzeW50aGV0aWNX aGVlbCk7CisgICAgaWYgKG1fZmxpbmdTb3VyY2VEZXZpY2UgPT0gV2ViR2VzdHVyZUV2ZW50OjpU b3VjaHBhZCkgeworICAgICAgICBXZWJNb3VzZVdoZWVsRXZlbnQgc3ludGhldGljV2hlZWw7Cisg ICAgICAgIGNvbnN0IGZsb2F0IHRpY2tEaXZpc29yID0gV2ViQ29yZTo6V2hlZWxFdmVudDo6dGlj a011bHRpcGxpZXI7CisKKyAgICAgICAgc3ludGhldGljV2hlZWwuZGVsdGFYID0gZGVsdGEueDsK KyAgICAgICAgc3ludGhldGljV2hlZWwuZGVsdGFZID0gZGVsdGEueTsKKyAgICAgICAgc3ludGhl dGljV2hlZWwud2hlZWxUaWNrc1ggPSBkZWx0YS54IC8gdGlja0Rpdmlzb3I7CisgICAgICAgIHN5 bnRoZXRpY1doZWVsLndoZWVsVGlja3NZID0gZGVsdGEueSAvIHRpY2tEaXZpc29yOworICAgICAg ICBzeW50aGV0aWNXaGVlbC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVsdGFzID0gdHJ1ZTsKKyAgICAg ICAgc3ludGhldGljV2hlZWwueCA9IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAgICAgICAg c3ludGhldGljV2hlZWwueSA9IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQueTsKKyAgICAgICAgc3lu dGhldGljV2hlZWwuZ2xvYmFsWCA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAg ICAgICAgc3ludGhldGljV2hlZWwuZ2xvYmFsWSA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3Rh cnQueTsKKyAgICAgICAgc3ludGhldGljV2hlZWwubW9kaWZpZXJzID0gbV9mbGluZ01vZGlmaWVy OworCisgICAgICAgIGlmIChtX3BhZ2UgJiYgbV9wYWdlLT5tYWluRnJhbWUoKSAmJiBtX3BhZ2Ut Pm1haW5GcmFtZSgpLT52aWV3KCkpCisgICAgICAgICAgICBoYW5kbGVNb3VzZVdoZWVsKCptX3Bh Z2UtPm1haW5GcmFtZSgpLCBzeW50aGV0aWNXaGVlbCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg V2ViR2VzdHVyZUV2ZW50IHN5bnRoZXRpY0dlc3R1cmVFdmVudDsKKworICAgICAgICBzeW50aGV0 aWNHZXN0dXJlRXZlbnQudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGU7 CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVgg PSBkZWx0YS54OworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZlbnQuZGF0YS5zY3JvbGxVcGRh dGUuZGVsdGFZID0gZGVsdGEueTsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50LnggPSBt X3Bvc2l0aW9uT25GbGluZ1N0YXJ0Lng7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC55 ID0gbV9wb3NpdGlvbk9uRmxpbmdTdGFydC55OworICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZl bnQuZ2xvYmFsWCA9IG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3RhcnQueDsKKyAgICAgICAgc3lu dGhldGljR2VzdHVyZUV2ZW50Lmdsb2JhbFkgPSBtX2dsb2JhbFBvc2l0aW9uT25GbGluZ1N0YXJ0 Lnk7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5tb2RpZmllcnMgPSBtX2ZsaW5nTW9k aWZpZXI7CisgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5zb3VyY2VEZXZpY2UgPSBXZWJH ZXN0dXJlRXZlbnQ6OlRvdWNoc2NyZWVuOworCisgICAgICAgIGlmIChtX3BhZ2UgJiYgbV9wYWdl LT5tYWluRnJhbWUoKSAmJiBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCkpCisgICAgICAgICAg ICBoYW5kbGVHZXN0dXJlRXZlbnQoc3ludGhldGljR2VzdHVyZUV2ZW50KTsKKyAgICB9CiB9CiAK ICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCkBAIC03MDcsOSArNzI1LDEwIEBAIGJvb2wgV2Vi Vmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVudChjb25zdCBXZWJHZXN0dXJlRXZlbnQmIGV2ZW50 KQogICAgICAgICBpZiAobWFpbkZyYW1lSW1wbCgpLT5mcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+ aXNTY3JvbGxiYXJIYW5kbGluZ0dlc3R1cmVzKCkpCiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgbV9jbGllbnQtPmNhbmNlbFNjaGVkdWxlZENvbnRlbnRJbnRlbnRzKCk7Ci0gICAgICAgIG1f bGFzdFdoZWVsUG9zaXRpb24gPSBXZWJQb2ludChldmVudC54LCBldmVudC55KTsKLSAgICAgICAg bV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50Lmdsb2JhbFgsIGV2ZW50 Lmdsb2JhbFkpOworICAgICAgICBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0ID0gV2ViUG9pbnQoZXZl bnQueCwgZXZlbnQueSk7CisgICAgICAgIG1fZ2xvYmFsUG9zaXRpb25PbkZsaW5nU3RhcnQgPSBX ZWJQb2ludChldmVudC5nbG9iYWxYLCBldmVudC5nbG9iYWxZKTsKICAgICAgICAgbV9mbGluZ01v ZGlmaWVyID0gZXZlbnQubW9kaWZpZXJzOworICAgICAgICBtX2ZsaW5nU291cmNlRGV2aWNlID0g ZXZlbnQuc291cmNlRGV2aWNlOwogICAgICAgICBPd25QdHI8V2ViR2VzdHVyZUN1cnZlPiBmbGlu Z0N1cnZlID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlRmxpbmdBbmltYXRp b25DdXJ2ZShldmVudC5zb3VyY2VEZXZpY2UsIFdlYkZsb2F0UG9pbnQoZXZlbnQuZGF0YS5mbGlu Z1N0YXJ0LnZlbG9jaXR5WCwgZXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSksIFdlYlNp emUoKSkpOwogICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBXZWJBY3RpdmVHZXN0dXJlQW5p bWF0aW9uOjpjcmVhdGVBdEFuaW1hdGlvblN0YXJ0KGZsaW5nQ3VydmUucmVsZWFzZSgpLCB0aGlz KTsKICAgICAgICAgc2NoZWR1bGVBbmltYXRpb24oKTsKQEAgLTgxMiw4ICs4MzEsOCBAQCB2b2lk IFdlYlZpZXdJbXBsOjp0cmFuc2ZlckFjdGl2ZVdoZWVsRmxpbmdBbmltYXRpb24oY29uc3QgV2Vi QWN0aXZlV2hlZWxGbGluZ1BhcgogewogICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIldlYlZp ZXdJbXBsOjp0cmFuc2ZlckFjdGl2ZVdoZWVsRmxpbmdBbmltYXRpb24iKTsKICAgICBBU1NFUlQo IW1fZ2VzdHVyZUFuaW1hdGlvbik7Ci0gICAgbV9sYXN0V2hlZWxQb3NpdGlvbiA9IHBhcmFtZXRl cnMucG9pbnQ7Ci0gICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IHBhcmFtZXRlcnMuZ2xv YmFsUG9pbnQ7CisgICAgbV9wb3NpdGlvbk9uRmxpbmdTdGFydCA9IHBhcmFtZXRlcnMucG9pbnQ7 CisgICAgbV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFydCA9IHBhcmFtZXRlcnMuZ2xvYmFsUG9p bnQ7CiAgICAgbV9mbGluZ01vZGlmaWVyID0gcGFyYW1ldGVycy5tb2RpZmllcnM7CiAgICAgT3du UHRyPFdlYkdlc3R1cmVDdXJ2ZT4gY3VydmUgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgp LT5jcmVhdGVGbGluZ0FuaW1hdGlvbkN1cnZlKHBhcmFtZXRlcnMuc291cmNlRGV2aWNlLCBXZWJG bG9hdFBvaW50KHBhcmFtZXRlcnMuZGVsdGEpLCBwYXJhbWV0ZXJzLmN1bXVsYXRpdmVTY3JvbGwp KTsKICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBXZWJBY3RpdmVHZXN0dXJlQW5pbWF0aW9uOjpj cmVhdGVXaXRoVGltZU9mZnNldChjdXJ2ZS5yZWxlYXNlKCksIHRoaXMsIHBhcmFtZXRlcnMuc3Rh cnRUaW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDQx NTQ5YThjNWYyNjlkNjgxZDVhN2Q4NjcwMTFhN2QwMGM2MDNlZTEuLmQ4Y2NiNGY0YTI4ZjA2MDlj ZmMxNDM5YTE0OTJlODA3ODE0NDY1YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaApAQCAtODc4LDkgKzg3OCwxMCBAQCBwcml2YXRlOgogICAgIE93blB0cjxOYXZp Z2F0b3JDb250ZW50VXRpbHNDbGllbnRJbXBsPiBtX25hdmlnYXRvckNvbnRlbnRVdGlsc0NsaWVu dDsKICNlbmRpZgogICAgIE93blB0cjxXZWJBY3RpdmVHZXN0dXJlQW5pbWF0aW9uPiBtX2dlc3R1 cmVBbmltYXRpb247Ci0gICAgV2ViUG9pbnQgbV9sYXN0V2hlZWxQb3NpdGlvbjsKLSAgICBXZWJQ b2ludCBtX2xhc3RXaGVlbEdsb2JhbFBvc2l0aW9uOworICAgIFdlYlBvaW50IG1fcG9zaXRpb25P bkZsaW5nU3RhcnQ7CisgICAgV2ViUG9pbnQgbV9nbG9iYWxQb3NpdGlvbk9uRmxpbmdTdGFydDsK ICAgICBpbnQgbV9mbGluZ01vZGlmaWVyOworICAgIGJvb2wgbV9mbGluZ1NvdXJjZURldmljZTsK ICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiAgICAgT3duUHRyPExpbmtIaWdobGlnaHQ+IG1f bGlua0hpZ2hsaWdodDsKICNlbmRpZgo=