48758 2010-11-01 08:20:04 -0700 Stale reference to JSDOMWindow in ScriptController::m_cacheableBindingObject 2010-11-04 13:42:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ossy webkit-unassigned abarth ap barraclough commit-queue ggaren mjs noam robert timothy tonikitoo webkit-ews oldest_to_newest 302695 0 ossy 2010-11-01 08:20:04 -0700 fast/dom/nodesFromRect-basic.html fails after r71004 if you execute run-webkit-tests. But it passes if you run only this testcase, so it must be a DRT bug. http://build.webkit.org/results/Qt%20Linux%20Release/r71025%20%2822924%29/fast/dom/nodesFromRect-basic-pretty-diff.html 302703 1 ossy 2010-11-01 08:28:42 -0700 I added fast/dom/nodesFromRect-basic.html to the Skipped list again until fix this bug: http://trac.webkit.org/changeset/71028 302848 2 robert 2010-11-01 12:37:11 -0700 Not surprisingly, though I don't understand why, this is fixed by the patch at https://bugs.webkit.org/show_bug.cgi?id=42578. However, I don't think the problem here is QNAM related like the other failures resolved by 42578. So it would be good to understand why the patch at 42578 fixes it. Some debugging reveals that the NodeList is getting inspected in DumpRenderTreeSupportQt but for some reason the QVariantList passed back to the runtime object contains null values by the time it is inspected in the test. The QVariantList is there, it has the right length, but the values in it are 'undefined'. To me this suggests a problem with the state of the LayoutTestController runtime object after a new document has been loaded in the same QWebPage. This may also be a problem during normal navigation so it could be a real bug. 302866 3 robert 2010-11-01 13:12:55 -0700 Yes, this is related to: https://bugs.webkit.org/show_bug.cgi?id=37725 Specifically the code that adds the LayoutTestController object: void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object, QScriptEngine::ValueOwnership ownership) { if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled)) return; #if USE(JSC) JSC::JSLock lock(JSC::SilenceAssertionsOnly); JSDOMWindow* window = toJSDOMWindow(d->frame, mainThreadNormalWorld()); JSC::Bindings::RootObject* root; if (ownership == QScriptEngine::QtOwnership) root = d->frame->script()->cacheableBindingRootObject(); else root = d->frame->script()->bindingRootObject(); At the moment LayoutTestController gets added as a cacheableBindingRootObject() so that it survives page navigations. This object will only get destroyed once the page has been destroyed. If you change it so that LayoutTestController gets added as a bindingRootObject() instead it will get destroyed on the page navigation implicit in loading a new test and node-from-rect-basic.html passes when run as the following tests. So there is something wrong with the state of the Qt root object after loading an initial page, then loading a new one. This problem does not arise with a 'fresh' root object. 302891 4 72549 robert 2010-11-01 13:42:22 -0700 Created attachment 72549 Patch 302893 5 72549 tonikitoo 2010-11-01 13:43:33 -0700 Comment on attachment 72549 Patch Nice fix. I am surprised! :) 302894 6 robert 2010-11-01 13:45:48 -0700 As stated in the log, I believe the correct method for getting the current active document in a JS context is from the context's lexicalGlobalObject()rather than the root's globalObject(). This is the way it's done elsewhere in WebCore. I don't pretend to fully understand the differences between the two - I'm just copying what is used elsewhere and applying it to fix the regression here. Would be nice if someone could say 'yes, you're right' with some degree of confidence! 302902 7 robert 2010-11-01 13:54:52 -0700 hi Noam, You added the line I'm amending here in http://trac.webkit.org/changeset/54775 What do you think? Is my change ok? 302903 8 webkit-ews 2010-11-01 13:55:40 -0700 Attachment 72549 did not build on qt: Build output: http://queues.webkit.org/results/4895001 302927 9 72559 robert 2010-11-01 14:18:31 -0700 Created attachment 72559 Patch 302929 10 robert 2010-11-01 14:19:00 -0700 (In reply to comment #8) > Attachment 72549 [details] did not build on qt: > Build output: http://queues.webkit.org/results/4895001 Ach, forgot the include when applying the patch to a clean branch. 303792 11 robert 2010-11-02 16:50:00 -0700 Looking at it a bit more this isn't the real fix. The problem is that after bug 37725 we need to update the globalObject() (i.e. JSDOMWindow) associated with the cached bindingRootObject every time we clear the frame and load a new page. This allows the runtime objects (e.g. LayoutTestController etc.) to persist between navigations as before but also ensures that when qt_runtime looks at root->globalObject() it's referring to the DOMWindow of the current page. --- a/WebCore/bindings/js/ScriptController.cpp +++ b/WebCore/bindings/js/ScriptController.cpp @@ -197,6 +198,9 @@ void ScriptController::clearWindowShell(bool goingIntoPageCache) windowShell->window()->willRemoveFromWindowShell(); windowShell->setWindow(m_frame->domWindow()); + if (m_cacheableBindingRootObject) + m_cacheableBindingRootObject->setGlobalObject(windowShell->window()); + if (Page* page = m_frame->page()) { attachDebugger(windowShell, page->debugger()); windowShell->window()->setProfileGroup(page->group().identifier()); Hopefully this will still be right tomorrow - but that's what it looks like now, and it certainly fixes the DRT sideeffect as well as allowing the tests in 37725 to continue to pass. 304216 12 72851 robert 2010-11-03 12:54:26 -0700 Created attachment 72851 Patch 304220 13 72851 darin 2010-11-03 12:58:33 -0700 Comment on attachment 72851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72851&action=review Change seems OK, but I’m not convinced this is all that’s needed. > WebCore/ChangeLog:8 > + associated with the m_cacheablebindingRootObject every time we clear the The m_cacheableBindingRootObject mechanism seems half-implemented and it’s not clear to me that “cacheable” is a good concept for this. This fixes one bug, but I think there are going to be other problems as well. Lets not add this in WebKit2 and maybe we can dump it for good eventually. > WebCore/bridge/runtime_root.h:72 > + void updateGlobalObject(JSGlobalObject* globalObject); No need for the argument name here. 304223 14 72853 robert 2010-11-03 13:00:30 -0700 Created attachment 72853 Patch 304226 15 72853 darin 2010-11-03 13:03:40 -0700 Comment on attachment 72853 Patch My comments from the original patch still apply. 304228 16 72855 robert 2010-11-03 13:05:52 -0700 Created attachment 72855 Patch 304524 17 72855 commit-queue 2010-11-04 01:24:46 -0700 Comment on attachment 72855 Patch Rejecting patch 72855 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'apply-attachment', '--force-clean', '--non-interactive', 72855]" exit_code: 2 Last 500 characters of output: rsed 5 diffs from patch file(s). patching file LayoutTests/platform/qt/Skipped Hunk #1 FAILED at 5461. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/platform/qt/Skipped.rej patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/bindings/js/ScriptController.cpp patching file WebCore/bridge/runtime_root.cpp patching file WebCore/bridge/runtime_root.h Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/5208007 304785 18 72969 robert 2010-11-04 11:56:57 -0700 Created attachment 72969 Patch 304837 19 commit-queue 2010-11-04 13:39:29 -0700 The commit-queue encountered the following flaky tests while processing attachment 72969: http/tests/websocket/tests/close-on-navigate-new-location.html Please file bugs against the tests. These tests were authored by abarth@webkit.org. The commit-queue is continuing to process your patch. 304839 20 72969 commit-queue 2010-11-04 13:42:05 -0700 Comment on attachment 72969 Patch Clearing flags on attachment: 72969 Committed r71354: <http://trac.webkit.org/changeset/71354> 304840 21 commit-queue 2010-11-04 13:42:13 -0700 All reviewed patches have been landed. Closing bug. 72549 2010-11-01 13:42:22 -0700 2010-11-01 14:18:23 -0700 Patch bug-48758-20101101204218.patch text/plain 3000 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxMTIwNmNkMDE1MTYyZjYxZGU2ZmI2YmMxOWU3OGM2NzQ5MjhkZjQwLi43YjkyMjBi ZjZhNmE4ODZlOTU4MDk3Yzc1MDY1OGRhNGIyYTljZDg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMTEtMDEgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRFJUIHNpZGVlZmZl Y3QgcmV2ZWFsZWQgYnkgcjcxMDA0CisKKyAgICAgICAgVGhlIGNvcnJlY3QgbWV0aG9kIGZvciBn ZXR0aW5nIHRoZSBjdXJyZW50IGFjdGl2ZQorICAgICAgICBkb2N1bWVudCBpbiBhIEpTIGNvbnRl eHQgaXMgZnJvbSB0aGUgY29udGV4dCdzIGxleGljYWxHbG9iYWxPYmplY3QoKQorICAgICAgICBy YXRoZXIgdGhhbiB0aGUgcm9vdCdzIGdsb2JhbE9iamVjdCgpLiBUaGlzIGlzIHRoZSB3YXkgaXQn cyBkb25lCisgICAgICAgIGVsc2V3aGVyZSBpbiBXZWJDb3JlLgorCisgICAgICAgIEZpeGVzIGZh c3QvZG9tL25vZGVzRnJvbVJlY3QtYmFzaWMuaHRtbAorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1OAorCisgICAgICAgICogcGxhdGZvcm0vcXQv U2tpcHBlZDoKKwogMjAxMC0xMS0wMSAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVt Lm9yZz4KICAgICAgICAgCiAgICAgICAgIFVwZGF0ZSB0aGUgcGl4ZWwgZXhwZWN0YXRpb25zIGZv ciBmYXN0L2Jsb2NrL3Bvc2l0aW9uaW5nIGZvciB0aGUgTWFjIHBvcnQuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQv U2tpcHBlZAppbmRleCAzYzcyNzM5MDg4OWIyZGEwY2NmMjJhZjg0OGU3ODAwNDQ5ZDE4MWFiLi45 ZWJhNWI3MDA2Zjk5MGM2ZTJlZjQwY2JjMWMzMmVkZDBmYTBjYTUyIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0 L1NraXBwZWQKQEAgLTU0NjEsNyArNTQ2MSwzIEBAIGZhc3QvbWVkaWEvY29sb3ItZG9lcy1ub3Qt aW5jbHVkZS1hbHBoYS5odG1sCiAKICMgUmVxdWlyZXMgV2ViUCBzdXBwb3J0LgogZmFzdC9pbWFn ZXMvd2VicC1pbWFnZS1kZWNvZGluZy5odG1sCi0KLSMgW1F0XSBEUlQgc2lkZWVmZmVjdCByZXZl YWxlZCBieSByNzEwMDQKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ4NzU4Ci1mYXN0L2RvbS9ub2Rlc0Zyb21SZWN0LWJhc2ljLmh0bWwKZGlmZiAtLWdpdCBhL1dl YkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIwNDA4ODBlMzMzZjI2 NjI1NTg4YTEyODRlNWJmNDBhMmZjNTAzYy4uNGZiZjgyMjRhZTYwN2VlZmRiMjQ4YzE3NzhjZWMx OWI1ZDdkOWI4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMS0wMSAgUm9iZXJ0IEhvZ2FuICA8cm9i ZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBEUlQgc2lkZWVmZmVjdCByZXZlYWxlZCBieSByNzEwMDQKKworICAgICAg ICBUaGUgY29ycmVjdCBtZXRob2QgZm9yIGdldHRpbmcgdGhlIGN1cnJlbnQgYWN0aXZlCisgICAg ICAgIGRvY3VtZW50IGluIGEgSlMgY29udGV4dCBpcyBmcm9tIHRoZSBjb250ZXh0J3MgbGV4aWNh bEdsb2JhbE9iamVjdCgpCisgICAgICAgIHJhdGhlciB0aGFuIHRoZSByb290J3MgZ2xvYmFsT2Jq ZWN0KCkuIFRoaXMgaXMgdGhlIHdheSBpdCdzIGRvbmUKKyAgICAgICAgZWxzZXdoZXJlIGluIFdl YkNvcmUuCisKKyAgICAgICAgRml4ZXMgZmFzdC9kb20vbm9kZXNGcm9tUmVjdC1iYXNpYy5odG1s CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NzU4 CisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKToKKwogMjAxMC0xMS0wMSAgRGF2aWQgSHlh dHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVp bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvV2ViQ29y ZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKaW5kZXggNjU5NWI4NDIxYTRhMmM3YTY0NjA1MjI3 MTQwMzExNzNhNTI2MDUyNy4uZWY4MTI3N2EzNWM5YTI2NDU4NDgzOTRkZTg3Nzc1YWFhNWZiYWE2 OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvV2Vi Q29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKQEAgLTg5MSw3ICs4OTEsNyBAQCBKU1ZhbHVl IGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoRXhlY1N0YXRlKiBleGVjLCBQYXNzUmVmUHRyPFJvb3RP YmplY3Q+IHJvb3QsIGNvbgogICAgICAgICBpZiAoIXJvb3QtPmdsb2JhbE9iamVjdCgpLT5pbmhl cml0cygmSlNET01XaW5kb3c6OnNfaW5mbykpCiAgICAgICAgICAgICByZXR1cm4ganNVbmRlZmlu ZWQoKTsKIAotICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSAoc3RhdGljX2Nhc3Q8SlNET01X aW5kb3cqPihyb290LT5nbG9iYWxPYmplY3QoKSkpLT5pbXBsKCktPmRvY3VtZW50KCk7CisgICAg ICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGFzSlNET01XaW5kb3coZXhlYy0+bGV4aWNhbEdsb2Jh bE9iamVjdCgpKS0+aW1wbCgpLT5kb2N1bWVudCgpOwogICAgICAgICBpZiAoIWRvY3VtZW50KQog ICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAK 72559 2010-11-01 14:18:31 -0700 2010-11-03 12:54:19 -0700 Patch bug-48758-20101101211827.patch text/plain 3210 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxMTIwNmNkMDE1MTYyZjYxZGU2ZmI2YmMxOWU3OGM2NzQ5MjhkZjQwLi43YjkyMjBi ZjZhNmE4ODZlOTU4MDk3Yzc1MDY1OGRhNGIyYTljZDg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMTEtMDEgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRFJUIHNpZGVlZmZl Y3QgcmV2ZWFsZWQgYnkgcjcxMDA0CisKKyAgICAgICAgVGhlIGNvcnJlY3QgbWV0aG9kIGZvciBn ZXR0aW5nIHRoZSBjdXJyZW50IGFjdGl2ZQorICAgICAgICBkb2N1bWVudCBpbiBhIEpTIGNvbnRl eHQgaXMgZnJvbSB0aGUgY29udGV4dCdzIGxleGljYWxHbG9iYWxPYmplY3QoKQorICAgICAgICBy YXRoZXIgdGhhbiB0aGUgcm9vdCdzIGdsb2JhbE9iamVjdCgpLiBUaGlzIGlzIHRoZSB3YXkgaXQn cyBkb25lCisgICAgICAgIGVsc2V3aGVyZSBpbiBXZWJDb3JlLgorCisgICAgICAgIEZpeGVzIGZh c3QvZG9tL25vZGVzRnJvbVJlY3QtYmFzaWMuaHRtbAorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1OAorCisgICAgICAgICogcGxhdGZvcm0vcXQv U2tpcHBlZDoKKwogMjAxMC0xMS0wMSAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVt Lm9yZz4KICAgICAgICAgCiAgICAgICAgIFVwZGF0ZSB0aGUgcGl4ZWwgZXhwZWN0YXRpb25zIGZv ciBmYXN0L2Jsb2NrL3Bvc2l0aW9uaW5nIGZvciB0aGUgTWFjIHBvcnQuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQv U2tpcHBlZAppbmRleCAzYzcyNzM5MDg4OWIyZGEwY2NmMjJhZjg0OGU3ODAwNDQ5ZDE4MWFiLi45 ZWJhNWI3MDA2Zjk5MGM2ZTJlZjQwY2JjMWMzMmVkZDBmYTBjYTUyIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0 L1NraXBwZWQKQEAgLTU0NjEsNyArNTQ2MSwzIEBAIGZhc3QvbWVkaWEvY29sb3ItZG9lcy1ub3Qt aW5jbHVkZS1hbHBoYS5odG1sCiAKICMgUmVxdWlyZXMgV2ViUCBzdXBwb3J0LgogZmFzdC9pbWFn ZXMvd2VicC1pbWFnZS1kZWNvZGluZy5odG1sCi0KLSMgW1F0XSBEUlQgc2lkZWVmZmVjdCByZXZl YWxlZCBieSByNzEwMDQKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ4NzU4Ci1mYXN0L2RvbS9ub2Rlc0Zyb21SZWN0LWJhc2ljLmh0bWwKZGlmZiAtLWdpdCBhL1dl YkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIwNDA4ODBlMzMzZjI2 NjI1NTg4YTEyODRlNWJmNDBhMmZjNTAzYy4uNGZiZjgyMjRhZTYwN2VlZmRiMjQ4YzE3NzhjZWMx OWI1ZDdkOWI4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMS0wMSAgUm9iZXJ0IEhvZ2FuICA8cm9i ZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBEUlQgc2lkZWVmZmVjdCByZXZlYWxlZCBieSByNzEwMDQKKworICAgICAg ICBUaGUgY29ycmVjdCBtZXRob2QgZm9yIGdldHRpbmcgdGhlIGN1cnJlbnQgYWN0aXZlCisgICAg ICAgIGRvY3VtZW50IGluIGEgSlMgY29udGV4dCBpcyBmcm9tIHRoZSBjb250ZXh0J3MgbGV4aWNh bEdsb2JhbE9iamVjdCgpCisgICAgICAgIHJhdGhlciB0aGFuIHRoZSByb290J3MgZ2xvYmFsT2Jq ZWN0KCkuIFRoaXMgaXMgdGhlIHdheSBpdCdzIGRvbmUKKyAgICAgICAgZWxzZXdoZXJlIGluIFdl YkNvcmUuCisKKyAgICAgICAgRml4ZXMgZmFzdC9kb20vbm9kZXNGcm9tUmVjdC1iYXNpYy5odG1s CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NzU4 CisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKToKKwogMjAxMC0xMS0wMSAgRGF2aWQgSHlh dHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVp bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwIGIvV2ViQ29y ZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKaW5kZXggNjU5NWI4NDIxYTRhMmM3YTY0NjA1MjI3 MTQwMzExNzNhNTI2MDUyNy4uYzY4ZTIxODY4YzIxNzM1MTRlYmVkMGU2NDNhYTg4MGU1NzdiM2Ew ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvV2Vi Q29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRl ICJKU0RvY3VtZW50LmgiCiAjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCiAjaW5jbHVkZSAiSlNE T01XaW5kb3cuaCIKKyNpbmNsdWRlICJKU0RPTVdpbmRvd0N1c3RvbS5oIgogI2luY2x1ZGUgPEpT RnVuY3Rpb24uaD4KICNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5oIgogI2luY2x1ZGUgIkpTSFRN TEVsZW1lbnQuaCIKQEAgLTg5MSw3ICs4OTIsNyBAQCBKU1ZhbHVlIGNvbnZlcnRRVmFyaWFudFRv VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+IHJvb3QsIGNvbgog ICAgICAgICBpZiAoIXJvb3QtPmdsb2JhbE9iamVjdCgpLT5pbmhlcml0cygmSlNET01XaW5kb3c6 OnNfaW5mbykpCiAgICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKIAotICAgICAgICBE b2N1bWVudCogZG9jdW1lbnQgPSAoc3RhdGljX2Nhc3Q8SlNET01XaW5kb3cqPihyb290LT5nbG9i YWxPYmplY3QoKSkpLT5pbXBsKCktPmRvY3VtZW50KCk7CisgICAgICAgIERvY3VtZW50KiBkb2N1 bWVudCA9IGFzSlNET01XaW5kb3coZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpKS0+aW1wbCgp LT5kb2N1bWVudCgpOwogICAgICAgICBpZiAoIWRvY3VtZW50KQogICAgICAgICAgICAgcmV0dXJu IGpzVW5kZWZpbmVkKCk7CiAK 72851 2010-11-03 12:54:26 -0700 2010-11-03 13:00:23 -0700 Patch bug-48758-20101103195423.patch text/plain 3940 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDNjNzI3MzkwODg5YjJkYTBjY2YyMmFmODQ4ZTc4 MDA0NDlkMTgxYWIuLjllYmE1YjcwMDZmOTkwYzZlMmVmNDBjYmMxYzMyZWRkMGZhMGNhNTIgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtNTQ2MSw3ICs1NDYxLDMgQEAgZmFzdC9tZWRpYS9j b2xvci1kb2VzLW5vdC1pbmNsdWRlLWFscGhhLmh0bWwKIAogIyBSZXF1aXJlcyBXZWJQIHN1cHBv cnQuCiBmYXN0L2ltYWdlcy93ZWJwLWltYWdlLWRlY29kaW5nLmh0bWwKLQotIyBbUXRdIERSVCBz aWRlZWZmZWN0IHJldmVhbGVkIGJ5IHI3MTAwNAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDg3NTgKLWZhc3QvZG9tL25vZGVzRnJvbVJlY3QtYmFzaWMuaHRtbApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAz OTNlNTIyNmRjOTU2NmMxMzc3ZmMzMGU2OTQ1ZjgwODhlYWJjM2EzLi4zMjFlNmU1ZDllYzRkYzQy ZjgxYThiODhhZTVjYjlhNjkyMGNlMzY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEwLTExLTAzICBSb2Jl cnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTdGFsZSByZWZlcmVuY2UgdG8gSlNET01XaW5kb3cgaW4g U2NyaXB0Q29udHJvbGxlcjo6bV9jYWNoZWFibGVCaW5kaW5nT2JqZWN0CisKKyAgICAgICAgQWZ0 ZXIgYnVnIDM3NzI1IHdlIG5lZWQgdG8gdXBkYXRlIHRoZSBnbG9iYWxPYmplY3QoKSAoaS5lLiBK U0RPTVdpbmRvdykKKyAgICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoZSBtX2NhY2hlYWJsZWJpbmRp bmdSb290T2JqZWN0IGV2ZXJ5IHRpbWUgd2UgY2xlYXIgdGhlCisgICAgICAgIGZyYW1lIGFuZCBs b2FkIGEgbmV3IHBhZ2UuIFRoaXMgYWxsb3dzIHRoZSBydW50aW1lIG9iamVjdHMKKyAgICAgICAg KGUuZy4gTGF5b3V0VGVzdENvbnRyb2xsZXIgZXRjLikgdG8gcGVyc2lzdCBiZXR3ZWVuIG5hdmln YXRpb25zIGFzCisgICAgICAgIGJlZm9yZSBidXQgYWxzbyBlbnN1cmVzIHRoYXQgd2hlbiBxdF9y dW50aW1lLCBvciBhbnkgb3RoZXIgYnJpZGdlLAorICAgICAgICBsb29rcyBhdCB0aGUgcm9vdC0+ Z2xvYmFsT2JqZWN0KCkgb2YgYSBjYWNoZWFibGUgYmluZGluZyBvYmplY3QKKyAgICAgICAgaXQg Z2V0cyB0aGUgRE9NV2luZG93IG9mIHRoZSBjdXJyZW50IHBhZ2UgcmF0aGVyIHRoYW4gdGhlIERP TVdpbmRvdworICAgICAgICB0aGF0IHdhcyBpbiBwbGFjZSB3aGVuIG1fY2FjaGVhYmxlQmluZGlu Z1Jvb3RPYmplY3Qgd2FzIGNyZWF0ZWQuCisKKyAgICAgICAgRml4ZXMgZmFzdC9kb20vbm9kZXNG cm9tUmVjdC1iYXNpYy5odG1sIG9uIFF0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1OAorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpjbGVh cldpbmRvd1NoZWxsKToKKyAgICAgICAgKiBicmlkZ2UvcnVudGltZV9yb290LmNwcDoKKyAgICAg ICAgKEpTQzo6QmluZGluZ3M6OlJvb3RPYmplY3Q6OnVwZGF0ZUdsb2JhbE9iamVjdCk6CisgICAg ICAgICogYnJpZGdlL3J1bnRpbWVfcm9vdC5oOgorCiAyMDEwLTExLTAxICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlh dHQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3Bw IGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAppbmRleCBlMDNjODIy MTllNDAwNWYxYzUyOWVjNzY1NzIxMDM2YzAzNzM1NjhiLi5jZjU1MDgwYjNmMjk1Yjg1YjE0Njk2 MGRjYWIwZjMyMjU5MDJmZmYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Njcmlw dENvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxl ci5jcHAKQEAgLTE5Nyw2ICsxOTcsMTEgQEAgdm9pZCBTY3JpcHRDb250cm9sbGVyOjpjbGVhcldp bmRvd1NoZWxsKGJvb2wgZ29pbmdJbnRvUGFnZUNhY2hlKQogICAgICAgICB3aW5kb3dTaGVsbC0+ d2luZG93KCktPndpbGxSZW1vdmVGcm9tV2luZG93U2hlbGwoKTsKICAgICAgICAgd2luZG93U2hl bGwtPnNldFdpbmRvdyhtX2ZyYW1lLT5kb21XaW5kb3coKSk7CiAKKyAgICAgICAgLy8gQW4gbV9j YWNoZWFibGVCaW5kaW5nUm9vdE9iamVjdCBwZXJzaXN0cyBiZXR3ZWVuIHBhZ2UgbmF2aWdhdGlv bnMKKyAgICAgICAgLy8gc28gbmVlZHMgdG8ga25vdyBhYm91dCB0aGUgbmV3IEpTRE9NV2luZG93 LgorICAgICAgICBpZiAobV9jYWNoZWFibGVCaW5kaW5nUm9vdE9iamVjdCkKKyAgICAgICAgICAg IG1fY2FjaGVhYmxlQmluZGluZ1Jvb3RPYmplY3QtPnVwZGF0ZUdsb2JhbE9iamVjdCh3aW5kb3dT aGVsbC0+d2luZG93KCkpOworCiAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFn ZSgpKSB7CiAgICAgICAgICAgICBhdHRhY2hEZWJ1Z2dlcih3aW5kb3dTaGVsbCwgcGFnZS0+ZGVi dWdnZXIoKSk7CiAgICAgICAgICAgICB3aW5kb3dTaGVsbC0+d2luZG93KCktPnNldFByb2ZpbGVH cm91cChwYWdlLT5ncm91cCgpLmlkZW50aWZpZXIoKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jy aWRnZS9ydW50aW1lX3Jvb3QuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmNwcApp bmRleCAwOWZkNDNiYzlmMDNjZmFjYjRhNWQ3NDM3N2EwNjhlZWIyNGVlZmNhLi43OTYzNTRmMmZj NjJkZWRlOWZlMDliMDA1MTcyZTc4NDY0NDAxNTgxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRn ZS9ydW50aW1lX3Jvb3QuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfcm9vdC5jcHAK QEAgLTE2OCw2ICsxNjgsMTEgQEAgSlNHbG9iYWxPYmplY3QqIFJvb3RPYmplY3Q6Omdsb2JhbE9i amVjdCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fZ2xvYmFsT2JqZWN0OwogfQogCit2b2lkIFJvb3RP YmplY3Q6OnVwZGF0ZUdsb2JhbE9iamVjdChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQor eworICAgIG1fZ2xvYmFsT2JqZWN0ID0gZ2xvYmFsT2JqZWN0OworfQorCiB2b2lkIFJvb3RPYmpl Y3Q6OmFkZFJ1bnRpbWVPYmplY3QoUnVudGltZU9iamVjdCogb2JqZWN0KQogewogICAgIEFTU0VS VChtX2lzVmFsaWQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290Lmgg Yi9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaAppbmRleCAwNGYzODJhYTMzZmVkNjkzZTJk ODFmYzNhZWMxNjcwYjg2NzVhYjNjLi5hMjVmNDhmOTViNmIyZWViNWRmMjJjYzE4NWM2NzI5MmUw MWFmNzRjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaAorKysgYi9X ZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaApAQCAtNjksNiArNjksNyBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCB2b2lkKiBuYXRpdmVIYW5kbGUoKSBjb25zdDsKICAgICBKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0KCkgY29uc3Q7CisgICAgdm9pZCB1cGRhdGVHbG9iYWxPYmplY3QoSlNH bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCk7CiAKICAgICB2b2lkIGFkZFJ1bnRpbWVPYmplY3Qo UnVudGltZU9iamVjdCopOwogICAgIHZvaWQgcmVtb3ZlUnVudGltZU9iamVjdChSdW50aW1lT2Jq ZWN0Kik7Cg== 72853 2010-11-03 13:00:30 -0700 2010-11-03 13:05:45 -0700 Patch bug-48758-20101103200028.patch text/plain 3927 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDNjNzI3MzkwODg5YjJkYTBjY2YyMmFmODQ4ZTc4 MDA0NDlkMTgxYWIuLjllYmE1YjcwMDZmOTkwYzZlMmVmNDBjYmMxYzMyZWRkMGZhMGNhNTIgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtNTQ2MSw3ICs1NDYxLDMgQEAgZmFzdC9tZWRpYS9j b2xvci1kb2VzLW5vdC1pbmNsdWRlLWFscGhhLmh0bWwKIAogIyBSZXF1aXJlcyBXZWJQIHN1cHBv cnQuCiBmYXN0L2ltYWdlcy93ZWJwLWltYWdlLWRlY29kaW5nLmh0bWwKLQotIyBbUXRdIERSVCBz aWRlZWZmZWN0IHJldmVhbGVkIGJ5IHI3MTAwNAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDg3NTgKLWZhc3QvZG9tL25vZGVzRnJvbVJlY3QtYmFzaWMuaHRtbApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAz OTNlNTIyNmRjOTU2NmMxMzc3ZmMzMGU2OTQ1ZjgwODhlYWJjM2EzLi4zMjFlNmU1ZDllYzRkYzQy ZjgxYThiODhhZTVjYjlhNjkyMGNlMzY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEwLTExLTAzICBSb2Jl cnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTdGFsZSByZWZlcmVuY2UgdG8gSlNET01XaW5kb3cgaW4g U2NyaXB0Q29udHJvbGxlcjo6bV9jYWNoZWFibGVCaW5kaW5nT2JqZWN0CisKKyAgICAgICAgQWZ0 ZXIgYnVnIDM3NzI1IHdlIG5lZWQgdG8gdXBkYXRlIHRoZSBnbG9iYWxPYmplY3QoKSAoaS5lLiBK U0RPTVdpbmRvdykKKyAgICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoZSBtX2NhY2hlYWJsZWJpbmRp bmdSb290T2JqZWN0IGV2ZXJ5IHRpbWUgd2UgY2xlYXIgdGhlCisgICAgICAgIGZyYW1lIGFuZCBs b2FkIGEgbmV3IHBhZ2UuIFRoaXMgYWxsb3dzIHRoZSBydW50aW1lIG9iamVjdHMKKyAgICAgICAg KGUuZy4gTGF5b3V0VGVzdENvbnRyb2xsZXIgZXRjLikgdG8gcGVyc2lzdCBiZXR3ZWVuIG5hdmln YXRpb25zIGFzCisgICAgICAgIGJlZm9yZSBidXQgYWxzbyBlbnN1cmVzIHRoYXQgd2hlbiBxdF9y dW50aW1lLCBvciBhbnkgb3RoZXIgYnJpZGdlLAorICAgICAgICBsb29rcyBhdCB0aGUgcm9vdC0+ Z2xvYmFsT2JqZWN0KCkgb2YgYSBjYWNoZWFibGUgYmluZGluZyBvYmplY3QKKyAgICAgICAgaXQg Z2V0cyB0aGUgRE9NV2luZG93IG9mIHRoZSBjdXJyZW50IHBhZ2UgcmF0aGVyIHRoYW4gdGhlIERP TVdpbmRvdworICAgICAgICB0aGF0IHdhcyBpbiBwbGFjZSB3aGVuIG1fY2FjaGVhYmxlQmluZGlu Z1Jvb3RPYmplY3Qgd2FzIGNyZWF0ZWQuCisKKyAgICAgICAgRml4ZXMgZmFzdC9kb20vbm9kZXNG cm9tUmVjdC1iYXNpYy5odG1sIG9uIFF0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1OAorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpjbGVh cldpbmRvd1NoZWxsKToKKyAgICAgICAgKiBicmlkZ2UvcnVudGltZV9yb290LmNwcDoKKyAgICAg ICAgKEpTQzo6QmluZGluZ3M6OlJvb3RPYmplY3Q6OnVwZGF0ZUdsb2JhbE9iamVjdCk6CisgICAg ICAgICogYnJpZGdlL3J1bnRpbWVfcm9vdC5oOgorCiAyMDEwLTExLTAxICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlh dHQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3Bw IGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAppbmRleCBlMDNjODIy MTllNDAwNWYxYzUyOWVjNzY1NzIxMDM2YzAzNzM1NjhiLi5jZjU1MDgwYjNmMjk1Yjg1YjE0Njk2 MGRjYWIwZjMyMjU5MDJmZmYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Njcmlw dENvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxl ci5jcHAKQEAgLTE5Nyw2ICsxOTcsMTEgQEAgdm9pZCBTY3JpcHRDb250cm9sbGVyOjpjbGVhcldp bmRvd1NoZWxsKGJvb2wgZ29pbmdJbnRvUGFnZUNhY2hlKQogICAgICAgICB3aW5kb3dTaGVsbC0+ d2luZG93KCktPndpbGxSZW1vdmVGcm9tV2luZG93U2hlbGwoKTsKICAgICAgICAgd2luZG93U2hl bGwtPnNldFdpbmRvdyhtX2ZyYW1lLT5kb21XaW5kb3coKSk7CiAKKyAgICAgICAgLy8gQW4gbV9j YWNoZWFibGVCaW5kaW5nUm9vdE9iamVjdCBwZXJzaXN0cyBiZXR3ZWVuIHBhZ2UgbmF2aWdhdGlv bnMKKyAgICAgICAgLy8gc28gbmVlZHMgdG8ga25vdyBhYm91dCB0aGUgbmV3IEpTRE9NV2luZG93 LgorICAgICAgICBpZiAobV9jYWNoZWFibGVCaW5kaW5nUm9vdE9iamVjdCkKKyAgICAgICAgICAg IG1fY2FjaGVhYmxlQmluZGluZ1Jvb3RPYmplY3QtPnVwZGF0ZUdsb2JhbE9iamVjdCh3aW5kb3dT aGVsbC0+d2luZG93KCkpOworCiAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFn ZSgpKSB7CiAgICAgICAgICAgICBhdHRhY2hEZWJ1Z2dlcih3aW5kb3dTaGVsbCwgcGFnZS0+ZGVi dWdnZXIoKSk7CiAgICAgICAgICAgICB3aW5kb3dTaGVsbC0+d2luZG93KCktPnNldFByb2ZpbGVH cm91cChwYWdlLT5ncm91cCgpLmlkZW50aWZpZXIoKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jy aWRnZS9ydW50aW1lX3Jvb3QuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmNwcApp bmRleCAwOWZkNDNiYzlmMDNjZmFjYjRhNWQ3NDM3N2EwNjhlZWIyNGVlZmNhLi43OTYzNTRmMmZj NjJkZWRlOWZlMDliMDA1MTcyZTc4NDY0NDAxNTgxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRn ZS9ydW50aW1lX3Jvb3QuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfcm9vdC5jcHAK QEAgLTE2OCw2ICsxNjgsMTEgQEAgSlNHbG9iYWxPYmplY3QqIFJvb3RPYmplY3Q6Omdsb2JhbE9i amVjdCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fZ2xvYmFsT2JqZWN0OwogfQogCit2b2lkIFJvb3RP YmplY3Q6OnVwZGF0ZUdsb2JhbE9iamVjdChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQor eworICAgIG1fZ2xvYmFsT2JqZWN0ID0gZ2xvYmFsT2JqZWN0OworfQorCiB2b2lkIFJvb3RPYmpl Y3Q6OmFkZFJ1bnRpbWVPYmplY3QoUnVudGltZU9iamVjdCogb2JqZWN0KQogewogICAgIEFTU0VS VChtX2lzVmFsaWQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290Lmgg Yi9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaAppbmRleCAwNGYzODJhYTMzZmVkNjkzZTJk ODFmYzNhZWMxNjcwYjg2NzVhYjNjLi5iYWJkN2FkZWQ3NjhlZDhhMzJjOWM2NzliNDQzOWE4YWQw NDE4M2EyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaAorKysgYi9X ZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaApAQCAtNjksNiArNjksNyBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCB2b2lkKiBuYXRpdmVIYW5kbGUoKSBjb25zdDsKICAgICBKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0KCkgY29uc3Q7CisgICAgdm9pZCB1cGRhdGVHbG9iYWxPYmplY3QoSlNH bG9iYWxPYmplY3QqKTsKIAogICAgIHZvaWQgYWRkUnVudGltZU9iamVjdChSdW50aW1lT2JqZWN0 Kik7CiAgICAgdm9pZCByZW1vdmVSdW50aW1lT2JqZWN0KFJ1bnRpbWVPYmplY3QqKTsK 72855 2010-11-03 13:05:52 -0700 2010-11-04 11:56:49 -0700 Patch bug-48758-20101103200550.patch text/plain 3924 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDNjNzI3MzkwODg5YjJkYTBjY2YyMmFmODQ4ZTc4 MDA0NDlkMTgxYWIuLjllYmE1YjcwMDZmOTkwYzZlMmVmNDBjYmMxYzMyZWRkMGZhMGNhNTIgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtNTQ2MSw3ICs1NDYxLDMgQEAgZmFzdC9tZWRpYS9j b2xvci1kb2VzLW5vdC1pbmNsdWRlLWFscGhhLmh0bWwKIAogIyBSZXF1aXJlcyBXZWJQIHN1cHBv cnQuCiBmYXN0L2ltYWdlcy93ZWJwLWltYWdlLWRlY29kaW5nLmh0bWwKLQotIyBbUXRdIERSVCBz aWRlZWZmZWN0IHJldmVhbGVkIGJ5IHI3MTAwNAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDg3NTgKLWZhc3QvZG9tL25vZGVzRnJvbVJlY3QtYmFzaWMuaHRtbApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAz OTNlNTIyNmRjOTU2NmMxMzc3ZmMzMGU2OTQ1ZjgwODhlYWJjM2EzLi44MWI5OWVkYTg0OTljYTNj MmZjNmI3ODQ0Nzg2NGEyYzMzNTAyNTVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEwLTExLTAzICBSb2Jl cnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KKworICAgICAgICBTdGFsZSByZWZlcmVuY2UgdG8gSlNET01XaW5kb3cgaW4gU2Ny aXB0Q29udHJvbGxlcjo6bV9jYWNoZWFibGVCaW5kaW5nT2JqZWN0CisKKyAgICAgICAgQWZ0ZXIg YnVnIDM3NzI1IHdlIG5lZWQgdG8gdXBkYXRlIHRoZSBnbG9iYWxPYmplY3QoKSAoaS5lLiBKU0RP TVdpbmRvdykKKyAgICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoZSBtX2NhY2hlYWJsZWJpbmRpbmdS b290T2JqZWN0IGV2ZXJ5IHRpbWUgd2UgY2xlYXIgdGhlCisgICAgICAgIGZyYW1lIGFuZCBsb2Fk IGEgbmV3IHBhZ2UuIFRoaXMgYWxsb3dzIHRoZSBydW50aW1lIG9iamVjdHMKKyAgICAgICAgKGUu Zy4gTGF5b3V0VGVzdENvbnRyb2xsZXIgZXRjLikgdG8gcGVyc2lzdCBiZXR3ZWVuIG5hdmlnYXRp b25zIGFzCisgICAgICAgIGJlZm9yZSBidXQgYWxzbyBlbnN1cmVzIHRoYXQgd2hlbiBxdF9ydW50 aW1lLCBvciBhbnkgb3RoZXIgYnJpZGdlLAorICAgICAgICBsb29rcyBhdCB0aGUgcm9vdC0+Z2xv YmFsT2JqZWN0KCkgb2YgYSBjYWNoZWFibGUgYmluZGluZyBvYmplY3QKKyAgICAgICAgaXQgZ2V0 cyB0aGUgRE9NV2luZG93IG9mIHRoZSBjdXJyZW50IHBhZ2UgcmF0aGVyIHRoYW4gdGhlIERPTVdp bmRvdworICAgICAgICB0aGF0IHdhcyBpbiBwbGFjZSB3aGVuIG1fY2FjaGVhYmxlQmluZGluZ1Jv b3RPYmplY3Qgd2FzIGNyZWF0ZWQuCisKKyAgICAgICAgRml4ZXMgZmFzdC9kb20vbm9kZXNGcm9t UmVjdC1iYXNpYy5odG1sIG9uIFF0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODc1OAorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29u dHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpjbGVhcldp bmRvd1NoZWxsKToKKyAgICAgICAgKiBicmlkZ2UvcnVudGltZV9yb290LmNwcDoKKyAgICAgICAg KEpTQzo6QmluZGluZ3M6OlJvb3RPYmplY3Q6OnVwZGF0ZUdsb2JhbE9iamVjdCk6CisgICAgICAg ICogYnJpZGdlL3J1bnRpbWVfcm9vdC5oOgorCiAyMDEwLTExLTAxICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwIGIv V2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAppbmRleCBlMDNjODIyMTll NDAwNWYxYzUyOWVjNzY1NzIxMDM2YzAzNzM1NjhiLi5jZjU1MDgwYjNmMjk1Yjg1YjE0Njk2MGRj YWIwZjMyMjU5MDJmZmYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENv bnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5j cHAKQEAgLTE5Nyw2ICsxOTcsMTEgQEAgdm9pZCBTY3JpcHRDb250cm9sbGVyOjpjbGVhcldpbmRv d1NoZWxsKGJvb2wgZ29pbmdJbnRvUGFnZUNhY2hlKQogICAgICAgICB3aW5kb3dTaGVsbC0+d2lu ZG93KCktPndpbGxSZW1vdmVGcm9tV2luZG93U2hlbGwoKTsKICAgICAgICAgd2luZG93U2hlbGwt PnNldFdpbmRvdyhtX2ZyYW1lLT5kb21XaW5kb3coKSk7CiAKKyAgICAgICAgLy8gQW4gbV9jYWNo ZWFibGVCaW5kaW5nUm9vdE9iamVjdCBwZXJzaXN0cyBiZXR3ZWVuIHBhZ2UgbmF2aWdhdGlvbnMK KyAgICAgICAgLy8gc28gbmVlZHMgdG8ga25vdyBhYm91dCB0aGUgbmV3IEpTRE9NV2luZG93Lgor ICAgICAgICBpZiAobV9jYWNoZWFibGVCaW5kaW5nUm9vdE9iamVjdCkKKyAgICAgICAgICAgIG1f Y2FjaGVhYmxlQmluZGluZ1Jvb3RPYmplY3QtPnVwZGF0ZUdsb2JhbE9iamVjdCh3aW5kb3dTaGVs bC0+d2luZG93KCkpOworCiAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgp KSB7CiAgICAgICAgICAgICBhdHRhY2hEZWJ1Z2dlcih3aW5kb3dTaGVsbCwgcGFnZS0+ZGVidWdn ZXIoKSk7CiAgICAgICAgICAgICB3aW5kb3dTaGVsbC0+d2luZG93KCktPnNldFByb2ZpbGVHcm91 cChwYWdlLT5ncm91cCgpLmlkZW50aWZpZXIoKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JyaWRn ZS9ydW50aW1lX3Jvb3QuY3BwIGIvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmNwcAppbmRl eCAwOWZkNDNiYzlmMDNjZmFjYjRhNWQ3NDM3N2EwNjhlZWIyNGVlZmNhLi43OTYzNTRmMmZjNjJk ZWRlOWZlMDliMDA1MTcyZTc4NDY0NDAxNTgxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9y dW50aW1lX3Jvb3QuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfcm9vdC5jcHAKQEAg LTE2OCw2ICsxNjgsMTEgQEAgSlNHbG9iYWxPYmplY3QqIFJvb3RPYmplY3Q6Omdsb2JhbE9iamVj dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fZ2xvYmFsT2JqZWN0OwogfQogCit2b2lkIFJvb3RPYmpl Y3Q6OnVwZGF0ZUdsb2JhbE9iamVjdChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQorewor ICAgIG1fZ2xvYmFsT2JqZWN0ID0gZ2xvYmFsT2JqZWN0OworfQorCiB2b2lkIFJvb3RPYmplY3Q6 OmFkZFJ1bnRpbWVPYmplY3QoUnVudGltZU9iamVjdCogb2JqZWN0KQogewogICAgIEFTU0VSVCht X2lzVmFsaWQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmggYi9X ZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaAppbmRleCAwNGYzODJhYTMzZmVkNjkzZTJkODFm YzNhZWMxNjcwYjg2NzVhYjNjLi5iYWJkN2FkZWQ3NjhlZDhhMzJjOWM2NzliNDQzOWE4YWQwNDE4 M2EyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaAorKysgYi9XZWJD b3JlL2JyaWRnZS9ydW50aW1lX3Jvb3QuaApAQCAtNjksNiArNjksNyBAQCBwdWJsaWM6CiAKICAg ICBjb25zdCB2b2lkKiBuYXRpdmVIYW5kbGUoKSBjb25zdDsKICAgICBKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0KCkgY29uc3Q7CisgICAgdm9pZCB1cGRhdGVHbG9iYWxPYmplY3QoSlNHbG9i YWxPYmplY3QqKTsKIAogICAgIHZvaWQgYWRkUnVudGltZU9iamVjdChSdW50aW1lT2JqZWN0Kik7 CiAgICAgdm9pZCByZW1vdmVSdW50aW1lT2JqZWN0KFJ1bnRpbWVPYmplY3QqKTsK 72969 2010-11-04 11:56:57 -0700 2010-11-04 13:42:05 -0700 Patch bug-48758-20101104185655.patch text/plain 4684 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMzNlZDMyMTVkZDNiYjczYWU4MWFlZjAxY2FiYjExMTE0MThkNmVhLi43MzgwMDI5 N2QzY2IwMTlkMzhmOTc2NmU2YmRlOGJkMDk2ZmNhODdmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTEtMDQgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFN0YWxlIHJlZmVyZW5jZSB0byBK U0RPTVdpbmRvdyBpbiBTY3JpcHRDb250cm9sbGVyOjptX2NhY2hlYWJsZUJpbmRpbmdPYmplY3QK KworICAgICAgICBVbnNraXAgZmFzdC9kb20vbm9kZXNGcm9tUmVjdC1iYXNpYy5odG1sIG9uIFF0 LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1 OAorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAxMC0xMS0wNCAgRXJpayBB cnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0 cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDAwMTc5MzVhYTUxOTEzM2Iz YTMxODViZjgxMDI2ZGY3MzlkMDhjNDIuLjUzOTIyZGQxNGE2MzVmNmUxMWU5ZGZiY2NhNGJkZGM4 NjQzOGUzOWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtNTQ2MSwxMCArNTQ2MSw2IEBA IGZhc3QvbWVkaWEvY29sb3ItZG9lcy1ub3QtaW5jbHVkZS1hbHBoYS5odG1sCiAjIFJlcXVpcmVz IFdlYlAgc3VwcG9ydC4KIGZhc3QvaW1hZ2VzL3dlYnAtaW1hZ2UtZGVjb2RpbmcuaHRtbAogCi0j IFtRdF0gRFJUIHNpZGVlZmZlY3QgcmV2ZWFsZWQgYnkgcjcxMDA0Ci0jIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1OAotZmFzdC9kb20vbm9kZXNGcm9tUmVjdC1i YXNpYy5odG1sCi0KICMgW1F0XSBEUlQgc2lkZWVmZmVjdCByZXZlYWxlZCBieSByNzEyNjgKICMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4OTU4CiBzdmcvY3VzdG9t L3RleHQtem9vbS54aHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCBiOTgzNGYxNjJiODNhNGY1MGI0YTc2NmNiM2M4YzI0MTE5YmE5MDRl Li5mZWU1N2EyYjY1ZmIxZGUzMWFiNzVmOWVmMDBjYTg4ZjUwNDk1MDk2IDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBA CisyMDEwLTExLTA0ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBTdGFsZSByZWZlcmVuY2UgdG8g SlNET01XaW5kb3cgaW4gU2NyaXB0Q29udHJvbGxlcjo6bV9jYWNoZWFibGVCaW5kaW5nT2JqZWN0 CisKKyAgICAgICAgQWZ0ZXIgYnVnIDM3NzI1IHdlIG5lZWQgdG8gdXBkYXRlIHRoZSBnbG9iYWxP YmplY3QoKSAoaS5lLiBKU0RPTVdpbmRvdykKKyAgICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoZSBt X2NhY2hlYWJsZWJpbmRpbmdSb290T2JqZWN0IGV2ZXJ5IHRpbWUgd2UgY2xlYXIgdGhlCisgICAg ICAgIGZyYW1lIGFuZCBsb2FkIGEgbmV3IHBhZ2UuIFRoaXMgYWxsb3dzIHRoZSBydW50aW1lIG9i amVjdHMKKyAgICAgICAgKGUuZy4gTGF5b3V0VGVzdENvbnRyb2xsZXIgZXRjLikgdG8gcGVyc2lz dCBiZXR3ZWVuIG5hdmlnYXRpb25zIGFzCisgICAgICAgIGJlZm9yZSBidXQgYWxzbyBlbnN1cmVz IHRoYXQgd2hlbiBxdF9ydW50aW1lLCBvciBhbnkgb3RoZXIgYnJpZGdlLAorICAgICAgICBsb29r cyBhdCB0aGUgcm9vdC0+Z2xvYmFsT2JqZWN0KCkgb2YgYSBjYWNoZWFibGUgYmluZGluZyBvYmpl Y3QKKyAgICAgICAgaXQgZ2V0cyB0aGUgRE9NV2luZG93IG9mIHRoZSBjdXJyZW50IHBhZ2UgcmF0 aGVyIHRoYW4gdGhlIERPTVdpbmRvdworICAgICAgICB0aGF0IHdhcyBpbiBwbGFjZSB3aGVuIG1f Y2FjaGVhYmxlQmluZGluZ1Jvb3RPYmplY3Qgd2FzIGNyZWF0ZWQuCisKKyAgICAgICAgRml4ZXMg ZmFzdC9kb20vbm9kZXNGcm9tUmVjdC1iYXNpYy5odG1sIG9uIFF0LgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODc1OAorCisgICAgICAgICogYmlu ZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRD b250cm9sbGVyOjpjbGVhcldpbmRvd1NoZWxsKToKKyAgICAgICAgKiBicmlkZ2UvcnVudGltZV9y b290LmNwcDoKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OlJvb3RPYmplY3Q6OnVwZGF0ZUdsb2Jh bE9iamVjdCk6CisgICAgICAgICogYnJpZGdlL3J1bnRpbWVfcm9vdC5oOgorCiAyMDEwLTExLTA0 ICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHRDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5j cHAKaW5kZXggZTAzYzgyMjE5ZTQwMDVmMWM1MjllYzc2NTcyMTAzNmMwMzczNTY4Yi4uY2Y1NTA4 MGIzZjI5NWI4NWIxNDY5NjBkY2FiMGYzMjI1OTAyZmZmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pz L1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC0xOTcsNiArMTk3LDExIEBAIHZvaWQgU2NyaXB0Q29u dHJvbGxlcjo6Y2xlYXJXaW5kb3dTaGVsbChib29sIGdvaW5nSW50b1BhZ2VDYWNoZSkKICAgICAg ICAgd2luZG93U2hlbGwtPndpbmRvdygpLT53aWxsUmVtb3ZlRnJvbVdpbmRvd1NoZWxsKCk7CiAg ICAgICAgIHdpbmRvd1NoZWxsLT5zZXRXaW5kb3cobV9mcmFtZS0+ZG9tV2luZG93KCkpOwogCisg ICAgICAgIC8vIEFuIG1fY2FjaGVhYmxlQmluZGluZ1Jvb3RPYmplY3QgcGVyc2lzdHMgYmV0d2Vl biBwYWdlIG5hdmlnYXRpb25zCisgICAgICAgIC8vIHNvIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhl IG5ldyBKU0RPTVdpbmRvdy4KKyAgICAgICAgaWYgKG1fY2FjaGVhYmxlQmluZGluZ1Jvb3RPYmpl Y3QpCisgICAgICAgICAgICBtX2NhY2hlYWJsZUJpbmRpbmdSb290T2JqZWN0LT51cGRhdGVHbG9i YWxPYmplY3Qod2luZG93U2hlbGwtPndpbmRvdygpKTsKKwogICAgICAgICBpZiAoUGFnZSogcGFn ZSA9IG1fZnJhbWUtPnBhZ2UoKSkgewogICAgICAgICAgICAgYXR0YWNoRGVidWdnZXIod2luZG93 U2hlbGwsIHBhZ2UtPmRlYnVnZ2VyKCkpOwogICAgICAgICAgICAgd2luZG93U2hlbGwtPndpbmRv dygpLT5zZXRQcm9maWxlR3JvdXAocGFnZS0+Z3JvdXAoKS5pZGVudGlmaWVyKCkpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmNwcCBiL1dlYkNvcmUvYnJpZGdlL3J1 bnRpbWVfcm9vdC5jcHAKaW5kZXggMDlmZDQzYmM5ZjAzY2ZhY2I0YTVkNzQzNzdhMDY4ZWViMjRl ZWZjYS4uNzk2MzU0ZjJmYzYyZGVkZTlmZTA5YjAwNTE3MmU3ODQ2NDQwMTU4MSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmNwcAorKysgYi9XZWJDb3JlL2JyaWRnZS9y dW50aW1lX3Jvb3QuY3BwCkBAIC0xNjgsNiArMTY4LDExIEBAIEpTR2xvYmFsT2JqZWN0KiBSb290 T2JqZWN0OjpnbG9iYWxPYmplY3QoKSBjb25zdAogICAgIHJldHVybiBtX2dsb2JhbE9iamVjdDsK IH0KIAordm9pZCBSb290T2JqZWN0Ojp1cGRhdGVHbG9iYWxPYmplY3QoSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCkKK3sKKyAgICBtX2dsb2JhbE9iamVjdCA9IGdsb2JhbE9iamVjdDsKK30K Kwogdm9pZCBSb290T2JqZWN0OjphZGRSdW50aW1lT2JqZWN0KFJ1bnRpbWVPYmplY3QqIG9iamVj dCkKIHsKICAgICBBU1NFUlQobV9pc1ZhbGlkKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdl L3J1bnRpbWVfcm9vdC5oIGIvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmgKaW5kZXggMDRm MzgyYWEzM2ZlZDY5M2UyZDgxZmMzYWVjMTY3MGI4Njc1YWIzYy4uYmFiZDdhZGVkNzY4ZWQ4YTMy YzljNjc5YjQ0MzlhOGFkMDQxODNhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcnVudGlt ZV9yb290LmgKKysrIGIvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9yb290LmgKQEAgLTY5LDYgKzY5 LDcgQEAgcHVibGljOgogCiAgICAgY29uc3Qgdm9pZCogbmF0aXZlSGFuZGxlKCkgY29uc3Q7CiAg ICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCgpIGNvbnN0OworICAgIHZvaWQgdXBkYXRl R2xvYmFsT2JqZWN0KEpTR2xvYmFsT2JqZWN0Kik7CiAKICAgICB2b2lkIGFkZFJ1bnRpbWVPYmpl Y3QoUnVudGltZU9iamVjdCopOwogICAgIHZvaWQgcmVtb3ZlUnVudGltZU9iamVjdChSdW50aW1l T2JqZWN0Kik7Cg==