100265 2012-10-24 10:20:13 -0700 call to setNeedsLayout during RenderVideo::paintReplaced 2012-12-11 16:36:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony fischman bdakin ddorwin eric.carlson eric feature-media-reviews fischman palmer simon.fraser webkit.review.bot oldest_to_newest 749777 0 tony 2012-10-24 10:20:13 -0700 Ami did some detective work in bug 89733, comment 8 and got the following stack: WebCore::RenderObject::setNeedsLayout() [0x7f7e5781e4ff] WebCore::RenderVideo::updateIntrinsicSize() [0x7f7e57a5353a] WebCore::RenderVideo::updatePlayer() [0x7f7e57a53d79] WebCore::RenderVideo::paintReplaced() [0x7f7e57a53acc] WebCore::RenderReplaced::paint() [0x7f7e579f6299] WebCore::RenderImage::paint() [0x7f7e5794c0ca] WebCore::RenderLayer::paintLayerContents() [0x7f7e5796c35e] WebCore::RenderLayer::paintLayerContentsAndReflection() [0x7f7e5796b63f] WebCore::RenderLayer::paintLayer() [0x7f7e5796ac36] WebCore::RenderLayer::paintList() [0x7f7e5796d3c5] WebCore::RenderLayer::paintLayerContents() [0x7f7e5796c58d] WebCore::RenderLayer::paintLayerContentsAndReflection() [0x7f7e5796b63f] WebCore::RenderLayer::paintLayer() [0x7f7e5796ac36] WebCore::RenderLayer::paintList() [0x7f7e5796d3c5] WebCore::RenderLayer::paintLayerContents() [0x7f7e5796c5fb] WebCore::RenderLayer::paintLayerContentsAndReflection() [0x7f7e5796b63f] WebCore::RenderLayer::paintLayer() [0x7f7e5796ac36] WebCore::RenderLayer::paint() [0x7f7e5796a49d] WebCore::FrameView::paintContents() [0x7f7e58865327] WebCore::ScrollView::paint() [0x7f7e57eba158] WebKit::PageWidgetDelegate::paint() [0x7f7e573f0956] WebKit::WebViewImpl::paint() [0x7f7e574b55eb] content::RenderWidget::PaintRect() [0x7f7e55d97da6] content::RenderWidget::DoDeferredUpdate() [0x7f7e55d9312d] content::RenderWidget::DoDeferredUpdateAndSendInputAck() [0x7f7e55d97319] content::RenderWidget::InvalidationCallback() [0x7f7e55d98a7a] Looking at the code, I'm not sure why we're trying to update the layout during paint. That seems wrong. My random guess would be that we can just remove the call to updatePlayer since RenderVideo::layout has already called it at this point. 749850 1 170434 fischman 2012-10-24 11:15:15 -0700 Created attachment 170434 Patch 749853 2 170434 simon.fraser 2012-10-24 11:20:28 -0700 Comment on attachment 170434 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170434&action=review > Source/WebCore/rendering/RenderObject.cpp:95 > +RenderObject::SetLayoutNeededForbiddingScope::SetLayoutNeededForbiddingScope(RenderObject* renderObject) I'd call this SetLayoutNeededForbiddenScope > Source/WebCore/rendering/RenderObject.cpp:97 > + , m_preExistingForbidden(m_renderObject->isSetNeedsLayoutForbidden()) m_preexistingForbidden perhaps? 749864 3 170434 fischman 2012-10-24 11:32:10 -0700 Comment on attachment 170434 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170434&action=review Thanks for the review. Does this mean you think the change to RenderVideo is correct? >> Source/WebCore/rendering/RenderObject.cpp:95 >> +RenderObject::SetLayoutNeededForbiddingScope::SetLayoutNeededForbiddingScope(RenderObject* renderObject) > > I'd call this SetLayoutNeededForbiddenScope Done. >> Source/WebCore/rendering/RenderObject.cpp:97 >> + , m_preExistingForbidden(m_renderObject->isSetNeedsLayoutForbidden()) > > m_preexistingForbidden perhaps? Done. 749866 4 170439 fischman 2012-10-24 11:32:43 -0700 Created attachment 170439 Patch 749903 5 170439 tony 2012-10-24 12:17:54 -0700 Comment on attachment 170439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170439&action=review Looks fine to me, but let's wait for the mac ews bot to finish. Also, the ews bots run in Release, so we should watch the waterfall closely after this lands for additional failing tests. > Source/WebCore/rendering/RenderObject.h:255 > + SetLayoutNeededForbiddenScope(RenderObject*); explicit 749904 6 170445 fischman 2012-10-24 12:21:14 -0700 Created attachment 170445 Patch 749905 7 170439 fischman 2012-10-24 12:21:24 -0700 Comment on attachment 170439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170439&action=review >> Source/WebCore/rendering/RenderObject.h:255 >> + SetLayoutNeededForbiddenScope(RenderObject*); > > explicit Done. 750023 8 170445 webkit.review.bot 2012-10-24 14:07:14 -0700 Comment on attachment 170445 Patch Clearing flags on attachment: 170445 Committed r132398: <http://trac.webkit.org/changeset/132398> 750024 9 webkit.review.bot 2012-10-24 14:07:18 -0700 All reviewed patches have been landed. Closing bug. 779077 10 inferno 2012-11-29 09:19:16 -0800 *** Bug 98449 has been marked as a duplicate of this bug. *** 788928 11 bdakin 2012-12-11 16:16:02 -0800 I believe that this patch caused https://bugs.webkit.org/show_bug.cgi?id=104735 788942 12 fischman 2012-12-11 16:22:03 -0800 (In reply to comment #11) > I believe that this patch caused https://bugs.webkit.org/show_bug.cgi?id=104735 s/caused/revealed/ ? Per bug 89733 calling setNeedsLayout() during a paint() is a programming bug. The patch I landed in this bug merely makes the programming bug apparent at the time of violation, instead of an arbitrary amount of time later (e.g. the causes of bug 89733). 788952 13 bdakin 2012-12-11 16:33:01 -0800 (In reply to comment #12) > (In reply to comment #11) > > I believe that this patch caused https://bugs.webkit.org/show_bug.cgi?id=104735 > > s/caused/revealed/ ? > Per bug 89733 calling setNeedsLayout() during a paint() is a programming bug. The patch I landed in this bug merely makes the programming bug apparent at the time of violation, instead of an arbitrary amount of time later (e.g. the causes of bug 89733). This patch caused bots to be red(der). That is something that needs to be dealt with immediately. Unfortunately it has been a while, but I will deal with it now. But yes, longer term, there is obviously a plugin bug to be fixed. 788957 14 fischman 2012-12-11 16:36:56 -0800 Looks like this is getting more attention in bug 104735 so let's continue the conversation there. 170434 2012-10-24 11:15:15 -0700 2012-10-24 11:32:41 -0700 Patch bug-100265-20121024111351.patch text/plain 5139 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJmYzA5M2VlZGY5ZDYw ZDZiMjdmNDI4ZjQwMzk2MjA5ZWQ3MWM4MS4uYjk3NDA5MjdmYjcwM2I2NzIzZjU2NWY1YWY1NGUw MGQ0OWU0N2U2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTI0ICBBbWkg RmlzY2htYW4gIDxmaXNjaG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgY2FsbCB0byBzZXRO ZWVkc0xheW91dCBkdXJpbmcgUmVuZGVyVmlkZW86OnBhaW50UmVwbGFjZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDI2NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdW5uZWNlc3Nhcnkg Y2FsbCBhbmQgYWRkZWQgbmV3IGRlZmVuc2l2ZSBndWFyZHMgdG8gY2F0Y2ggZXJyb25lb3VzIHNl dE5lZWRzTGF5b3V0KCkgY2FsbHMKKyAgICAgICAgZHVyaW5nIHBhaW50cyBlYXJsaWVyIChzbyB0 aGUgb2ZmZW5kaW5nIGNhbGxzIGFyZSBpbiB0aGUgZW1pdHRlZCBzdGFja3RyYWNlKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgLSBuZXcgZGVmZW5zaXZlIGNoZWNrcyBhcmUgdHJpZ2dlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpwYWludENvbnRlbnRzKTogZm9yYmlkIHNldE5lZWRzTGF5 b3V0KCkgZHVyaW5nIHBhaW50aW5nCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGluZ1Njb3BlOjpTZXRMYXlvdXROZWVkZWRGb3JiaWRkaW5n U2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpTZXRMYXlvdXROZWVkZWRG b3JiaWRkaW5nU2NvcGU6On5TZXRMYXlvdXROZWVkZWRGb3JiaWRkaW5nU2NvcGUpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKFJlbmRlck9iamVjdCk6Cisg ICAgICAgIChTZXRMYXlvdXROZWVkZWRGb3JiaWRkaW5nU2NvcGUpOiBhZGRlZCBoZWxwZXIgY2xh c3MgZm9yIGZvcmJpZGRpbmcgc2V0TmVlZHNMYXlvdXQoKSBpbiBhIHNjb3BlLgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJWaWRlby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWRl bzo6cGFpbnRSZXBsYWNlZCk6IGRyb3AgdGhlIG9mZmVuZGluZyAmIHVubmVjZXNzYXJ5IGNhbGwg dG8gdXBkYXRlUGxheWVyKCkuCisKIDIwMTItMTAtMjMgICdQYXZlbCBGZWxkbWFuJyAgPHBmZWxk bWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQ6IGtpY2sgb3V0IG5vbi1j aHJvbWl1bSBmaWxlcyBmcm9tIFdlYkNvcmUuZ3lwaS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cAppbmRleCAyZDMxMmEzMWEyZDYxMDhmNzRlNmFmZjMzODM0YWRhNzA4MjE5YjVhLi43NjZkMGRk ZTg3NDFjMGYzNGIxY2Y5ZjA1ZWY5MDlkNjVkMDhkM2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuY3BwCkBAIC0zMjQyLDYgKzMyNDIsMTAgQEAgdm9pZCBGcmFtZVZpZXc6OnBhaW50Q29udGVu dHMoR3JhcGhpY3NDb250ZXh0KiBwLCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIFJlbmRlck9i amVjdCogZWx0UmVuZGVyZXIgPSBtX25vZGVUb0RyYXcgPyBtX25vZGVUb0RyYXctPnJlbmRlcmVy KCkgOiAwOwogICAgIFJlbmRlckxheWVyKiByb290TGF5ZXIgPSByb290LT5sYXllcigpOwogCisj aWZuZGVmIE5ERUJVRworICAgIFJlbmRlck9iamVjdDo6U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGlu Z1Njb3BlIGZvcmJpZFNldE5lZWRzTGF5b3V0KHJvb3RMYXllci0+cmVuZGVyZXIoKSk7CisjZW5k aWYKKwogICAgIHJvb3RMYXllci0+cGFpbnQocCwgcmVjdCwgbV9wYWludEJlaGF2aW9yLCBlbHRS ZW5kZXJlcik7CiAKICAgICBpZiAocm9vdExheWVyLT5jb250YWluc0RpcnR5T3ZlcmxheVNjcm9s bGJhcnMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXgg MzE4YTE0OTdlMDA2MjdkOGM0YjJlODg3YWY1ZDk4ZTlhOWEwYmM1Ni4uNDk0ZTFiZTYyNjA5NWI5 YTYyZWIzYWRhMmNkOWY0NDQ3NzZjNWJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKQEAgLTkxLDYgKzkxLDE4IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFt ZXM7CiAKICNpZm5kZWYgTkRFQlVHCiBzdGF0aWMgdm9pZCogYmFzZU9mUmVuZGVyT2JqZWN0QmVp bmdEZWxldGVkOworCitSZW5kZXJPYmplY3Q6OlNldExheW91dE5lZWRlZEZvcmJpZGRpbmdTY29w ZTo6U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGluZ1Njb3BlKFJlbmRlck9iamVjdCogcmVuZGVyT2Jq ZWN0KQorICAgIDogbV9yZW5kZXJPYmplY3QocmVuZGVyT2JqZWN0KQorICAgICwgbV9wcmVFeGlz dGluZ0ZvcmJpZGRlbihtX3JlbmRlck9iamVjdC0+aXNTZXROZWVkc0xheW91dEZvcmJpZGRlbigp KQoreworICAgIG1fcmVuZGVyT2JqZWN0LT5zZXROZWVkc0xheW91dElzRm9yYmlkZGVuKHRydWUp OworfQorCitSZW5kZXJPYmplY3Q6OlNldExheW91dE5lZWRlZEZvcmJpZGRpbmdTY29wZTo6flNl dExheW91dE5lZWRlZEZvcmJpZGRpbmdTY29wZSgpCit7CisgICAgbV9yZW5kZXJPYmplY3QtPnNl dE5lZWRzTGF5b3V0SXNGb3JiaWRkZW4obV9wcmVFeGlzdGluZ0ZvcmJpZGRlbik7Cit9CiAjZW5k aWYKIAogc3RydWN0IFNhbWVTaXplQXNSZW5kZXJPYmplY3QgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDFkNWU3NjdkNDkzMThhNTE1MTIzODVmODk2ZDRmMTBl ZmNhYzgxYTMuLjFmODg4MjQwZWJhY2U0ZmZmMTczZjBiZDU5NTgxYjg3NWMzYjZiM2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTI0OCw2ICsyNDgsMTYgQEAg cHVibGljOgogICAgIGJvb2wgaGFzQVhPYmplY3QoKSBjb25zdCB7IHJldHVybiBtX2hhc0FYT2Jq ZWN0OyB9CiAgICAgYm9vbCBpc1NldE5lZWRzTGF5b3V0Rm9yYmlkZGVuKCkgY29uc3QgeyByZXR1 cm4gbV9zZXROZWVkc0xheW91dEZvcmJpZGRlbjsgfQogICAgIHZvaWQgc2V0TmVlZHNMYXlvdXRJ c0ZvcmJpZGRlbihib29sIGZsYWcpIHsgbV9zZXROZWVkc0xheW91dEZvcmJpZGRlbiA9IGZsYWc7 IH0KKworICAgIC8vIEhlbHBlciBjbGFzcyBmb3JiaWRkaW5nIGNhbGxzIHRvIHNldE5lZWRzTGF5 b3V0KCkgZHVyaW5nIGl0cyBsaWZldGltZS4KKyAgICBjbGFzcyBTZXRMYXlvdXROZWVkZWRGb3Ji aWRkaW5nU2NvcGUgeworICAgIHB1YmxpYzoKKyAgICAgICAgU2V0TGF5b3V0TmVlZGVkRm9yYmlk ZGluZ1Njb3BlKFJlbmRlck9iamVjdCopOworICAgICAgICB+U2V0TGF5b3V0TmVlZGVkRm9yYmlk ZGluZ1Njb3BlKCk7CisgICAgcHJpdmF0ZToKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBtX3JlbmRl ck9iamVjdDsKKyAgICAgICAgYm9vbCBtX3ByZUV4aXN0aW5nRm9yYmlkZGVuOworICAgIH07CiAj ZW5kaWYKIAogICAgIC8vIE9idGFpbnMgdGhlIG5lYXJlc3QgZW5jbG9zaW5nIGJsb2NrIChpbmNs dWRpbmcgdGhpcyBibG9jaykgdGhhdCBjb250cmlidXRlcyBhIGZpcnN0LWxpbmUgc3R5bGUgdG8g b3VyIGlubGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZGVvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5kZXgg MDJjMzEzYmEyMWQ2ZDhhMDM2MmQ4NjJjOGM0YWFhOTkzOTI4NDAyMy4uNTQ1YjE0M2I2N2E2MGRh Nzg1NTlmMzBlYzRkNDUzNTM3YTViZGUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclZpZGVvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVmlkZW8uY3BwCkBAIC0xOTUsMTMgKzE5NSwxMCBAQCB2b2lkIFJlbmRlclZpZGVvOjpwYWlu dFJlcGxhY2VkKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRP ZgogICAgIGlmIChGcmFtZSogZnJhbWUgPSB0aGlzLT5mcmFtZSgpKQogICAgICAgICBwYWdlID0g ZnJhbWUtPnBhZ2UoKTsKIAotICAgIGlmICghZGlzcGxheWluZ1Bvc3RlcikgewotICAgICAgICBp ZiAoIW1lZGlhUGxheWVyKSB7Ci0gICAgICAgICAgICBpZiAocGFnZSAmJiBwYWludEluZm8ucGhh c2UgPT0gUGFpbnRQaGFzZUZvcmVncm91bmQpCi0gICAgICAgICAgICAgICAgcGFnZS0+YWRkUmVs ZXZhbnRVbnBhaW50ZWRPYmplY3QodGhpcywgdmlzdWFsT3ZlcmZsb3dSZWN0KCkpOwotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIHVwZGF0ZVBsYXllcigpOworICAgIGlm ICghZGlzcGxheWluZ1Bvc3RlciAmJiAhbWVkaWFQbGF5ZXIpIHsKKyAgICAgICAgaWYgKHBhZ2Ug JiYgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKQorICAgICAgICAgICAg cGFnZS0+YWRkUmVsZXZhbnRVbnBhaW50ZWRPYmplY3QodGhpcywgdmlzdWFsT3ZlcmZsb3dSZWN0 KCkpOworICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgTGF5b3V0UmVjdCByZWN0ID0gdmlk ZW9Cb3goKTsK 170439 2012-10-24 11:32:43 -0700 2012-10-24 13:09:50 -0700 Patch bug-100265-20121024113118.patch text/plain 5126 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJmYzA5M2VlZGY5ZDYw ZDZiMjdmNDI4ZjQwMzk2MjA5ZWQ3MWM4MS4uYmFhNzE5ZmRhNzc2ODcxM2QzYmY0Yzc1ZTZlYzBi ZmZlYzAyYjRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTI0ICBBbWkg RmlzY2htYW4gIDxmaXNjaG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgY2FsbCB0byBzZXRO ZWVkc0xheW91dCBkdXJpbmcgUmVuZGVyVmlkZW86OnBhaW50UmVwbGFjZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDI2NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdW5uZWNlc3Nhcnkg Y2FsbCBhbmQgYWRkZWQgbmV3IGRlZmVuc2l2ZSBndWFyZHMgdG8gY2F0Y2ggZXJyb25lb3VzIHNl dE5lZWRzTGF5b3V0KCkgY2FsbHMKKyAgICAgICAgZHVyaW5nIHBhaW50cyBlYXJsaWVyIChzbyB0 aGUgb2ZmZW5kaW5nIGNhbGxzIGFyZSBpbiB0aGUgZW1pdHRlZCBzdGFja3RyYWNlKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgLSBuZXcgZGVmZW5zaXZlIGNoZWNrcyBhcmUgdHJpZ2dlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpwYWludENvbnRlbnRzKTogZm9yYmlkIHNldE5lZWRzTGF5 b3V0KCkgZHVyaW5nIHBhaW50aW5nCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGVuU2NvcGU6OlNldExheW91dE5lZWRlZEZvcmJpZGRlblNj b3BlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6U2V0TGF5b3V0TmVlZGVkRm9y YmlkZGVuU2NvcGU6On5TZXRMYXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoUmVuZGVyT2JqZWN0KToKKyAgICAg ICAgKFNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3BlKTogYWRkZWQgaGVscGVyIGNsYXNzIGZv ciBmb3JiaWRkaW5nIHNldE5lZWRzTGF5b3V0KCkgaW4gYSBzY29wZS4KKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVmlkZW8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlkZW86OnBh aW50UmVwbGFjZWQpOiBkcm9wIHRoZSBvZmZlbmRpbmcgJiB1bm5lY2Vzc2FyeSBjYWxsIHRvIHVw ZGF0ZVBsYXllcigpLgorCiAyMDEyLTEwLTIzICAnUGF2ZWwgRmVsZG1hbicgIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgTm90IHJldmlld2VkOiBraWNrIG91dCBub24tY2hyb21p dW0gZmlsZXMgZnJvbSBXZWJDb3JlLmd5cGkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5k ZXggMmQzMTJhMzFhMmQ2MTA4Zjc0ZTZhZmYzMzgzNGFkYTcwODIxOWI1YS4uN2YwYTc4MTA2ZWEw Mzc3MzdmMTVjY2UyODNjNzc1NzEzNmYzNzc0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cApAQCAtMzI0Miw2ICszMjQyLDEwIEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzKEdy YXBoaWNzQ29udGV4dCogcCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBSZW5kZXJPYmplY3Qq IGVsdFJlbmRlcmVyID0gbV9ub2RlVG9EcmF3ID8gbV9ub2RlVG9EcmF3LT5yZW5kZXJlcigpIDog MDsKICAgICBSZW5kZXJMYXllciogcm9vdExheWVyID0gcm9vdC0+bGF5ZXIoKTsKIAorI2lmbmRl ZiBOREVCVUcKKyAgICBSZW5kZXJPYmplY3Q6OlNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3Bl IGZvcmJpZFNldE5lZWRzTGF5b3V0KHJvb3RMYXllci0+cmVuZGVyZXIoKSk7CisjZW5kaWYKKwog ICAgIHJvb3RMYXllci0+cGFpbnQocCwgcmVjdCwgbV9wYWludEJlaGF2aW9yLCBlbHRSZW5kZXJl cik7CiAKICAgICBpZiAocm9vdExheWVyLT5jb250YWluc0RpcnR5T3ZlcmxheVNjcm9sbGJhcnMo KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggMzE4YTE0 OTdlMDA2MjdkOGM0YjJlODg3YWY1ZDk4ZTlhOWEwYmM1Ni4uZTY0OWQxMzU0ZGI2MjcyNDNlNjg3 MmZlNmMwZGNlOWYwZGYyOWRmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAKQEAgLTkxLDYgKzkxLDE4IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAK ICNpZm5kZWYgTkRFQlVHCiBzdGF0aWMgdm9pZCogYmFzZU9mUmVuZGVyT2JqZWN0QmVpbmdEZWxl dGVkOworCitSZW5kZXJPYmplY3Q6OlNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3BlOjpTZXRM YXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZShSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCkKKyAg ICA6IG1fcmVuZGVyT2JqZWN0KHJlbmRlck9iamVjdCkKKyAgICAsIG1fcHJlZXhpc3RpbmdGb3Ji aWRkZW4obV9yZW5kZXJPYmplY3QtPmlzU2V0TmVlZHNMYXlvdXRGb3JiaWRkZW4oKSkKK3sKKyAg ICBtX3JlbmRlck9iamVjdC0+c2V0TmVlZHNMYXlvdXRJc0ZvcmJpZGRlbih0cnVlKTsKK30KKwor UmVuZGVyT2JqZWN0OjpTZXRMYXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZTo6flNldExheW91dE5l ZWRlZEZvcmJpZGRlblNjb3BlKCkKK3sKKyAgICBtX3JlbmRlck9iamVjdC0+c2V0TmVlZHNMYXlv dXRJc0ZvcmJpZGRlbihtX3ByZWV4aXN0aW5nRm9yYmlkZGVuKTsKK30KICNlbmRpZgogCiBzdHJ1 Y3QgU2FtZVNpemVBc1JlbmRlck9iamVjdCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmgKaW5kZXggMWQ1ZTc2N2Q0OTMxOGE1MTUxMjM4NWY4OTZkNGYxMGVmY2FjODFhMy4u OWNmYTgyMjRiZDk4YjY0OTU0OGJlNDFkMTFkZmYxMWIzOTZhYzdmNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtMjQ4LDYgKzI0OCwxNiBAQCBwdWJsaWM6CiAg ICAgYm9vbCBoYXNBWE9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzQVhPYmplY3Q7IH0KICAg ICBib29sIGlzU2V0TmVlZHNMYXlvdXRGb3JiaWRkZW4oKSBjb25zdCB7IHJldHVybiBtX3NldE5l ZWRzTGF5b3V0Rm9yYmlkZGVuOyB9CiAgICAgdm9pZCBzZXROZWVkc0xheW91dElzRm9yYmlkZGVu KGJvb2wgZmxhZykgeyBtX3NldE5lZWRzTGF5b3V0Rm9yYmlkZGVuID0gZmxhZzsgfQorCisgICAg Ly8gSGVscGVyIGNsYXNzIGZvcmJpZGRpbmcgY2FsbHMgdG8gc2V0TmVlZHNMYXlvdXQoKSBkdXJp bmcgaXRzIGxpZmV0aW1lLgorICAgIGNsYXNzIFNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3Bl IHsKKyAgICBwdWJsaWM6CisgICAgICAgIFNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3BlKFJl bmRlck9iamVjdCopOworICAgICAgICB+U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGVuU2NvcGUoKTsK KyAgICBwcml2YXRlOgorICAgICAgICBSZW5kZXJPYmplY3QqIG1fcmVuZGVyT2JqZWN0OworICAg ICAgICBib29sIG1fcHJlZXhpc3RpbmdGb3JiaWRkZW47CisgICAgfTsKICNlbmRpZgogCiAgICAg Ly8gT2J0YWlucyB0aGUgbmVhcmVzdCBlbmNsb3NpbmcgYmxvY2sgKGluY2x1ZGluZyB0aGlzIGJs b2NrKSB0aGF0IGNvbnRyaWJ1dGVzIGEgZmlyc3QtbGluZSBzdHlsZSB0byBvdXIgaW5saW5lCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAppbmRleCAwMmMzMTNiYTIxZDZk OGEwMzYyZDg2MmM4YzRhYWE5OTM5Mjg0MDIzLi41NDViMTQzYjY3YTYwZGE3ODU1OWYzMGVjNGQ0 NTM1MzdhNWJkZTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VmlkZW8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAK QEAgLTE5NSwxMyArMTk1LDEwIEBAIHZvaWQgUmVuZGVyVmlkZW86OnBhaW50UmVwbGFjZWQoUGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAgICAgaWYgKEZy YW1lKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCkpCiAgICAgICAgIHBhZ2UgPSBmcmFtZS0+cGFnZSgp OwogCi0gICAgaWYgKCFkaXNwbGF5aW5nUG9zdGVyKSB7Ci0gICAgICAgIGlmICghbWVkaWFQbGF5 ZXIpIHsKLSAgICAgICAgICAgIGlmIChwYWdlICYmIHBhaW50SW5mby5waGFzZSA9PSBQYWludFBo YXNlRm9yZWdyb3VuZCkKLSAgICAgICAgICAgICAgICBwYWdlLT5hZGRSZWxldmFudFVucGFpbnRl ZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7Ci0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIH0KLSAgICAgICAgdXBkYXRlUGxheWVyKCk7CisgICAgaWYgKCFkaXNwbGF5aW5n UG9zdGVyICYmICFtZWRpYVBsYXllcikgeworICAgICAgICBpZiAocGFnZSAmJiBwYWludEluZm8u cGhhc2UgPT0gUGFpbnRQaGFzZUZvcmVncm91bmQpCisgICAgICAgICAgICBwYWdlLT5hZGRSZWxl dmFudFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7CisgICAgICAg IHJldHVybjsKICAgICB9CiAKICAgICBMYXlvdXRSZWN0IHJlY3QgPSB2aWRlb0JveCgpOwo= 170445 2012-10-24 12:21:14 -0700 2012-10-24 14:07:14 -0700 Patch bug-100265-20121024121949.patch text/plain 5135 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJmYzA5M2VlZGY5ZDYw ZDZiMjdmNDI4ZjQwMzk2MjA5ZWQ3MWM4MS4uYmFhNzE5ZmRhNzc2ODcxM2QzYmY0Yzc1ZTZlYzBi ZmZlYzAyYjRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTI0ICBBbWkg RmlzY2htYW4gIDxmaXNjaG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgY2FsbCB0byBzZXRO ZWVkc0xheW91dCBkdXJpbmcgUmVuZGVyVmlkZW86OnBhaW50UmVwbGFjZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDI2NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdW5uZWNlc3Nhcnkg Y2FsbCBhbmQgYWRkZWQgbmV3IGRlZmVuc2l2ZSBndWFyZHMgdG8gY2F0Y2ggZXJyb25lb3VzIHNl dE5lZWRzTGF5b3V0KCkgY2FsbHMKKyAgICAgICAgZHVyaW5nIHBhaW50cyBlYXJsaWVyIChzbyB0 aGUgb2ZmZW5kaW5nIGNhbGxzIGFyZSBpbiB0aGUgZW1pdHRlZCBzdGFja3RyYWNlKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgLSBuZXcgZGVmZW5zaXZlIGNoZWNrcyBhcmUgdHJpZ2dlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpwYWludENvbnRlbnRzKTogZm9yYmlkIHNldE5lZWRzTGF5 b3V0KCkgZHVyaW5nIHBhaW50aW5nCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGVuU2NvcGU6OlNldExheW91dE5lZWRlZEZvcmJpZGRlblNj b3BlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6U2V0TGF5b3V0TmVlZGVkRm9y YmlkZGVuU2NvcGU6On5TZXRMYXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoUmVuZGVyT2JqZWN0KToKKyAgICAg ICAgKFNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3BlKTogYWRkZWQgaGVscGVyIGNsYXNzIGZv ciBmb3JiaWRkaW5nIHNldE5lZWRzTGF5b3V0KCkgaW4gYSBzY29wZS4KKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVmlkZW8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlkZW86OnBh aW50UmVwbGFjZWQpOiBkcm9wIHRoZSBvZmZlbmRpbmcgJiB1bm5lY2Vzc2FyeSBjYWxsIHRvIHVw ZGF0ZVBsYXllcigpLgorCiAyMDEyLTEwLTIzICAnUGF2ZWwgRmVsZG1hbicgIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgTm90IHJldmlld2VkOiBraWNrIG91dCBub24tY2hyb21p dW0gZmlsZXMgZnJvbSBXZWJDb3JlLmd5cGkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5k ZXggMmQzMTJhMzFhMmQ2MTA4Zjc0ZTZhZmYzMzgzNGFkYTcwODIxOWI1YS4uN2YwYTc4MTA2ZWEw Mzc3MzdmMTVjY2UyODNjNzc1NzEzNmYzNzc0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cApAQCAtMzI0Miw2ICszMjQyLDEwIEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzKEdy YXBoaWNzQ29udGV4dCogcCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBSZW5kZXJPYmplY3Qq IGVsdFJlbmRlcmVyID0gbV9ub2RlVG9EcmF3ID8gbV9ub2RlVG9EcmF3LT5yZW5kZXJlcigpIDog MDsKICAgICBSZW5kZXJMYXllciogcm9vdExheWVyID0gcm9vdC0+bGF5ZXIoKTsKIAorI2lmbmRl ZiBOREVCVUcKKyAgICBSZW5kZXJPYmplY3Q6OlNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3Bl IGZvcmJpZFNldE5lZWRzTGF5b3V0KHJvb3RMYXllci0+cmVuZGVyZXIoKSk7CisjZW5kaWYKKwog ICAgIHJvb3RMYXllci0+cGFpbnQocCwgcmVjdCwgbV9wYWludEJlaGF2aW9yLCBlbHRSZW5kZXJl cik7CiAKICAgICBpZiAocm9vdExheWVyLT5jb250YWluc0RpcnR5T3ZlcmxheVNjcm9sbGJhcnMo KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggMzE4YTE0 OTdlMDA2MjdkOGM0YjJlODg3YWY1ZDk4ZTlhOWEwYmM1Ni4uZTY0OWQxMzU0ZGI2MjcyNDNlNjg3 MmZlNmMwZGNlOWYwZGYyOWRmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAKQEAgLTkxLDYgKzkxLDE4IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAK ICNpZm5kZWYgTkRFQlVHCiBzdGF0aWMgdm9pZCogYmFzZU9mUmVuZGVyT2JqZWN0QmVpbmdEZWxl dGVkOworCitSZW5kZXJPYmplY3Q6OlNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3BlOjpTZXRM YXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZShSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCkKKyAg ICA6IG1fcmVuZGVyT2JqZWN0KHJlbmRlck9iamVjdCkKKyAgICAsIG1fcHJlZXhpc3RpbmdGb3Ji aWRkZW4obV9yZW5kZXJPYmplY3QtPmlzU2V0TmVlZHNMYXlvdXRGb3JiaWRkZW4oKSkKK3sKKyAg ICBtX3JlbmRlck9iamVjdC0+c2V0TmVlZHNMYXlvdXRJc0ZvcmJpZGRlbih0cnVlKTsKK30KKwor UmVuZGVyT2JqZWN0OjpTZXRMYXlvdXROZWVkZWRGb3JiaWRkZW5TY29wZTo6flNldExheW91dE5l ZWRlZEZvcmJpZGRlblNjb3BlKCkKK3sKKyAgICBtX3JlbmRlck9iamVjdC0+c2V0TmVlZHNMYXlv dXRJc0ZvcmJpZGRlbihtX3ByZWV4aXN0aW5nRm9yYmlkZGVuKTsKK30KICNlbmRpZgogCiBzdHJ1 Y3QgU2FtZVNpemVBc1JlbmRlck9iamVjdCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmgKaW5kZXggMWQ1ZTc2N2Q0OTMxOGE1MTUxMjM4NWY4OTZkNGYxMGVmY2FjODFhMy4u OTc2OGVhMjI1YTI3M2FlZjQyYzc1ZGFhNmMzNmY1MzJhMjgxNzVmYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtMjQ4LDYgKzI0OCwxNiBAQCBwdWJsaWM6CiAg ICAgYm9vbCBoYXNBWE9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzQVhPYmplY3Q7IH0KICAg ICBib29sIGlzU2V0TmVlZHNMYXlvdXRGb3JiaWRkZW4oKSBjb25zdCB7IHJldHVybiBtX3NldE5l ZWRzTGF5b3V0Rm9yYmlkZGVuOyB9CiAgICAgdm9pZCBzZXROZWVkc0xheW91dElzRm9yYmlkZGVu KGJvb2wgZmxhZykgeyBtX3NldE5lZWRzTGF5b3V0Rm9yYmlkZGVuID0gZmxhZzsgfQorCisgICAg Ly8gSGVscGVyIGNsYXNzIGZvcmJpZGRpbmcgY2FsbHMgdG8gc2V0TmVlZHNMYXlvdXQoKSBkdXJp bmcgaXRzIGxpZmV0aW1lLgorICAgIGNsYXNzIFNldExheW91dE5lZWRlZEZvcmJpZGRlblNjb3Bl IHsKKyAgICBwdWJsaWM6CisgICAgICAgIGV4cGxpY2l0IFNldExheW91dE5lZWRlZEZvcmJpZGRl blNjb3BlKFJlbmRlck9iamVjdCopOworICAgICAgICB+U2V0TGF5b3V0TmVlZGVkRm9yYmlkZGVu U2NvcGUoKTsKKyAgICBwcml2YXRlOgorICAgICAgICBSZW5kZXJPYmplY3QqIG1fcmVuZGVyT2Jq ZWN0OworICAgICAgICBib29sIG1fcHJlZXhpc3RpbmdGb3JiaWRkZW47CisgICAgfTsKICNlbmRp ZgogCiAgICAgLy8gT2J0YWlucyB0aGUgbmVhcmVzdCBlbmNsb3NpbmcgYmxvY2sgKGluY2x1ZGlu ZyB0aGlzIGJsb2NrKSB0aGF0IGNvbnRyaWJ1dGVzIGEgZmlyc3QtbGluZSBzdHlsZSB0byBvdXIg aW5saW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8u Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAppbmRleCAwMmMz MTNiYTIxZDZkOGEwMzYyZDg2MmM4YzRhYWE5OTM5Mjg0MDIzLi41NDViMTQzYjY3YTYwZGE3ODU1 OWYzMGVjNGQ0NTM1MzdhNWJkZTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVmlkZW8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWRlby5jcHAKQEAgLTE5NSwxMyArMTk1LDEwIEBAIHZvaWQgUmVuZGVyVmlkZW86OnBhaW50UmVw bGFjZWQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAg ICAgaWYgKEZyYW1lKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCkpCiAgICAgICAgIHBhZ2UgPSBmcmFt ZS0+cGFnZSgpOwogCi0gICAgaWYgKCFkaXNwbGF5aW5nUG9zdGVyKSB7Ci0gICAgICAgIGlmICgh bWVkaWFQbGF5ZXIpIHsKLSAgICAgICAgICAgIGlmIChwYWdlICYmIHBhaW50SW5mby5waGFzZSA9 PSBQYWludFBoYXNlRm9yZWdyb3VuZCkKLSAgICAgICAgICAgICAgICBwYWdlLT5hZGRSZWxldmFu dFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7Ci0gICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgdXBkYXRlUGxheWVyKCk7CisgICAgaWYgKCFk aXNwbGF5aW5nUG9zdGVyICYmICFtZWRpYVBsYXllcikgeworICAgICAgICBpZiAocGFnZSAmJiBw YWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZUZvcmVncm91bmQpCisgICAgICAgICAgICBwYWdl LT5hZGRSZWxldmFudFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXN1YWxPdmVyZmxvd1JlY3QoKSk7 CisgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBMYXlvdXRSZWN0IHJlY3QgPSB2aWRlb0Jv eCgpOwo=