84605 2012-04-23 09:55:41 -0700 [chromium] Do not clobber synchronized start times. 2012-04-25 10:31:45 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vollick vollick cc-bugs enne jamesr webkit.review.bot oldest_to_newest 607768 0 vollick 2012-04-23 09:55:41 -0700 If an animation starts on the impl thread before it starts on the main thread, we currently clobber the synchronized start time. This is a bug. 607770 1 138369 vollick 2012-04-23 09:58:15 -0700 Created attachment 138369 Patch 607777 2 138369 danakj 2012-04-23 10:06:36 -0700 Comment on attachment 138369 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138369&action=review > Source/WebCore/ChangeLog:5 > + The comment from your test would go well here as well. > Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.h:84 > + void setStartTime(double startTime) { m_startTime = startTime; m_hasSetStartTime = true; } one statement per line 607781 3 138373 vollick 2012-04-23 10:13:25 -0700 Created attachment 138373 Patch (In reply to comment #2) > (From update of attachment 138369 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138369&action=review > > > Source/WebCore/ChangeLog:5 > > + > > The comment from your test would go well here as well. Done. > > > Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.h:84 > > + void setStartTime(double startTime) { m_startTime = startTime; m_hasSetStartTime = true; } > > one statement per line Moved to the cpp. 609493 4 138373 jamesr 2012-04-24 23:47:37 -0700 Comment on attachment 138373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138373&action=review Looks OK but try to get rid of the new member if you don't really need it. > Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.h:130 > + bool m_hasSetStartTime; we don't really need a bool, do we? m_startTime is initialized to 0 and can only become non-zero by a setStartTime() call or code internal to CCActiveAnimation, so would it be enough to just check for 0? 609818 5 138821 vollick 2012-04-25 09:09:07 -0700 Created attachment 138821 Patch (In reply to comment #4) > (From update of attachment 138373 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138373&action=review > > Looks OK but try to get rid of the new member if you don't really need it. > > > Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.h:130 > > + bool m_hasSetStartTime; > > we don't really need a bool, do we? m_startTime is initialized to 0 and can only become non-zero by a setStartTime() call or code internal to CCActiveAnimation, so would it be enough to just check for 0? That's true. Removed. (Also, I had to update the unit test because I was setting the time to 0 and expecting hasSetStartTime() to be true.) 609867 6 138833 vollick 2012-04-25 10:09:22 -0700 Created attachment 138833 Patch 609883 7 138833 webkit.review.bot 2012-04-25 10:31:41 -0700 Comment on attachment 138833 Patch Clearing flags on attachment: 138833 Committed r115226: <http://trac.webkit.org/changeset/115226> 609884 8 webkit.review.bot 2012-04-25 10:31:45 -0700 All reviewed patches have been landed. Closing bug. 138369 2012-04-23 09:58:15 -0700 2012-04-23 10:13:18 -0700 Patch bug-84605-20120423125813.patch text/plain 8646 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFmZGNmZGM3ODJmMTA5 ZjQzZDYwNGUwOWFkNjQ0YzJjYmZmMGRiYS4uN2ZlOWM0MWZiNTMwYjZkNTUyZWMzYjg3NmYzMmI3 ZmM3OGNlN2JmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA0LTIzICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gRG8g bm90IGNsb2JiZXIgc3luY2hyb25pemVkIHN0YXJ0IHRpbWVzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ2MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgaW4gQ0NMYXllckFuaW1hdGlvbkNv bnRyb2xsZXJUZXN0LmRvTm90Q2xvYmJlclN0YXJ0VGltZXMKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDQWN0aXZlQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNDQWN0aXZlQW5pbWF0aW9uOjpDQ0FjdGl2ZUFuaW1hdGlvbik6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRpb24uaDoKKyAgICAg ICAgKFdlYkNvcmU6OkNDQWN0aXZlQW5pbWF0aW9uOjpzZXRTdGFydFRpbWUpOgorICAgICAgICAo V2ViQ29yZTo6Q0NBY3RpdmVBbmltYXRpb246Omhhc1NldFN0YXJ0VGltZSk6CisgICAgICAgIChD Q0FjdGl2ZUFuaW1hdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NM YXllckFuaW1hdGlvbkNvbnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc1dhaXRpbmdGb3JOZXh0VGlj ayk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6c3RhcnRB bmltYXRpb25zV2FpdGluZ0ZvclRhcmdldEF2YWlsYWJpbGl0eSk6CisKIDIwMTItMDQtMjMgIEdh dmluIFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTW92ZSBSZWZlcnJl clBvbGljeSBvdXQgb2YgU2VjdXJpdHlQb2xpY3kgY2xhc3MgaW50byBpdHMgb3duIGhlYWRlciBp biBwbGF0Zm9ybS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNWI3MmY3NDAxOGFlZTc1 MGU3M2NjZjJlY2IzNmM0ZTE5MThkOGE5Mi4uMWM4ODI4ODQ1ZDM0MGNjYzgyYzA1ZDE1MGRjODA2 YmJkNzViOWVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxMi0wNC0yMyAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9taXVtLm9yZz4KKworICAgICAg ICBbY2hyb21pdW1dIERvIG5vdCBjbG9iYmVyIHN5bmNocm9uaXplZCBzdGFydCB0aW1lcy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NjA1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0xh eWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0VGVzdHMpOgor ICAgICAgICAoV2ViS2l0VGVzdHM6OlRFU1QpOgorCiAyMDEyLTA0LTIzICBHYXZpbiBQZXRlcnMg IDxnYXZpbnBAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1vdmUgUmVmZXJyZXJQb2xpY3kgb3V0 IG9mIFNlY3VyaXR5UG9saWN5IGNsYXNzIGludG8gaXRzIG93biBoZWFkZXIgaW4gcGxhdGZvcm0u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ0FjdGl2ZUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0FjdGl2ZUFuaW1hdGlvbi5jcHAKaW5kZXggMjYwZDdkNDdlM2IzMWI2 MmY1OWIxZGE4MDYwYWNkNWI3ODczNzJhYy4uZDkwMDViNzA3YTU3MmQxOTk4MTZmNTA0Y2NlNTdi YmVlMWEwYWI0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDQWN0aXZlQW5pbWF0aW9uLmNwcApAQCAtNDYs NiArNDYsNyBAQCBDQ0FjdGl2ZUFuaW1hdGlvbjo6Q0NBY3RpdmVBbmltYXRpb24oUGFzc093blB0 cjxDQ0FuaW1hdGlvbkN1cnZlPiBjdXJ2ZSwgaW50IGFuaQogICAgICwgbV9pdGVyYXRpb25zKDEp CiAgICAgLCBtX3N0YXJ0VGltZSgwKQogICAgICwgbV9uZWVkc1N5bmNocm9uaXplZFN0YXJ0VGlt ZShmYWxzZSkKKyAgICAsIG1faGFzU2V0U3RhcnRUaW1lKGZhbHNlKQogICAgICwgbV9wYXVzZVRp bWUoMCkKICAgICAsIG1fdG90YWxQYXVzZWRUaW1lKDApCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0FjdGl2ZUFuaW1hdGlvbi5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVB bmltYXRpb24uaAppbmRleCA1ZGI4M2FmOTU2MjFmNjUwZjNkZmMzZWVjMzE0ZDQ4ZGRjOTRlNGY1 Li40ZTdkOGQyNzc4ZmY5NWY4NTA0NDY0OWEzZDY4MGRlYTIzMTVjNTYyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0FjdGl2ZUFuaW1h dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDQWN0aXZlQW5pbWF0aW9uLmgKQEAgLTgxLDcgKzgxLDggQEAgcHVibGljOgogICAgIHZvaWQg c2V0SXRlcmF0aW9ucyhpbnQgbikgeyBtX2l0ZXJhdGlvbnMgPSBuOyB9CiAKICAgICBkb3VibGUg c3RhcnRUaW1lKCkgY29uc3QgeyByZXR1cm4gbV9zdGFydFRpbWU7IH0KLSAgICB2b2lkIHNldFN0 YXJ0VGltZShkb3VibGUgc3RhcnRUaW1lKSB7IG1fc3RhcnRUaW1lID0gc3RhcnRUaW1lOyB9Cisg ICAgdm9pZCBzZXRTdGFydFRpbWUoZG91YmxlIHN0YXJ0VGltZSkgeyBtX3N0YXJ0VGltZSA9IHN0 YXJ0VGltZTsgbV9oYXNTZXRTdGFydFRpbWUgPSB0cnVlOyB9CisgICAgYm9vbCBoYXNTZXRTdGFy dFRpbWUoKSBjb25zdCB7IHJldHVybiBtX2hhc1NldFN0YXJ0VGltZTsgfQogCiAgICAgYm9vbCBp c0ZpbmlzaGVkQXQoZG91YmxlIHRpbWUpIGNvbnN0OwogICAgIGJvb2wgaXNGaW5pc2hlZCgpIGNv bnN0IHsgcmV0dXJuIG1fcnVuU3RhdGUgPT0gRmluaXNoZWQgfHwgbV9ydW5TdGF0ZSA9PSBBYm9y dGVkOyB9CkBAIC0xMjYsNiArMTI3LDcgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9zdGFydFRp bWU7CiAKICAgICBib29sIG1fbmVlZHNTeW5jaHJvbml6ZWRTdGFydFRpbWU7CisgICAgYm9vbCBt X2hhc1NldFN0YXJ0VGltZTsKIAogICAgIC8vIFRoZXNlIGFyZSB1c2VkIGluIHRyaW1UaW1lVG9D dXJyZW50SXRlcmF0aW9uIHRvIGFjY291bnQgZm9yIHRpbWUKICAgICAvLyBzcGVudCB3aGlsZSBw YXVzZWQuIFRoaXMgaXMgbm90IGluY2x1ZGVkIGluIEFuaW1hdGlvblN0YXRlIHNpbmNlIGl0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyQW5pbWF0aW9uQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXgg N2Y1YTkyOGU4Y2UxOTkwYTM5YzYzZmRhNWM0YmJkYTE3ZGU5M2E5MC4uNzA2NjhmYzc3MmVmYjRi N2Q4OTNjMGNjMmRmNTA2OWMxMTZhMjQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcApAQCAtMjc3LDcgKzI3Nyw4IEBAIHZvaWQgQ0NMYXll ckFuaW1hdGlvbkNvbnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc1dhaXRpbmdGb3JOZXh0VGljayhk b3VibGUgbW9ub3RvCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2FjdGl2ZUFuaW1hdGlv bnMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgaWYgKG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+cnVu U3RhdGUoKSA9PSBDQ0FjdGl2ZUFuaW1hdGlvbjo6V2FpdGluZ0Zvck5leHRUaWNrKSB7CiAgICAg ICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPnNldFJ1blN0YXRlKENDQWN0aXZlQW5pbWF0 aW9uOjpSdW5uaW5nLCBtb25vdG9uaWNUaW1lKTsKLSAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0 aW9uc1tpXS0+c2V0U3RhcnRUaW1lKG1vbm90b25pY1RpbWUpOworICAgICAgICAgICAgaWYgKCFt X2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmhhc1NldFN0YXJ0VGltZSgpKQorICAgICAgICAgICAgICAg IG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+c2V0U3RhcnRUaW1lKG1vbm90b25pY1RpbWUpOwogICAg ICAgICAgICAgaWYgKGV2ZW50cykKICAgICAgICAgICAgICAgICBldmVudHMtPmFwcGVuZChDQ0Fu aW1hdGlvblN0YXJ0ZWRFdmVudChtX2NsaWVudC0+aWQoKSwgbV9hY3RpdmVBbmltYXRpb25zW2ld LT5ncm91cCgpLCBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPnRhcmdldFByb3BlcnR5KCksIG1vbm90 b25pY1RpbWUpKTsKICAgICAgICAgfQpAQCAtMzI2LDEzICszMjcsMTUgQEAgdm9pZCBDQ0xheWVy QW5pbWF0aW9uQ29udHJvbGxlcjo6c3RhcnRBbmltYXRpb25zV2FpdGluZ0ZvclRhcmdldEF2YWls YWJpbGl0eShkb3UKICAgICAgICAgICAgIC8vIElmIHRoZSBpbnRlcnNlY3Rpb24gaXMgbnVsbCwg dGhlbiB3ZSBhcmUgZnJlZSB0byBzdGFydCB0aGUgYW5pbWF0aW9ucyBpbiB0aGUgZ3JvdXAuCiAg ICAgICAgICAgICBpZiAobnVsbEludGVyc2VjdGlvbikgewogICAgICAgICAgICAgICAgIG1fYWN0 aXZlQW5pbWF0aW9uc1tpXS0+c2V0UnVuU3RhdGUoQ0NBY3RpdmVBbmltYXRpb246OlJ1bm5pbmcs IG1vbm90b25pY1RpbWUpOwotICAgICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+ c2V0U3RhcnRUaW1lKG1vbm90b25pY1RpbWUpOworICAgICAgICAgICAgICAgIGlmICghbV9hY3Rp dmVBbmltYXRpb25zW2ldLT5oYXNTZXRTdGFydFRpbWUoKSkKKyAgICAgICAgICAgICAgICAgICAg bV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7CiAgICAg ICAgICAgICAgICAgaWYgKGV2ZW50cykKICAgICAgICAgICAgICAgICAgICAgZXZlbnRzLT5hcHBl bmQoQ0NBbmltYXRpb25TdGFydGVkRXZlbnQobV9jbGllbnQtPmlkKCksIG1fYWN0aXZlQW5pbWF0 aW9uc1tpXS0+Z3JvdXAoKSwgbV9hY3RpdmVBbmltYXRpb25zW2ldLT50YXJnZXRQcm9wZXJ0eSgp LCBtb25vdG9uaWNUaW1lKSk7CiAgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaiA9IGkgKyAx OyBqIDwgbV9hY3RpdmVBbmltYXRpb25zLnNpemUoKTsgKytqKSB7CiAgICAgICAgICAgICAgICAg ICAgIGlmIChtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmdyb3VwKCkgPT0gbV9hY3RpdmVBbmltYXRp b25zW2pdLT5ncm91cCgpKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1h dGlvbnNbal0tPnNldFJ1blN0YXRlKENDQWN0aXZlQW5pbWF0aW9uOjpSdW5uaW5nLCBtb25vdG9u aWNUaW1lKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tqXS0+ c2V0U3RhcnRUaW1lKG1vbm90b25pY1RpbWUpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYg KCFtX2FjdGl2ZUFuaW1hdGlvbnNbal0tPmhhc1NldFN0YXJ0VGltZSgpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tqXS0+c2V0U3RhcnRUaW1lKG1vbm90 b25pY1RpbWUpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xh eWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuY3BwCmluZGV4IDExM2I2MzllMzZk ODA5MWExNTllMjAwNDYzZTE3YmQ1NzUxZGY0NjEuLjczZjBmMzVhZGY4N2VmNTNiNTNmNmZjNDZl ZTgyZDhmM2Q0YmY1NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyVGVzdC5jcHAKQEAgLTE0MSw2 ICsxNDEsMzcgQEAgVEVTVChDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QsIHN5bmNOZXdB bmltYXRpb24pCiAgICAgRVhQRUNUX0VRKENDQWN0aXZlQW5pbWF0aW9uOjpXYWl0aW5nRm9yVGFy Z2V0QXZhaWxhYmlsaXR5LCBjb250cm9sbGVySW1wbC0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIEND QWN0aXZlQW5pbWF0aW9uOjpPcGFjaXR5KS0+cnVuU3RhdGUoKSk7CiB9CiAKKy8vIElmIGFuIGFu aW1hdGlvbiBpcyBzdGFydGVkIG9uIHRoZSBpbXBsIHRocmVhZCBiZWZvcmUgaXQgaXMgdGlja2Vk IG9uIHRoZSBtYWluCisvLyB0aHJlYWQsIHdlIG11c3QgYmUgc3VyZSB0byByZXNwZWN0IHRoZSBz eW5jaHJvbml6ZWQgc3RhcnQgdGltZS4KK1RFU1QoQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJU ZXN0LCBkb05vdENsb2JiZXJTdGFydFRpbWVzKQoreworICAgIEZha2VMYXllckFuaW1hdGlvbkNv bnRyb2xsZXJDbGllbnQgZHVtbXlJbXBsOworICAgIE93blB0cjxDQ0xheWVyQW5pbWF0aW9uQ29u dHJvbGxlcj4gY29udHJvbGxlckltcGwoQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXI6OmNyZWF0 ZSgmZHVtbXlJbXBsKSk7CisgICAgRmFrZUxheWVyQW5pbWF0aW9uQ29udHJvbGxlckNsaWVudCBk dW1teTsKKyAgICBPd25QdHI8Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXI+IGNvbnRyb2xsZXIo Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXI6OmNyZWF0ZSgmZHVtbXkpKTsKKworICAgIEVYUEVD VF9GQUxTRShjb250cm9sbGVySW1wbC0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5p bWF0aW9uOjpPcGFjaXR5KSk7CisKKyAgICBhZGRPcGFjaXR5VHJhbnNpdGlvblRvQ29udHJvbGxl cigqY29udHJvbGxlciwgMSwgMCwgMSwgZmFsc2UpOworCisgICAgY29udHJvbGxlci0+cHVzaEFu aW1hdGlvblVwZGF0ZXNUbyhjb250cm9sbGVySW1wbC5nZXQoKSk7CisKKyAgICBFWFBFQ1RfVFJV RShjb250cm9sbGVySW1wbC0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5pbWF0aW9u OjpPcGFjaXR5KSk7CisgICAgRVhQRUNUX0VRKENDQWN0aXZlQW5pbWF0aW9uOjpXYWl0aW5nRm9y VGFyZ2V0QXZhaWxhYmlsaXR5LCBjb250cm9sbGVySW1wbC0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAs IENDQWN0aXZlQW5pbWF0aW9uOjpPcGFjaXR5KS0+cnVuU3RhdGUoKSk7CisKKyAgICBDQ0FuaW1h dGlvbkV2ZW50c1ZlY3RvciBldmVudHM7CisgICAgY29udHJvbGxlckltcGwtPmFuaW1hdGUoMCwg JmV2ZW50cyk7CisKKyAgICAvLyBTeW5jaHJvbml6ZSB0aGUgc3RhcnQgdGltZXMuCisgICAgRVhQ RUNUX0VRKDF1LCBldmVudHMuc2l6ZSgpKTsKKyAgICBjb250cm9sbGVyLT5ub3RpZnlBbmltYXRp b25TdGFydGVkKGV2ZW50c1swXSk7CisgICAgRVhQRUNUX0VRKGNvbnRyb2xsZXItPmdldEFjdGl2 ZUFuaW1hdGlvbigwLCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSktPnN0YXJ0VGltZSgpLCBj b250cm9sbGVySW1wbC0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5pbWF0aW9uOjpP cGFjaXR5KS0+c3RhcnRUaW1lKCkpOworCisgICAgLy8gU3RhcnQgdGhlIGFuaW1hdGlvbiBvbiB0 aGUgbWFpbiB0aHJlYWQuIFNob3VsZCBub3QgYWZmZWN0IHRoZSBzdGFydCB0aW1lLgorICAgIGNv bnRyb2xsZXItPmFuaW1hdGUoMC41LCAwKTsKKyAgICBFWFBFQ1RfRVEoY29udHJvbGxlci0+Z2V0 QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5pbWF0aW9uOjpPcGFjaXR5KS0+c3RhcnRUaW1l KCksIGNvbnRyb2xsZXJJbXBsLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRp b246Ok9wYWNpdHkpLT5zdGFydFRpbWUoKSk7Cit9CisKIFRFU1QoQ0NMYXllckFuaW1hdGlvbkNv bnRyb2xsZXJUZXN0LCBkb05vdFN5bmNGaW5pc2hlZEFuaW1hdGlvbikKIHsKICAgICBGYWtlTGF5 ZXJBbmltYXRpb25Db250cm9sbGVyQ2xpZW50IGR1bW15SW1wbDsK 138373 2012-04-23 10:13:25 -0700 2012-04-25 09:09:00 -0700 Patch bug-84605-20120423131323.patch text/plain 9106 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFmZGNmZGM3ODJmMTA5 ZjQzZDYwNGUwOWFkNjQ0YzJjYmZmMGRiYS4uMDM0NTgzODU1ZjlkYzc3ZDU5YjIwY2E0MzkwMGY2 ZjJmYmZjYmMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTIzICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gRG8g bm90IGNsb2JiZXIgc3luY2hyb25pemVkIHN0YXJ0IHRpbWVzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ2MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhbiBhbmltYXRpb24gaXMgc3RhcnRlZCBv biB0aGUgaW1wbCB0aHJlYWQgYmVmb3JlIGl0IGlzIHRpY2tlZCBvbiB0aGUgbWFpbgorICAgICAg ICB0aHJlYWQsIHdlIG11c3QgYmUgc3VyZSB0byByZXNwZWN0IHRoZSBzeW5jaHJvbml6ZWQgc3Rh cnQgdGltZS4KKworICAgICAgICBUZXN0ZWQgaW4gQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJU ZXN0LmRvTm90Q2xvYmJlclN0YXJ0VGltZXMKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDQWN0aXZlQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkND QWN0aXZlQW5pbWF0aW9uOjpDQ0FjdGl2ZUFuaW1hdGlvbik6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRpb24uaDoKKyAgICAgICAgKFdlYkNv cmU6OkNDQWN0aXZlQW5pbWF0aW9uOjpzZXRTdGFydFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6 Q0NBY3RpdmVBbmltYXRpb246Omhhc1NldFN0YXJ0VGltZSk6CisgICAgICAgIChDQ0FjdGl2ZUFu aW1hdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll ckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckFuaW1h dGlvbkNvbnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc1dhaXRpbmdGb3JOZXh0VGljayk6CisgICAg ICAgIChXZWJDb3JlOjpDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6c3RhcnRBbmltYXRpb25z V2FpdGluZ0ZvclRhcmdldEF2YWlsYWJpbGl0eSk6CisKIDIwMTItMDQtMjMgIEdhdmluIFBldGVy cyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTW92ZSBSZWZlcnJlclBvbGljeSBv dXQgb2YgU2VjdXJpdHlQb2xpY3kgY2xhc3MgaW50byBpdHMgb3duIGhlYWRlciBpbiBwbGF0Zm9y bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNWI3MmY3NDAxOGFlZTc1MGU3M2NjZjJl Y2IzNmM0ZTE5MThkOGE5Mi4uMWM4ODI4ODQ1ZDM0MGNjYzgyYzA1ZDE1MGRjODA2YmJkNzViOWVl YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wNC0y MyAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIERvIG5vdCBjbG9iYmVyIHN5bmNocm9uaXplZCBzdGFydCB0aW1lcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NjA1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0xheWVyQW5pbWF0 aW9uQ29udHJvbGxlclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0VGVzdHMpOgorICAgICAgICAo V2ViS2l0VGVzdHM6OlRFU1QpOgorCiAyMDEyLTA0LTIzICBHYXZpbiBQZXRlcnMgIDxnYXZpbnBA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1vdmUgUmVmZXJyZXJQb2xpY3kgb3V0IG9mIFNlY3Vy aXR5UG9saWN5IGNsYXNzIGludG8gaXRzIG93biBoZWFkZXIgaW4gcGxhdGZvcm0uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0FjdGl2 ZUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0FjdGl2ZUFuaW1hdGlvbi5jcHAKaW5kZXggMjYwZDdkNDdlM2IzMWI2MmY1OWIxZGE4 MDYwYWNkNWI3ODczNzJhYy4uMmRhZTU4M2I4NDgxMGQyYmYxYTk5OGI4ZGM4N2I3YjJhYWRhMDk4 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NBY3RpdmVBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDQWN0aXZlQW5pbWF0aW9uLmNwcApAQCAtNDYsNiArNDYsNyBA QCBDQ0FjdGl2ZUFuaW1hdGlvbjo6Q0NBY3RpdmVBbmltYXRpb24oUGFzc093blB0cjxDQ0FuaW1h dGlvbkN1cnZlPiBjdXJ2ZSwgaW50IGFuaQogICAgICwgbV9pdGVyYXRpb25zKDEpCiAgICAgLCBt X3N0YXJ0VGltZSgwKQogICAgICwgbV9uZWVkc1N5bmNocm9uaXplZFN0YXJ0VGltZShmYWxzZSkK KyAgICAsIG1faGFzU2V0U3RhcnRUaW1lKGZhbHNlKQogICAgICwgbV9wYXVzZVRpbWUoMCkKICAg ICAsIG1fdG90YWxQYXVzZWRUaW1lKDApCiB7CkBAIC02NCw2ICs2NSwxMiBAQCB2b2lkIENDQWN0 aXZlQW5pbWF0aW9uOjpzZXRSdW5TdGF0ZShSdW5TdGF0ZSBydW5TdGF0ZSwgZG91YmxlIG5vdykK ICAgICBtX3J1blN0YXRlID0gcnVuU3RhdGU7CiB9CiAKK3ZvaWQgQ0NBY3RpdmVBbmltYXRpb246 OnNldFN0YXJ0VGltZShkb3VibGUgc3RhcnRUaW1lKQoreworICAgIG1fc3RhcnRUaW1lID0gc3Rh cnRUaW1lOworICAgIG1faGFzU2V0U3RhcnRUaW1lID0gdHJ1ZTsKK30KKwogYm9vbCBDQ0FjdGl2 ZUFuaW1hdGlvbjo6aXNGaW5pc2hlZEF0KGRvdWJsZSB0aW1lKSBjb25zdAogewogICAgIGlmICht X3J1blN0YXRlID09IEZpbmlzaGVkIHx8IG1fcnVuU3RhdGUgPT0gQWJvcnRlZCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDQWN0aXZl QW5pbWF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ0FjdGl2ZUFuaW1hdGlvbi5oCmluZGV4IDVkYjgzYWY5NTYyMWY2NTBmM2RmYzNlZWMzMTRk NDhkZGM5NGU0ZjUuLjZiNzM4ZmEzZjU1ZmMwODQwOGFhZjAzYmZmYTY4YTAxY2NhOGUzZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND QWN0aXZlQW5pbWF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRpb24uaApAQCAtODEsNyArODEsOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzZXRJdGVyYXRpb25zKGludCBuKSB7IG1faXRlcmF0aW9ucyA9IG47IH0KIAog ICAgIGRvdWJsZSBzdGFydFRpbWUoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0VGltZTsgfQotICAg IHZvaWQgc2V0U3RhcnRUaW1lKGRvdWJsZSBzdGFydFRpbWUpIHsgbV9zdGFydFRpbWUgPSBzdGFy dFRpbWU7IH0KKyAgICB2b2lkIHNldFN0YXJ0VGltZShkb3VibGUpOworICAgIGJvb2wgaGFzU2V0 U3RhcnRUaW1lKCkgY29uc3QgeyByZXR1cm4gbV9oYXNTZXRTdGFydFRpbWU7IH0KIAogICAgIGJv b2wgaXNGaW5pc2hlZEF0KGRvdWJsZSB0aW1lKSBjb25zdDsKICAgICBib29sIGlzRmluaXNoZWQo KSBjb25zdCB7IHJldHVybiBtX3J1blN0YXRlID09IEZpbmlzaGVkIHx8IG1fcnVuU3RhdGUgPT0g QWJvcnRlZDsgfQpAQCAtMTI2LDYgKzEyNyw3IEBAIHByaXZhdGU6CiAgICAgZG91YmxlIG1fc3Rh cnRUaW1lOwogCiAgICAgYm9vbCBtX25lZWRzU3luY2hyb25pemVkU3RhcnRUaW1lOworICAgIGJv b2wgbV9oYXNTZXRTdGFydFRpbWU7CiAKICAgICAvLyBUaGVzZSBhcmUgdXNlZCBpbiB0cmltVGlt ZVRvQ3VycmVudEl0ZXJhdGlvbiB0byBhY2NvdW50IGZvciB0aW1lCiAgICAgLy8gc3BlbnQgd2hp bGUgcGF1c2VkLiBUaGlzIGlzIG5vdCBpbmNsdWRlZCBpbiBBbmltYXRpb25TdGF0ZSBzaW5jZSBp dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCmlu ZGV4IDdmNWE5MjhlOGNlMTk5MGEzOWM2M2ZkYTVjNGJiZGExN2RlOTNhOTAuLjcwNjY4ZmM3NzJl ZmI0YjdkODkzYzBjYzJkZjUwNjljMTE2YTI0OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKQEAgLTI3Nyw3ICsyNzcsOCBAQCB2b2lkIEND TGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpzdGFydEFuaW1hdGlvbnNXYWl0aW5nRm9yTmV4dFRp Y2soZG91YmxlIG1vbm90bwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9hY3RpdmVBbmlt YXRpb25zLnNpemUoKTsgKytpKSB7CiAgICAgICAgIGlmIChtX2FjdGl2ZUFuaW1hdGlvbnNbaV0t PnJ1blN0YXRlKCkgPT0gQ0NBY3RpdmVBbmltYXRpb246OldhaXRpbmdGb3JOZXh0VGljaykgewog ICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRSdW5TdGF0ZShDQ0FjdGl2ZUFu aW1hdGlvbjo6UnVubmluZywgbW9ub3RvbmljVGltZSk7Ci0gICAgICAgICAgICBtX2FjdGl2ZUFu aW1hdGlvbnNbaV0tPnNldFN0YXJ0VGltZShtb25vdG9uaWNUaW1lKTsKKyAgICAgICAgICAgIGlm ICghbV9hY3RpdmVBbmltYXRpb25zW2ldLT5oYXNTZXRTdGFydFRpbWUoKSkKKyAgICAgICAgICAg ICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPnNldFN0YXJ0VGltZShtb25vdG9uaWNUaW1lKTsK ICAgICAgICAgICAgIGlmIChldmVudHMpCiAgICAgICAgICAgICAgICAgZXZlbnRzLT5hcHBlbmQo Q0NBbmltYXRpb25TdGFydGVkRXZlbnQobV9jbGllbnQtPmlkKCksIG1fYWN0aXZlQW5pbWF0aW9u c1tpXS0+Z3JvdXAoKSwgbV9hY3RpdmVBbmltYXRpb25zW2ldLT50YXJnZXRQcm9wZXJ0eSgpLCBt b25vdG9uaWNUaW1lKSk7CiAgICAgICAgIH0KQEAgLTMyNiwxMyArMzI3LDE1IEBAIHZvaWQgQ0NM YXllckFuaW1hdGlvbkNvbnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc1dhaXRpbmdGb3JUYXJnZXRB dmFpbGFiaWxpdHkoZG91CiAgICAgICAgICAgICAvLyBJZiB0aGUgaW50ZXJzZWN0aW9uIGlzIG51 bGwsIHRoZW4gd2UgYXJlIGZyZWUgdG8gc3RhcnQgdGhlIGFuaW1hdGlvbnMgaW4gdGhlIGdyb3Vw LgogICAgICAgICAgICAgaWYgKG51bGxJbnRlcnNlY3Rpb24pIHsKICAgICAgICAgICAgICAgICBt X2FjdGl2ZUFuaW1hdGlvbnNbaV0tPnNldFJ1blN0YXRlKENDQWN0aXZlQW5pbWF0aW9uOjpSdW5u aW5nLCBtb25vdG9uaWNUaW1lKTsKLSAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNb aV0tPnNldFN0YXJ0VGltZShtb25vdG9uaWNUaW1lKTsKKyAgICAgICAgICAgICAgICBpZiAoIW1f YWN0aXZlQW5pbWF0aW9uc1tpXS0+aGFzU2V0U3RhcnRUaW1lKCkpCisgICAgICAgICAgICAgICAg ICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+c2V0U3RhcnRUaW1lKG1vbm90b25pY1RpbWUpOwog ICAgICAgICAgICAgICAgIGlmIChldmVudHMpCiAgICAgICAgICAgICAgICAgICAgIGV2ZW50cy0+ YXBwZW5kKENDQW5pbWF0aW9uU3RhcnRlZEV2ZW50KG1fY2xpZW50LT5pZCgpLCBtX2FjdGl2ZUFu aW1hdGlvbnNbaV0tPmdyb3VwKCksIG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+dGFyZ2V0UHJvcGVy dHkoKSwgbW9ub3RvbmljVGltZSkpOwogICAgICAgICAgICAgICAgIGZvciAoc2l6ZV90IGogPSBp ICsgMTsgaiA8IG1fYWN0aXZlQW5pbWF0aW9ucy5zaXplKCk7ICsraikgewogICAgICAgICAgICAg ICAgICAgICBpZiAobV9hY3RpdmVBbmltYXRpb25zW2ldLT5ncm91cCgpID09IG1fYWN0aXZlQW5p bWF0aW9uc1tqXS0+Z3JvdXAoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgbV9hY3RpdmVB bmltYXRpb25zW2pdLT5zZXRSdW5TdGF0ZShDQ0FjdGl2ZUFuaW1hdGlvbjo6UnVubmluZywgbW9u b3RvbmljVGltZSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNb al0tPnNldFN0YXJ0VGltZShtb25vdG9uaWNUaW1lKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGlmICghbV9hY3RpdmVBbmltYXRpb25zW2pdLT5oYXNTZXRTdGFydFRpbWUoKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNbal0tPnNldFN0YXJ0VGltZSht b25vdG9uaWNUaW1lKTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNwcAppbmRleCAxMTNiNjM5 ZTM2ZDgwOTFhMTU5ZTIwMDQ2M2UxN2JkNTc1MWRmNDYxLi43M2YwZjM1YWRmODdlZjUzYjUzZjZm YzQ2ZWU4MmQ4ZjNkNGJmNTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuY3BwCkBAIC0x NDEsNiArMTQxLDM3IEBAIFRFU1QoQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LCBzeW5j TmV3QW5pbWF0aW9uKQogICAgIEVYUEVDVF9FUShDQ0FjdGl2ZUFuaW1hdGlvbjo6V2FpdGluZ0Zv clRhcmdldEF2YWlsYWJpbGl0eSwgY29udHJvbGxlckltcGwtPmdldEFjdGl2ZUFuaW1hdGlvbigw LCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSktPnJ1blN0YXRlKCkpOwogfQogCisvLyBJZiBh biBhbmltYXRpb24gaXMgc3RhcnRlZCBvbiB0aGUgaW1wbCB0aHJlYWQgYmVmb3JlIGl0IGlzIHRp Y2tlZCBvbiB0aGUgbWFpbgorLy8gdGhyZWFkLCB3ZSBtdXN0IGJlIHN1cmUgdG8gcmVzcGVjdCB0 aGUgc3luY2hyb25pemVkIHN0YXJ0IHRpbWUuCitURVNUKENDTGF5ZXJBbmltYXRpb25Db250cm9s bGVyVGVzdCwgZG9Ob3RDbG9iYmVyU3RhcnRUaW1lcykKK3sKKyAgICBGYWtlTGF5ZXJBbmltYXRp b25Db250cm9sbGVyQ2xpZW50IGR1bW15SW1wbDsKKyAgICBPd25QdHI8Q0NMYXllckFuaW1hdGlv bkNvbnRyb2xsZXI+IGNvbnRyb2xsZXJJbXBsKENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpj cmVhdGUoJmR1bW15SW1wbCkpOworICAgIEZha2VMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJDbGll bnQgZHVtbXk7CisgICAgT3duUHRyPENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyPiBjb250cm9s bGVyKENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpjcmVhdGUoJmR1bW15KSk7CisKKyAgICBF WFBFQ1RfRkFMU0UoY29udHJvbGxlckltcGwtPmdldEFjdGl2ZUFuaW1hdGlvbigwLCBDQ0FjdGl2 ZUFuaW1hdGlvbjo6T3BhY2l0eSkpOworCisgICAgYWRkT3BhY2l0eVRyYW5zaXRpb25Ub0NvbnRy b2xsZXIoKmNvbnRyb2xsZXIsIDEsIDAsIDEsIGZhbHNlKTsKKworICAgIGNvbnRyb2xsZXItPnB1 c2hBbmltYXRpb25VcGRhdGVzVG8oY29udHJvbGxlckltcGwuZ2V0KCkpOworCisgICAgRVhQRUNU X1RSVUUoY29udHJvbGxlckltcGwtPmdldEFjdGl2ZUFuaW1hdGlvbigwLCBDQ0FjdGl2ZUFuaW1h dGlvbjo6T3BhY2l0eSkpOworICAgIEVYUEVDVF9FUShDQ0FjdGl2ZUFuaW1hdGlvbjo6V2FpdGlu Z0ZvclRhcmdldEF2YWlsYWJpbGl0eSwgY29udHJvbGxlckltcGwtPmdldEFjdGl2ZUFuaW1hdGlv bigwLCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSktPnJ1blN0YXRlKCkpOworCisgICAgQ0NB bmltYXRpb25FdmVudHNWZWN0b3IgZXZlbnRzOworICAgIGNvbnRyb2xsZXJJbXBsLT5hbmltYXRl KDAsICZldmVudHMpOworCisgICAgLy8gU3luY2hyb25pemUgdGhlIHN0YXJ0IHRpbWVzLgorICAg IEVYUEVDVF9FUSgxdSwgZXZlbnRzLnNpemUoKSk7CisgICAgY29udHJvbGxlci0+bm90aWZ5QW5p bWF0aW9uU3RhcnRlZChldmVudHNbMF0pOworICAgIEVYUEVDVF9FUShjb250cm9sbGVyLT5nZXRB Y3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpLT5zdGFydFRpbWUo KSwgY29udHJvbGxlckltcGwtPmdldEFjdGl2ZUFuaW1hdGlvbigwLCBDQ0FjdGl2ZUFuaW1hdGlv bjo6T3BhY2l0eSktPnN0YXJ0VGltZSgpKTsKKworICAgIC8vIFN0YXJ0IHRoZSBhbmltYXRpb24g b24gdGhlIG1haW4gdGhyZWFkLiBTaG91bGQgbm90IGFmZmVjdCB0aGUgc3RhcnQgdGltZS4KKyAg ICBjb250cm9sbGVyLT5hbmltYXRlKDAuNSwgMCk7CisgICAgRVhQRUNUX0VRKGNvbnRyb2xsZXIt PmdldEFjdGl2ZUFuaW1hdGlvbigwLCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSktPnN0YXJ0 VGltZSgpLCBjb250cm9sbGVySW1wbC0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5p bWF0aW9uOjpPcGFjaXR5KS0+c3RhcnRUaW1lKCkpOworfQorCiBURVNUKENDTGF5ZXJBbmltYXRp b25Db250cm9sbGVyVGVzdCwgZG9Ob3RTeW5jRmluaXNoZWRBbmltYXRpb24pCiB7CiAgICAgRmFr ZUxheWVyQW5pbWF0aW9uQ29udHJvbGxlckNsaWVudCBkdW1teUltcGw7Cg== 138821 2012-04-25 09:09:07 -0700 2012-04-25 10:09:18 -0700 Patch bug-84605-20120425120906.patch text/plain 7535 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWU5MjgxY2VmNmVjYWMy ZTNmNWRjMjg4M2NmMWFlMmY2ZDI4MDMyYy4uNjg5NTliMTNlM2NhMzQ0ZTgzNmM2MWRmMDYwMjZm MjkzZmNlYzIzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA0LTI1ICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1bV0gRG8g bm90IGNsb2JiZXIgc3luY2hyb25pemVkIHN0YXJ0IHRpbWVzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ2MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgaW4gQ0NMYXllckFuaW1hdGlvbkNv bnRyb2xsZXJUZXN0LmRvTm90Q2xvYmJlclN0YXJ0VGltZXMKKworICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRp b24uaDoKKyAgICAgICAgKENDQWN0aXZlQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkND QWN0aXZlQW5pbWF0aW9uOjpoYXNTZXRTdGFydFRpbWUpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpzdGFydEFuaW1hdGlvbnNX YWl0aW5nRm9yTmV4dFRpY2spOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckFuaW1hdGlvbkNv bnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc1dhaXRpbmdGb3JUYXJnZXRBdmFpbGFiaWxpdHkpOgor CisyMDEyLTA0LTI1ICBJYW4gVm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIFtjaHJvbWl1bV0gQW5pbWF0aW9ucyB3YWl0aW5nIGZvciBhIHN5bmNocm9uaXplZCBzdGFy dCB0aW1lIHNob3VsZCBuZXZlciBiZSBtYXJrZWQgZmluaXNoZWQuCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDUxOQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDM1MzEwOGI2MzMzZjRlMTkwYTVkMzdkMjRlOTQyZDlmNTkyN2MyNDEuLjUx ZDE4MzliNDY4MGE2YmVmMTg5NjkyMWMzZTYxYjgzYTlmZjM2NDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTItMDQtMjUgIElhbiBWb2xsaWNrICA8dm9s bGlja0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBEbyBub3QgY2xvYmJlciBz eW5jaHJvbml6ZWQgc3RhcnQgdGltZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNw cDoKKyAgICAgICAgKFdlYktpdFRlc3RzKToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUKToK KworMjAxMi0wNC0yNSAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBbY2hyb21pdW1dIEFuaW1hdGlvbnMgd2FpdGluZyBmb3IgYSBzeW5jaHJvbml6ZWQgc3Rh cnQgdGltZSBzaG91bGQgbmV2ZXIgYmUgbWFya2VkIGZpbmlzaGVkLgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1MTkKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRp b24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDQWN0 aXZlQW5pbWF0aW9uLmgKaW5kZXggNWRiODNhZjk1NjIxZjY1MGYzZGZjM2VlYzMxNGQ0OGRkYzk0 ZTRmNS4uYTIyM2I2NmUzMjQzOTVkMTZiYjU5ZDkwMTRlYWIzYmQwNDQ5NmU0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVB bmltYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0FjdGl2ZUFuaW1hdGlvbi5oCkBAIC04Miw2ICs4Miw3IEBAIHB1YmxpYzoKIAogICAg IGRvdWJsZSBzdGFydFRpbWUoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0VGltZTsgfQogICAgIHZv aWQgc2V0U3RhcnRUaW1lKGRvdWJsZSBzdGFydFRpbWUpIHsgbV9zdGFydFRpbWUgPSBzdGFydFRp bWU7IH0KKyAgICBib29sIGhhc1NldFN0YXJ0VGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnRU aW1lOyB9CiAKICAgICBib29sIGlzRmluaXNoZWRBdChkb3VibGUgdGltZSkgY29uc3Q7CiAgICAg Ym9vbCBpc0ZpbmlzaGVkKCkgY29uc3QgeyByZXR1cm4gbV9ydW5TdGF0ZSA9PSBGaW5pc2hlZCB8 fCBtX3J1blN0YXRlID09IEFib3J0ZWQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJB bmltYXRpb25Db250cm9sbGVyLmNwcAppbmRleCBmZjUwYzkxMThlOGJhMDVjZDc3ZjAzYmVhNzAz OTgxYWQwNjFlMDllLi44MTkxOWYwZTUyNWI2N2NlYzk4MWY0ZTY5ZWQ0ZTczMjdmZmE2ZWY1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBA IC0yNzcsNyArMjc3LDggQEAgdm9pZCBDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6c3RhcnRB bmltYXRpb25zV2FpdGluZ0Zvck5leHRUaWNrKGRvdWJsZSBtb25vdG8KICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1fYWN0aXZlQW5pbWF0aW9ucy5zaXplKCk7ICsraSkgewogICAgICAgICBp ZiAobV9hY3RpdmVBbmltYXRpb25zW2ldLT5ydW5TdGF0ZSgpID09IENDQWN0aXZlQW5pbWF0aW9u OjpXYWl0aW5nRm9yTmV4dFRpY2spIHsKICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tp XS0+c2V0UnVuU3RhdGUoQ0NBY3RpdmVBbmltYXRpb246OlJ1bm5pbmcsIG1vbm90b25pY1RpbWUp OwotICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRTdGFydFRpbWUobW9ub3Rv bmljVGltZSk7CisgICAgICAgICAgICBpZiAoIW1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+aGFzU2V0 U3RhcnRUaW1lKCkpCisgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRT dGFydFRpbWUobW9ub3RvbmljVGltZSk7CiAgICAgICAgICAgICBpZiAoZXZlbnRzKQogICAgICAg ICAgICAgICAgIGV2ZW50cy0+YXBwZW5kKENDQW5pbWF0aW9uU3RhcnRlZEV2ZW50KG1fY2xpZW50 LT5pZCgpLCBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmdyb3VwKCksIG1fYWN0aXZlQW5pbWF0aW9u c1tpXS0+dGFyZ2V0UHJvcGVydHkoKSwgbW9ub3RvbmljVGltZSkpOwogICAgICAgICB9CkBAIC0z MjYsMTMgKzMyNywxNSBAQCB2b2lkIENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpzdGFydEFu aW1hdGlvbnNXYWl0aW5nRm9yVGFyZ2V0QXZhaWxhYmlsaXR5KGRvdQogICAgICAgICAgICAgLy8g SWYgdGhlIGludGVyc2VjdGlvbiBpcyBudWxsLCB0aGVuIHdlIGFyZSBmcmVlIHRvIHN0YXJ0IHRo ZSBhbmltYXRpb25zIGluIHRoZSBncm91cC4KICAgICAgICAgICAgIGlmIChudWxsSW50ZXJzZWN0 aW9uKSB7CiAgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRSdW5TdGF0 ZShDQ0FjdGl2ZUFuaW1hdGlvbjo6UnVubmluZywgbW9ub3RvbmljVGltZSk7Ci0gICAgICAgICAg ICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7 CisgICAgICAgICAgICAgICAgaWYgKCFtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmhhc1NldFN0YXJ0 VGltZSgpKQorICAgICAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPnNldFN0 YXJ0VGltZShtb25vdG9uaWNUaW1lKTsKICAgICAgICAgICAgICAgICBpZiAoZXZlbnRzKQogICAg ICAgICAgICAgICAgICAgICBldmVudHMtPmFwcGVuZChDQ0FuaW1hdGlvblN0YXJ0ZWRFdmVudCht X2NsaWVudC0+aWQoKSwgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5ncm91cCgpLCBtX2FjdGl2ZUFu aW1hdGlvbnNbaV0tPnRhcmdldFByb3BlcnR5KCksIG1vbm90b25pY1RpbWUpKTsKICAgICAgICAg ICAgICAgICBmb3IgKHNpemVfdCBqID0gaSArIDE7IGogPCBtX2FjdGl2ZUFuaW1hdGlvbnMuc2l6 ZSgpOyArK2opIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKG1fYWN0aXZlQW5pbWF0aW9uc1tp XS0+Z3JvdXAoKSA9PSBtX2FjdGl2ZUFuaW1hdGlvbnNbal0tPmdyb3VwKCkpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tqXS0+c2V0UnVuU3RhdGUoQ0NBY3Rp dmVBbmltYXRpb246OlJ1bm5pbmcsIG1vbm90b25pY1RpbWUpOwotICAgICAgICAgICAgICAgICAg ICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2pdLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7 CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIW1fYWN0aXZlQW5pbWF0aW9uc1tqXS0+aGFz U2V0U3RhcnRUaW1lKCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmlt YXRpb25zW2pdLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7CiAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyVGVzdC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9s bGVyVGVzdC5jcHAKaW5kZXggMmZiMzM4MTA2MGViZWU1MjdjNjIwM2JhMWVmMGNhMWEyNjk0YTdh Yi4uNWQ4Njg1Yjc5ODA1NGQwZDRmMjg4YjhhMTIxNjhhMzAxOGI4MmEyOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllckFuaW1hdGlv bkNvbnRyb2xsZXJUZXN0LmNwcApAQCAtMTY4LDYgKzE2OCwzNyBAQCBURVNUKENDTGF5ZXJBbmlt YXRpb25Db250cm9sbGVyVGVzdCwgc3luY05ld0FuaW1hdGlvbikKICAgICBFWFBFQ1RfRVEoQ0NB Y3RpdmVBbmltYXRpb246OldhaXRpbmdGb3JUYXJnZXRBdmFpbGFiaWxpdHksIGNvbnRyb2xsZXJJ bXBsLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpLT5y dW5TdGF0ZSgpKTsKIH0KIAorLy8gSWYgYW4gYW5pbWF0aW9uIGlzIHN0YXJ0ZWQgb24gdGhlIGlt cGwgdGhyZWFkIGJlZm9yZSBpdCBpcyB0aWNrZWQgb24gdGhlIG1haW4KKy8vIHRocmVhZCwgd2Ug bXVzdCBiZSBzdXJlIHRvIHJlc3BlY3QgdGhlIHN5bmNocm9uaXplZCBzdGFydCB0aW1lLgorVEVT VChDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QsIGRvTm90Q2xvYmJlclN0YXJ0VGltZXMp Cit7CisgICAgRmFrZUxheWVyQW5pbWF0aW9uQ29udHJvbGxlckNsaWVudCBkdW1teUltcGw7Cisg ICAgT3duUHRyPENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyPiBjb250cm9sbGVySW1wbChDQ0xh eWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6Y3JlYXRlKCZkdW1teUltcGwpKTsKKyAgICBGYWtlTGF5 ZXJBbmltYXRpb25Db250cm9sbGVyQ2xpZW50IGR1bW15OworICAgIE93blB0cjxDQ0xheWVyQW5p bWF0aW9uQ29udHJvbGxlcj4gY29udHJvbGxlcihDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6 Y3JlYXRlKCZkdW1teSkpOworCisgICAgRVhQRUNUX0ZBTFNFKGNvbnRyb2xsZXJJbXBsLT5nZXRB Y3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpKTsKKworICAgIGFk ZE9wYWNpdHlUcmFuc2l0aW9uVG9Db250cm9sbGVyKCpjb250cm9sbGVyLCAxLCAwLCAxLCBmYWxz ZSk7CisKKyAgICBjb250cm9sbGVyLT5wdXNoQW5pbWF0aW9uVXBkYXRlc1RvKGNvbnRyb2xsZXJJ bXBsLmdldCgpKTsKKworICAgIEVYUEVDVF9UUlVFKGNvbnRyb2xsZXJJbXBsLT5nZXRBY3RpdmVB bmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpKTsKKyAgICBFWFBFQ1RfRVEo Q0NBY3RpdmVBbmltYXRpb246OldhaXRpbmdGb3JUYXJnZXRBdmFpbGFiaWxpdHksIGNvbnRyb2xs ZXJJbXBsLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkp LT5ydW5TdGF0ZSgpKTsKKworICAgIENDQW5pbWF0aW9uRXZlbnRzVmVjdG9yIGV2ZW50czsKKyAg ICBjb250cm9sbGVySW1wbC0+YW5pbWF0ZSgxLCAmZXZlbnRzKTsKKworICAgIC8vIFN5bmNocm9u aXplIHRoZSBzdGFydCB0aW1lcy4KKyAgICBFWFBFQ1RfRVEoMXUsIGV2ZW50cy5zaXplKCkpOwor ICAgIGNvbnRyb2xsZXItPm5vdGlmeUFuaW1hdGlvblN0YXJ0ZWQoZXZlbnRzWzBdKTsKKyAgICBF WFBFQ1RfRVEoY29udHJvbGxlci0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5pbWF0 aW9uOjpPcGFjaXR5KS0+c3RhcnRUaW1lKCksIGNvbnRyb2xsZXJJbXBsLT5nZXRBY3RpdmVBbmlt YXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpLT5zdGFydFRpbWUoKSk7CisKKyAg ICAvLyBTdGFydCB0aGUgYW5pbWF0aW9uIG9uIHRoZSBtYWluIHRocmVhZC4gU2hvdWxkIG5vdCBh ZmZlY3QgdGhlIHN0YXJ0IHRpbWUuCisgICAgY29udHJvbGxlci0+YW5pbWF0ZSgxLjUsIDApOwor ICAgIEVYUEVDVF9FUShjb250cm9sbGVyLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVB bmltYXRpb246Ok9wYWNpdHkpLT5zdGFydFRpbWUoKSwgY29udHJvbGxlckltcGwtPmdldEFjdGl2 ZUFuaW1hdGlvbigwLCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSktPnN0YXJ0VGltZSgpKTsK K30KKwogVEVTVChDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QsIGRvTm90U3luY0Zpbmlz aGVkQW5pbWF0aW9uKQogewogICAgIEZha2VMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJDbGllbnQg ZHVtbXlJbXBsOwo= 138833 2012-04-25 10:09:22 -0700 2012-04-25 10:31:40 -0700 Patch bug-84605-20120425130921.patch text/plain 7535 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWU5MjgxY2VmNmVjYWMy ZTNmNWRjMjg4M2NmMWFlMmY2ZDI4MDMyYy4uYThjOGQ1MmVlMjZmZmI4N2ZmMzI2MmJkNmI0NjZk MDBlMDZlYTExNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA0LTI1ICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1bV0gRG8g bm90IGNsb2JiZXIgc3luY2hyb25pemVkIHN0YXJ0IHRpbWVzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ2MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBKYW1lcyBSb2JpbnNvbi4KKworICAgICAgICBUZXN0ZWQgaW4gQ0NMYXllckFuaW1hdGlvbkNv bnRyb2xsZXJUZXN0LmRvTm90Q2xvYmJlclN0YXJ0VGltZXMKKworICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRp b24uaDoKKyAgICAgICAgKENDQWN0aXZlQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkND QWN0aXZlQW5pbWF0aW9uOjpoYXNTZXRTdGFydFRpbWUpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpzdGFydEFuaW1hdGlvbnNX YWl0aW5nRm9yTmV4dFRpY2spOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckFuaW1hdGlvbkNv bnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc1dhaXRpbmdGb3JUYXJnZXRBdmFpbGFiaWxpdHkpOgor CisyMDEyLTA0LTI1ICBJYW4gVm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIFtjaHJvbWl1bV0gQW5pbWF0aW9ucyB3YWl0aW5nIGZvciBhIHN5bmNocm9uaXplZCBzdGFy dCB0aW1lIHNob3VsZCBuZXZlciBiZSBtYXJrZWQgZmluaXNoZWQuCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDUxOQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDM1MzEwOGI2MzMzZjRlMTkwYTVkMzdkMjRlOTQyZDlmNTkyN2MyNDEuLjEw OGI1YTUzMDZhYjYyZDE4ZDlhOTZmOWJjYzIxYzFjN2UxMDA1ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTItMDQtMjUgIElhbiBWb2xsaWNrICA8dm9s bGlja0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBEbyBub3QgY2xvYmJlciBz eW5jaHJvbml6ZWQgc3RhcnQgdGltZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmlu c29uLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNw cDoKKyAgICAgICAgKFdlYktpdFRlc3RzKToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUKToK KworMjAxMi0wNC0yNSAgSWFuIFZvbGxpY2sgIDx2b2xsaWNrQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBbY2hyb21pdW1dIEFuaW1hdGlvbnMgd2FpdGluZyBmb3IgYSBzeW5jaHJvbml6ZWQgc3Rh cnQgdGltZSBzaG91bGQgbmV2ZXIgYmUgbWFya2VkIGZpbmlzaGVkLgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1MTkKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVBbmltYXRp b24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDQWN0 aXZlQW5pbWF0aW9uLmgKaW5kZXggNWRiODNhZjk1NjIxZjY1MGYzZGZjM2VlYzMxNGQ0OGRkYzk0 ZTRmNS4uYTIyM2I2NmUzMjQzOTVkMTZiYjU5ZDkwMTRlYWIzYmQwNDQ5NmU0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NBY3RpdmVB bmltYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0FjdGl2ZUFuaW1hdGlvbi5oCkBAIC04Miw2ICs4Miw3IEBAIHB1YmxpYzoKIAogICAg IGRvdWJsZSBzdGFydFRpbWUoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0VGltZTsgfQogICAgIHZv aWQgc2V0U3RhcnRUaW1lKGRvdWJsZSBzdGFydFRpbWUpIHsgbV9zdGFydFRpbWUgPSBzdGFydFRp bWU7IH0KKyAgICBib29sIGhhc1NldFN0YXJ0VGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnRU aW1lOyB9CiAKICAgICBib29sIGlzRmluaXNoZWRBdChkb3VibGUgdGltZSkgY29uc3Q7CiAgICAg Ym9vbCBpc0ZpbmlzaGVkKCkgY29uc3QgeyByZXR1cm4gbV9ydW5TdGF0ZSA9PSBGaW5pc2hlZCB8 fCBtX3J1blN0YXRlID09IEFib3J0ZWQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJB bmltYXRpb25Db250cm9sbGVyLmNwcAppbmRleCBmZjUwYzkxMThlOGJhMDVjZDc3ZjAzYmVhNzAz OTgxYWQwNjFlMDllLi44MTkxOWYwZTUyNWI2N2NlYzk4MWY0ZTY5ZWQ0ZTczMjdmZmE2ZWY1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBA IC0yNzcsNyArMjc3LDggQEAgdm9pZCBDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6c3RhcnRB bmltYXRpb25zV2FpdGluZ0Zvck5leHRUaWNrKGRvdWJsZSBtb25vdG8KICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1fYWN0aXZlQW5pbWF0aW9ucy5zaXplKCk7ICsraSkgewogICAgICAgICBp ZiAobV9hY3RpdmVBbmltYXRpb25zW2ldLT5ydW5TdGF0ZSgpID09IENDQWN0aXZlQW5pbWF0aW9u OjpXYWl0aW5nRm9yTmV4dFRpY2spIHsKICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tp XS0+c2V0UnVuU3RhdGUoQ0NBY3RpdmVBbmltYXRpb246OlJ1bm5pbmcsIG1vbm90b25pY1RpbWUp OwotICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRTdGFydFRpbWUobW9ub3Rv bmljVGltZSk7CisgICAgICAgICAgICBpZiAoIW1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+aGFzU2V0 U3RhcnRUaW1lKCkpCisgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRT dGFydFRpbWUobW9ub3RvbmljVGltZSk7CiAgICAgICAgICAgICBpZiAoZXZlbnRzKQogICAgICAg ICAgICAgICAgIGV2ZW50cy0+YXBwZW5kKENDQW5pbWF0aW9uU3RhcnRlZEV2ZW50KG1fY2xpZW50 LT5pZCgpLCBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmdyb3VwKCksIG1fYWN0aXZlQW5pbWF0aW9u c1tpXS0+dGFyZ2V0UHJvcGVydHkoKSwgbW9ub3RvbmljVGltZSkpOwogICAgICAgICB9CkBAIC0z MjYsMTMgKzMyNywxNSBAQCB2b2lkIENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjpzdGFydEFu aW1hdGlvbnNXYWl0aW5nRm9yVGFyZ2V0QXZhaWxhYmlsaXR5KGRvdQogICAgICAgICAgICAgLy8g SWYgdGhlIGludGVyc2VjdGlvbiBpcyBudWxsLCB0aGVuIHdlIGFyZSBmcmVlIHRvIHN0YXJ0IHRo ZSBhbmltYXRpb25zIGluIHRoZSBncm91cC4KICAgICAgICAgICAgIGlmIChudWxsSW50ZXJzZWN0 aW9uKSB7CiAgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRSdW5TdGF0 ZShDQ0FjdGl2ZUFuaW1hdGlvbjo6UnVubmluZywgbW9ub3RvbmljVGltZSk7Ci0gICAgICAgICAg ICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7 CisgICAgICAgICAgICAgICAgaWYgKCFtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmhhc1NldFN0YXJ0 VGltZSgpKQorICAgICAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPnNldFN0 YXJ0VGltZShtb25vdG9uaWNUaW1lKTsKICAgICAgICAgICAgICAgICBpZiAoZXZlbnRzKQogICAg ICAgICAgICAgICAgICAgICBldmVudHMtPmFwcGVuZChDQ0FuaW1hdGlvblN0YXJ0ZWRFdmVudCht X2NsaWVudC0+aWQoKSwgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5ncm91cCgpLCBtX2FjdGl2ZUFu aW1hdGlvbnNbaV0tPnRhcmdldFByb3BlcnR5KCksIG1vbm90b25pY1RpbWUpKTsKICAgICAgICAg ICAgICAgICBmb3IgKHNpemVfdCBqID0gaSArIDE7IGogPCBtX2FjdGl2ZUFuaW1hdGlvbnMuc2l6 ZSgpOyArK2opIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKG1fYWN0aXZlQW5pbWF0aW9uc1tp XS0+Z3JvdXAoKSA9PSBtX2FjdGl2ZUFuaW1hdGlvbnNbal0tPmdyb3VwKCkpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIG1fYWN0aXZlQW5pbWF0aW9uc1tqXS0+c2V0UnVuU3RhdGUoQ0NBY3Rp dmVBbmltYXRpb246OlJ1bm5pbmcsIG1vbm90b25pY1RpbWUpOwotICAgICAgICAgICAgICAgICAg ICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2pdLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7 CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIW1fYWN0aXZlQW5pbWF0aW9uc1tqXS0+aGFz U2V0U3RhcnRUaW1lKCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmlt YXRpb25zW2pdLT5zZXRTdGFydFRpbWUobW9ub3RvbmljVGltZSk7CiAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyVGVzdC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9s bGVyVGVzdC5jcHAKaW5kZXggMmZiMzM4MTA2MGViZWU1MjdjNjIwM2JhMWVmMGNhMWEyNjk0YTdh Yi4uNWQ4Njg1Yjc5ODA1NGQwZDRmMjg4YjhhMTIxNjhhMzAxOGI4MmEyOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllckFuaW1hdGlv bkNvbnRyb2xsZXJUZXN0LmNwcApAQCAtMTY4LDYgKzE2OCwzNyBAQCBURVNUKENDTGF5ZXJBbmlt YXRpb25Db250cm9sbGVyVGVzdCwgc3luY05ld0FuaW1hdGlvbikKICAgICBFWFBFQ1RfRVEoQ0NB Y3RpdmVBbmltYXRpb246OldhaXRpbmdGb3JUYXJnZXRBdmFpbGFiaWxpdHksIGNvbnRyb2xsZXJJ bXBsLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpLT5y dW5TdGF0ZSgpKTsKIH0KIAorLy8gSWYgYW4gYW5pbWF0aW9uIGlzIHN0YXJ0ZWQgb24gdGhlIGlt cGwgdGhyZWFkIGJlZm9yZSBpdCBpcyB0aWNrZWQgb24gdGhlIG1haW4KKy8vIHRocmVhZCwgd2Ug bXVzdCBiZSBzdXJlIHRvIHJlc3BlY3QgdGhlIHN5bmNocm9uaXplZCBzdGFydCB0aW1lLgorVEVT VChDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QsIGRvTm90Q2xvYmJlclN0YXJ0VGltZXMp Cit7CisgICAgRmFrZUxheWVyQW5pbWF0aW9uQ29udHJvbGxlckNsaWVudCBkdW1teUltcGw7Cisg ICAgT3duUHRyPENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyPiBjb250cm9sbGVySW1wbChDQ0xh eWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6Y3JlYXRlKCZkdW1teUltcGwpKTsKKyAgICBGYWtlTGF5 ZXJBbmltYXRpb25Db250cm9sbGVyQ2xpZW50IGR1bW15OworICAgIE93blB0cjxDQ0xheWVyQW5p bWF0aW9uQ29udHJvbGxlcj4gY29udHJvbGxlcihDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6 Y3JlYXRlKCZkdW1teSkpOworCisgICAgRVhQRUNUX0ZBTFNFKGNvbnRyb2xsZXJJbXBsLT5nZXRB Y3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpKTsKKworICAgIGFk ZE9wYWNpdHlUcmFuc2l0aW9uVG9Db250cm9sbGVyKCpjb250cm9sbGVyLCAxLCAwLCAxLCBmYWxz ZSk7CisKKyAgICBjb250cm9sbGVyLT5wdXNoQW5pbWF0aW9uVXBkYXRlc1RvKGNvbnRyb2xsZXJJ bXBsLmdldCgpKTsKKworICAgIEVYUEVDVF9UUlVFKGNvbnRyb2xsZXJJbXBsLT5nZXRBY3RpdmVB bmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpKTsKKyAgICBFWFBFQ1RfRVEo Q0NBY3RpdmVBbmltYXRpb246OldhaXRpbmdGb3JUYXJnZXRBdmFpbGFiaWxpdHksIGNvbnRyb2xs ZXJJbXBsLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkp LT5ydW5TdGF0ZSgpKTsKKworICAgIENDQW5pbWF0aW9uRXZlbnRzVmVjdG9yIGV2ZW50czsKKyAg ICBjb250cm9sbGVySW1wbC0+YW5pbWF0ZSgxLCAmZXZlbnRzKTsKKworICAgIC8vIFN5bmNocm9u aXplIHRoZSBzdGFydCB0aW1lcy4KKyAgICBFWFBFQ1RfRVEoMXUsIGV2ZW50cy5zaXplKCkpOwor ICAgIGNvbnRyb2xsZXItPm5vdGlmeUFuaW1hdGlvblN0YXJ0ZWQoZXZlbnRzWzBdKTsKKyAgICBF WFBFQ1RfRVEoY29udHJvbGxlci0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5pbWF0 aW9uOjpPcGFjaXR5KS0+c3RhcnRUaW1lKCksIGNvbnRyb2xsZXJJbXBsLT5nZXRBY3RpdmVBbmlt YXRpb24oMCwgQ0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpLT5zdGFydFRpbWUoKSk7CisKKyAg ICAvLyBTdGFydCB0aGUgYW5pbWF0aW9uIG9uIHRoZSBtYWluIHRocmVhZC4gU2hvdWxkIG5vdCBh ZmZlY3QgdGhlIHN0YXJ0IHRpbWUuCisgICAgY29udHJvbGxlci0+YW5pbWF0ZSgxLjUsIDApOwor ICAgIEVYUEVDVF9FUShjb250cm9sbGVyLT5nZXRBY3RpdmVBbmltYXRpb24oMCwgQ0NBY3RpdmVB bmltYXRpb246Ok9wYWNpdHkpLT5zdGFydFRpbWUoKSwgY29udHJvbGxlckltcGwtPmdldEFjdGl2 ZUFuaW1hdGlvbigwLCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSktPnN0YXJ0VGltZSgpKTsK K30KKwogVEVTVChDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QsIGRvTm90U3luY0Zpbmlz aGVkQW5pbWF0aW9uKQogewogICAgIEZha2VMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJDbGllbnQg ZHVtbXlJbXBsOwo=