42772 2010-07-21 12:11:51 -0700 WebTiming does not take page cache into account 2010-08-08 10:28:05 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 42775 30685 42434 42435 1 simon.fraser mihaip abarth dbates eric mihaip tonyg webkit.review.bot oldest_to_newest 254444 0 simon.fraser 2010-07-21 12:11:51 -0700 After running run-webkit-tests and getting a Safari browser showing a page with test results, with some failures, if I click on a test result diff, and then click Back, I get: ASSERTION FAILED: !timing->unloadEventEnd (/Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:456 void WebCore::FrameLoader::stopLoading(WebCore::UnloadEventPolicy, WebCore::DatabasePolicy)) Stack is: #0 0x00000001035d210e in WebCore::FrameLoader::stopLoading (this=0x11c816050, unloadEventPolicy=WebCore::UnloadEventPolicyUnloadAndPageHide, databasePolicy=WebCore::DatabasePolicyStop) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:456 #1 0x00000001035d24a6 in WebCore::FrameLoader::closeURL (this=0x11c816050) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:527 #2 0x00000001035d3d9d in WebCore::FrameLoader::transitionToCommitted (this=0x11c816050, cachedPage=@0x7fff5fbfd9d0) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:1983 #3 0x00000001035d4605 in WebCore::FrameLoader::commitProvisionalLoad (this=0x11c816050) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:1907 #4 0x00000001035d4b48 in WebCore::FrameLoader::loadProvisionalItemFromCachedPage (this=0x11c816050) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:3150 #5 0x00000001035d4edc in WebCore::FrameLoader::continueLoadAfterNavigationPolicy (this=0x11c816050, formState=@0x7fff5fbfdca0, shouldContinue=true) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:3023 #6 0x00000001035d4f9e in WebCore::FrameLoader::callContinueLoadAfterNavigationPolicy (argument=0x11c816050, request=@0x11c8d9220, formState=@0x7fff5fbfddf0, shouldContinue=true) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:2929 #7 0x0000000103b05921 in WebCore::PolicyChecker::checkNavigationPolicy (this=0x11c816060, request=@0x11c8d9220, loader=0x11c8d8e00, formState=@0x7fff5fbfdee0, function=0x1035d4f5a <WebCore::FrameLoader::callContinueLoadAfterNavigationPolicy(void*, WebCore::ResourceRequest const&, WTF::PassRefPtr<WebCore::FormState>, bool)>, argument=0x11c816050) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/PolicyChecker.cpp:68 #8 0x00000001035d53b6 in WebCore::FrameLoader::loadWithDocumentLoader (this=0x11c816050, loader=0x11c8d8e00, type=WebCore::FrameLoadTypeBack, prpFormState=@0x7fff5fbfe210) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:1542 #9 0x00000001035d6251 in WebCore::FrameLoader::navigateToDifferentDocument (this=0x11c816050, item=0x11ff4c7f0, loadType=WebCore::FrameLoadTypeBack) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:3208 #10 0x00000001035d6874 in WebCore::FrameLoader::loadItem (this=0x11c816050, item=0x11ff4c7f0, loadType=WebCore::FrameLoadTypeBack) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/FrameLoader.cpp:3311 #11 0x000000010364d8b8 in WebCore::HistoryController::recursiveGoToItem (this=0x11c8161c8, item=0x11ff4c7f0, fromItem=0x124922b30, type=WebCore::FrameLoadTypeBack) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/HistoryController.cpp:580 #12 0x000000010364da10 in WebCore::HistoryController::goToItem (this=0x11c8161c8, targetItem=0x11ff4c7f0, type=WebCore::FrameLoadTypeBack) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/loader/HistoryController.cpp:224 #13 0x0000000103ade01e in WebCore::Page::goToItem (this=0x11add3530, item=0x11ff4c7f0, type=WebCore::FrameLoadTypeBack) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/page/Page.cpp:332 #14 0x0000000103ade1e5 in WebCore::Page::goBack (this=0x11add3530) at /Volumes/InternalData/Development/webkit/OpenSource/WebCore/page/Page.cpp:261 # 254445 1 simon.fraser 2010-07-21 12:14:21 -0700 This prevents me from browser layout test results with a debug build. 254452 2 abarth 2010-07-21 12:28:35 -0700 Yeah, this bug is super annoying to me too. Tonyg, are you looking at it? 254456 3 tonyg 2010-07-21 12:33:34 -0700 (In reply to comment #2) > Yeah, this bug is super annoying to me too. Tonyg, are you looking at it? Yes, I'll be landing a patch to temporarily comment out the ASSERT momentarily. 254460 4 tonyg 2010-07-21 12:42:02 -0700 I've disabled the ASSERT for now. The consequence of that ASSERT being reached is that the unloadEventEnd exposed to Web Timing is incorrect. I'm leaving this open to track the actual fix. 260377 5 63543 mihaip 2010-08-04 21:33:13 -0700 Created attachment 63543 testcast 260381 6 mihaip 2010-08-04 21:38:25 -0700 I've attached a reduced test case. For triggering the assert when going page 1-> page 2 -> back the requirements are for page 1 to not have an unload handler but for page 2 to have one. This makes page 1 end up in the page cache, while page 2 doesn't. Tony, do you mind if I work on fixing this? It seems like another good (i.e. simple) initial patch for me. 260405 7 tonyg 2010-08-04 22:33:58 -0700 (In reply to comment #6) > I've attached a reduced test case. For triggering the assert when going page 1-> page 2 -> back the requirements are for page 1 to not have an unload handler but for page 2 to have one. This makes page 1 end up in the page cache, while page 2 doesn't. > > Tony, do you mind if I work on fixing this? It seems like another good (i.e. simple) initial patch for me. By all means. Nice reduction :-) 261545 8 mihaip 2010-08-06 16:08:11 -0700 After looking at this a bit more, it looks like the WebTiming code in general doesn't take the page cache into account at all. When we're restoring a page from the page cache, we bypass the normal loading flow (e.g. navigationStart is called in continueLoadAfterWillSubmitForm, but we exit before that in continueLoadAfterNavigationPolicy, and instead call loadProvisionalItemFromCachedPage). The fix might be as simple as resetting the timing data in loadProvisionalItemFromCachedPage (so that times recorded for the previous time the page was displayed aren't used) and also recording navigationStart there. 261575 9 63783 mihaip 2010-08-06 16:46:17 -0700 Created attachment 63783 Patch 261576 10 mihaip 2010-08-06 16:47:57 -0700 Adam, can you review this (since you helped Tony and I understand what's going on in the first place)? 261585 11 63786 mihaip 2010-08-06 17:17:36 -0700 Created attachment 63786 Patch 261601 12 63786 abarth 2010-08-06 18:00:49 -0700 Comment on attachment 63786 Patch Looks great! Thanks. 261838 13 63786 eric 2010-08-07 23:19:57 -0700 Comment on attachment 63786 Patch Clearing flags on attachment: 63786 Committed r64939: <http://trac.webkit.org/changeset/64939> 261839 14 eric 2010-08-07 23:20:03 -0700 All reviewed patches have been landed. Closing bug. 261844 15 webkit.review.bot 2010-08-07 23:55:29 -0700 http://trac.webkit.org/changeset/64939 might have broken GTK Linux 64-bit Debug 261890 16 mihaip 2010-08-08 09:36:40 -0700 This is the diff from the GTK builder of onunload-back-to-page-cache.html -main frame "navigated" - has 1 onunload handler(s) +main frame - has 1 onunload handler(s) Seems like the GTK DRT doesn't report frame names quite the same way as the other DRTs. I'll modify the test to clear the frame name before exiting and file a bug about the GTK DRT (if there isn't one already). 261895 17 abarth 2010-08-08 10:03:00 -0700 > Seems like the GTK DRT doesn't report frame names quite the same way as the other DRTs. I'll modify the test to clear the frame name before exiting and file a bug about the GTK DRT (if there isn't one already). Thanks. The other option is to make the Gtk DRT report frame names correctly. 261900 18 mihaip 2010-08-08 10:28:05 -0700 (In reply to comment #17) > > Seems like the GTK DRT doesn't report frame names quite the same way as the other DRTs. I'll modify the test to clear the frame name before exiting and file a bug about the GTK DRT (if there isn't one already). > > Thanks. The other option is to make the Gtk DRT report frame names correctly. I filed bug 43690 about fixing the GTK DRT, but since I don't have a Linux build environment (yet), modifying the test seems like reasonable workaround for now (bug 43692 has that). 63543 2010-08-04 21:33:13 -0700 2010-08-04 21:33:13 -0700 testcast assert-on-back.html text/html 298 mihaip PHNjcmlwdD4Kb25wYWdlc2hvdyA9IGZ1bmN0aW9uKCkgewogIGlmICh3aW5kb3cubmFtZSkgewog ICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAnUEFTUyc7CiAgfSBlbHNlIHsKICAgIHdpbmRv dy5uYW1lID0gJ25hdmlnYXRlZCc7CiAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge2xvY2F0aW9u LmhyZWYgPSAnZGF0YTp0ZXh0L2h0bWwsPHNjcmlwdD5vbnVubG9hZD1mdW5jdGlvbigpIHt9LG9u bG9hZD1mdW5jdGlvbigpe2hpc3RvcnkuYmFjaygpO308JyArICcvc2NyaXB0Pic7fSwgMCk7CiAg fQp9Cjwvc2NyaXB0Pg== 63783 2010-08-06 16:46:17 -0700 2010-08-06 17:17:33 -0700 Patch bug-42772-20100806164616.patch text/plain 6229 mihaip ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZDUyOGJmZjdkZjJjOTAyOWVkNDAwZTdmMWFjMmRkZmI3ZDI1NjliLi4xNzVmZjRk NDk0YjU4NmJkNTBlYjA2NzA5ZDU4ZTQyNTU5ODk3YjhkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMDgtMDYgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViVGltaW5nIGRv ZXMgbm90IHRha2UgcGFnZSBjYWNoZSBpbnRvIGFjY291bnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNzcyCisgICAgICAgIAorICAgICAgICBBZGRz IHRlc3RzIHRoYXQgc2ltdWxhdGVzIGZsb3cgZnJvbSBhIHBhZ2UgdGhhdCdzIGluIHRoZSBwYWdl IGNhY2hlIHRvCisgICAgICAgIG9uZSB0aGF0J3Mgbm90LCBhbmQgdGhlbiBiYWNrIHRvIHRoZSBw YWdlIGNhY2hlZCBwYWdlICh3aGVyZSB0aGUKKyAgICAgICAgRG9jdW1lbnRMb2FkZXIgaXMgcmV1 c2VkLCBidXQgd2Ugc2hvdWxkIGhhdmUgYSBuZXcgRG9jdW1lbnRMb2FkVGltaW5nCisgICAgICAg IHN0cnVjdCkuCisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9vbnVubG9hZC1iYWNrLXRvLXBhZ2Ut Y2FjaGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy9vbnVubG9h ZC1iYWNrLXRvLXBhZ2UtY2FjaGUuaHRtbDogQWRkZWQuCisKIDIwMTAtMDgtMDYgIEppYW4gTGkg IDxqaWFubGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVwZGF0ZSBjaHJvbWl1bSB0ZXN0IHJl c3VsdHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9vbnVubG9hZC1iYWNr LXRvLXBhZ2UtY2FjaGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvb251 bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yNjEzMjU1 ZDg1Yzk0NTE1NDllODM5NDYzMzU0OThiYzllY2UwODA2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvb251bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDIgQEAKK21haW4gZnJhbWUgIm5hdmlnYXRlZCIgLSBoYXMgMSBvbnVu bG9hZCBoYW5kbGVyKHMpCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50 cy9vbnVubG9hZC1iYWNrLXRvLXBhZ2UtY2FjaGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZXZl bnRzL29udW5sb2FkLWJhY2stdG8tcGFnZS1jYWNoZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdhYmZjMWRk Yzk4ODlkNDBjYjQ3MTZjOWQ1ZmJhMGYyNjUyOWZhYTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2V2ZW50cy9vbnVubG9hZC1iYWNrLXRvLXBhZ2UtY2FjaGUuaHRtbApAQCAt MCwwICsxLDIxIEBACis8IS0tCisgIFNpbXVsYXRlcyBmbG93IGZyb20gYSBwYWdlIHRoYXQncyBp biB0aGUgcGFnZSBjYWNoZSB0byBvbmUgdGhhdCdzIG5vdCwgYW5kIAorICB0aGVuIGJhY2sgdG8g dGhlIHBhZ2UgY2FjaGVkIHBhZ2UuCistLT4KKzxzY3JpcHQ+CitvbnBhZ2VzaG93ID0gZnVuY3Rp b24oZXZlbnQpIHsKKyAgICBpZiAod2luZG93Lm5hbWUpIHsKKyAgICAgICAgZG9jdW1lbnQuYm9k eS5pbm5lckhUTUwgPSAnUEFTUyc7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCisgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgewor ICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICAgICAgbGF5 b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJpZGVQcmVmZXJlbmNlKCJXZWJLaXRVc2VzUGFnZUNhY2hl UHJlZmVyZW5jZUtleSIsIDEpOworICAgICAgICB9CisgICAgICAgIHdpbmRvdy5uYW1lID0gJ25h dmlnYXRlZCc7CisgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7bG9jYXRpb24uaHJlZiA9 ICdkYXRhOnRleHQvaHRtbCw8c2NyaXB0Pm9udW5sb2FkPWZ1bmN0aW9uKCkge30sb25sb2FkPWZ1 bmN0aW9uKCl7aGlzdG9yeS5iYWNrKCk7fTwnICsgJy9zY3JpcHQ+Jzt9LCAwKTsKKyAgICB9Cit9 Cis8L3NjcmlwdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGExMzcyNjFmZWRjNzlhNzYz MzFjMzM3MmUzZDg0ZGYyZTZhNjc3OGYuLjU5YjkwNDRmOTMzODE1ZmU0ZDQ0YjE0NDI5YzYwMjEz ODM5ZWQ0YTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDgtMDYgIE1paGFpIFBhcnBhcml0YSAgPG1p aGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViVGltaW5nIGRvZXMgbm90IHRha2UgcGFnZSBjYWNoZSBpbnRvIGFjY291 bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNzcy CisKKyAgICAgICAgV2hlbiByZXN0b3JpbmcgYSBwYWdlIGZyb20gdGhlIHBhZ2UgY2FjaGUsIHJl c2V0IGl0cyBEb2N1bWVudExvYWRUaW1pbmcKKyAgICAgICAgc3RydWN0IGFuZCByZWNvcmQgbmF2 aWdhdGlvblN0YXJ0LgorICAgIAorICAgICAgICBUZXN0OiBmYXN0L2V2ZW50cy9vbnVubG9hZC1i YWNrLXRvLXBhZ2UtY2FjaGUuaHRtbAorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZFRp bWluZy5oOiByZW1vdmVkIE5vbmNvcHlhYmxlLCBzaW5jZSBpdCdzIGp1c3QgYSBzaW1wbGUgc3Ry dWN0LgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXI6OnJlc2V0VGltaW5nKTogQWRkZWQgbWV0aG9kLgorICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 c3RvcExvYWRpbmcpOiBVbmNvbW1lbnRlZCBhc3NlcnQuCisgICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6bG9hZFByb3Zpc2lvbmFsSXRlbUZyb21DYWNoZWRQYWdlKTogQWRkZWQgcmVzZXRU aW1pbmcoKSBjYWxsLgorCiAyMDEwLTA4LTA2ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0 YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBM b3Blei4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZFRpbWluZy5oIGIv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkVGltaW5nLmgKaW5kZXggNzFhMWRjNGU3MzA3Yjc0 NGZlYmMyOTUxYTg5Mjc0NjUxZDU0ODc3YS4uNzg4YzIzMDBjMDQzY2Q0YzM1YjUxYjFjZTc0Yzdh OTBjOTk0NDI5ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkVGltaW5n LmgKKysrIGIvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkVGltaW5nLmgKQEAgLTMwLDcgKzMw LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdHJ1Y3QgRG9jdW1lbnRMb2FkVGltaW5n IDogcHVibGljIE5vbmNvcHlhYmxlIHsKK3N0cnVjdCBEb2N1bWVudExvYWRUaW1pbmcgewogICAg IERvY3VtZW50TG9hZFRpbWluZygpCiAgICAgICAgIDogbmF2aWdhdGlvblN0YXJ0KDAuMCkKICAg ICAgICAgLCB1bmxvYWRFdmVudEVuZCgwLjApCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5oIGIvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAppbmRleCA0 MzJiYWE1MDE3ZGZkOGJiOGIwNTA5MWY4ZTNjOTNjYzY0MDJhYzUwLi5hODNlMWEzNTk0MDUzM2Fj ZmVmMmJmZWY3OGE0ZDU2MWM4NWQ5ZGI0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKQEAgLTIw Nyw2ICsyMDcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgdGFrZU1lbW9y eUNhY2hlTG9hZHNGb3JDbGllbnROb3RpZmljYXRpb24oVmVjdG9yPFN0cmluZz4mIGxvYWRzKTsK IAogICAgICAgICBEb2N1bWVudExvYWRUaW1pbmcqIHRpbWluZygpIHsgcmV0dXJuICZtX2RvY3Vt ZW50TG9hZFRpbWluZzsgfQorICAgICAgICB2b2lkIHJlc2V0VGltaW5nKCkgeyBtX2RvY3VtZW50 TG9hZFRpbWluZyA9IERvY3VtZW50TG9hZFRpbWluZygpOyB9CiAKICNpZiBFTkFCTEUoT0ZGTElO RV9XRUJfQVBQTElDQVRJT05TKQogICAgICAgICBBcHBsaWNhdGlvbkNhY2hlSG9zdCogYXBwbGlj YXRpb25DYWNoZUhvc3QoKSBjb25zdCB7IHJldHVybiBtX2FwcGxpY2F0aW9uQ2FjaGVIb3N0Lmdl dCgpOyB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggNjg4OGY2Yzc0Mjc0NGVhNTA1MzhjNDdj ZDAzNWYwNzMzOTNhMmQ4Yi4uMjIwNmRiMzU0ZDY1OGE1YzdmZjIwODBiNjQ5ODEyMjVmODRjOWM3 ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtNDUzLDggKzQ1Myw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnN0b3BMb2FkaW5nKFVubG9hZEV2ZW50UG9saWN5IHVubG9hZEV2ZW50UG9saWN5LCBE YXRhYmFzZVBvbGljCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAobV9wcm92aXNpb25hbERv Y3VtZW50TG9hZGVyKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRG9jdW1lbnRMb2Fk VGltaW5nKiB0aW1pbmcgPSBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXItPnRpbWluZygpOwog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCh0aW1pbmctPm5hdmlnYXRpb25TdGFy dCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgZmFpbHMgaW4g U2FmYXJpIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3NzIpLiBV bmRlcnN0YW5kIHdoeS4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBBU1NFUlQoIXRp bWluZy0+dW5sb2FkRXZlbnRFbmQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VS VCghdGltaW5nLT51bmxvYWRFdmVudEVuZCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGltaW5nLT51bmxvYWRFdmVudEVuZCA9IGN1cnJlbnRUaW1lKCk7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgQVNTRVJUKHRpbWluZy0+dW5sb2FkRXZlbnRFbmQgPj0gdGltaW5nLT5uYXZp Z2F0aW9uU3RhcnQpOwogICAgICAgICAgICAgICAgICAgICAgICAgfQpAQCAtMzE0NCw2ICszMTQz LDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRQcm92aXNpb25hbEl0ZW1Gcm9tQ2FjaGVkUGFn ZSgpCiAgICAgcHJvdmlzaW9uYWxMb2FkZXItPnByZXBhcmVGb3JMb2FkU3RhcnQoKTsKIAogICAg IG1fbG9hZGluZ0Zyb21DYWNoZWRQYWdlID0gdHJ1ZTsKKyAgICAKKyAgICAvLyBTaG91bGQgaGF2 ZSB0aW1pbmcgZGF0YSBmcm9tIHByZXZpb3VzIHRpbWUocykgdGhlIHBhZ2Ugd2FzIHNob3duLgor ICAgIEFTU0VSVChwcm92aXNpb25hbExvYWRlci0+dGltaW5nKCktPm5hdmlnYXRpb25TdGFydCk7 CisgICAgcHJvdmlzaW9uYWxMb2FkZXItPnJlc2V0VGltaW5nKCk7CisgICAgcHJvdmlzaW9uYWxM b2FkZXItPnRpbWluZygpLT5uYXZpZ2F0aW9uU3RhcnQgPSBjdXJyZW50VGltZSgpOyAgICAKIAog ICAgIHByb3Zpc2lvbmFsTG9hZGVyLT5zZXRDb21taXR0ZWQodHJ1ZSk7CiAgICAgY29tbWl0UHJv dmlzaW9uYWxMb2FkKCk7Cg== 63786 2010-08-06 17:17:36 -0700 2010-08-07 23:19:57 -0700 Patch bug-42772-20100806171735.patch text/plain 7145 mihaip ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZDUyOGJmZjdkZjJjOTAyOWVkNDAwZTdmMWFjMmRkZmI3ZDI1NjliLi4xNzVmZjRk NDk0YjU4NmJkNTBlYjA2NzA5ZDU4ZTQyNTU5ODk3YjhkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMDgtMDYgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViVGltaW5nIGRv ZXMgbm90IHRha2UgcGFnZSBjYWNoZSBpbnRvIGFjY291bnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNzcyCisgICAgICAgIAorICAgICAgICBBZGRz IHRlc3RzIHRoYXQgc2ltdWxhdGVzIGZsb3cgZnJvbSBhIHBhZ2UgdGhhdCdzIGluIHRoZSBwYWdl IGNhY2hlIHRvCisgICAgICAgIG9uZSB0aGF0J3Mgbm90LCBhbmQgdGhlbiBiYWNrIHRvIHRoZSBw YWdlIGNhY2hlZCBwYWdlICh3aGVyZSB0aGUKKyAgICAgICAgRG9jdW1lbnRMb2FkZXIgaXMgcmV1 c2VkLCBidXQgd2Ugc2hvdWxkIGhhdmUgYSBuZXcgRG9jdW1lbnRMb2FkVGltaW5nCisgICAgICAg IHN0cnVjdCkuCisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9vbnVubG9hZC1iYWNrLXRvLXBhZ2Ut Y2FjaGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy9vbnVubG9h ZC1iYWNrLXRvLXBhZ2UtY2FjaGUuaHRtbDogQWRkZWQuCisKIDIwMTAtMDgtMDYgIEppYW4gTGkg IDxqaWFubGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVwZGF0ZSBjaHJvbWl1bSB0ZXN0IHJl c3VsdHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9vbnVubG9hZC1iYWNr LXRvLXBhZ2UtY2FjaGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvb251 bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kYmQzOGEz M2YzYjAxNGFmNmEzNjc3NGY0YjI4ZTYzYjIzYmYzMzA4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvb251bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDEwIEBACittYWluIGZyYW1lICJuYXZpZ2F0ZWQiIC0gaGFzIDEgb251 bmxvYWQgaGFuZGxlcihzKQorU2ltdWxhdGVzIGZsb3cgZnJvbSBhIHBhZ2UgdGhhdCdzIGluIHRo ZSBwYWdlIGNhY2hlIHRvIG9uZSB0aGF0J3Mgbm90LCBhbmQgdGhlbiBiYWNrIHRvIHRoZSBwYWdl IGNhY2hlZCBwYWdlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBB U1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvZXZlbnRzL29udW5sb2FkLWJhY2stdG8tcGFnZS1jYWNoZS5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvb251bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYjVkYWRjNDc3NTYzZjQxNDM1NjQxZTMwNTMwYWNmNWE4NjU3NzJmNwotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL29udW5sb2FkLWJhY2stdG8t cGFnZS1jYWNoZS5odG1sCkBAIC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAi LS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxl c2hlZXQiIGhyZWY9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0 IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rp dj4KKzxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvb251bmxvYWQtYmFjay10by1wYWdlLWNhY2hl LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL3NjcmlwdC10ZXN0cy9vbnVubG9hZC1iYWNrLXRvLXBhZ2UtY2FjaGUuanMg Yi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zY3JpcHQtdGVzdHMvb251bmxvYWQtYmFjay10by1w YWdlLWNhY2hlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVmZjBjODljMzRjYWY0MmVmNGUxOTg1MzQ4NDQ3YmE3 OTU4M2E5M2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zY3Jp cHQtdGVzdHMvb251bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLmpzCkBAIC0wLDAgKzEsMTUgQEAK K2Rlc2NyaXB0aW9uKCdTaW11bGF0ZXMgZmxvdyBmcm9tIGEgcGFnZSB0aGF0XCdzIGluIHRoZSBw YWdlIGNhY2hlIHRvIG9uZSB0aGF0XCdzIG5vdCwgYW5kIHRoZW4gYmFjayB0byB0aGUgcGFnZSBj YWNoZWQgcGFnZS4nKTsKKworb25wYWdlc2hvdyA9IGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgaWYg KHdpbmRvdy5uYW1lID09ICduYXZpZ2F0ZWQnKSB7CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOwor ICAgIH0gZWxzZSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisg ICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVByZWZlcmVuY2UoJ1dlYktp dFVzZXNQYWdlQ2FjaGVQcmVmZXJlbmNlS2V5JywgMSk7CisgICAgICAgIHdpbmRvdy5uYW1lID0g J25hdmlnYXRlZCc7CisgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7bG9jYXRpb24uaHJl ZiA9ICdkYXRhOnRleHQvaHRtbCw8c2NyaXB0Pm9udW5sb2FkPWZ1bmN0aW9uKCkge30sb25sb2Fk PWZ1bmN0aW9uKCl7aGlzdG9yeS5iYWNrKCk7fTwnICsgJy9zY3JpcHQ+Jzt9LCAwKTsKKyAgICB9 Cit9CisKK3ZhciBqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQg PSB0cnVlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBhMTM3MjYxZmVkYzc5YTc2MzMxYzMzNzJlM2Q4NGRmMmU2YTY3NzhmLi41OWI5MDQ0 ZjkzMzgxNWZlNGQ0NGIxNDQyOWM2MDIxMzgzOWVkNGEwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEwLTA4 LTA2ICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYlRpbWluZyBkb2VzIG5vdCB0 YWtlIHBhZ2UgY2FjaGUgaW50byBhY2NvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00Mjc3MgorCisgICAgICAgIFdoZW4gcmVzdG9yaW5nIGEgcGFn ZSBmcm9tIHRoZSBwYWdlIGNhY2hlLCByZXNldCBpdHMgRG9jdW1lbnRMb2FkVGltaW5nCisgICAg ICAgIHN0cnVjdCBhbmQgcmVjb3JkIG5hdmlnYXRpb25TdGFydC4KKyAgICAKKyAgICAgICAgVGVz dDogZmFzdC9ldmVudHMvb251bmxvYWQtYmFjay10by1wYWdlLWNhY2hlLmh0bWwKKworICAgICAg ICAqIGxvYWRlci9Eb2N1bWVudExvYWRUaW1pbmcuaDogcmVtb3ZlZCBOb25jb3B5YWJsZSwgc2lu Y2UgaXQncyBqdXN0IGEgc2ltcGxlIHN0cnVjdC4KKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRM b2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpyZXNldFRpbWluZyk6 IEFkZGVkIG1ldGhvZC4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5nKTogVW5jb21tZW50ZWQgYXNzZXJ0 LgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRQcm92aXNpb25hbEl0ZW1Gcm9t Q2FjaGVkUGFnZSk6IEFkZGVkIHJlc2V0VGltaW5nKCkgY2FsbC4KKwogMjAxMC0wOC0wNiAgR3Vz dGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAog ICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudExvYWRUaW1pbmcuaCBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZFRpbWlu Zy5oCmluZGV4IDcxYTFkYzRlNzMwN2I3NDRmZWJjMjk1MWE4OTI3NDY1MWQ1NDg3N2EuLjJkNGIw ZmFkOWE5OWVkZmE1N2ExYTg2ODQxMzg1ZWY2MWFmMDkwMDIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZFRpbWluZy5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 TG9hZFRpbWluZy5oCkBAIC0yNiwxMSArMjYsOSBAQAogI2lmbmRlZiBEb2N1bWVudExvYWRUaW1p bmdfaAogI2RlZmluZSBEb2N1bWVudExvYWRUaW1pbmdfaAogCi0jaW5jbHVkZSA8d3RmL05vbmNv cHlhYmxlLmg+Ci0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RydWN0IERvY3VtZW50TG9hZFRp bWluZyA6IHB1YmxpYyBOb25jb3B5YWJsZSB7CitzdHJ1Y3QgRG9jdW1lbnRMb2FkVGltaW5nIHsK ICAgICBEb2N1bWVudExvYWRUaW1pbmcoKQogICAgICAgICA6IG5hdmlnYXRpb25TdGFydCgwLjAp CiAgICAgICAgICwgdW5sb2FkRXZlbnRFbmQoMC4wKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuaCBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKaW5k ZXggNDMyYmFhNTAxN2RmZDhiYjhiMDUwOTFmOGUzYzkzY2M2NDAyYWM1MC4uYTgzZTFhMzU5NDA1 MzNhY2ZlZjJiZmVmNzhhNGQ1NjFjODVkOWRiNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIv RG9jdW1lbnRMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCkBA IC0yMDcsNiArMjA3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHRha2VN ZW1vcnlDYWNoZUxvYWRzRm9yQ2xpZW50Tm90aWZpY2F0aW9uKFZlY3RvcjxTdHJpbmc+JiBsb2Fk cyk7CiAKICAgICAgICAgRG9jdW1lbnRMb2FkVGltaW5nKiB0aW1pbmcoKSB7IHJldHVybiAmbV9k b2N1bWVudExvYWRUaW1pbmc7IH0KKyAgICAgICAgdm9pZCByZXNldFRpbWluZygpIHsgbV9kb2N1 bWVudExvYWRUaW1pbmcgPSBEb2N1bWVudExvYWRUaW1pbmcoKTsgfQogCiAjaWYgRU5BQkxFKE9G RkxJTkVfV0VCX0FQUExJQ0FUSU9OUykKICAgICAgICAgQXBwbGljYXRpb25DYWNoZUhvc3QqIGFw cGxpY2F0aW9uQ2FjaGVIb3N0KCkgY29uc3QgeyByZXR1cm4gbV9hcHBsaWNhdGlvbkNhY2hlSG9z dC5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDY4ODhmNmM3NDI3NDRlYTUwNTM4 YzQ3Y2QwMzVmMDczMzkzYTJkOGIuLjIyMDZkYjM1NGQ2NThhNWM3ZmYyMDgwYjY0OTgxMjI1Zjg0 YzljN2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTQ1Myw4ICs0NTMsNyBAQCB2b2lkIEZy YW1lTG9hZGVyOjpzdG9wTG9hZGluZyhVbmxvYWRFdmVudFBvbGljeSB1bmxvYWRFdmVudFBvbGlj eSwgRGF0YWJhc2VQb2xpYwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1fcHJvdmlzaW9u YWxEb2N1bWVudExvYWRlcikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIERvY3VtZW50 TG9hZFRpbWluZyogdGltaW5nID0gbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyLT50aW1pbmco KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQodGltaW5nLT5uYXZpZ2F0aW9u U3RhcnQpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGZhaWxz IGluIFNhZmFyaSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNzcy KS4gVW5kZXJzdGFuZCB3aHkuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gQVNTRVJU KCF0aW1pbmctPnVubG9hZEV2ZW50RW5kKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBB U1NFUlQoIXRpbWluZy0+dW5sb2FkRXZlbnRFbmQpOwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWluZy0+dW5sb2FkRXZlbnRFbmQgPSBjdXJyZW50VGltZSgpOwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEFTU0VSVCh0aW1pbmctPnVubG9hZEV2ZW50RW5kID49IHRpbWluZy0+ bmF2aWdhdGlvblN0YXJ0KTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KQEAgLTMxNDQsNiAr MzE0MywxMSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkUHJvdmlzaW9uYWxJdGVtRnJvbUNhY2hl ZFBhZ2UoKQogICAgIHByb3Zpc2lvbmFsTG9hZGVyLT5wcmVwYXJlRm9yTG9hZFN0YXJ0KCk7CiAK ICAgICBtX2xvYWRpbmdGcm9tQ2FjaGVkUGFnZSA9IHRydWU7CisgICAgCisgICAgLy8gU2hvdWxk IGhhdmUgdGltaW5nIGRhdGEgZnJvbSBwcmV2aW91cyB0aW1lKHMpIHRoZSBwYWdlIHdhcyBzaG93 bi4KKyAgICBBU1NFUlQocHJvdmlzaW9uYWxMb2FkZXItPnRpbWluZygpLT5uYXZpZ2F0aW9uU3Rh cnQpOworICAgIHByb3Zpc2lvbmFsTG9hZGVyLT5yZXNldFRpbWluZygpOworICAgIHByb3Zpc2lv bmFsTG9hZGVyLT50aW1pbmcoKS0+bmF2aWdhdGlvblN0YXJ0ID0gY3VycmVudFRpbWUoKTsgICAg CiAKICAgICBwcm92aXNpb25hbExvYWRlci0+c2V0Q29tbWl0dGVkKHRydWUpOwogICAgIGNvbW1p dFByb3Zpc2lvbmFsTG9hZCgpOwo=