36484 2010-03-23 01:17:18 -0700 [chromium] correctly handle move drag operations 2010-03-25 22:48:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony webkit-unassigned commit-queue jianli oldest_to_newest 202961 0 tony 2010-03-23 01:17:18 -0700 [chromium] correctly handle move drag operations 202962 1 51400 tony 2010-03-23 01:19:21 -0700 Created attachment 51400 Patch 202965 2 tony 2010-03-23 01:20:57 -0700 This is to work around the fact that the "move" maps to DragOperationGeneric (see https://bugs.webkit.org/show_bug.cgi?id=33697). This is consistent with what happens in WebKit/WebKit/win/. 203306 3 jianli 2010-03-23 18:54:07 -0700 > --- a/WebKit/chromium/src/WebViewImpl.cpp > +++ b/WebKit/chromium/src/WebViewImpl.cpp > -unsigned long WebViewImpl::createUniqueIdentifierForRequest() { > +WebDragOperation WebViewImpl::dragTargetDragging(WebCore::DragData* dragData, bool isEntering) > +{ I think the creation of DragData could also be shared in this function. DragData dragData( m_currentDragData.get(), clientPoint, screenPoint, static_cast<DragOperation>(operationsAllowed)); > --- a/WebKit/chromium/src/WebViewImpl.h > +++ b/WebKit/chromium/src/WebViewImpl.h > + // Consolidate some common code between starting a drag over a target and > + // updating a drag over a target. If we're starting a drag, |isEntering| > + // should be true. > + WebDragOperation dragTargetDragging(WebCore::DragData*, bool isEntering); Probably it might be better to call it as dragTargetDragEnterOrOver. In addition, since WebKit does not have line length, we do not need to split the long comment into 3 tidy lines. 203310 4 51473 tony 2010-03-23 19:21:09 -0700 Created attachment 51473 Patch 203311 5 tony 2010-03-23 19:22:19 -0700 (In reply to comment #3) > I think the creation of DragData could also be shared in this function. Done. > Probably it might be better to call it as dragTargetDragEnterOrOver. > In addition, since WebKit does not have line length, we do not need to split > the long comment into 3 tidy lines. I renamed the function to dragTargetDragEnterOrOver, but kept the comment as 3 lines because that matches the style in the rest of the file. 203892 6 51473 tony 2010-03-25 01:09:35 -0700 Comment on attachment 51473 Patch Since https://bugs.webkit.org/show_bug.cgi?id=33697 got r+, I'm going to rev this patch to no longer need the GENERIC -> MOVE conversions. 203899 7 51604 tony 2010-03-25 01:27:09 -0700 Created attachment 51604 Patch 203900 8 51605 tony 2010-03-25 01:32:40 -0700 Created attachment 51605 Patch 204167 9 51605 levin 2010-03-25 11:43:11 -0700 Comment on attachment 51605 Patch > diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h > + // Consolidate some common code between starting a drag over a target and > + // updating a drag over a target. If we're starting a drag, |isEntering| > + // should be true. > + WebDragOperation dragTargetDragEnterOrOver(const WebPoint& clientPoint, > + const WebPoint& screenPoint, > + bool isEntering); "bool isEntering" should be an enum, so it is clearer at the calling site what the function is being passed (instead of "true/false" be passed into the function). 204330 10 51698 tony 2010-03-25 17:27:44 -0700 Created attachment 51698 Patch 204332 11 tony 2010-03-25 17:29:19 -0700 (In reply to comment #9) > "bool isEntering" should be an enum, so it is clearer at the calling site what > the function is being passed (instead of "true/false" be passed into the > function). Done. New patch up. 204345 12 51698 levin 2010-03-25 17:50:33 -0700 Comment on attachment 51698 Patch > diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h > + // Consolidate some common code between starting a drag over a target and > + // updating a drag over a target. If we're starting a drag, |isEntering| Single space after . in comments (in WK land). Sorry, I should have caught this last time. 204354 13 51704 tony 2010-03-25 17:58:19 -0700 Created attachment 51704 Patch 204355 14 tony 2010-03-25 17:59:14 -0700 (In reply to comment #12) > (From update of attachment 51698 [details]) > > > diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h > > + // Consolidate some common code between starting a drag over a target and > > + // updating a drag over a target. If we're starting a drag, |isEntering| > > Single space after . in comments (in WK land). Sorry, I should have caught this > last time. Fixed throughout the file. If this is really something that's important, it should be in the style checker. 204369 15 51707 tony 2010-03-25 18:36:42 -0700 Created attachment 51707 Patch for landing 204417 16 51707 commit-queue 2010-03-25 22:48:39 -0700 Comment on attachment 51707 Patch for landing Clearing flags on attachment: 51707 Committed r56603: <http://trac.webkit.org/changeset/56603> 204418 17 commit-queue 2010-03-25 22:48:44 -0700 All reviewed patches have been landed. Closing bug. 51400 2010-03-23 01:19:21 -0700 2010-03-23 19:21:04 -0700 Patch bug-36484-20100323171918.patch text/plain 9731 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYTU1YzVmLi40MTA3NzVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMt MjMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3RseSBoYW5kbGUg bW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4 cGVjdGF0aW9ucy50eHQ6CisKIDIwMTAtMDMtMjIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAppbmRl eCAwODE1MGM1Li4zNDMyODBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hy b21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CkBAIC0yNzk4LDkgKzI3OTgsNiBAQCBCVUdfSklB TkxJIE1BQyA6IGZhc3QvZm9ybXMvc2VsZWN0LXN0eWxlLmh0bWwgPSBJTUFHRSBQQVNTCiBCVUcz ODM3NSA6IHBsdWdpbnMvcm91bmQtdHJpcC1ucG9iamVjdC5odG1sID0gVEVYVAogQlVHMzgzNzYg V0lOIDogZWRpdGluZy9kZWxldGluZy81MzkwNjgxLTIuaHRtbCA9IElNQUdFK1RFWFQKIAotLy8g V2ViS2l0IHJvbGwgNTU5NDAgLT4gNTYwMDQKLUJVRzM4MjI4IDogZmFzdC9ldmVudHMvZHJhZy1h bmQtZHJvcC5odG1sID0gVEVYVAotCiAvLyBIVE1MUHJvZ3Jlc3NFbGVtZW50IHJlbGF0ZWQgdGVz dHMgZGVmZXJyZWQgZHVlIHRvIHI1NTk4MC4KIEJVRzM4MjI3IERFRkVSIDogZmFzdC9kb20vSFRN TFByb2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50Lmh0bWwgPSBNSVNTSU5HCiBCVUczODIy NyBERUZFUiA6IGZhc3QvZG9tL0hUTUxQcm9ncmVzc0VsZW1lbnQvc2V0LXByb2dyZXNzLXByb3Bl cnRpZXMuaHRtbCA9IE1JU1NJTkcKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDBjNTA1ZjguLjE3OWEwNzUgMTAw NjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTAzLTIzICBUb255IENoYW5nICA8dG9u eUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW2Nocm9taXVtXSBjb3JyZWN0bHkgaGFuZGxlIG1vdmUgZHJhZyBvcGVyYXRpb25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjQ4NAor CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRHJh Z09wZXJhdGlvblRvRHJhZ09wZXJhdGlvbik6IENvbnZlcnQgYmV0d2VlbiBXZWJLaXQgYXBpIGFu ZCBXZWJDb3JlIHR5cGVzLgorICAgICAgICAgICAgQWxzbyBoYW5kbGVzIGNvbnZlcnNpb24gYmV0 d2VlbiBEcmFnT3BlcmF0aW9uR2VuZXJpYyBhbmQgRHJhZ09wZXJhdGlvbk1vdmUuCisgICAgICAg IChXZWJLaXQ6OkRyYWdPcGVyYXRpb25Ub1dlYkRyYWdPcGVyYXRpb24pOiByZXZlcnNlIG9mIFdl YkRyYWdPcGVyYXRpb25Ub0RyYWdPcGVyYXRpb24KKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0lt cGw6OmRyYWdTb3VyY2VFbmRlZEF0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRy YWdUYXJnZXREcmFnRW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1Rh cmdldERyYWdPdmVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXRE cmFnTGVhdmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyb3Ap OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdnaW5nKTogQ29t YmluZSBjb21tb24gY29kZSBpbnRvIGEgaGVscGVyIG1ldGhvZC4KKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KToKKyAgICAgICAg KiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMC0wMy0yMiAgS2VubmV0aCBSdXNzZWxsICA8a2Jy QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA1N2E2Mjk0Li42NmY1ZDllIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTYwLDYgKzE2MCwzMSBAQCBzdGF0aWMgY29uc3Qg UG9wdXBDb250YWluZXJTZXR0aW5ncyBzdWdnZXN0aW9uc1BvcHVwU2V0dGluZ3MgPSB7CiAgICAg UG9wdXBDb250YWluZXJTZXR0aW5nczo6RE9NRWxlbWVudERpcmVjdGlvbiwKIH07CiAKK3N0YXRp YyBEcmFnT3BlcmF0aW9uIFdlYkRyYWdPcGVyYXRpb25Ub0RyYWdPcGVyYXRpb24oV2ViRHJhZ09w ZXJhdGlvbiBvcGVyYXRpb25zQWxsb3dlZCkKK3sKKyNpZiAhT1MoREFSV0lOKQorICAgIC8vIFRo ZSBkZWZhdWx0IGRyYWcgb3BlcmF0aW9uIG9uIE9TWCBpcyBnZW5lcmljLCBidXQgdGhpcyB0eXBl IG9mIG9wZXJhdGlvbgorICAgIC8vIGRvZXNuJ3QgZXhpc3Qgb24gb3RoZXIgb3BlcmF0aW5nIHN5 c3RlbXMuICBGb3IgdGhlc2UgT1NlcywgbWFwICJtb3ZlIiB0bworICAgIC8vICJnZW5lcmljIiBm b3Igd2ViY29yZS4KKyAgICBpZiAob3BlcmF0aW9uc0FsbG93ZWQgJiBXZWJEcmFnT3BlcmF0aW9u TW92ZSkKKyAgICAgICAgb3BlcmF0aW9uc0FsbG93ZWQgPSBzdGF0aWNfY2FzdDxXZWJEcmFnT3Bl cmF0aW9uc01hc2s+KG9wZXJhdGlvbnNBbGxvd2VkIHwgV2ViRHJhZ09wZXJhdGlvbkdlbmVyaWMp OworI2VuZGlmCisgICAgcmV0dXJuIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlv bnNBbGxvd2VkKTsKK30KKworc3RhdGljIFdlYkRyYWdPcGVyYXRpb24gRHJhZ09wZXJhdGlvblRv V2ViRHJhZ09wZXJhdGlvbihEcmFnT3BlcmF0aW9uIG9wZXJhdGlvbnNBbGxvd2VkKQoreworI2lm ICFPUyhEQVJXSU4pCisgICAgLy8gVGhlIGRlZmF1bHQgZHJhZyBvcGVyYXRpb24gb24gT1NYIGlz IGdlbmVyaWMsIGJ1dCB0aGlzIHR5cGUgb2Ygb3BlcmF0aW9uCisgICAgLy8gZG9lc24ndCBleGlz dCBvbiBvdGhlciBvcGVyYXRpbmcgc3lzdGVtcy4gIEZvciB0aGVzZSBPU2VzLCBtYXAgImdlbmVy aWMiIHRvCisgICAgLy8gIm1vdmUiIGZvciBjaHJvbWl1bS4gIFdlIG1hc2sgb3V0IGdlbmVyaWMg YmVjYXVzZSBpdCBkb2Vzbid0IG1ha2Ugc2Vuc2UKKyAgICAvLyBhdCBhbGwuCisgICAgaWYgKG9w ZXJhdGlvbnNBbGxvd2VkICYgRHJhZ09wZXJhdGlvbkdlbmVyaWMpCisgICAgICAgIG9wZXJhdGlv bnNBbGxvd2VkID0gc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4oKG9wZXJhdGlvbnNBbGxvd2Vk ICYgfkRyYWdPcGVyYXRpb25HZW5lcmljKSB8IERyYWdPcGVyYXRpb25Nb3ZlKTsKKyNlbmRpZgor ICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihvcGVyYXRpb25zQWxsb3dl ZCk7Cit9CisKIC8vIFdlYlZpZXcgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBXZWJWaWV3KiBXZWJWaWV3OjpjcmVhdGUo V2ViVmlld0NsaWVudCogY2xpZW50KQpAQCAtMTQ4Nyw2ICsxNTEyLDggQEAgdm9pZCBXZWJWaWV3 SW1wbDo6ZHJhZ1NvdXJjZUVuZGVkQXQoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3Jl ZW5Qb2ludCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIExlZnRCdXR0b24sIE1vdXNlRXZl bnRNb3ZlZCwgMCwgZmFsc2UsIGZhbHNlLCBmYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZhbHNlLCAwKTsKKyAgICAvLyBXZSBkb24ndCB1c2UgV2ViRHJhZ09wZXJhdGlvblRvRHJh Z09wZXJhdGlvbiBoZXJlIGJlY2F1c2UgdGhpcyBpcyBmb3IgYQorICAgIC8vIHNpbmdsZSBvcGVy YXRpb24sIG5vdCBhIG1hc2sgb2YgcG9zc2libGUgb3BlcmF0aW9ucy4KICAgICBtX3BhZ2UtPm1h aW5GcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+ZHJhZ1NvdXJjZUVuZGVkQXQocG1lLAogICAgICAg ICBzdGF0aWNfY2FzdDxEcmFnT3BlcmF0aW9uPihvcGVyYXRpb24pKTsKIH0KQEAgLTE1MTcsMjQg KzE1NDQsMTIgQEAgV2ViRHJhZ09wZXJhdGlvbiBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdF bnRlcigKICAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCksCiAgICAgICAgIGNsaWVudFBv aW50LAogICAgICAgICBzY3JlZW5Qb2ludCwKLSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJh dGlvbj4ob3BlcmF0aW9uc0FsbG93ZWQpKTsKKyAgICAgICAgV2ViRHJhZ09wZXJhdGlvblRvRHJh Z09wZXJhdGlvbihtX29wZXJhdGlvbnNBbGxvd2VkKSk7CiAKLSAgICBtX2Ryb3BFZmZlY3QgPSBE cm9wRWZmZWN0RGVmYXVsdDsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7Ci0gICAg RHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdFbnRl cmVkKCZkcmFnRGF0YSk7Ci0gICAgLy8gTWFzayB0aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRy YWcgc291cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25zLgotICAgIGlmICgoZWZmZWN0ICYgZHJhZ0Rh dGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrKCkpICE9IGVmZmVjdCkKLSAgICAgICAgZWZm ZWN0ID0gRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxz ZTsKLQotICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAg ICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBX ZWJEcmFnT3BlcmF0aW9uQ29weQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA6IFdlYkRyYWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxz ZQotICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9u PihlZmZlY3QpOwotICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdU YXJnZXREcmFnZ2luZygmZHJhZ0RhdGEsIHRydWUpOwogfQogCisKIFdlYkRyYWdPcGVyYXRpb24g V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnT3ZlcigKICAgICBjb25zdCBXZWJQb2ludCYgY2xp ZW50UG9pbnQsCiAgICAgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBvaW50LApAQCAtMTU0NywyMiAr MTU2Miw5IEBAIFdlYkRyYWdPcGVyYXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnT3Zl cigKICAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCksCiAgICAgICAgIGNsaWVudFBvaW50 LAogICAgICAgICBzY3JlZW5Qb2ludCwKLSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlv bj4ob3BlcmF0aW9uc0FsbG93ZWQpKTsKLQotICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3RE ZWZhdWx0OwotICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKLSAgICBEcmFnT3BlcmF0 aW9uIGVmZmVjdCA9IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdE YXRhKTsKLSAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3VyY2Un cyBhbGxvd2VkIG9wZXJhdGlvbnMuCi0gICAgaWYgKChlZmZlY3QgJiBkcmFnRGF0YS5kcmFnZ2lu Z1NvdXJjZU9wZXJhdGlvbk1hc2soKSkgIT0gZWZmZWN0KQotICAgICAgICBlZmZlY3QgPSBEcmFn T3BlcmF0aW9uTm9uZTsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOworICAgICAg ICBXZWJEcmFnT3BlcmF0aW9uVG9EcmFnT3BlcmF0aW9uKG1fb3BlcmF0aW9uc0FsbG93ZWQpKTsK IAotICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAg bV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJE cmFnT3BlcmF0aW9uQ29weQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA6IFdlYkRyYWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQot ICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihl ZmZlY3QpOwotICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJn ZXREcmFnZ2luZygmZHJhZ0RhdGEsIGZhbHNlKTsKIH0KIAogdm9pZCBXZWJWaWV3SW1wbDo6ZHJh Z1RhcmdldERyYWdMZWF2ZSgpCkBAIC0xNTczLDcgKzE1NzUsNyBAQCB2b2lkIFdlYlZpZXdJbXBs OjpkcmFnVGFyZ2V0RHJhZ0xlYXZlKCkKICAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCks CiAgICAgICAgIEludFBvaW50KCksCiAgICAgICAgIEludFBvaW50KCksCi0gICAgICAgIHN0YXRp Y19jYXN0PERyYWdPcGVyYXRpb24+KG1fb3BlcmF0aW9uc0FsbG93ZWQpKTsKKyAgICAgICAgV2Vi RHJhZ09wZXJhdGlvblRvRHJhZ09wZXJhdGlvbihtX29wZXJhdGlvbnNBbGxvd2VkKSk7CiAKICAg ICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7CiAgICAgbV9wYWdlLT5kcmFnQ29udHJvbGxl cigpLT5kcmFnRXhpdGVkKCZkcmFnRGF0YSk7CkBAIC0xNjA2LDcgKzE2MDgsNyBAQCB2b2lkIFdl YlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJvcChjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsCiAg ICAgICAgIG1fY3VycmVudERyYWdEYXRhLmdldCgpLAogICAgICAgICBjbGllbnRQb2ludCwKICAg ICAgICAgc2NyZWVuUG9pbnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG1f b3BlcmF0aW9uc0FsbG93ZWQpKTsKKyAgICAgICAgV2ViRHJhZ09wZXJhdGlvblRvRHJhZ09wZXJh dGlvbihtX29wZXJhdGlvbnNBbGxvd2VkKSk7CiAKICAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9 IHRydWU7CiAgICAgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5wZXJmb3JtRHJhZygmZHJhZ0Rh dGEpOwpAQCAtMTYyNSw3ICsxNjI3LDMwIEBAIGludCBXZWJWaWV3SW1wbDo6ZHJhZ0lkZW50aXR5 KCkKICAgICByZXR1cm4gMDsKIH0KIAotdW5zaWduZWQgbG9uZyBXZWJWaWV3SW1wbDo6Y3JlYXRl VW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3QoKSB7CitXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJ bXBsOjpkcmFnVGFyZ2V0RHJhZ2dpbmcoV2ViQ29yZTo6RHJhZ0RhdGEqIGRyYWdEYXRhLCBib29s IGlzRW50ZXJpbmcpCit7CisgICAgQVNTRVJUKGRyYWdEYXRhKTsKKyAgICBtX2Ryb3BFZmZlY3Qg PSBEcm9wRWZmZWN0RGVmYXVsdDsKKyAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7Cisg ICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBpc0VudGVyaW5nID8gbV9wYWdlLT5kcmFnQ29udHJv bGxlcigpLT5kcmFnRW50ZXJlZChkcmFnRGF0YSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgOiBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdVcGRhdGVkKGRyYWdE YXRhKTsKKyAgICBXZWJEcmFnT3BlcmF0aW9uIHdlYkVmZmVjdCA9IERyYWdPcGVyYXRpb25Ub1dl YkRyYWdPcGVyYXRpb24oZWZmZWN0KTsKKyAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5z dCB0aGUgZHJhZyBzb3VyY2UncyBhbGxvd2VkIG9wZXJhdGlvbnMuCisgICAgaWYgKCEod2ViRWZm ZWN0ICYgRHJhZ09wZXJhdGlvblRvV2ViRHJhZ09wZXJhdGlvbihkcmFnRGF0YS0+ZHJhZ2dpbmdT b3VyY2VPcGVyYXRpb25NYXNrKCkpKSkKKyAgICAgICAgd2ViRWZmZWN0ID0gV2ViRHJhZ09wZXJh dGlvbk5vbmU7CisgICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKKworICAgIGlmICht X2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKKyAgICAgICAgbV9kcmFnT3BlcmF0 aW9uID0gKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9u Q29weQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA6IFdlYkRyYWdPcGVyYXRpb25Ob25lOworICAgIH0gZWxzZQorICAgICAgICBtX2Ry YWdPcGVyYXRpb24gPSB3ZWJFZmZlY3Q7CisKKyAgICByZXR1cm4gbV9kcmFnT3BlcmF0aW9uOwor fQorCit1bnNpZ25lZCBsb25nIFdlYlZpZXdJbXBsOjpjcmVhdGVVbmlxdWVJZGVudGlmaWVyRm9y UmVxdWVzdCgpCit7CiAgICAgaWYgKG1fcGFnZSkKICAgICAgICAgcmV0dXJuIG1fcGFnZS0+cHJv Z3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwogICAgIHJldHVybiAwOwpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IGRlNjAzYmMuLjViZWUxNTYgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmgKQEAgLTUzLDYgKzUzLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Y2xhc3MgQ2hyb21pdW1EYXRhT2JqZWN0OworY2xhc3MgRHJhZ0RhdGE7CiBjbGFzcyBGcmFtZTsK IGNsYXNzIEhpc3RvcnlJdGVtOwogY2xhc3MgSGl0VGVzdFJlc3VsdDsKQEAgLTM0MCw2ICszNDEs MTEgQEAgcHJpdmF0ZToKICAgICAvLyB0aGUgSGl0VGVzdFJlc3VsdCBmb3IgaXQuCiAgICAgV2Vi Q29yZTo6SGl0VGVzdFJlc3VsdCBoaXRUZXN0UmVzdWx0Rm9yV2luZG93UG9zKGNvbnN0IFdlYkNv cmU6OkludFBvaW50Jik7CiAKKyAgICAvLyBDb25zb2xpZGF0ZSBzb21lIGNvbW1vbiBjb2RlIGJl dHdlZW4gc3RhcnRpbmcgYSBkcmFnIG92ZXIgYSB0YXJnZXQgYW5kCisgICAgLy8gdXBkYXRpbmcg YSBkcmFnIG92ZXIgYSB0YXJnZXQuICBJZiB3ZSdyZSBzdGFydGluZyBhIGRyYWcsIHxpc0VudGVy aW5nfAorICAgIC8vIHNob3VsZCBiZSB0cnVlLgorICAgIFdlYkRyYWdPcGVyYXRpb24gZHJhZ1Rh cmdldERyYWdnaW5nKFdlYkNvcmU6OkRyYWdEYXRhKiwgYm9vbCBpc0VudGVyaW5nKTsKKwogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICB2b2lkIHNldEFjY2VsZXJhdGVkQ29t cG9zaXRpbmcoYm9vbCk7CiAgICAgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSBjb25z dCB7IHJldHVybiBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGluZzsgfQo= 51473 2010-03-23 19:21:09 -0700 2010-03-25 01:27:04 -0700 Patch bug-36484-20100324112107.patch text/plain 10058 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYTQzZTBiLi40MWUzMDg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMt MjMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3RseSBoYW5kbGUg bW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4 cGVjdGF0aW9ucy50eHQ6CisKIDIwMTAtMDMtMjMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dApp bmRleCA0YzljODQwLi5jMDI1OGRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CkBAIC0yNzkzLDkgKzI3OTMsNiBAQCBCVUdf SklBTkxJIE1BQyA6IGZhc3QvZm9ybXMvc2VsZWN0LXN0eWxlLmh0bWwgPSBJTUFHRSBQQVNTCiBC VUczODM3NSA6IHBsdWdpbnMvcm91bmQtdHJpcC1ucG9iamVjdC5odG1sID0gVEVYVAogQlVHMzgz NzYgV0lOIDogZWRpdGluZy9kZWxldGluZy81MzkwNjgxLTIuaHRtbCA9IElNQUdFK1RFWFQKIAot Ly8gV2ViS2l0IHJvbGwgNTU5NDAgLT4gNTYwMDQKLUJVRzM4MjI4IDogZmFzdC9ldmVudHMvZHJh Zy1hbmQtZHJvcC5odG1sID0gVEVYVAotCiAvLyBIVE1MUHJvZ3Jlc3NFbGVtZW50IHJlbGF0ZWQg dGVzdHMgZGVmZXJyZWQgZHVlIHRvIHI1NTk4MC4KIEJVRzM4MjI3IERFRkVSIDogZmFzdC9kb20v SFRNTFByb2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50Lmh0bWwgPSBNSVNTSU5HCiBCVUcz ODIyNyBERUZFUiA6IGZhc3QvZG9tL0hUTUxQcm9ncmVzc0VsZW1lbnQvc2V0LXByb2dyZXNzLXBy b3BlcnRpZXMuaHRtbCA9IE1JU1NJTkcKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDQ3NDQ0MGUuLjU1Y2U1Yzkg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTAzLTIzICBUb255IENoYW5nICA8 dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBjb3JyZWN0bHkgaGFuZGxlIG1vdmUgZHJhZyBvcGVyYXRp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjQ4 NAorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi RHJhZ09wZXJhdGlvblRvRHJhZ09wZXJhdGlvbik6IENvbnZlcnQgYmV0d2VlbiBXZWJLaXQgYXBp IGFuZCBXZWJDb3JlIHR5cGVzLgorICAgICAgICAgICAgQWxzbyBoYW5kbGVzIGNvbnZlcnNpb24g YmV0d2VlbiBEcmFnT3BlcmF0aW9uR2VuZXJpYyBhbmQgRHJhZ09wZXJhdGlvbk1vdmUuCisgICAg ICAgIChXZWJLaXQ6OkRyYWdPcGVyYXRpb25Ub1dlYkRyYWdPcGVyYXRpb24pOiByZXZlcnNlIG9m IFdlYkRyYWdPcGVyYXRpb25Ub0RyYWdPcGVyYXRpb24KKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6OmRyYWdTb3VyY2VFbmRlZEF0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6 OmRyYWdUYXJnZXREcmFnRW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJh Z1RhcmdldERyYWdPdmVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJn ZXREcmFnTGVhdmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERy b3ApOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdnaW5nKTog Q29tYmluZSBjb21tb24gY29kZSBpbnRvIGEgaGVscGVyIG1ldGhvZC4KKyAgICAgICAgKFdlYktp dDo6V2ViVmlld0ltcGw6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KToKKyAgICAg ICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMC0wMy0yMyAgS2VubmV0aCBSdXNzZWxsICA8 a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDgxNDI5ZjguLmQxMjA5M2IgMTAwNjQ0Ci0tLSBh L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0xNjQsNiArMTY0LDMxIEBAIHN0YXRpYyBjb25zdCBQ b3B1cENvbnRhaW5lclNldHRpbmdzIHN1Z2dlc3Rpb25zUG9wdXBTZXR0aW5ncyA9IHsKICAgICBQ b3B1cENvbnRhaW5lclNldHRpbmdzOjpET01FbGVtZW50RGlyZWN0aW9uLAogfTsKIAorc3RhdGlj IERyYWdPcGVyYXRpb24gV2ViRHJhZ09wZXJhdGlvblRvRHJhZ09wZXJhdGlvbihXZWJEcmFnT3Bl cmF0aW9uIG9wZXJhdGlvbnNBbGxvd2VkKQoreworI2lmICFPUyhEQVJXSU4pCisgICAgLy8gVGhl IGRlZmF1bHQgZHJhZyBvcGVyYXRpb24gb24gT1NYIGlzIGdlbmVyaWMsIGJ1dCB0aGlzIHR5cGUg b2Ygb3BlcmF0aW9uCisgICAgLy8gZG9lc24ndCBleGlzdCBvbiBvdGhlciBvcGVyYXRpbmcgc3lz dGVtcy4gIEZvciB0aGVzZSBPU2VzLCBtYXAgIm1vdmUiIHRvCisgICAgLy8gImdlbmVyaWMiIGZv ciB3ZWJjb3JlLgorICAgIGlmIChvcGVyYXRpb25zQWxsb3dlZCAmIFdlYkRyYWdPcGVyYXRpb25N b3ZlKQorICAgICAgICBvcGVyYXRpb25zQWxsb3dlZCA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVy YXRpb25zTWFzaz4ob3BlcmF0aW9uc0FsbG93ZWQgfCBXZWJEcmFnT3BlcmF0aW9uR2VuZXJpYyk7 CisjZW5kaWYKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4ob3BlcmF0aW9u c0FsbG93ZWQpOworfQorCitzdGF0aWMgV2ViRHJhZ09wZXJhdGlvbiBEcmFnT3BlcmF0aW9uVG9X ZWJEcmFnT3BlcmF0aW9uKERyYWdPcGVyYXRpb24gb3BlcmF0aW9uc0FsbG93ZWQpCit7CisjaWYg IU9TKERBUldJTikKKyAgICAvLyBUaGUgZGVmYXVsdCBkcmFnIG9wZXJhdGlvbiBvbiBPU1ggaXMg Z2VuZXJpYywgYnV0IHRoaXMgdHlwZSBvZiBvcGVyYXRpb24KKyAgICAvLyBkb2Vzbid0IGV4aXN0 IG9uIG90aGVyIG9wZXJhdGluZyBzeXN0ZW1zLiAgRm9yIHRoZXNlIE9TZXMsIG1hcCAiZ2VuZXJp YyIgdG8KKyAgICAvLyAibW92ZSIgZm9yIGNocm9taXVtLiAgV2UgbWFzayBvdXQgZ2VuZXJpYyBi ZWNhdXNlIGl0IGRvZXNuJ3QgbWFrZSBzZW5zZQorICAgIC8vIGF0IGFsbC4KKyAgICBpZiAob3Bl cmF0aW9uc0FsbG93ZWQgJiBEcmFnT3BlcmF0aW9uR2VuZXJpYykKKyAgICAgICAgb3BlcmF0aW9u c0FsbG93ZWQgPSBzdGF0aWNfY2FzdDxEcmFnT3BlcmF0aW9uPigob3BlcmF0aW9uc0FsbG93ZWQg JiB+RHJhZ09wZXJhdGlvbkdlbmVyaWMpIHwgRHJhZ09wZXJhdGlvbk1vdmUpOworI2VuZGlmCisg ICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KG9wZXJhdGlvbnNBbGxvd2Vk KTsKK30KKwogLy8gV2ViVmlldyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIFdlYlZpZXcqIFdlYlZpZXc6OmNyZWF0ZShX ZWJWaWV3Q2xpZW50KiBjbGllbnQpCkBAIC0xNDU1LDYgKzE0ODAsOCBAQCB2b2lkIFdlYlZpZXdJ bXBsOjpkcmFnU291cmNlRW5kZWRBdCgKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcmVl blBvaW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgTGVmdEJ1dHRvbiwgTW91c2VFdmVu dE1vdmVkLCAwLCBmYWxzZSwgZmFsc2UsIGZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgZmFsc2UsIDApOworICAgIC8vIFdlIGRvbid0IHVzZSBXZWJEcmFnT3BlcmF0aW9uVG9EcmFn T3BlcmF0aW9uIGhlcmUgYmVjYXVzZSB0aGlzIGlzIGZvciBhCisgICAgLy8gc2luZ2xlIG9wZXJh dGlvbiwgbm90IGEgbWFzayBvZiBwb3NzaWJsZSBvcGVyYXRpb25zLgogICAgIG1fcGFnZS0+bWFp bkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5kcmFnU291cmNlRW5kZWRBdChwbWUsCiAgICAgICAg IHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlvbikpOwogfQpAQCAtMTQ4MSw1NiAr MTUwOCwxOCBAQCBXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0Vu dGVyKAogICAgIG1fZHJhZ0lkZW50aXR5ID0gaWRlbnRpdHk7CiAgICAgbV9vcGVyYXRpb25zQWxs b3dlZCA9IG9wZXJhdGlvbnNBbGxvd2VkOwogCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCi0gICAg ICAgIG1fY3VycmVudERyYWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQb2ludCwKLSAgICAg ICAgc2NyZWVuUG9pbnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJh dGlvbnNBbGxvd2VkKSk7Ci0KLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsK LSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJhdGlvbiBlZmZl Y3QgPSBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7Ci0g ICAgLy8gTWFzayB0aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNlJ3MgYWxsb3dl ZCBvcGVyYXRpb25zLgotICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VP cGVyYXRpb25NYXNrKCkpICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJhZ09wZXJhdGlv bk5vbmU7Ci0gICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAgIGlmIChtX2Ry b3BFZmZlY3QgIT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFnT3BlcmF0aW9u ID0gKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29w eQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA6IFdlYkRyYWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAgICAgICBtX2RyYWdP cGVyYXRpb24gPSBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3QpOwotICAgIHJl dHVybiBtX2RyYWdPcGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFnRW50ZXJPck92 ZXIoY2xpZW50UG9pbnQsIHNjcmVlblBvaW50LCB0cnVlKTsKIH0KIAorCiBXZWJEcmFnT3BlcmF0 aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIoCiAgICAgY29uc3QgV2ViUG9pbnQm IGNsaWVudFBvaW50LAogICAgIGNvbnN0IFdlYlBvaW50JiBzY3JlZW5Qb2ludCwKICAgICBXZWJE cmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0FsbG93ZWQpCiB7Ci0gICAgQVNTRVJUKG1fY3Vy cmVudERyYWdEYXRhLmdldCgpKTsKLQogICAgIG1fb3BlcmF0aW9uc0FsbG93ZWQgPSBvcGVyYXRp b25zQWxsb3dlZDsKLSAgICBEcmFnRGF0YSBkcmFnRGF0YSgKLSAgICAgICAgbV9jdXJyZW50RHJh Z0RhdGEuZ2V0KCksCi0gICAgICAgIGNsaWVudFBvaW50LAotICAgICAgICBzY3JlZW5Qb2ludCwK LSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4ob3BlcmF0aW9uc0FsbG93ZWQpKTsK IAotICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3REZWZhdWx0OwotICAgIG1fZHJhZ1Rhcmdl dERpc3BhdGNoID0gdHJ1ZTsKLSAgICBEcmFnT3BlcmF0aW9uIGVmZmVjdCA9IG1fcGFnZS0+ZHJh Z0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRhKTsKLSAgICAvLyBNYXNrIHRoZSBv cGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3VyY2UncyBhbGxvd2VkIG9wZXJhdGlvbnMuCi0g ICAgaWYgKChlZmZlY3QgJiBkcmFnRGF0YS5kcmFnZ2luZ1NvdXJjZU9wZXJhdGlvbk1hc2soKSkg IT0gZWZmZWN0KQotICAgICAgICBlZmZlY3QgPSBEcmFnT3BlcmF0aW9uTm9uZTsKLSAgICBtX2Ry YWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOwotCi0gICAgaWYgKG1fZHJvcEVmZmVjdCAhPSBEcm9w RWZmZWN0RGVmYXVsdCkgewotICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSAobV9kcm9wRWZmZWN0 ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdPcGVyYXRpb25Db3B5Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogV2ViRHJhZ09w ZXJhdGlvbk5vbmU7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1fZHJhZ09wZXJhdGlvbiA9IHN0YXRp Y19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVjdCk7Ci0gICAgcmV0dXJuIG1fZHJhZ09wZXJh dGlvbjsKKyAgICByZXR1cm4gZHJhZ1RhcmdldERyYWdFbnRlck9yT3ZlcihjbGllbnRQb2ludCwg c2NyZWVuUG9pbnQsIGZhbHNlKTsKIH0KIAogdm9pZCBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERy YWdMZWF2ZSgpCkBAIC0xNTQxLDcgKzE1MzAsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkcmFnVGFy Z2V0RHJhZ0xlYXZlKCkKICAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCksCiAgICAgICAg IEludFBvaW50KCksCiAgICAgICAgIEludFBvaW50KCksCi0gICAgICAgIHN0YXRpY19jYXN0PERy YWdPcGVyYXRpb24+KG1fb3BlcmF0aW9uc0FsbG93ZWQpKTsKKyAgICAgICAgV2ViRHJhZ09wZXJh dGlvblRvRHJhZ09wZXJhdGlvbihtX29wZXJhdGlvbnNBbGxvd2VkKSk7CiAKICAgICBtX2RyYWdU YXJnZXREaXNwYXRjaCA9IHRydWU7CiAgICAgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFn RXhpdGVkKCZkcmFnRGF0YSk7CkBAIC0xNTc0LDcgKzE1NjMsNyBAQCB2b2lkIFdlYlZpZXdJbXBs OjpkcmFnVGFyZ2V0RHJvcChjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsCiAgICAgICAgIG1f Y3VycmVudERyYWdEYXRhLmdldCgpLAogICAgICAgICBjbGllbnRQb2ludCwKICAgICAgICAgc2Ny ZWVuUG9pbnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG1fb3BlcmF0aW9u c0FsbG93ZWQpKTsKKyAgICAgICAgV2ViRHJhZ09wZXJhdGlvblRvRHJhZ09wZXJhdGlvbihtX29w ZXJhdGlvbnNBbGxvd2VkKSk7CiAKICAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7CiAg ICAgbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5wZXJmb3JtRHJhZygmZHJhZ0RhdGEpOwpAQCAt MTU5Myw3ICsxNTgyLDM3IEBAIGludCBXZWJWaWV3SW1wbDo6ZHJhZ0lkZW50aXR5KCkKICAgICBy ZXR1cm4gMDsKIH0KIAotdW5zaWduZWQgbG9uZyBXZWJWaWV3SW1wbDo6Y3JlYXRlVW5pcXVlSWRl bnRpZmllckZvclJlcXVlc3QoKSB7CitXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFn VGFyZ2V0RHJhZ0VudGVyT3JPdmVyKGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwgY29uc3Qg V2ViUG9pbnQmIHNjcmVlblBvaW50LCBib29sIGlzRW50ZXJpbmcpCit7CisgICAgQVNTRVJUKG1f Y3VycmVudERyYWdEYXRhLmdldCgpKTsKKworICAgIERyYWdEYXRhIGRyYWdEYXRhKAorICAgICAg ICBtX2N1cnJlbnREcmFnRGF0YS5nZXQoKSwKKyAgICAgICAgY2xpZW50UG9pbnQsCisgICAgICAg IHNjcmVlblBvaW50LAorICAgICAgICBXZWJEcmFnT3BlcmF0aW9uVG9EcmFnT3BlcmF0aW9uKG1f b3BlcmF0aW9uc0FsbG93ZWQpKTsKKworICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3REZWZh dWx0OworICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKKyAgICBEcmFnT3BlcmF0aW9u IGVmZmVjdCA9IGlzRW50ZXJpbmcgPyBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdFbnRl cmVkKCZkcmFnRGF0YSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiBt X3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdVcGRhdGVkKCZkcmFnRGF0YSk7CisgICAgV2Vi RHJhZ09wZXJhdGlvbiB3ZWJFZmZlY3QgPSBEcmFnT3BlcmF0aW9uVG9XZWJEcmFnT3BlcmF0aW9u KGVmZmVjdCk7CisgICAgLy8gTWFzayB0aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291 cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25zLgorICAgIGlmICghKHdlYkVmZmVjdCAmIERyYWdPcGVy YXRpb25Ub1dlYkRyYWdPcGVyYXRpb24oZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25N YXNrKCkpKSkKKyAgICAgICAgd2ViRWZmZWN0ID0gV2ViRHJhZ09wZXJhdGlvbk5vbmU7CisgICAg bV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKKworICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0g RHJvcEVmZmVjdERlZmF1bHQpIHsKKyAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVm ZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29weQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IFdlYkRy YWdPcGVyYXRpb25Ob25lOworICAgIH0gZWxzZQorICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSB3 ZWJFZmZlY3Q7CisKKyAgICByZXR1cm4gbV9kcmFnT3BlcmF0aW9uOworfQorCit1bnNpZ25lZCBs b25nIFdlYlZpZXdJbXBsOjpjcmVhdGVVbmlxdWVJZGVudGlmaWVyRm9yUmVxdWVzdCgpCit7CiAg ICAgaWYgKG1fcGFnZSkKICAgICAgICAgcmV0dXJuIG1fcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRl VW5pcXVlSWRlbnRpZmllcigpOwogICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCmluZGV4IGFjZDJiMjIuLjBiNjEzN2IgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK QEAgLTMzMCw2ICszMzAsMTMgQEAgcHJpdmF0ZToKICAgICAvLyB0aGUgSGl0VGVzdFJlc3VsdCBm b3IgaXQuCiAgICAgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdCBoaXRUZXN0UmVzdWx0Rm9yV2luZG93 UG9zKGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAKKyAgICAvLyBDb25zb2xpZGF0ZSBzb21l IGNvbW1vbiBjb2RlIGJldHdlZW4gc3RhcnRpbmcgYSBkcmFnIG92ZXIgYSB0YXJnZXQgYW5kCisg ICAgLy8gdXBkYXRpbmcgYSBkcmFnIG92ZXIgYSB0YXJnZXQuICBJZiB3ZSdyZSBzdGFydGluZyBh IGRyYWcsIHxpc0VudGVyaW5nfAorICAgIC8vIHNob3VsZCBiZSB0cnVlLgorICAgIFdlYkRyYWdP cGVyYXRpb24gZHJhZ1RhcmdldERyYWdFbnRlck9yT3Zlcihjb25zdCBXZWJQb2ludCYgY2xpZW50 UG9pbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IFdlYlBvaW50JiBzY3JlZW5Qb2ludCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYm9vbCBpc0VudGVyaW5nKTsKKwogI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKICAgICB2b2lkIHNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoYm9vbCk7 CiAgICAgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSBjb25zdCB7IHJldHVybiBtX2lz QWNjZWxlcmF0ZWRDb21wb3NpdGluZzsgfQo= 51604 2010-03-25 01:27:09 -0700 2010-03-25 01:32:35 -0700 Patch bug-36484-20100325172707.patch text/plain 5731 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGM1NjhkMTUuLjRiM2ZkYWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTAzLTI1ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBj b3JyZWN0bHkgaGFuZGxlIG1vdmUgZHJhZyBvcGVyYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjQ4NAorCisgICAgICAgICogc3JjL1dlYlZp ZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFn RW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdPdmVy KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50ZXJPck92 ZXIpOiBDb21iaW5lIGNvbW1vbiBjb2RlIGludG8gYSBoZWxwZXIgbWV0aG9kCisgICAgICAgICAg ICBhbmQgcHJvcGVybHkgbWFzayBhZ2FpbnN0IHRoZSBkcmFnIGVmZmVjdC4KKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KToKKyAg ICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMC0wMy0yNCAgRG1pdHJ5IFRpdG92ICA8 ZGltaWNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI1 NjQ1My4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggODc1NTY5MS4uNDY5MjRi NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1MTYsMjYgKzE1MTYsNyBA QCBXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKAogICAg IG1fZHJhZ0lkZW50aXR5ID0gaWRlbnRpdHk7CiAgICAgbV9vcGVyYXRpb25zQWxsb3dlZCA9IG9w ZXJhdGlvbnNBbGxvd2VkOwogCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCi0gICAgICAgIG1fY3Vy cmVudERyYWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQb2ludCwKLSAgICAgICAgc2NyZWVu UG9pbnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlvbnNBbGxv d2VkKSk7Ci0KLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKLSAgICBtX2Ry YWdUYXJnZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBtX3Bh Z2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7Ci0gICAgLy8gTWFz ayB0aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNlJ3MgYWxsb3dlZCBvcGVyYXRp b25zLgotICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25N YXNrKCkpICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJhZ09wZXJhdGlvbk5vbmU7Ci0g ICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAgIGlmIChtX2Ryb3BFZmZlY3Qg IT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJv cEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29weQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IFdl YkRyYWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAgICAgICBtX2RyYWdPcGVyYXRpb24g PSBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3QpOwotICAgIHJldHVybiBtX2Ry YWdPcGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFnRW50ZXJPck92ZXIoY2xpZW50 UG9pbnQsIHNjcmVlblBvaW50LCB0cnVlKTsKIH0KIAogV2ViRHJhZ09wZXJhdGlvbiBXZWJWaWV3 SW1wbDo6ZHJhZ1RhcmdldERyYWdPdmVyKApAQCAtMTU0MywyOSArMTUyNCw5IEBAIFdlYkRyYWdP cGVyYXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnT3ZlcigKICAgICBjb25zdCBXZWJQ b2ludCYgc2NyZWVuUG9pbnQsCiAgICAgV2ViRHJhZ09wZXJhdGlvbnNNYXNrIG9wZXJhdGlvbnNB bGxvd2VkKQogewotICAgIEFTU0VSVChtX2N1cnJlbnREcmFnRGF0YS5nZXQoKSk7Ci0KICAgICBt X29wZXJhdGlvbnNBbGxvd2VkID0gb3BlcmF0aW9uc0FsbG93ZWQ7Ci0gICAgRHJhZ0RhdGEgZHJh Z0RhdGEoCi0gICAgICAgIG1fY3VycmVudERyYWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQ b2ludCwKLSAgICAgICAgc2NyZWVuUG9pbnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVy YXRpb24+KG9wZXJhdGlvbnNBbGxvd2VkKSk7CiAKLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZm ZWN0RGVmYXVsdDsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09w ZXJhdGlvbiBlZmZlY3QgPSBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdVcGRhdGVkKCZk cmFnRGF0YSk7Ci0gICAgLy8gTWFzayB0aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291 cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25zLgotICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJh Z2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrKCkpICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0g RHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQot ICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9k cmFnT3BlcmF0aW9uID0gKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFn T3BlcmF0aW9uQ29weQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA6IFdlYkRyYWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAg ICAgICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZl Y3QpOwotICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXRE cmFnRW50ZXJPck92ZXIoY2xpZW50UG9pbnQsIHNjcmVlblBvaW50LCBmYWxzZSk7CiB9CiAKIHZv aWQgV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnTGVhdmUoKQpAQCAtMTYyOCw3ICsxNTg5LDM2 IEBAIGludCBXZWJWaWV3SW1wbDo6ZHJhZ0lkZW50aXR5KCkKICAgICByZXR1cm4gMDsKIH0KIAot dW5zaWduZWQgbG9uZyBXZWJWaWV3SW1wbDo6Y3JlYXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVl c3QoKSB7CitXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVy T3JPdmVyKGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwgY29uc3QgV2ViUG9pbnQmIHNjcmVl blBvaW50LCBib29sIGlzRW50ZXJpbmcpCit7CisgICAgQVNTRVJUKG1fY3VycmVudERyYWdEYXRh LmdldCgpKTsKKworICAgIERyYWdEYXRhIGRyYWdEYXRhKAorICAgICAgICBtX2N1cnJlbnREcmFn RGF0YS5nZXQoKSwKKyAgICAgICAgY2xpZW50UG9pbnQsCisgICAgICAgIHNjcmVlblBvaW50LAor ICAgICAgICBzdGF0aWNfY2FzdDxEcmFnT3BlcmF0aW9uPihtX29wZXJhdGlvbnNBbGxvd2VkKSk7 CisKKyAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKKyAgICBtX2RyYWdUYXJn ZXREaXNwYXRjaCA9IHRydWU7CisgICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBpc0VudGVyaW5n ID8gbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50ZXJlZCgmZHJhZ0RhdGEpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogbV9wYWdlLT5kcmFnQ29udHJvbGxl cigpLT5kcmFnVXBkYXRlZCgmZHJhZ0RhdGEpOworICAgIC8vIE1hc2sgdGhlIG9wZXJhdGlvbiBh Z2FpbnN0IHRoZSBkcmFnIHNvdXJjZSdzIGFsbG93ZWQgb3BlcmF0aW9ucy4KKyAgICBpZiAoIShl ZmZlY3QgJiBkcmFnRGF0YS5kcmFnZ2luZ1NvdXJjZU9wZXJhdGlvbk1hc2soKSkpCisgICAgICAg IGVmZmVjdCA9IERyYWdPcGVyYXRpb25Ob25lOworICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0g ZmFsc2U7CisKKyAgICBpZiAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3REZWZhdWx0KSB7Cisg ICAgICAgIG1fZHJhZ09wZXJhdGlvbiA9IChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdE5vbmUp ID8gV2ViRHJhZ09wZXJhdGlvbkNvcHkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgOiBXZWJEcmFnT3BlcmF0aW9uTm9uZTsKKyAgICB9 IGVsc2UKKyAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gc3RhdGljX2Nhc3Q8V2ViRHJhZ09wZXJh dGlvbj4oZWZmZWN0KTsKKworICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247Cit9CisKK3Vuc2ln bmVkIGxvbmcgV2ViVmlld0ltcGw6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KCkK K3sKICAgICBpZiAobV9wYWdlKQogICAgICAgICByZXR1cm4gbV9wYWdlLT5wcm9ncmVzcygpLT5j cmVhdGVVbmlxdWVJZGVudGlmaWVyKCk7CiAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmgKaW5kZXggZGU2MDNiYy4uZGNmMmYxNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaApAQCAtMzQwLDYgKzM0MCwxMyBAQCBwcml2YXRlOgogICAgIC8vIHRoZSBIaXRUZXN0UmVz dWx0IGZvciBpdC4KICAgICBXZWJDb3JlOjpIaXRUZXN0UmVzdWx0IGhpdFRlc3RSZXN1bHRGb3JX aW5kb3dQb3MoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsKIAorICAgIC8vIENvbnNvbGlkYXRl IHNvbWUgY29tbW9uIGNvZGUgYmV0d2VlbiBzdGFydGluZyBhIGRyYWcgb3ZlciBhIHRhcmdldCBh bmQKKyAgICAvLyB1cGRhdGluZyBhIGRyYWcgb3ZlciBhIHRhcmdldC4gIElmIHdlJ3JlIHN0YXJ0 aW5nIGEgZHJhZywgfGlzRW50ZXJpbmd8CisgICAgLy8gc2hvdWxkIGJlIHRydWUuCisgICAgV2Vi RHJhZ09wZXJhdGlvbiBkcmFnVGFyZ2V0RHJhZ0VudGVyT3JPdmVyKGNvbnN0IFdlYlBvaW50JiBj bGllbnRQb2ludCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBvaW50LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIGlzRW50ZXJpbmcpOworCiAjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyhi b29sKTsKICAgICBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0IHsgcmV0dXJu IG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nOyB9Cg== 51605 2010-03-25 01:32:40 -0700 2010-03-25 17:27:38 -0700 Patch bug-36484-20100325173238.patch text/plain 7039 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyYmM5Zjc2Li5lYWYxY2UyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMt MjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3RseSBoYW5kbGUg bW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4 cGVjdGF0aW9ucy50eHQ6CisKIDIwMTAtMDMtMjQgIEFuZHJldyBTY2hlcmt1cyAgPHNjaGVya3Vz QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24sIEVyaWMg U2VpZGVsIGFuZCBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2No cm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAppbmRleCA0YzljODQwLi5jMDI1OGRmIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50 eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMu dHh0CkBAIC0yNzkzLDkgKzI3OTMsNiBAQCBCVUdfSklBTkxJIE1BQyA6IGZhc3QvZm9ybXMvc2Vs ZWN0LXN0eWxlLmh0bWwgPSBJTUFHRSBQQVNTCiBCVUczODM3NSA6IHBsdWdpbnMvcm91bmQtdHJp cC1ucG9iamVjdC5odG1sID0gVEVYVAogQlVHMzgzNzYgV0lOIDogZWRpdGluZy9kZWxldGluZy81 MzkwNjgxLTIuaHRtbCA9IElNQUdFK1RFWFQKIAotLy8gV2ViS2l0IHJvbGwgNTU5NDAgLT4gNTYw MDQKLUJVRzM4MjI4IDogZmFzdC9ldmVudHMvZHJhZy1hbmQtZHJvcC5odG1sID0gVEVYVAotCiAv LyBIVE1MUHJvZ3Jlc3NFbGVtZW50IHJlbGF0ZWQgdGVzdHMgZGVmZXJyZWQgZHVlIHRvIHI1NTk4 MC4KIEJVRzM4MjI3IERFRkVSIDogZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVudC9wcm9ncmVz cy1lbGVtZW50Lmh0bWwgPSBNSVNTSU5HCiBCVUczODIyNyBERUZFUiA6IGZhc3QvZG9tL0hUTUxQ cm9ncmVzc0VsZW1lbnQvc2V0LXByb2dyZXNzLXByb3BlcnRpZXMuaHRtbCA9IE1JU1NJTkcKZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IGM1NjhkMTUuLjRiM2ZkYWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEwLTAzLTI1ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBjb3Jy ZWN0bHkgaGFuZGxlIG1vdmUgZHJhZyBvcGVyYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjQ4NAorCisgICAgICAgICogc3JjL1dlYlZpZXdJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50 ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdPdmVyKToK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50ZXJPck92ZXIp OiBDb21iaW5lIGNvbW1vbiBjb2RlIGludG8gYSBoZWxwZXIgbWV0aG9kCisgICAgICAgICAgICBh bmQgcHJvcGVybHkgbWFzayBhZ2FpbnN0IHRoZSBkcmFnIGVmZmVjdC4KKyAgICAgICAgKFdlYktp dDo6V2ViVmlld0ltcGw6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KToKKyAgICAg ICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMC0wMy0yNCAgRG1pdHJ5IFRpdG92ICA8ZGlt aWNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI1NjQ1 My4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggODc1NTY5MS4uNDY5MjRiNiAx MDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1MTYsMjYgKzE1MTYsNyBAQCBX ZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKAogICAgIG1f ZHJhZ0lkZW50aXR5ID0gaWRlbnRpdHk7CiAgICAgbV9vcGVyYXRpb25zQWxsb3dlZCA9IG9wZXJh dGlvbnNBbGxvd2VkOwogCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCi0gICAgICAgIG1fY3VycmVu dERyYWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQb2ludCwKLSAgICAgICAgc2NyZWVuUG9p bnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlvbnNBbGxvd2Vk KSk7Ci0KLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKLSAgICBtX2RyYWdU YXJnZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBtX3BhZ2Ut PmRyYWdDb250cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7Ci0gICAgLy8gTWFzayB0 aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25z LgotICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNr KCkpICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAg bV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0g RHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVm ZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29weQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IFdlYkRy YWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSBz dGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3QpOwotICAgIHJldHVybiBtX2RyYWdP cGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFnRW50ZXJPck92ZXIoY2xpZW50UG9p bnQsIHNjcmVlblBvaW50LCB0cnVlKTsKIH0KIAogV2ViRHJhZ09wZXJhdGlvbiBXZWJWaWV3SW1w bDo6ZHJhZ1RhcmdldERyYWdPdmVyKApAQCAtMTU0MywyOSArMTUyNCw5IEBAIFdlYkRyYWdPcGVy YXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnT3ZlcigKICAgICBjb25zdCBXZWJQb2lu dCYgc2NyZWVuUG9pbnQsCiAgICAgV2ViRHJhZ09wZXJhdGlvbnNNYXNrIG9wZXJhdGlvbnNBbGxv d2VkKQogewotICAgIEFTU0VSVChtX2N1cnJlbnREcmFnRGF0YS5nZXQoKSk7Ci0KICAgICBtX29w ZXJhdGlvbnNBbGxvd2VkID0gb3BlcmF0aW9uc0FsbG93ZWQ7Ci0gICAgRHJhZ0RhdGEgZHJhZ0Rh dGEoCi0gICAgICAgIG1fY3VycmVudERyYWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQb2lu dCwKLSAgICAgICAgc2NyZWVuUG9pbnQsCi0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRp b24+KG9wZXJhdGlvbnNBbGxvd2VkKSk7CiAKLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0 RGVmYXVsdDsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJh dGlvbiBlZmZlY3QgPSBtX3BhZ2UtPmRyYWdDb250cm9sbGVyKCktPmRyYWdVcGRhdGVkKCZkcmFn RGF0YSk7Ci0gICAgLy8gTWFzayB0aGUgb3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNl J3MgYWxsb3dlZCBvcGVyYXRpb25zLgotICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dp bmdTb3VyY2VPcGVyYXRpb25NYXNrKCkpICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJh Z09wZXJhdGlvbk5vbmU7Ci0gICAgbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAg IGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFn T3BlcmF0aW9uID0gKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3Bl cmF0aW9uQ29weQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA6IFdlYkRyYWdPcGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAgICAg ICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3Qp OwotICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFn RW50ZXJPck92ZXIoY2xpZW50UG9pbnQsIHNjcmVlblBvaW50LCBmYWxzZSk7CiB9CiAKIHZvaWQg V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnTGVhdmUoKQpAQCAtMTYyOCw3ICsxNTg5LDM2IEBA IGludCBXZWJWaWV3SW1wbDo6ZHJhZ0lkZW50aXR5KCkKICAgICByZXR1cm4gMDsKIH0KIAotdW5z aWduZWQgbG9uZyBXZWJWaWV3SW1wbDo6Y3JlYXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3Qo KSB7CitXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyT3JP dmVyKGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBv aW50LCBib29sIGlzRW50ZXJpbmcpCit7CisgICAgQVNTRVJUKG1fY3VycmVudERyYWdEYXRhLmdl dCgpKTsKKworICAgIERyYWdEYXRhIGRyYWdEYXRhKAorICAgICAgICBtX2N1cnJlbnREcmFnRGF0 YS5nZXQoKSwKKyAgICAgICAgY2xpZW50UG9pbnQsCisgICAgICAgIHNjcmVlblBvaW50LAorICAg ICAgICBzdGF0aWNfY2FzdDxEcmFnT3BlcmF0aW9uPihtX29wZXJhdGlvbnNBbGxvd2VkKSk7CisK KyAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKKyAgICBtX2RyYWdUYXJnZXRE aXNwYXRjaCA9IHRydWU7CisgICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBpc0VudGVyaW5nID8g bV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50ZXJlZCgmZHJhZ0RhdGEpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogbV9wYWdlLT5kcmFnQ29udHJvbGxlcigp LT5kcmFnVXBkYXRlZCgmZHJhZ0RhdGEpOworICAgIC8vIE1hc2sgdGhlIG9wZXJhdGlvbiBhZ2Fp bnN0IHRoZSBkcmFnIHNvdXJjZSdzIGFsbG93ZWQgb3BlcmF0aW9ucy4KKyAgICBpZiAoIShlZmZl Y3QgJiBkcmFnRGF0YS5kcmFnZ2luZ1NvdXJjZU9wZXJhdGlvbk1hc2soKSkpCisgICAgICAgIGVm ZmVjdCA9IERyYWdPcGVyYXRpb25Ob25lOworICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gZmFs c2U7CisKKyAgICBpZiAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3REZWZhdWx0KSB7CisgICAg ICAgIG1fZHJhZ09wZXJhdGlvbiA9IChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVjdE5vbmUpID8g V2ViRHJhZ09wZXJhdGlvbkNvcHkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgOiBXZWJEcmFnT3BlcmF0aW9uTm9uZTsKKyAgICB9IGVs c2UKKyAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gc3RhdGljX2Nhc3Q8V2ViRHJhZ09wZXJhdGlv bj4oZWZmZWN0KTsKKworICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247Cit9CisKK3Vuc2lnbmVk IGxvbmcgV2ViVmlld0ltcGw6OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXJGb3JSZXF1ZXN0KCkKK3sK ICAgICBpZiAobV9wYWdlKQogICAgICAgICByZXR1cm4gbV9wYWdlLT5wcm9ncmVzcygpLT5jcmVh dGVVbmlxdWVJZGVudGlmaWVyKCk7CiAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmgKaW5kZXggZGU2MDNiYy4uZGNmMmYxNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu aApAQCAtMzQwLDYgKzM0MCwxMyBAQCBwcml2YXRlOgogICAgIC8vIHRoZSBIaXRUZXN0UmVzdWx0 IGZvciBpdC4KICAgICBXZWJDb3JlOjpIaXRUZXN0UmVzdWx0IGhpdFRlc3RSZXN1bHRGb3JXaW5k b3dQb3MoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsKIAorICAgIC8vIENvbnNvbGlkYXRlIHNv bWUgY29tbW9uIGNvZGUgYmV0d2VlbiBzdGFydGluZyBhIGRyYWcgb3ZlciBhIHRhcmdldCBhbmQK KyAgICAvLyB1cGRhdGluZyBhIGRyYWcgb3ZlciBhIHRhcmdldC4gIElmIHdlJ3JlIHN0YXJ0aW5n IGEgZHJhZywgfGlzRW50ZXJpbmd8CisgICAgLy8gc2hvdWxkIGJlIHRydWUuCisgICAgV2ViRHJh Z09wZXJhdGlvbiBkcmFnVGFyZ2V0RHJhZ0VudGVyT3JPdmVyKGNvbnN0IFdlYlBvaW50JiBjbGll bnRQb2ludCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgV2ViUG9pbnQmIHNjcmVlblBvaW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBib29sIGlzRW50ZXJpbmcpOworCiAjaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQogICAgIHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyhib29s KTsKICAgICBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpIGNvbnN0IHsgcmV0dXJuIG1f aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nOyB9Cg== 51698 2010-03-25 17:27:44 -0700 2010-03-25 17:58:13 -0700 Patch bug-36484-20100326092742.patch text/plain 7357 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiOTJlMzhiLi4yNGFlYWMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMt MjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3RseSBoYW5kbGUg bW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4 cGVjdGF0aW9ucy50eHQ6CisKIDIwMTAtMDMtMjUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGdu c0Bnbm9tZS5vcmc+CiAKICAgICAgICAgTmVlZHMgYSAiTGludXhFZGl0aW5nQmVoYXZpb3IiLCBw ZXJoYXBzIHdpdGggYSBiZXR0ZXIgbmFtZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CmluZGV4IDg2NjQ1NDYuLmNlYzExODYgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25z LnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9u cy50eHQKQEAgLTI3OTIsOSArMjc5Miw2IEBAIEJVR19KSUFOTEkgTUFDIDogZmFzdC9mb3Jtcy9z ZWxlY3Qtc3R5bGUuaHRtbCA9IElNQUdFIFBBU1MKIEJVRzM4Mzc1IDogcGx1Z2lucy9yb3VuZC10 cmlwLW5wb2JqZWN0Lmh0bWwgPSBURVhUCiBCVUczODM3NiBXSU4gOiBlZGl0aW5nL2RlbGV0aW5n LzUzOTA2ODEtMi5odG1sID0gSU1BR0UrVEVYVAogCi0vLyBXZWJLaXQgcm9sbCA1NTk0MCAtPiA1 NjAwNAotQlVHMzgyMjggOiBmYXN0L2V2ZW50cy9kcmFnLWFuZC1kcm9wLmh0bWwgPSBURVhUCi0K IC8vIEhUTUxQcm9ncmVzc0VsZW1lbnQgcmVsYXRlZCB0ZXN0cyBkZWZlcnJlZCBkdWUgdG8gcjU1 OTgwLgogQlVHMzgyMjcgREVGRVIgOiBmYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dy ZXNzLWVsZW1lbnQuaHRtbCA9IE1JU1NJTkcKIEJVRzM4MjI3IERFRkVSIDogZmFzdC9kb20vSFRN TFByb2dyZXNzRWxlbWVudC9zZXQtcHJvZ3Jlc3MtcHJvcGVydGllcy5odG1sID0gTUlTU0lORwpk aWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggYjRmMzhjYS4uZWU0NmRiMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTggQEAKKzIwMTAtMDMtMjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNv cnJlY3RseSBoYW5kbGUgbW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBzcmMvV2ViVmll d0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdF bnRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdFbnRlck9yT3Zl cik6IENvbWJpbmUgY29tbW9uIGNvZGUgaW50byBhIGhlbHBlciBtZXRob2QKKyAgICAgICAgICAg IGFuZCBwcm9wZXJseSBtYXNrIGFnYWluc3QgdGhlIGRyYWcgZWZmZWN0LgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3SW1wbDo6Y3JlYXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3QpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTAzLTI1ICBEcmV3IFdpbHNvbiAgPGF0 d2lsc29uQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOYXRlIENoYXBpbi4K ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZmY2ZjBlZi4uNDU2YzBmMSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1MTIsMjYgKzE1MTIsNyBAQCBXZWJE cmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKAogICAgIG1fZHJh Z0lkZW50aXR5ID0gaWRlbnRpdHk7CiAgICAgbV9vcGVyYXRpb25zQWxsb3dlZCA9IG9wZXJhdGlv bnNBbGxvd2VkOwogCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCi0gICAgICAgIG1fY3VycmVudERy YWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQb2ludCwKLSAgICAgICAgc2NyZWVuUG9pbnQs Ci0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlvbnNBbGxvd2VkKSk7 Ci0KLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKLSAgICBtX2RyYWdUYXJn ZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBtX3BhZ2UtPmRy YWdDb250cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7Ci0gICAgLy8gTWFzayB0aGUg b3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25zLgot ICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrKCkp ICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgbV9k cmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJv cEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVmZmVj dCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29weQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IFdlYkRyYWdP cGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0 aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3QpOwotICAgIHJldHVybiBtX2RyYWdPcGVy YXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFnRW50ZXJPck92ZXIoY2xpZW50UG9pbnQs IHNjcmVlblBvaW50LCBEcmFnRW50ZXIpOwogfQogCiBXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJ bXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIoCkBAIC0xNTM5LDI5ICsxNTIwLDkgQEAgV2ViRHJhZ09w ZXJhdGlvbiBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdPdmVyKAogICAgIGNvbnN0IFdlYlBv aW50JiBzY3JlZW5Qb2ludCwKICAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0Fs bG93ZWQpCiB7Ci0gICAgQVNTRVJUKG1fY3VycmVudERyYWdEYXRhLmdldCgpKTsKLQogICAgIG1f b3BlcmF0aW9uc0FsbG93ZWQgPSBvcGVyYXRpb25zQWxsb3dlZDsKLSAgICBEcmFnRGF0YSBkcmFn RGF0YSgKLSAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCksCi0gICAgICAgIGNsaWVudFBv aW50LAotICAgICAgICBzY3JlZW5Qb2ludCwKLSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJh dGlvbj4ob3BlcmF0aW9uc0FsbG93ZWQpKTsKIAotICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZl Y3REZWZhdWx0OwotICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKLSAgICBEcmFnT3Bl cmF0aW9uIGVmZmVjdCA9IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRy YWdEYXRhKTsKLSAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3Vy Y2UncyBhbGxvd2VkIG9wZXJhdGlvbnMuCi0gICAgaWYgKChlZmZlY3QgJiBkcmFnRGF0YS5kcmFn Z2luZ1NvdXJjZU9wZXJhdGlvbk1hc2soKSkgIT0gZWZmZWN0KQotICAgICAgICBlZmZlY3QgPSBE cmFnT3BlcmF0aW9uTm9uZTsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOwotCi0g ICAgaWYgKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0RGVmYXVsdCkgewotICAgICAgICBtX2Ry YWdPcGVyYXRpb24gPSAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdP cGVyYXRpb25Db3B5Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDogV2ViRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgfSBlbHNlCi0gICAg ICAgIG1fZHJhZ09wZXJhdGlvbiA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVj dCk7Ci0gICAgcmV0dXJuIG1fZHJhZ09wZXJhdGlvbjsKKyAgICByZXR1cm4gZHJhZ1RhcmdldERy YWdFbnRlck9yT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIERyYWdPdmVyKTsKIH0KIAog dm9pZCBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdMZWF2ZSgpCkBAIC0xNjI0LDcgKzE1ODUs MzYgQEAgaW50IFdlYlZpZXdJbXBsOjpkcmFnSWRlbnRpdHkoKQogICAgIHJldHVybiAwOwogfQog Ci11bnNpZ25lZCBsb25nIFdlYlZpZXdJbXBsOjpjcmVhdGVVbmlxdWVJZGVudGlmaWVyRm9yUmVx dWVzdCgpIHsKK1dlYkRyYWdPcGVyYXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50 ZXJPck92ZXIoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LCBjb25zdCBXZWJQb2ludCYgc2Ny ZWVuUG9pbnQsIERyYWdBY3Rpb24gZHJhZ0FjdGlvbikKK3sKKyAgICBBU1NFUlQobV9jdXJyZW50 RHJhZ0RhdGEuZ2V0KCkpOworCisgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCisgICAgICAgIG1fY3Vy cmVudERyYWdEYXRhLmdldCgpLAorICAgICAgICBjbGllbnRQb2ludCwKKyAgICAgICAgc2NyZWVu UG9pbnQsCisgICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG1fb3BlcmF0aW9uc0Fs bG93ZWQpKTsKKworICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3REZWZhdWx0OworICAgIG1f ZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKKyAgICBEcmFnT3BlcmF0aW9uIGVmZmVjdCA9IGRy YWdBY3Rpb24gPT0gRHJhZ0VudGVyID8gbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50 ZXJlZCgmZHJhZ0RhdGEpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA6IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdE YXRhKTsKKyAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3VyY2Un cyBhbGxvd2VkIG9wZXJhdGlvbnMuCisgICAgaWYgKCEoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dp bmdTb3VyY2VPcGVyYXRpb25NYXNrKCkpKQorICAgICAgICBlZmZlY3QgPSBEcmFnT3BlcmF0aW9u Tm9uZTsKKyAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOworCisgICAgaWYgKG1fZHJv cEVmZmVjdCAhPSBEcm9wRWZmZWN0RGVmYXVsdCkgeworICAgICAgICBtX2RyYWdPcGVyYXRpb24g PSAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdPcGVyYXRpb25Db3B5 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDogV2ViRHJhZ09wZXJhdGlvbk5vbmU7CisgICAgfSBlbHNlCisgICAgICAgIG1fZHJhZ09w ZXJhdGlvbiA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVjdCk7CisKKyAgICBy ZXR1cm4gbV9kcmFnT3BlcmF0aW9uOworfQorCit1bnNpZ25lZCBsb25nIFdlYlZpZXdJbXBsOjpj cmVhdGVVbmlxdWVJZGVudGlmaWVyRm9yUmVxdWVzdCgpCit7CiAgICAgaWYgKG1fcGFnZSkKICAg ICAgICAgcmV0dXJuIG1fcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigp OwogICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IGRlNjAzYmMu LmY3N2U5NjcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAor KysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTMxMyw2ICszMTMsMTEg QEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV2ViVmlldzsgIC8vIFNvIFdlYlZpZXc6OkNy ZWF0ZSBjYW4gY2FsbCBvdXIgY29uc3RydWN0b3IKICAgICBmcmllbmQgY2xhc3MgV1RGOjpSZWZD b3VudGVkPFdlYlZpZXdJbXBsPjsKIAorICAgIGVudW0gRHJhZ0FjdGlvbiB7CisgICAgICBEcmFn RW50ZXIsCisgICAgICBEcmFnT3ZlcgorICAgIH07CisKICAgICBXZWJWaWV3SW1wbChXZWJWaWV3 Q2xpZW50KiBjbGllbnQpOwogICAgIH5XZWJWaWV3SW1wbCgpOwogCkBAIC0zNDAsNiArMzQ1LDEz IEBAIHByaXZhdGU6CiAgICAgLy8gdGhlIEhpdFRlc3RSZXN1bHQgZm9yIGl0LgogICAgIFdlYkNv cmU6OkhpdFRlc3RSZXN1bHQgaGl0VGVzdFJlc3VsdEZvcldpbmRvd1Bvcyhjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYpOwogCisgICAgLy8gQ29uc29saWRhdGUgc29tZSBjb21tb24gY29kZSBiZXR3 ZWVuIHN0YXJ0aW5nIGEgZHJhZyBvdmVyIGEgdGFyZ2V0IGFuZAorICAgIC8vIHVwZGF0aW5nIGEg ZHJhZyBvdmVyIGEgdGFyZ2V0LiAgSWYgd2UncmUgc3RhcnRpbmcgYSBkcmFnLCB8aXNFbnRlcmlu Z3wKKyAgICAvLyBzaG91bGQgYmUgdHJ1ZS4KKyAgICBXZWJEcmFnT3BlcmF0aW9uIGRyYWdUYXJn ZXREcmFnRW50ZXJPck92ZXIoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJQb2ludCYgc2Ny ZWVuUG9pbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IERyYWdBY3Rpb24pOworCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIHZv aWQgc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyhib29sKTsKICAgICBib29sIGlzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZygpIGNvbnN0IHsgcmV0dXJuIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n OyB9Cg== 51704 2010-03-25 17:58:19 -0700 2010-03-25 18:36:36 -0700 Patch bug-36484-20100326095817.patch text/plain 11986 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiOTJlMzhiLi4yNGFlYWMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMt MjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3RseSBoYW5kbGUg bW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4 cGVjdGF0aW9ucy50eHQ6CisKIDIwMTAtMDMtMjUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGdu c0Bnbm9tZS5vcmc+CiAKICAgICAgICAgTmVlZHMgYSAiTGludXhFZGl0aW5nQmVoYXZpb3IiLCBw ZXJoYXBzIHdpdGggYSBiZXR0ZXIgbmFtZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CmluZGV4IDg2NjQ1NDYuLmNlYzExODYgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25z LnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9u cy50eHQKQEAgLTI3OTIsOSArMjc5Miw2IEBAIEJVR19KSUFOTEkgTUFDIDogZmFzdC9mb3Jtcy9z ZWxlY3Qtc3R5bGUuaHRtbCA9IElNQUdFIFBBU1MKIEJVRzM4Mzc1IDogcGx1Z2lucy9yb3VuZC10 cmlwLW5wb2JqZWN0Lmh0bWwgPSBURVhUCiBCVUczODM3NiBXSU4gOiBlZGl0aW5nL2RlbGV0aW5n LzUzOTA2ODEtMi5odG1sID0gSU1BR0UrVEVYVAogCi0vLyBXZWJLaXQgcm9sbCA1NTk0MCAtPiA1 NjAwNAotQlVHMzgyMjggOiBmYXN0L2V2ZW50cy9kcmFnLWFuZC1kcm9wLmh0bWwgPSBURVhUCi0K IC8vIEhUTUxQcm9ncmVzc0VsZW1lbnQgcmVsYXRlZCB0ZXN0cyBkZWZlcnJlZCBkdWUgdG8gcjU1 OTgwLgogQlVHMzgyMjcgREVGRVIgOiBmYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dy ZXNzLWVsZW1lbnQuaHRtbCA9IE1JU1NJTkcKIEJVRzM4MjI3IERFRkVSIDogZmFzdC9kb20vSFRN TFByb2dyZXNzRWxlbWVudC9zZXQtcHJvZ3Jlc3MtcHJvcGVydGllcy5odG1sID0gTUlTU0lORwpk aWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggYjRmMzhjYS4uZWU0NmRiMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTggQEAKKzIwMTAtMDMtMjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGNv cnJlY3RseSBoYW5kbGUgbW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBzcmMvV2ViVmll d0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdF bnRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdFbnRlck9yT3Zl cik6IENvbWJpbmUgY29tbW9uIGNvZGUgaW50byBhIGhlbHBlciBtZXRob2QKKyAgICAgICAgICAg IGFuZCBwcm9wZXJseSBtYXNrIGFnYWluc3QgdGhlIGRyYWcgZWZmZWN0LgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3SW1wbDo6Y3JlYXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3QpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTAzLTI1ICBEcmV3IFdpbHNvbiAgPGF0 d2lsc29uQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOYXRlIENoYXBpbi4K ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZmY2ZjBlZi4uNDU2YzBmMSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1MTIsMjYgKzE1MTIsNyBAQCBXZWJE cmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKAogICAgIG1fZHJh Z0lkZW50aXR5ID0gaWRlbnRpdHk7CiAgICAgbV9vcGVyYXRpb25zQWxsb3dlZCA9IG9wZXJhdGlv bnNBbGxvd2VkOwogCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCi0gICAgICAgIG1fY3VycmVudERy YWdEYXRhLmdldCgpLAotICAgICAgICBjbGllbnRQb2ludCwKLSAgICAgICAgc2NyZWVuUG9pbnQs Ci0gICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlvbnNBbGxvd2VkKSk7 Ci0KLSAgICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKLSAgICBtX2RyYWdUYXJn ZXREaXNwYXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBtX3BhZ2UtPmRy YWdDb250cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7Ci0gICAgLy8gTWFzayB0aGUg b3BlcmF0aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25zLgot ICAgIGlmICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrKCkp ICE9IGVmZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgbV9k cmFnVGFyZ2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJv cEVmZmVjdERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVmZmVj dCAhPSBEcm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29weQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IFdlYkRyYWdP cGVyYXRpb25Ob25lOwotICAgIH0gZWxzZQotICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0 aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3QpOwotICAgIHJldHVybiBtX2RyYWdPcGVy YXRpb247CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFnRW50ZXJPck92ZXIoY2xpZW50UG9pbnQs IHNjcmVlblBvaW50LCBEcmFnRW50ZXIpOwogfQogCiBXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJ bXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIoCkBAIC0xNTM5LDI5ICsxNTIwLDkgQEAgV2ViRHJhZ09w ZXJhdGlvbiBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdPdmVyKAogICAgIGNvbnN0IFdlYlBv aW50JiBzY3JlZW5Qb2ludCwKICAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0Fs bG93ZWQpCiB7Ci0gICAgQVNTRVJUKG1fY3VycmVudERyYWdEYXRhLmdldCgpKTsKLQogICAgIG1f b3BlcmF0aW9uc0FsbG93ZWQgPSBvcGVyYXRpb25zQWxsb3dlZDsKLSAgICBEcmFnRGF0YSBkcmFn RGF0YSgKLSAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCksCi0gICAgICAgIGNsaWVudFBv aW50LAotICAgICAgICBzY3JlZW5Qb2ludCwKLSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJh dGlvbj4ob3BlcmF0aW9uc0FsbG93ZWQpKTsKIAotICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZl Y3REZWZhdWx0OwotICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKLSAgICBEcmFnT3Bl cmF0aW9uIGVmZmVjdCA9IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRy YWdEYXRhKTsKLSAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3Vy Y2UncyBhbGxvd2VkIG9wZXJhdGlvbnMuCi0gICAgaWYgKChlZmZlY3QgJiBkcmFnRGF0YS5kcmFn Z2luZ1NvdXJjZU9wZXJhdGlvbk1hc2soKSkgIT0gZWZmZWN0KQotICAgICAgICBlZmZlY3QgPSBE cmFnT3BlcmF0aW9uTm9uZTsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOwotCi0g ICAgaWYgKG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0RGVmYXVsdCkgewotICAgICAgICBtX2Ry YWdPcGVyYXRpb24gPSAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdP cGVyYXRpb25Db3B5Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDogV2ViRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgfSBlbHNlCi0gICAg ICAgIG1fZHJhZ09wZXJhdGlvbiA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVj dCk7Ci0gICAgcmV0dXJuIG1fZHJhZ09wZXJhdGlvbjsKKyAgICByZXR1cm4gZHJhZ1RhcmdldERy YWdFbnRlck9yT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIERyYWdPdmVyKTsKIH0KIAog dm9pZCBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdMZWF2ZSgpCkBAIC0xNjI0LDcgKzE1ODUs MzYgQEAgaW50IFdlYlZpZXdJbXBsOjpkcmFnSWRlbnRpdHkoKQogICAgIHJldHVybiAwOwogfQog Ci11bnNpZ25lZCBsb25nIFdlYlZpZXdJbXBsOjpjcmVhdGVVbmlxdWVJZGVudGlmaWVyRm9yUmVx dWVzdCgpIHsKK1dlYkRyYWdPcGVyYXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50 ZXJPck92ZXIoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LCBjb25zdCBXZWJQb2ludCYgc2Ny ZWVuUG9pbnQsIERyYWdBY3Rpb24gZHJhZ0FjdGlvbikKK3sKKyAgICBBU1NFUlQobV9jdXJyZW50 RHJhZ0RhdGEuZ2V0KCkpOworCisgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCisgICAgICAgIG1fY3Vy cmVudERyYWdEYXRhLmdldCgpLAorICAgICAgICBjbGllbnRQb2ludCwKKyAgICAgICAgc2NyZWVu UG9pbnQsCisgICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG1fb3BlcmF0aW9uc0Fs bG93ZWQpKTsKKworICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3REZWZhdWx0OworICAgIG1f ZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKKyAgICBEcmFnT3BlcmF0aW9uIGVmZmVjdCA9IGRy YWdBY3Rpb24gPT0gRHJhZ0VudGVyID8gbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50 ZXJlZCgmZHJhZ0RhdGEpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA6IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdE YXRhKTsKKyAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3VyY2Un cyBhbGxvd2VkIG9wZXJhdGlvbnMuCisgICAgaWYgKCEoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dp bmdTb3VyY2VPcGVyYXRpb25NYXNrKCkpKQorICAgICAgICBlZmZlY3QgPSBEcmFnT3BlcmF0aW9u Tm9uZTsKKyAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOworCisgICAgaWYgKG1fZHJv cEVmZmVjdCAhPSBEcm9wRWZmZWN0RGVmYXVsdCkgeworICAgICAgICBtX2RyYWdPcGVyYXRpb24g PSAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdPcGVyYXRpb25Db3B5 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDogV2ViRHJhZ09wZXJhdGlvbk5vbmU7CisgICAgfSBlbHNlCisgICAgICAgIG1fZHJhZ09w ZXJhdGlvbiA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVjdCk7CisKKyAgICBy ZXR1cm4gbV9kcmFnT3BlcmF0aW9uOworfQorCit1bnNpZ25lZCBsb25nIFdlYlZpZXdJbXBsOjpj cmVhdGVVbmlxdWVJZGVudGlmaWVyRm9yUmVxdWVzdCgpCit7CiAgICAgaWYgKG1fcGFnZSkKICAg ICAgICAgcmV0dXJuIG1fcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigp OwogICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IGRlNjAzYmMu LmM2MDQyODUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAor KysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTIwNCw3ICsyMDQsNyBA QCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBtX2NsaWVudDsKICAgICB9CiAKLSAgICAvLyBSZXR1 cm5zIHRoZSBwYWdlIG9iamVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyB2aWV3LiAgVGhpcyBtYXkg YmUgbnVsbCB3aGVuCisgICAgLy8gUmV0dXJucyB0aGUgcGFnZSBvYmplY3QgYXNzb2NpYXRlZCB3 aXRoIHRoaXMgdmlldy4gVGhpcyBtYXkgYmUgbnVsbCB3aGVuCiAgICAgLy8gdGhlIHBhZ2UgaXMg c2h1dHRpbmcgZG93biwgYnV0IHdpbGwgYmUgdmFsaWQgYXQgYWxsIG90aGVyIHRpbWVzLgogICAg IFdlYkNvcmU6OlBhZ2UqIHBhZ2UoKSBjb25zdAogICAgIHsKQEAgLTIxMyw3ICsyMTMsNyBAQCBw dWJsaWM6CiAKICAgICBXZWJDb3JlOjpSZW5kZXJUaGVtZSogdGhlbWUoKSBjb25zdDsKIAotICAg IC8vIFJldHVybnMgdGhlIG1haW4gZnJhbWUgYXNzb2NpYXRlZCB3aXRoIHRoaXMgdmlldy4gIFRo aXMgbWF5IGJlIG51bGwgd2hlbgorICAgIC8vIFJldHVybnMgdGhlIG1haW4gZnJhbWUgYXNzb2Np YXRlZCB3aXRoIHRoaXMgdmlldy4gVGhpcyBtYXkgYmUgbnVsbCB3aGVuCiAgICAgLy8gdGhlIHBh Z2UgaXMgc2h1dHRpbmcgZG93biwgYnV0IHdpbGwgYmUgdmFsaWQgYXQgYWxsIG90aGVyIHRpbWVz LgogICAgIFdlYkZyYW1lSW1wbCogbWFpbkZyYW1lSW1wbCgpOwogCkBAIC0yMzUsMTQgKzIzNSwx NCBAQCBwdWJsaWM6CiAgICAgYm9vbCB0b3VjaEV2ZW50KGNvbnN0IFdlYlRvdWNoRXZlbnQmKTsK IAogICAgIC8vIEhhbmRsZXMgY29udGV4dCBtZW51IGV2ZW50cyBvcmlnbmF0ZWQgdmlhIHRoZSB0 aGUga2V5Ym9hcmQuIFRoZXNlCi0gICAgLy8gaW5jbHVkZSB0aGUgVktfQVBQUyB2aXJ0dWFsIGtl eSBhbmQgdGhlIFNoaWZ0K0YxMCBjb21iaW5lLiAgQ29kZSBpcworICAgIC8vIGluY2x1ZGUgdGhl IFZLX0FQUFMgdmlydHVhbCBrZXkgYW5kIHRoZSBTaGlmdCtGMTAgY29tYmluZS4gQ29kZSBpcwog ICAgIC8vIGJhc2VkIG9uIHRoZSBXZWJraXQgZnVuY3Rpb24gYm9vbCBXZWJWaWV3OjpoYW5kbGVD b250ZXh0TWVudUV2ZW50KFdQQVJBTQogICAgIC8vIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkgaW4g d2Via2l0XHdlYmtpdFx3aW5cV2ViVmlldy5jcHAuIFRoZSBvbmx5CiAgICAgLy8gc2lnbmlmaWNh bnQgY2hhbmdlIGluIHRoaXMgZnVuY3Rpb24gaXMgdGhlIGNvZGUgdG8gY29udmVydCBmcm9tIGEK ICAgICAvLyBLZXlib2FyZCBldmVudCB0byB0aGUgUmlnaHQgTW91c2UgYnV0dG9uIGRvd24gZXZl bnQuCiAgICAgYm9vbCBzZW5kQ29udGV4dE1lbnVFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50 Jik7CiAKLSAgICAvLyBOb3RpZmllcyB0aGUgV2ViVmlldyB0aGF0IGEgbG9hZCBoYXMgYmVlbiBj b21taXR0ZWQuICBpc05ld05hdmlnYXRpb24KKyAgICAvLyBOb3RpZmllcyB0aGUgV2ViVmlldyB0 aGF0IGEgbG9hZCBoYXMgYmVlbiBjb21taXR0ZWQuIGlzTmV3TmF2aWdhdGlvbgogICAgIC8vIHdp bGwgYmUgdHJ1ZSBpZiBhIG5ldyBzZXNzaW9uIGhpc3RvcnkgaXRlbSBzaG91bGQgYmUgY3JlYXRl ZCBmb3IgdGhhdAogICAgIC8vIGxvYWQuCiAgICAgdm9pZCBkaWRDb21taXRMb2FkKGJvb2wqIGlz TmV3TmF2aWdhdGlvbik7CkBAIC0zMTMsNiArMzEzLDExIEBAIHByaXZhdGU6CiAgICAgZnJpZW5k IGNsYXNzIFdlYlZpZXc7ICAvLyBTbyBXZWJWaWV3OjpDcmVhdGUgY2FuIGNhbGwgb3VyIGNvbnN0 cnVjdG9yCiAgICAgZnJpZW5kIGNsYXNzIFdURjo6UmVmQ291bnRlZDxXZWJWaWV3SW1wbD47CiAK KyAgICBlbnVtIERyYWdBY3Rpb24geworICAgICAgRHJhZ0VudGVyLAorICAgICAgRHJhZ092ZXIK KyAgICB9OworCiAgICAgV2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KTsKICAgICB+ V2ViVmlld0ltcGwoKTsKIApAQCAtMzI1LDggKzMzMCw4IEBAIHByaXZhdGU6CiAgICAgLy8gUmV0 dXJucyB0cnVlIGlmIHRoZSBhdXRvY29tcGxlIGhhcyBjb25zdW1lZCB0aGUgZXZlbnQuCiAgICAg Ym9vbCBhdXRvY29tcGxldGVIYW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7 CiAKLSAgICAvLyBSZXBhaW50cyB0aGUgc3VnZ2VzdGlvbnMgcG9wdXAuICBTaG91bGQgYmUgY2Fs bGVkIHdoZW4gdGhlIHN1Z2dlc3Rpb25zCi0gICAgLy8gaGF2ZSBjaGFuZ2VkLiAgTm90ZSB0aGF0 IHRoaXMgc2hvdWxkIG9ubHkgYmUgY2FsbGVkIHdoZW4gdGhlIHN1Z2dlc3Rpb25zCisgICAgLy8g UmVwYWludHMgdGhlIHN1Z2dlc3Rpb25zIHBvcHVwLiBTaG91bGQgYmUgY2FsbGVkIHdoZW4gdGhl IHN1Z2dlc3Rpb25zCisgICAgLy8gaGF2ZSBjaGFuZ2VkLiBOb3RlIHRoYXQgdGhpcyBzaG91bGQg b25seSBiZSBjYWxsZWQgd2hlbiB0aGUgc3VnZ2VzdGlvbnMKICAgICAvLyBwb3B1cCBpcyBzaG93 aW5nLgogICAgIHZvaWQgcmVmcmVzaFN1Z2dlc3Rpb25zUG9wdXAoKTsKIApAQCAtMzQwLDYgKzM0 NSwxMyBAQCBwcml2YXRlOgogICAgIC8vIHRoZSBIaXRUZXN0UmVzdWx0IGZvciBpdC4KICAgICBX ZWJDb3JlOjpIaXRUZXN0UmVzdWx0IGhpdFRlc3RSZXN1bHRGb3JXaW5kb3dQb3MoY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmKTsKIAorICAgIC8vIENvbnNvbGlkYXRlIHNvbWUgY29tbW9uIGNvZGUg YmV0d2VlbiBzdGFydGluZyBhIGRyYWcgb3ZlciBhIHRhcmdldCBhbmQKKyAgICAvLyB1cGRhdGlu ZyBhIGRyYWcgb3ZlciBhIHRhcmdldC4gSWYgd2UncmUgc3RhcnRpbmcgYSBkcmFnLCB8aXNFbnRl cmluZ3wKKyAgICAvLyBzaG91bGQgYmUgdHJ1ZS4KKyAgICBXZWJEcmFnT3BlcmF0aW9uIGRyYWdU YXJnZXREcmFnRW50ZXJPck92ZXIoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJQb2ludCYg c2NyZWVuUG9pbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIERyYWdBY3Rpb24pOworCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAg IHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyhib29sKTsKICAgICBib29sIGlzQWNjZWxl cmF0ZWRDb21wb3NpdGluZygpIGNvbnN0IHsgcmV0dXJuIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nOyB9CkBAIC0zNjAsNyArMzcyLDcgQEAgcHJpdmF0ZToKICAgICBXZWJQb2ludCBtX2xhc3RN b3VzZVBvc2l0aW9uOwogICAgIE93blB0cjxXZWJDb3JlOjpQYWdlPiBtX3BhZ2U7CiAKLSAgICAv LyBUaGlzIGZsYWcgaXMgc2V0IHdoZW4gYSBuZXcgbmF2aWdhdGlvbiBpcyBkZXRlY3RlZC4gIEl0 IGlzIHVzZWQgdG8gc2F0aXNmeQorICAgIC8vIFRoaXMgZmxhZyBpcyBzZXQgd2hlbiBhIG5ldyBu YXZpZ2F0aW9uIGlzIGRldGVjdGVkLiBJdCBpcyB1c2VkIHRvIHNhdGlzZnkKICAgICAvLyB0aGUg Y29ycmVzcG9uZGluZyBhcmd1bWVudCB0byBXZWJGcmFtZUNsaWVudDo6ZGlkQ29tbWl0UHJvdmlz aW9uYWxMb2FkLgogICAgIGJvb2wgbV9vYnNlcnZlZE5ld05hdmlnYXRpb247CiAjaWZuZGVmIE5E RUJVRwpAQCAtMzcwLDcgKzM4Miw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIC8vIEFuIG9i amVjdCB0aGF0IGNhbiBiZSB1c2VkIHRvIG1hbmlwdWxhdGUgbV9wYWdlLT5zZXR0aW5ncygpIHdp dGhvdXQgbGlua2luZwotICAgIC8vIGFnYWluc3QgV2ViQ29yZS4gIFRoaXMgaXMgbGF6aWx5IGFs bG9jYXRlZCB0aGUgZmlyc3QgdGltZSBHZXRXZWJTZXR0aW5ncygpCisgICAgLy8gYWdhaW5zdCBX ZWJDb3JlLiBUaGlzIGlzIGxhemlseSBhbGxvY2F0ZWQgdGhlIGZpcnN0IHRpbWUgR2V0V2ViU2V0 dGluZ3MoKQogICAgIC8vIGlzIGNhbGxlZC4KICAgICBPd25QdHI8V2ViU2V0dGluZ3NJbXBsPiBt X3dlYlNldHRpbmdzOwogCkBAIC0zODYsNyArMzk4LDcgQEAgcHJpdmF0ZToKICAgICAvLyBkcmFn Z2VkIGJ5IHRoZSB0aW1lIGEgZHJhZyBpcyBpbml0aWF0ZWQuCiAgICAgV2ViUG9pbnQgbV9sYXN0 TW91c2VEb3duUG9pbnQ7CiAKLSAgICAvLyBLZWVwcyB0cmFjayBvZiB0aGUgY3VycmVudCB6b29t IGxldmVsLiAgMCBtZWFucyBubyB6b29tLCBwb3NpdGl2ZSBudW1iZXJzCisgICAgLy8gS2VlcHMg dHJhY2sgb2YgdGhlIGN1cnJlbnQgem9vbSBsZXZlbC4gMCBtZWFucyBubyB6b29tLCBwb3NpdGl2 ZSBudW1iZXJzCiAgICAgLy8gbWVhbiB6b29tIGluLCBuZWdhdGl2ZSBudW1iZXJzIG1lYW4gem9v bSBvdXQuCiAgICAgaW50IG1fem9vbUxldmVsOwogCkBAIC00MTYsNyArNDI4LDcgQEAgcHJpdmF0 ZToKICAgICAvLyBjb3BpZWQgZnJvbSB0aGUgV2ViRHJvcERhdGEgb2JqZWN0IHNlbnQgZnJvbSB0 aGUgYnJvd3NlciBwcm9jZXNzLgogICAgIGludCBtX2RyYWdJZGVudGl0eTsKIAotICAgIC8vIFZh bGlkIHdoZW4gbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggaXMgdHJ1ZS4gIFVzZWQgdG8gb3ZlcnJpZGUg dGhlIGRlZmF1bHQKKyAgICAvLyBWYWxpZCB3aGVuIG1fZHJhZ1RhcmdldERpc3BhdGNoIGlzIHRy dWUuIFVzZWQgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQKICAgICAvLyBicm93c2VyIGRyb3AgZWZm ZWN0IHdpdGggdGhlIGVmZmVjdHMgIm5vbmUiIG9yICJjb3B5Ii4KICAgICBlbnVtIERyYWdUYXJn ZXREcm9wRWZmZWN0IHsKICAgICAgICAgRHJvcEVmZmVjdERlZmF1bHQgPSAtMSwKQEAgLTQzNSw4 ICs0NDcsOCBAQCBwcml2YXRlOgogICAgIC8vIFdoZXRoZXIgYSBzdWdnZXN0aW9ucyBwb3B1cCBp cyBjdXJyZW50bHkgc2hvd2luZy4KICAgICBib29sIG1fc3VnZ2VzdGlvbnNQb3B1cFNob3dpbmc7 CiAKLSAgICAvLyBBIHBvaW50ZXIgdG8gdGhlIGN1cnJlbnQgc3VnZ2VzdGlvbnMgcG9wdXAgbWVu dSBjbGllbnQuICBUaGlzIGNhbiBiZQotICAgIC8vIGVpdGhlciBhbiBBdXRvRmlsbFBvcHVwTWVu dUNsaWVudCBvciBhbiBBdXRvY29tcGxldGVQb3B1cE1lbnVDbGllbnQuICBXZQorICAgIC8vIEEg cG9pbnRlciB0byB0aGUgY3VycmVudCBzdWdnZXN0aW9ucyBwb3B1cCBtZW51IGNsaWVudC4gVGhp cyBjYW4gYmUKKyAgICAvLyBlaXRoZXIgYW4gQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQgb3IgYW4g QXV0b2NvbXBsZXRlUG9wdXBNZW51Q2xpZW50LiBXZQogICAgIC8vIGRvIG5vdCBvd24gdGhpcyBw b2ludGVyLgogICAgIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50KiBtX3N1Z2dlc3Rpb25zUG9w dXBDbGllbnQ7CiAKQEAgLTQ0Niw3ICs0NTgsNyBAQCBwcml2YXRlOgogICAgIC8vIFRoZSBBdXRv Y29tcGxldGUgcG9wdXAgY2xpZW50LgogICAgIE93blB0cjxBdXRvY29tcGxldGVQb3B1cE1lbnVD bGllbnQ+IG1fYXV0b2NvbXBsZXRlUG9wdXBDbGllbnQ7CiAKLSAgICAvLyBBIHBvaW50ZXIgdG8g dGhlIGN1cnJlbnQgc3VnZ2VzdGlvbnMgcG9wdXAuICBXZSBkbyBub3Qgb3duIHRoaXMgcG9pbnRl ci4KKyAgICAvLyBBIHBvaW50ZXIgdG8gdGhlIGN1cnJlbnQgc3VnZ2VzdGlvbnMgcG9wdXAuIFdl IGRvIG5vdCBvd24gdGhpcyBwb2ludGVyLgogICAgIFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyKiBt X3N1Z2dlc3Rpb25zUG9wdXA7CiAKICAgICAvLyBUaGUgcG9wdXAgYXNzb2NpYXRlZCB3aXRoIGEg c2VsZWN0IGVsZW1lbnQuCg== 51707 2010-03-25 18:36:42 -0700 2010-03-25 22:48:39 -0700 Patch for landing bug-36484-20100326103640.patch text/plain 11980 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiOTJlMzhiLi4wNjJjNjg2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMt MjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBEYXZpZCBMZXZpbi4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3RseSBoYW5kbGUgbW92 ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVj dGF0aW9ucy50eHQ6CisKIDIwMTAtMDMtMjUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bn bm9tZS5vcmc+CiAKICAgICAgICAgTmVlZHMgYSAiTGludXhFZGl0aW5nQmVoYXZpb3IiLCBwZXJo YXBzIHdpdGggYSBiZXR0ZXIgbmFtZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hy b21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CmluZGV4IDg2NjQ1NDYuLmNlYzExODYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50 eHQKQEAgLTI3OTIsOSArMjc5Miw2IEBAIEJVR19KSUFOTEkgTUFDIDogZmFzdC9mb3Jtcy9zZWxl Y3Qtc3R5bGUuaHRtbCA9IElNQUdFIFBBU1MKIEJVRzM4Mzc1IDogcGx1Z2lucy9yb3VuZC10cmlw LW5wb2JqZWN0Lmh0bWwgPSBURVhUCiBCVUczODM3NiBXSU4gOiBlZGl0aW5nL2RlbGV0aW5nLzUz OTA2ODEtMi5odG1sID0gSU1BR0UrVEVYVAogCi0vLyBXZWJLaXQgcm9sbCA1NTk0MCAtPiA1NjAw NAotQlVHMzgyMjggOiBmYXN0L2V2ZW50cy9kcmFnLWFuZC1kcm9wLmh0bWwgPSBURVhUCi0KIC8v IEhUTUxQcm9ncmVzc0VsZW1lbnQgcmVsYXRlZCB0ZXN0cyBkZWZlcnJlZCBkdWUgdG8gcjU1OTgw LgogQlVHMzgyMjcgREVGRVIgOiBmYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNz LWVsZW1lbnQuaHRtbCA9IE1JU1NJTkcKIEJVRzM4MjI3IERFRkVSIDogZmFzdC9kb20vSFRNTFBy b2dyZXNzRWxlbWVudC9zZXQtcHJvZ3Jlc3MtcHJvcGVydGllcy5odG1sID0gTUlTU0lORwpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKaW5kZXggYjRmMzhjYS4uMzEwZWFhOSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTAtMDMtMjUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KKworICAgICAgICBbY2hyb21pdW1dIGNvcnJlY3Rs eSBoYW5kbGUgbW92ZSBkcmFnIG9wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDg0CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdFbnRlcik6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIpOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdFbnRlck9yT3Zlcik6IENv bWJpbmUgY29tbW9uIGNvZGUgaW50byBhIGhlbHBlciBtZXRob2QKKyAgICAgICAgICAgIGFuZCBw cm9wZXJseSBtYXNrIGFnYWluc3QgdGhlIGRyYWcgZWZmZWN0LgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3SW1wbDo6Y3JlYXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3QpOgorICAgICAgICAq IHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTAzLTI1ICBEcmV3IFdpbHNvbiAgPGF0d2lsc29u QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOYXRlIENoYXBpbi4KZGlmZiAt LWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZmY2ZjBlZi4uNDU2YzBmMSAxMDA2NDQKLS0t IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1MTIsMjYgKzE1MTIsNyBAQCBXZWJEcmFnT3Bl cmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKAogICAgIG1fZHJhZ0lkZW50 aXR5ID0gaWRlbnRpdHk7CiAgICAgbV9vcGVyYXRpb25zQWxsb3dlZCA9IG9wZXJhdGlvbnNBbGxv d2VkOwogCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCi0gICAgICAgIG1fY3VycmVudERyYWdEYXRh LmdldCgpLAotICAgICAgICBjbGllbnRQb2ludCwKLSAgICAgICAgc2NyZWVuUG9pbnQsCi0gICAg ICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG9wZXJhdGlvbnNBbGxvd2VkKSk7Ci0KLSAg ICBtX2Ryb3BFZmZlY3QgPSBEcm9wRWZmZWN0RGVmYXVsdDsKLSAgICBtX2RyYWdUYXJnZXREaXNw YXRjaCA9IHRydWU7Ci0gICAgRHJhZ09wZXJhdGlvbiBlZmZlY3QgPSBtX3BhZ2UtPmRyYWdDb250 cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7Ci0gICAgLy8gTWFzayB0aGUgb3BlcmF0 aW9uIGFnYWluc3QgdGhlIGRyYWcgc291cmNlJ3MgYWxsb3dlZCBvcGVyYXRpb25zLgotICAgIGlm ICgoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrKCkpICE9IGVm ZmVjdCkKLSAgICAgICAgZWZmZWN0ID0gRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgbV9kcmFnVGFy Z2V0RGlzcGF0Y2ggPSBmYWxzZTsKLQotICAgIGlmIChtX2Ryb3BFZmZlY3QgIT0gRHJvcEVmZmVj dERlZmF1bHQpIHsKLSAgICAgICAgbV9kcmFnT3BlcmF0aW9uID0gKG1fZHJvcEVmZmVjdCAhPSBE cm9wRWZmZWN0Tm9uZSkgPyBXZWJEcmFnT3BlcmF0aW9uQ29weQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IFdlYkRyYWdPcGVyYXRp b25Ob25lOwotICAgIH0gZWxzZQotICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSBzdGF0aWNfY2Fz dDxXZWJEcmFnT3BlcmF0aW9uPihlZmZlY3QpOwotICAgIHJldHVybiBtX2RyYWdPcGVyYXRpb247 CisgICAgcmV0dXJuIGRyYWdUYXJnZXREcmFnRW50ZXJPck92ZXIoY2xpZW50UG9pbnQsIHNjcmVl blBvaW50LCBEcmFnRW50ZXIpOwogfQogCiBXZWJEcmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpk cmFnVGFyZ2V0RHJhZ092ZXIoCkBAIC0xNTM5LDI5ICsxNTIwLDkgQEAgV2ViRHJhZ09wZXJhdGlv biBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdPdmVyKAogICAgIGNvbnN0IFdlYlBvaW50JiBz Y3JlZW5Qb2ludCwKICAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0FsbG93ZWQp CiB7Ci0gICAgQVNTRVJUKG1fY3VycmVudERyYWdEYXRhLmdldCgpKTsKLQogICAgIG1fb3BlcmF0 aW9uc0FsbG93ZWQgPSBvcGVyYXRpb25zQWxsb3dlZDsKLSAgICBEcmFnRGF0YSBkcmFnRGF0YSgK LSAgICAgICAgbV9jdXJyZW50RHJhZ0RhdGEuZ2V0KCksCi0gICAgICAgIGNsaWVudFBvaW50LAot ICAgICAgICBzY3JlZW5Qb2ludCwKLSAgICAgICAgc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4o b3BlcmF0aW9uc0FsbG93ZWQpKTsKIAotICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3REZWZh dWx0OwotICAgIG1fZHJhZ1RhcmdldERpc3BhdGNoID0gdHJ1ZTsKLSAgICBEcmFnT3BlcmF0aW9u IGVmZmVjdCA9IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRh KTsKLSAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3VyY2UncyBh bGxvd2VkIG9wZXJhdGlvbnMuCi0gICAgaWYgKChlZmZlY3QgJiBkcmFnRGF0YS5kcmFnZ2luZ1Nv dXJjZU9wZXJhdGlvbk1hc2soKSkgIT0gZWZmZWN0KQotICAgICAgICBlZmZlY3QgPSBEcmFnT3Bl cmF0aW9uTm9uZTsKLSAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOwotCi0gICAgaWYg KG1fZHJvcEVmZmVjdCAhPSBEcm9wRWZmZWN0RGVmYXVsdCkgewotICAgICAgICBtX2RyYWdPcGVy YXRpb24gPSAobV9kcm9wRWZmZWN0ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdPcGVyYXRp b25Db3B5Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDogV2ViRHJhZ09wZXJhdGlvbk5vbmU7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1f ZHJhZ09wZXJhdGlvbiA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVjdCk7Ci0g ICAgcmV0dXJuIG1fZHJhZ09wZXJhdGlvbjsKKyAgICByZXR1cm4gZHJhZ1RhcmdldERyYWdFbnRl ck9yT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIERyYWdPdmVyKTsKIH0KIAogdm9pZCBX ZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdMZWF2ZSgpCkBAIC0xNjI0LDcgKzE1ODUsMzYgQEAg aW50IFdlYlZpZXdJbXBsOjpkcmFnSWRlbnRpdHkoKQogICAgIHJldHVybiAwOwogfQogCi11bnNp Z25lZCBsb25nIFdlYlZpZXdJbXBsOjpjcmVhdGVVbmlxdWVJZGVudGlmaWVyRm9yUmVxdWVzdCgp IHsKK1dlYkRyYWdPcGVyYXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50ZXJPck92 ZXIoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LCBjb25zdCBXZWJQb2ludCYgc2NyZWVuUG9p bnQsIERyYWdBY3Rpb24gZHJhZ0FjdGlvbikKK3sKKyAgICBBU1NFUlQobV9jdXJyZW50RHJhZ0Rh dGEuZ2V0KCkpOworCisgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoCisgICAgICAgIG1fY3VycmVudERy YWdEYXRhLmdldCgpLAorICAgICAgICBjbGllbnRQb2ludCwKKyAgICAgICAgc2NyZWVuUG9pbnQs CisgICAgICAgIHN0YXRpY19jYXN0PERyYWdPcGVyYXRpb24+KG1fb3BlcmF0aW9uc0FsbG93ZWQp KTsKKworICAgIG1fZHJvcEVmZmVjdCA9IERyb3BFZmZlY3REZWZhdWx0OworICAgIG1fZHJhZ1Rh cmdldERpc3BhdGNoID0gdHJ1ZTsKKyAgICBEcmFnT3BlcmF0aW9uIGVmZmVjdCA9IGRyYWdBY3Rp b24gPT0gRHJhZ0VudGVyID8gbV9wYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50ZXJlZCgm ZHJhZ0RhdGEpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA6IG1fcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRhKTsK KyAgICAvLyBNYXNrIHRoZSBvcGVyYXRpb24gYWdhaW5zdCB0aGUgZHJhZyBzb3VyY2UncyBhbGxv d2VkIG9wZXJhdGlvbnMuCisgICAgaWYgKCEoZWZmZWN0ICYgZHJhZ0RhdGEuZHJhZ2dpbmdTb3Vy Y2VPcGVyYXRpb25NYXNrKCkpKQorICAgICAgICBlZmZlY3QgPSBEcmFnT3BlcmF0aW9uTm9uZTsK KyAgICBtX2RyYWdUYXJnZXREaXNwYXRjaCA9IGZhbHNlOworCisgICAgaWYgKG1fZHJvcEVmZmVj dCAhPSBEcm9wRWZmZWN0RGVmYXVsdCkgeworICAgICAgICBtX2RyYWdPcGVyYXRpb24gPSAobV9k cm9wRWZmZWN0ICE9IERyb3BFZmZlY3ROb25lKSA/IFdlYkRyYWdPcGVyYXRpb25Db3B5CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDog V2ViRHJhZ09wZXJhdGlvbk5vbmU7CisgICAgfSBlbHNlCisgICAgICAgIG1fZHJhZ09wZXJhdGlv biA9IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb24+KGVmZmVjdCk7CisKKyAgICByZXR1cm4g bV9kcmFnT3BlcmF0aW9uOworfQorCit1bnNpZ25lZCBsb25nIFdlYlZpZXdJbXBsOjpjcmVhdGVV bmlxdWVJZGVudGlmaWVyRm9yUmVxdWVzdCgpCit7CiAgICAgaWYgKG1fcGFnZSkKICAgICAgICAg cmV0dXJuIG1fcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwogICAg IHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5o IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IGRlNjAzYmMuLmM2MDQy ODUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTIwNCw3ICsyMDQsNyBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiBtX2NsaWVudDsKICAgICB9CiAKLSAgICAvLyBSZXR1cm5zIHRo ZSBwYWdlIG9iamVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyB2aWV3LiAgVGhpcyBtYXkgYmUgbnVs bCB3aGVuCisgICAgLy8gUmV0dXJucyB0aGUgcGFnZSBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRo aXMgdmlldy4gVGhpcyBtYXkgYmUgbnVsbCB3aGVuCiAgICAgLy8gdGhlIHBhZ2UgaXMgc2h1dHRp bmcgZG93biwgYnV0IHdpbGwgYmUgdmFsaWQgYXQgYWxsIG90aGVyIHRpbWVzLgogICAgIFdlYkNv cmU6OlBhZ2UqIHBhZ2UoKSBjb25zdAogICAgIHsKQEAgLTIxMyw3ICsyMTMsNyBAQCBwdWJsaWM6 CiAKICAgICBXZWJDb3JlOjpSZW5kZXJUaGVtZSogdGhlbWUoKSBjb25zdDsKIAotICAgIC8vIFJl dHVybnMgdGhlIG1haW4gZnJhbWUgYXNzb2NpYXRlZCB3aXRoIHRoaXMgdmlldy4gIFRoaXMgbWF5 IGJlIG51bGwgd2hlbgorICAgIC8vIFJldHVybnMgdGhlIG1haW4gZnJhbWUgYXNzb2NpYXRlZCB3 aXRoIHRoaXMgdmlldy4gVGhpcyBtYXkgYmUgbnVsbCB3aGVuCiAgICAgLy8gdGhlIHBhZ2UgaXMg c2h1dHRpbmcgZG93biwgYnV0IHdpbGwgYmUgdmFsaWQgYXQgYWxsIG90aGVyIHRpbWVzLgogICAg IFdlYkZyYW1lSW1wbCogbWFpbkZyYW1lSW1wbCgpOwogCkBAIC0yMzUsMTQgKzIzNSwxNCBAQCBw dWJsaWM6CiAgICAgYm9vbCB0b3VjaEV2ZW50KGNvbnN0IFdlYlRvdWNoRXZlbnQmKTsKIAogICAg IC8vIEhhbmRsZXMgY29udGV4dCBtZW51IGV2ZW50cyBvcmlnbmF0ZWQgdmlhIHRoZSB0aGUga2V5 Ym9hcmQuIFRoZXNlCi0gICAgLy8gaW5jbHVkZSB0aGUgVktfQVBQUyB2aXJ0dWFsIGtleSBhbmQg dGhlIFNoaWZ0K0YxMCBjb21iaW5lLiAgQ29kZSBpcworICAgIC8vIGluY2x1ZGUgdGhlIFZLX0FQ UFMgdmlydHVhbCBrZXkgYW5kIHRoZSBTaGlmdCtGMTAgY29tYmluZS4gQ29kZSBpcwogICAgIC8v IGJhc2VkIG9uIHRoZSBXZWJraXQgZnVuY3Rpb24gYm9vbCBXZWJWaWV3OjpoYW5kbGVDb250ZXh0 TWVudUV2ZW50KFdQQVJBTQogICAgIC8vIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkgaW4gd2Via2l0 XHdlYmtpdFx3aW5cV2ViVmlldy5jcHAuIFRoZSBvbmx5CiAgICAgLy8gc2lnbmlmaWNhbnQgY2hh bmdlIGluIHRoaXMgZnVuY3Rpb24gaXMgdGhlIGNvZGUgdG8gY29udmVydCBmcm9tIGEKICAgICAv LyBLZXlib2FyZCBldmVudCB0byB0aGUgUmlnaHQgTW91c2UgYnV0dG9uIGRvd24gZXZlbnQuCiAg ICAgYm9vbCBzZW5kQ29udGV4dE1lbnVFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAK LSAgICAvLyBOb3RpZmllcyB0aGUgV2ViVmlldyB0aGF0IGEgbG9hZCBoYXMgYmVlbiBjb21taXR0 ZWQuICBpc05ld05hdmlnYXRpb24KKyAgICAvLyBOb3RpZmllcyB0aGUgV2ViVmlldyB0aGF0IGEg bG9hZCBoYXMgYmVlbiBjb21taXR0ZWQuIGlzTmV3TmF2aWdhdGlvbgogICAgIC8vIHdpbGwgYmUg dHJ1ZSBpZiBhIG5ldyBzZXNzaW9uIGhpc3RvcnkgaXRlbSBzaG91bGQgYmUgY3JlYXRlZCBmb3Ig dGhhdAogICAgIC8vIGxvYWQuCiAgICAgdm9pZCBkaWRDb21taXRMb2FkKGJvb2wqIGlzTmV3TmF2 aWdhdGlvbik7CkBAIC0zMTMsNiArMzEzLDExIEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNz IFdlYlZpZXc7ICAvLyBTbyBXZWJWaWV3OjpDcmVhdGUgY2FuIGNhbGwgb3VyIGNvbnN0cnVjdG9y CiAgICAgZnJpZW5kIGNsYXNzIFdURjo6UmVmQ291bnRlZDxXZWJWaWV3SW1wbD47CiAKKyAgICBl bnVtIERyYWdBY3Rpb24geworICAgICAgRHJhZ0VudGVyLAorICAgICAgRHJhZ092ZXIKKyAgICB9 OworCiAgICAgV2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KTsKICAgICB+V2ViVmll d0ltcGwoKTsKIApAQCAtMzI1LDggKzMzMCw4IEBAIHByaXZhdGU6CiAgICAgLy8gUmV0dXJucyB0 cnVlIGlmIHRoZSBhdXRvY29tcGxlIGhhcyBjb25zdW1lZCB0aGUgZXZlbnQuCiAgICAgYm9vbCBh dXRvY29tcGxldGVIYW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAKLSAg ICAvLyBSZXBhaW50cyB0aGUgc3VnZ2VzdGlvbnMgcG9wdXAuICBTaG91bGQgYmUgY2FsbGVkIHdo ZW4gdGhlIHN1Z2dlc3Rpb25zCi0gICAgLy8gaGF2ZSBjaGFuZ2VkLiAgTm90ZSB0aGF0IHRoaXMg c2hvdWxkIG9ubHkgYmUgY2FsbGVkIHdoZW4gdGhlIHN1Z2dlc3Rpb25zCisgICAgLy8gUmVwYWlu dHMgdGhlIHN1Z2dlc3Rpb25zIHBvcHVwLiBTaG91bGQgYmUgY2FsbGVkIHdoZW4gdGhlIHN1Z2dl c3Rpb25zCisgICAgLy8gaGF2ZSBjaGFuZ2VkLiBOb3RlIHRoYXQgdGhpcyBzaG91bGQgb25seSBi ZSBjYWxsZWQgd2hlbiB0aGUgc3VnZ2VzdGlvbnMKICAgICAvLyBwb3B1cCBpcyBzaG93aW5nLgog ICAgIHZvaWQgcmVmcmVzaFN1Z2dlc3Rpb25zUG9wdXAoKTsKIApAQCAtMzQwLDYgKzM0NSwxMyBA QCBwcml2YXRlOgogICAgIC8vIHRoZSBIaXRUZXN0UmVzdWx0IGZvciBpdC4KICAgICBXZWJDb3Jl OjpIaXRUZXN0UmVzdWx0IGhpdFRlc3RSZXN1bHRGb3JXaW5kb3dQb3MoY29uc3QgV2ViQ29yZTo6 SW50UG9pbnQmKTsKIAorICAgIC8vIENvbnNvbGlkYXRlIHNvbWUgY29tbW9uIGNvZGUgYmV0d2Vl biBzdGFydGluZyBhIGRyYWcgb3ZlciBhIHRhcmdldCBhbmQKKyAgICAvLyB1cGRhdGluZyBhIGRy YWcgb3ZlciBhIHRhcmdldC4gSWYgd2UncmUgc3RhcnRpbmcgYSBkcmFnLCB8aXNFbnRlcmluZ3wK KyAgICAvLyBzaG91bGQgYmUgdHJ1ZS4KKyAgICBXZWJEcmFnT3BlcmF0aW9uIGRyYWdUYXJnZXRE cmFnRW50ZXJPck92ZXIoY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJQb2ludCYgc2NyZWVu UG9pbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERy YWdBY3Rpb24pOworCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIHZvaWQg c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyhib29sKTsKICAgICBib29sIGlzQWNjZWxlcmF0ZWRD b21wb3NpdGluZygpIGNvbnN0IHsgcmV0dXJuIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nOyB9 CkBAIC0zNjAsNyArMzcyLDcgQEAgcHJpdmF0ZToKICAgICBXZWJQb2ludCBtX2xhc3RNb3VzZVBv c2l0aW9uOwogICAgIE93blB0cjxXZWJDb3JlOjpQYWdlPiBtX3BhZ2U7CiAKLSAgICAvLyBUaGlz IGZsYWcgaXMgc2V0IHdoZW4gYSBuZXcgbmF2aWdhdGlvbiBpcyBkZXRlY3RlZC4gIEl0IGlzIHVz ZWQgdG8gc2F0aXNmeQorICAgIC8vIFRoaXMgZmxhZyBpcyBzZXQgd2hlbiBhIG5ldyBuYXZpZ2F0 aW9uIGlzIGRldGVjdGVkLiBJdCBpcyB1c2VkIHRvIHNhdGlzZnkKICAgICAvLyB0aGUgY29ycmVz cG9uZGluZyBhcmd1bWVudCB0byBXZWJGcmFtZUNsaWVudDo6ZGlkQ29tbWl0UHJvdmlzaW9uYWxM b2FkLgogICAgIGJvb2wgbV9vYnNlcnZlZE5ld05hdmlnYXRpb247CiAjaWZuZGVmIE5ERUJVRwpA QCAtMzcwLDcgKzM4Miw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIC8vIEFuIG9iamVjdCB0 aGF0IGNhbiBiZSB1c2VkIHRvIG1hbmlwdWxhdGUgbV9wYWdlLT5zZXR0aW5ncygpIHdpdGhvdXQg bGlua2luZwotICAgIC8vIGFnYWluc3QgV2ViQ29yZS4gIFRoaXMgaXMgbGF6aWx5IGFsbG9jYXRl ZCB0aGUgZmlyc3QgdGltZSBHZXRXZWJTZXR0aW5ncygpCisgICAgLy8gYWdhaW5zdCBXZWJDb3Jl LiBUaGlzIGlzIGxhemlseSBhbGxvY2F0ZWQgdGhlIGZpcnN0IHRpbWUgR2V0V2ViU2V0dGluZ3Mo KQogICAgIC8vIGlzIGNhbGxlZC4KICAgICBPd25QdHI8V2ViU2V0dGluZ3NJbXBsPiBtX3dlYlNl dHRpbmdzOwogCkBAIC0zODYsNyArMzk4LDcgQEAgcHJpdmF0ZToKICAgICAvLyBkcmFnZ2VkIGJ5 IHRoZSB0aW1lIGEgZHJhZyBpcyBpbml0aWF0ZWQuCiAgICAgV2ViUG9pbnQgbV9sYXN0TW91c2VE b3duUG9pbnQ7CiAKLSAgICAvLyBLZWVwcyB0cmFjayBvZiB0aGUgY3VycmVudCB6b29tIGxldmVs LiAgMCBtZWFucyBubyB6b29tLCBwb3NpdGl2ZSBudW1iZXJzCisgICAgLy8gS2VlcHMgdHJhY2sg b2YgdGhlIGN1cnJlbnQgem9vbSBsZXZlbC4gMCBtZWFucyBubyB6b29tLCBwb3NpdGl2ZSBudW1i ZXJzCiAgICAgLy8gbWVhbiB6b29tIGluLCBuZWdhdGl2ZSBudW1iZXJzIG1lYW4gem9vbSBvdXQu CiAgICAgaW50IG1fem9vbUxldmVsOwogCkBAIC00MTYsNyArNDI4LDcgQEAgcHJpdmF0ZToKICAg ICAvLyBjb3BpZWQgZnJvbSB0aGUgV2ViRHJvcERhdGEgb2JqZWN0IHNlbnQgZnJvbSB0aGUgYnJv d3NlciBwcm9jZXNzLgogICAgIGludCBtX2RyYWdJZGVudGl0eTsKIAotICAgIC8vIFZhbGlkIHdo ZW4gbV9kcmFnVGFyZ2V0RGlzcGF0Y2ggaXMgdHJ1ZS4gIFVzZWQgdG8gb3ZlcnJpZGUgdGhlIGRl ZmF1bHQKKyAgICAvLyBWYWxpZCB3aGVuIG1fZHJhZ1RhcmdldERpc3BhdGNoIGlzIHRydWUuIFVz ZWQgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQKICAgICAvLyBicm93c2VyIGRyb3AgZWZmZWN0IHdp dGggdGhlIGVmZmVjdHMgIm5vbmUiIG9yICJjb3B5Ii4KICAgICBlbnVtIERyYWdUYXJnZXREcm9w RWZmZWN0IHsKICAgICAgICAgRHJvcEVmZmVjdERlZmF1bHQgPSAtMSwKQEAgLTQzNSw4ICs0NDcs OCBAQCBwcml2YXRlOgogICAgIC8vIFdoZXRoZXIgYSBzdWdnZXN0aW9ucyBwb3B1cCBpcyBjdXJy ZW50bHkgc2hvd2luZy4KICAgICBib29sIG1fc3VnZ2VzdGlvbnNQb3B1cFNob3dpbmc7CiAKLSAg ICAvLyBBIHBvaW50ZXIgdG8gdGhlIGN1cnJlbnQgc3VnZ2VzdGlvbnMgcG9wdXAgbWVudSBjbGll bnQuICBUaGlzIGNhbiBiZQotICAgIC8vIGVpdGhlciBhbiBBdXRvRmlsbFBvcHVwTWVudUNsaWVu dCBvciBhbiBBdXRvY29tcGxldGVQb3B1cE1lbnVDbGllbnQuICBXZQorICAgIC8vIEEgcG9pbnRl ciB0byB0aGUgY3VycmVudCBzdWdnZXN0aW9ucyBwb3B1cCBtZW51IGNsaWVudC4gVGhpcyBjYW4g YmUKKyAgICAvLyBlaXRoZXIgYW4gQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQgb3IgYW4gQXV0b2Nv bXBsZXRlUG9wdXBNZW51Q2xpZW50LiBXZQogICAgIC8vIGRvIG5vdCBvd24gdGhpcyBwb2ludGVy LgogICAgIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50KiBtX3N1Z2dlc3Rpb25zUG9wdXBDbGll bnQ7CiAKQEAgLTQ0Niw3ICs0NTgsNyBAQCBwcml2YXRlOgogICAgIC8vIFRoZSBBdXRvY29tcGxl dGUgcG9wdXAgY2xpZW50LgogICAgIE93blB0cjxBdXRvY29tcGxldGVQb3B1cE1lbnVDbGllbnQ+ IG1fYXV0b2NvbXBsZXRlUG9wdXBDbGllbnQ7CiAKLSAgICAvLyBBIHBvaW50ZXIgdG8gdGhlIGN1 cnJlbnQgc3VnZ2VzdGlvbnMgcG9wdXAuICBXZSBkbyBub3Qgb3duIHRoaXMgcG9pbnRlci4KKyAg ICAvLyBBIHBvaW50ZXIgdG8gdGhlIGN1cnJlbnQgc3VnZ2VzdGlvbnMgcG9wdXAuIFdlIGRvIG5v dCBvd24gdGhpcyBwb2ludGVyLgogICAgIFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyKiBtX3N1Z2dl c3Rpb25zUG9wdXA7CiAKICAgICAvLyBUaGUgcG9wdXAgYXNzb2NpYXRlZCB3aXRoIGEgc2VsZWN0 IGVsZW1lbnQuCg==