131319 2014-04-07 15:53:02 -0700 Allow elements to register for changes in page scale 2014-04-08 18:43:35 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 131322 1 dino dino calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble kangil.han philipj sergio webkit-bug-importer oldest_to_newest 998262 0 dino 2014-04-07 15:53:02 -0700 Some HTML elements might want to react to changes in the page scale. 998263 1 webkit-bug-importer 2014-04-07 15:54:22 -0700 <rdar://problem/16545804> 998264 2 228765 dino 2014-04-07 15:57:12 -0700 Created attachment 228765 Patch 998297 3 228773 dino 2014-04-07 17:01:08 -0700 Created attachment 228773 Patch 998312 4 228773 eric.carlson 2014-04-07 17:12:46 -0700 Comment on attachment 228773 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228773&action=review > Source/WebCore/ChangeLog:25 > + * html/HTMLMediaElement.cpp: > + (WebCore::HTMLMediaElement::HTMLMediaElement): > + (WebCore::HTMLMediaElement::~HTMLMediaElement): Remove ourselves from the > + callback if necessary. Nit: you forgot "setMediaControlsDependOnPageScaleFactor". > Source/WebCore/ChangeLog:28 > + (WebCore::HTMLMediaElement::mediaControlsDependOnPageScaleFactor): Add ourselves to Nit: This is the accessor. > Source/WebCore/ChangeLog:31 > + (WebCore::Page::setPageScaleFactor): Tell the document that the user has zoomed. Nit: "the document" -> "all documents" > Source/WebCore/dom/Document.cpp:4199 > +void Document::registerForPageScaleFactorChangedCallbacks(HTMLMediaElement* e) Nit: might as well spell out "element". > Source/WebCore/dom/Document.cpp:4204 > +void Document::unregisterForPageScaleFactorChangedCallbacks(HTMLMediaElement* e) Ditto. > Source/WebCore/html/HTMLMediaElement.cpp:422 > + if (m_mediaControlsDependOnPageScaleFactor) > + document().unregisterForPageScaleFactorChangedCallbacks(this); Can this go in HTMLMediaElement::unregisterWithDocument? > Source/WebCore/html/HTMLMediaElement.cpp:5986 > +void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool v) Nit: you might as well use a descriptive variable name. > Source/WebCore/html/HTMLMediaElement.h:892 > + bool m_mediaControlsDependOnPageScaleFactor : 1; Nit: this should be grouped with the other 1-bit bools to make the element slightly smaller. 998315 5 228773 simon.fraser 2014-04-07 17:15:59 -0700 Comment on attachment 228773 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228773&action=review r- for the "moving between documents" issue. > Source/WebCore/dom/Document.cpp:4199 > +void Document::registerForPageScaleFactorChangedCallbacks(HTMLMediaElement* e) e -> element. > Source/WebCore/html/HTMLMediaElement.cpp:423 > +#if ENABLE(MEDIA_CONTROLS_SCRIPT) > + if (m_mediaControlsDependOnPageScaleFactor) > + document().unregisterForPageScaleFactorChangedCallbacks(this); > +#endif What happens when an element moves between documents? > Source/WebCore/html/HTMLMediaElement.cpp:5986 > +void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool v) v -> something. > Source/WebCore/page/Page.cpp:737 > +#if ENABLE(MEDIA_CONTROLS_SCRIPT) > + for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) > + frame->document()->pageScaleFactorChanged(); > +#endif Don't we already do this somewhere, e.g. to tell compositing that the scale changed? Can this happen to pages in the page cache? 998323 6 228773 dino 2014-04-07 17:26:27 -0700 Comment on attachment 228773 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228773&action=review >> Source/WebCore/html/HTMLMediaElement.cpp:422 >> + document().unregisterForPageScaleFactorChangedCallbacks(this); > > Can this go in HTMLMediaElement::unregisterWithDocument? Yes, and that will solve Simon's issue. >> Source/WebCore/html/HTMLMediaElement.cpp:423 >> +#endif > > What happens when an element moves between documents? I'll fix that. >> Source/WebCore/html/HTMLMediaElement.h:892 >> + bool m_mediaControlsDependOnPageScaleFactor : 1; > > Nit: this should be grouped with the other 1-bit bools to make the element slightly smaller. OK. >> Source/WebCore/page/Page.cpp:737 >> +#endif > > Don't we already do this somewhere, e.g. to tell compositing that the scale changed? > > Can this happen to pages in the page cache? We do similar stuff in this method. e.g. if (view && view->fixedElementsLayoutRelativeToFrame()) view->setViewportConstrainedObjectsNeedLayout(); This is basically the same thing but there is no point going up to the view for it. 998379 7 228794 dino 2014-04-07 19:15:03 -0700 Created attachment 228794 Patch 998403 8 228794 eric.carlson 2014-04-07 20:16:27 -0700 Comment on attachment 228794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228794&action=review > Source/WebCore/ChangeLog:29 > + (WebCore::HTMLMediaElement::setMediaControlsDependOnPageScaleFactor): Add ourselves to > + the callback if necessary. Nit: Add -> Add/remove 998659 9 dino 2014-04-08 11:07:08 -0700 Committed r166937: <http://trac.webkit.org/changeset/166937> 228765 2014-04-07 15:57:12 -0700 2014-04-07 17:00:55 -0700 Patch bug-131319-20140408085650.patch text/plain 4231 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFjZDllZTQxMjQ2OGQ0 OTlkOTY2ODAxM2Q3ODk1MTIyNjk1ODY0Mi4uNTk3ODA5NWRlNGM1MzhlMzBiYzY0YTEwN2QyZTFk ZjZhM2QyM2VmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBlbGVtZW50cyB0byBy ZWdpc3RlciBmb3IgY2hhbmdlcyBpbiBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIHBhcnRzIG9mIFdlYkNvcmUgbmVlZCB0byBy ZWFjdCB0byBjaGFuZ2VzIGluIHRoZSBwYWdlCisgICAgICAgIHNjYWxlIGZhY3Rvciwgc3VjaCBh cyByZXNpemluZyB3aGVuIHRoZSB1c2VyIHpvb21zLiBBIGZvbGxvd3VwCisgICAgICAgIHBhdGNo IHdpbGwgZW5hYmxlIHRoaXMgZm9yIG1lZGlhIGNvbnRyb2xzIC0gdGhpcyBzaW1wbHkgbGF5cwor ICAgICAgICB0aGUgZ3JvdW5kd29yay4KKworICAgICAgICBBdCB0aGUgbW9tZW50IHdlIG9ubHkg YWxsb3cgSFRNTE1lZGlhRWxlbWVudHMgdG8gcmVnaXN0ZXIsIGJ1dCBpZgorICAgICAgICBuZWNl c3NhcnkgdGhpcyBjb3VsZCBiZSBleHBhbmRlZCBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICog ZG9tL0RvY3VtZW50LmNwcDogTmV3IG1ldGhvZHMgdG8ga2VlcCBhIGxpc3Qgb2YgSFRNTE1lZGlh RWxlbWVudHMgdG8gYnJvYWRjYXN0CisgICAgICAgIGNoYW5nZXMgdG8uCisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6cmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tz KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1bnJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFj dG9yQ2hhbmdlZENhbGxiYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cGFnZVNj YWxlRmFjdG9yQ2hhbmdlZCk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgICog cGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnNldFBhZ2VTY2FsZUZhY3Rv cik6IFRlbGwgdGhlIGRvY3VtZW50IHRoYXQgdGhlIHVzZXIgaGFzIHpvb21lZC4KKwogMjAxNC0w NC0wNSAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl IHVudXNlZCB0eXBlIGNhc3RpbmcgaGVscGVycyBmb3IgSFRNTFVua25vd25FbGVtZW50Li4uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAxZWI4MDkyYjZiMmYzMzZiOTcyZDE5MzQxYjZmMmZm MDMxMGE4ZTZkLi42YWJmOWJiNDhhZTBlYWIxOTdlZmM0MzY1M2QzZGQwOTgzZjdmMWE1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTQxOTUsNiArNDE5NSwyNCBAQCB2b2lkIERvY3VtZW50 OjpjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkKCkKIH0KICNlbmRpZgogCisjaWYgRU5BQkxFKE1F RElBX0NPTlRST0xTX1NDUklQVCkKK3ZvaWQgRG9jdW1lbnQ6OnJlZ2lzdGVyRm9yUGFnZVNjYWxl RmFjdG9yQ2hhbmdlZENhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50KiBlKQoreworICAgIG1fcGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZEVsZW1lbnRzLmFkZChlKTsKK30KKwordm9pZCBEb2N1bWVudDo6 dW5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MoSFRNTE1lZGlhRWxl bWVudCogZSkKK3sKKyAgICBtX3BhZ2VTY2FsZUZhY3RvckNoYW5nZWRFbGVtZW50cy5yZW1vdmUo ZSk7Cit9CisKK3ZvaWQgRG9jdW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQoKQoreworICAg IGZvciAoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50IDogbV9wYWdlU2NhbGVGYWN0b3JD aGFuZ2VkRWxlbWVudHMpCisgICAgICAgIG1lZGlhRWxlbWVudC0+cGFnZVNjYWxlRmFjdG9yQ2hh bmdlZCgpOworfQorI2VuZGlmCisKIHZvaWQgRG9jdW1lbnQ6OnNldFNob3VsZENyZWF0ZVJlbmRl cmVycyhib29sIGYpCiB7CiAgICAgbV9jcmVhdGVSZW5kZXJlcnMgPSBmOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuaAppbmRleCBmMTFhY2Y2OGRkOTVhYjFiNzI2Y2M2ZWYxN2I0YzgyMWRhOThhMWZmLi5mYTkw ZjhmYTBhNDU5ZjBhNDdlYjBmNzI3YmNjYmU4YWNmNWFiNjNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu aApAQCAtMTA5LDYgKzEwOSw3IEBAIGNsYXNzIEhUTUxIZWFkRWxlbWVudDsKIGNsYXNzIEhUTUxJ RnJhbWVFbGVtZW50OwogY2xhc3MgSFRNTEltYWdlRWxlbWVudDsKIGNsYXNzIEhUTUxNYXBFbGVt ZW50OworY2xhc3MgSFRNTE1lZGlhRWxlbWVudDsKIGNsYXNzIEhUTUxOYW1lQ29sbGVjdGlvbjsK IGNsYXNzIEhUTUxTY3JpcHRFbGVtZW50OwogY2xhc3MgSGl0VGVzdFJlcXVlc3Q7CkBAIC0xMDQw LDYgKzEwNDEsMTIgQEAgcHVibGljOgogICAgIHZvaWQgY2FwdGlvblByZWZlcmVuY2VzQ2hhbmdl ZCgpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIHZv aWQgcmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKEhUTUxNZWRpYUVs ZW1lbnQqKTsKKyAgICB2b2lkIHVucmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2Fs bGJhY2tzKEhUTUxNZWRpYUVsZW1lbnQqKTsKKyAgICB2b2lkIHBhZ2VTY2FsZUZhY3RvckNoYW5n ZWQoKTsKKyNlbmRpZgorCiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElUWV9BUEkpCiAgICAgdm9p ZCByZWdpc3RlckZvclZpc2liaWxpdHlTdGF0ZUNoYW5nZWRDYWxsYmFja3MoRWxlbWVudCopOwog ICAgIHZvaWQgdW5yZWdpc3RlckZvclZpc2liaWxpdHlTdGF0ZUNoYW5nZWRDYWxsYmFja3MoRWxl bWVudCopOwpAQCAtMTUzMSw2ICsxNTM4LDEwIEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDxFbGVt ZW50Kj4gbV9jYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkRWxlbWVudHM7CiAjZW5kaWYKIAorI2lm IEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgSGFzaFNldDxIVE1MTWVkaWFFbGVt ZW50Kj4gbV9wYWdlU2NhbGVGYWN0b3JDaGFuZ2VkRWxlbWVudHM7CisjZW5kaWYKKwogI2lmIEVO QUJMRShQQUdFX1ZJU0lCSUxJVFlfQVBJKQogICAgIEhhc2hTZXQ8RWxlbWVudCo+IG1fdmlzaWJp bGl0eVN0YXRlQ2FsbGJhY2tFbGVtZW50czsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXgg MjVmNzY3YWU5MTc3NDA2ZGE2Mjg5MWQzNDExMWU3ZGM0NDQ5Njg2Yi4uM2MyNGMwNmExYWE1YzZk MDE5NWIxYmY0YzZiYTI4YzEyNTMwNzQ3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC03MzAsNiAr NzMwLDExIEBAIHZvaWQgUGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlLCBjb25z dCBJbnRQb2ludCYgb3JpZ2luKQogICAgICAgICBpZiAoIXZpZXctPmRlbGVnYXRlc1Njcm9sbGlu ZygpKQogICAgICAgICAgICAgdmlldy0+c2V0U2Nyb2xsUG9zaXRpb24ob3JpZ2luKTsKICAgICB9 CisKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIGZvciAoRnJhbWUqIGZy YW1lID0gJm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNl TmV4dCgpKQorICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+cGFnZVNjYWxlRmFjdG9yQ2hhbmdl ZCgpOworI2VuZGlmCiB9CiAKIHZvaWQgUGFnZTo6c2V0RGV2aWNlU2NhbGVGYWN0b3IoZmxvYXQg c2NhbGVGYWN0b3IpCg== 228773 2014-04-07 17:01:08 -0700 2014-04-07 19:14:52 -0700 Patch bug-131319-20140408100046.patch text/plain 7948 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFjZDllZTQxMjQ2OGQ0 OTlkOTY2ODAxM2Q3ODk1MTIyNjk1ODY0Mi4uOGVmODNmMjdjYjFkMDNkMDk3YzY5NGQxNzRlNWQ2 MmY1YTRiZjZlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBlbGVtZW50cyB0byBy ZWdpc3RlciBmb3IgY2hhbmdlcyBpbiBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIHBhcnRzIG9mIFdlYkNvcmUgbmVlZCB0byBy ZWFjdCB0byBjaGFuZ2VzIGluIHRoZSBwYWdlCisgICAgICAgIHNjYWxlIGZhY3Rvciwgc3VjaCBh cyByZXNpemluZyB3aGVuIHRoZSB1c2VyIHpvb21zLiBBIGZvbGxvd3VwCisgICAgICAgIHBhdGNo IHdpbGwgZW5hYmxlIHRoaXMgZm9yIG1lZGlhIGNvbnRyb2xzIC0gdGhpcyBzaW1wbHkgbGF5cwor ICAgICAgICB0aGUgZ3JvdW5kd29yay4KKworICAgICAgICBBdCB0aGUgbW9tZW50IHdlIG9ubHkg YWxsb3cgSFRNTE1lZGlhRWxlbWVudHMgdG8gcmVnaXN0ZXIsIGJ1dCBpZgorICAgICAgICBuZWNl c3NhcnkgdGhpcyBjb3VsZCBiZSBleHBhbmRlZCBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICog ZG9tL0RvY3VtZW50LmNwcDogTmV3IG1ldGhvZHMgdG8ga2VlcCBhIGxpc3Qgb2YgSFRNTE1lZGlh RWxlbWVudHMgdGhhdAorICAgICAgICBhcmUgaW50ZXJlc3RlZCBpbiB1cGRhdGVzLgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFjdG9yQ2hhbmdlZENh bGxiYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5yZWdpc3RlckZvclBhZ2VT Y2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnQ6On5IVE1MTWVkaWFFbGVtZW50KTogUmVtb3ZlIG91cnNlbHZlcyBmcm9tIHRo ZQorICAgICAgICBjYWxsYmFjayBpZiBuZWNlc3NhcnkuCisgICAgICAgICogaHRtbC9IVE1MTWVk aWFFbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpwYWdlU2Nh bGVGYWN0b3JDaGFuZ2VkKTogVGhlIGNhbGxiYWNrIGZ1bmN0aW9uLiBFbXB0eSBmb3Igbm93Lgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFDb250cm9sc0RlcGVuZE9u UGFnZVNjYWxlRmFjdG9yKTogQWRkIG91cnNlbHZlcyB0bworICAgICAgICB0aGUgY2FsbGJhY2tz LgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRQ YWdlU2NhbGVGYWN0b3IpOiBUZWxsIHRoZSBkb2N1bWVudCB0aGF0IHRoZSB1c2VyIGhhcyB6b29t ZWQuCisKIDIwMTQtMDQtMDUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbW92ZSB1bnVzZWQgdHlwZSBjYXN0aW5nIGhlbHBlcnMgZm9yIEhUTUxVbmtub3du RWxlbWVudC4uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMWViODA5MmI2YjJmMzM2Yjk3 MmQxOTM0MWI2ZjJmZjAzMTBhOGU2ZC4uNmFiZjliYjQ4YWUwZWFiMTk3ZWZjNDM2NTNkM2RkMDk4 M2Y3ZjFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC00MTk1LDYgKzQxOTUsMjQgQEAg dm9pZCBEb2N1bWVudDo6Y2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZCgpCiB9CiAjZW5kaWYKIAor I2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCit2b2lkIERvY3VtZW50OjpyZWdpc3Rl ckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MoSFRNTE1lZGlhRWxlbWVudCogZSkK K3sKKyAgICBtX3BhZ2VTY2FsZUZhY3RvckNoYW5nZWRFbGVtZW50cy5hZGQoZSk7Cit9CisKK3Zv aWQgRG9jdW1lbnQ6OnVucmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tz KEhUTUxNZWRpYUVsZW1lbnQqIGUpCit7CisgICAgbV9wYWdlU2NhbGVGYWN0b3JDaGFuZ2VkRWxl bWVudHMucmVtb3ZlKGUpOworfQorCit2b2lkIERvY3VtZW50OjpwYWdlU2NhbGVGYWN0b3JDaGFu Z2VkKCkKK3sKKyAgICBmb3IgKEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA6IG1fcGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZEVsZW1lbnRzKQorICAgICAgICBtZWRpYUVsZW1lbnQtPnBhZ2VT Y2FsZUZhY3RvckNoYW5nZWQoKTsKK30KKyNlbmRpZgorCiB2b2lkIERvY3VtZW50OjpzZXRTaG91 bGRDcmVhdGVSZW5kZXJlcnMoYm9vbCBmKQogewogICAgIG1fY3JlYXRlUmVuZGVyZXJzID0gZjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmgKaW5kZXggZjExYWNmNjhkZDk1YWIxYjcyNmNjNmVmMTdiNGM4MjFk YTk4YTFmZi4uZmE5MGY4ZmEwYTQ1OWYwYTQ3ZWIwZjcyN2JjY2JlOGFjZjVhYjYzZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmgKQEAgLTEwOSw2ICsxMDksNyBAQCBjbGFzcyBIVE1MSGVhZEVsZW1lbnQ7 CiBjbGFzcyBIVE1MSUZyYW1lRWxlbWVudDsKIGNsYXNzIEhUTUxJbWFnZUVsZW1lbnQ7CiBjbGFz cyBIVE1MTWFwRWxlbWVudDsKK2NsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7CiBjbGFzcyBIVE1MTmFt ZUNvbGxlY3Rpb247CiBjbGFzcyBIVE1MU2NyaXB0RWxlbWVudDsKIGNsYXNzIEhpdFRlc3RSZXF1 ZXN0OwpAQCAtMTA0MCw2ICsxMDQxLDEyIEBAIHB1YmxpYzoKICAgICB2b2lkIGNhcHRpb25QcmVm ZXJlbmNlc0NoYW5nZWQoKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX1ND UklQVCkKKyAgICB2b2lkIHJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFjdG9yQ2hhbmdlZENhbGxiYWNr cyhIVE1MTWVkaWFFbGVtZW50Kik7CisgICAgdm9pZCB1bnJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFj dG9yQ2hhbmdlZENhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50Kik7CisgICAgdm9pZCBwYWdlU2Nh bGVGYWN0b3JDaGFuZ2VkKCk7CisjZW5kaWYKKwogI2lmIEVOQUJMRShQQUdFX1ZJU0lCSUxJVFlf QVBJKQogICAgIHZvaWQgcmVnaXN0ZXJGb3JWaXNpYmlsaXR5U3RhdGVDaGFuZ2VkQ2FsbGJhY2tz KEVsZW1lbnQqKTsKICAgICB2b2lkIHVucmVnaXN0ZXJGb3JWaXNpYmlsaXR5U3RhdGVDaGFuZ2Vk Q2FsbGJhY2tzKEVsZW1lbnQqKTsKQEAgLTE1MzEsNiArMTUzOCwxMCBAQCBwcml2YXRlOgogICAg IEhhc2hTZXQ8RWxlbWVudCo+IG1fY2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZEVsZW1lbnRzOwog I2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIEhhc2hTZXQ8 SFRNTE1lZGlhRWxlbWVudCo+IG1fcGFnZVNjYWxlRmFjdG9yQ2hhbmdlZEVsZW1lbnRzOworI2Vu ZGlmCisKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICBIYXNoU2V0PEVsZW1l bnQqPiBtX3Zpc2liaWxpdHlTdGF0ZUNhbGxiYWNrRWxlbWVudHM7CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDk2NWY3NTkyZDdmOTQzYjc2YTk1 MGEyMzFlNjYyMDFhZTNlZTQzMWIuLjEyMTljNzAzNWU2NzM5NWVjZDQwZjYzZDBjNGNiYjdiNzQ3 YThlOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzQ2 LDYgKzM0Niw5IEBAIEhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQoY29uc3QgUXVh bGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQmIGRvY3VtCiAjZW5kaWYKICAgICAsIG1fbWVk aWFTZXNzaW9uKEhUTUxNZWRpYVNlc3Npb246OmNyZWF0ZSgqdGhpcykpCiAgICAgLCBtX3JlcG9y dGVkRXh0cmFNZW1vcnlDb3N0KDApCisjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkK KyAgICAsIG1fbWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGZhbHNlKQorI2Vu ZGlmCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICAsIG1fbWVkaWFTdHJlYW1TcmNPYmpl Y3QobnVsbHB0cikKICNlbmRpZgpAQCAtNDE0LDYgKzQxNywxMSBAQCBIVE1MTWVkaWFFbGVtZW50 Ojp+SFRNTE1lZGlhRWxlbWVudCgpCiAgICAgICAgIG1fbWVkaWFTZXNzaW9uLT5zZXRIYXNQbGF5 YmFja1RhcmdldEF2YWlsYWJpbGl0eUxpc3RlbmVycygqdGhpcywgZmFsc2UpOwogI2VuZGlmCiAK KyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIGlmIChtX21lZGlhQ29udHJv bHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcikKKyAgICAgICAgZG9jdW1lbnQoKS51bnJlZ2lzdGVy Rm9yUGFnZVNjYWxlRmFjdG9yQ2hhbmdlZENhbGxiYWNrcyh0aGlzKTsKKyNlbmRpZgorCiAgICAg aWYgKG1fbWVkaWFDb250cm9sbGVyKSB7CiAgICAgICAgIG1fbWVkaWFDb250cm9sbGVyLT5yZW1v dmVNZWRpYUVsZW1lbnQodGhpcyk7CiAgICAgICAgIG1fbWVkaWFDb250cm9sbGVyID0gMDsKQEAg LTU5NzQsNiArNTk4MiwyNCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFkZFVzZXJBZ2Vu dFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9u KCkpCiAgICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CiB9CisKK3ZvaWQgSFRNTE1lZGlh RWxlbWVudDo6c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGJvb2wgdikK K3sKKyAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1lbnQ6OnNldE1lZGlhQ29udHJvbHNEZXBlbmRQ YWdlU2NhbGVGYWN0b3IgPSAlcyIsIGJvb2xTdHJpbmcodikpOworICAgIGlmIChtX21lZGlhQ29u dHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvciA9PSB2KQorICAgICAgICByZXR1cm47CisKKyAg ICBtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvciA9IHY7CisKKyAgICBpZiAo bV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IpCisgICAgICAgIGRvY3VtZW50 KCkucmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKHRoaXMpOworICAg IGVsc2UKKyAgICAgICAgZG9jdW1lbnQoKS51bnJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFjdG9yQ2hh bmdlZENhbGxiYWNrcyh0aGlzKTsKK30KKwordm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwYWdlU2Nh bGVGYWN0b3JDaGFuZ2VkKCkKK3sKK30KICNlbmRpZiAvLyBFTkFCTEUoTUVESUFfQ09OVFJPTFNf U0NSSVBUKQogCiB1bnNpZ25lZCBsb25nIGxvbmcgSFRNTE1lZGlhRWxlbWVudDo6ZmlsZVNpemUo KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCA0NWNjMDkw NjlkZThiYjIyYzlkODM4ZWMwZDk5NjA4NGM0NDBiZGU3Li45YTJlNTU0Zjg2NWI1YmY5YzM1ZGNi ZjMzMTkwYWJkMTBlZWM5YmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aApAQCAtNDU2LDYgKzQ1NiwxMCBAQCBwdWJsaWM6CiAgICAgTWVkaWFQbGF5ZXI6OlByZWxvYWQg cHJlbG9hZFZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9wcmVsb2FkOyB9CiAgICAgSFRNTE1lZGlh U2Vzc2lvbiYgbWVkaWFTZXNzaW9uKCkgY29uc3QgeyByZXR1cm4gKm1fbWVkaWFTZXNzaW9uOyB9 CiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIHZvaWQgcGFnZVNjYWxl RmFjdG9yQ2hhbmdlZCgpOworI2VuZGlmCisKIHByb3RlY3RlZDoKICAgICBIVE1MTWVkaWFFbGVt ZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCYsIGJvb2wpOwogICAgIHZpcnR1YWwg fkhUTUxNZWRpYUVsZW1lbnQoKTsKQEAgLTQ4Miw2ICs0ODYsMTEgQEAgcHJvdGVjdGVkOgogCiAg ICAgdmlydHVhbCBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gY3JlYXRlRWxlbWVudFJlbmRlcmVy KFBhc3NSZWY8UmVuZGVyU3R5bGU+KSBvdmVycmlkZTsKIAorI2lmIEVOQUJMRShNRURJQV9DT05U Uk9MU19TQ1JJUFQpCisgICAgYm9vbCBtZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IoKSBjb25zdCB7IHJldHVybiBtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rv cjsgfQorICAgIHZvaWQgc2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGJv b2wpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgdm9pZCBjcmVhdGVNZWRpYVBsYXllcigpOwog CkBAIC04NzcsOCArODg2LDEwIEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IG1fcmVwb3J0ZWRFeHRy YU1lbW9yeUNvc3Q7CiAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIGZy aWVuZCBjbGFzcyBNZWRpYUNvbnRyb2xzSG9zdDsKICAgICBSZWZQdHI8TWVkaWFDb250cm9sc0hv c3Q+IG1fbWVkaWFDb250cm9sc0hvc3Q7CiAgICAgUmVmUHRyPERPTVdyYXBwZXJXb3JsZD4gbV9p c29sYXRlZFdvcmxkOworICAgIGJvb2wgbV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVG YWN0b3IgOiAxOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5jcHAKaW5kZXggMjVmNzY3YWU5MTc3NDA2ZGE2Mjg5MWQzNDExMWU3ZGM0NDQ5Njg2Yi4uM2My NGMwNmExYWE1YzZkMDE5NWIxYmY0YzZiYTI4YzEyNTMwNzQ3YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw CkBAIC03MzAsNiArNzMwLDExIEBAIHZvaWQgUGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0 IHNjYWxlLCBjb25zdCBJbnRQb2ludCYgb3JpZ2luKQogICAgICAgICBpZiAoIXZpZXctPmRlbGVn YXRlc1Njcm9sbGluZygpKQogICAgICAgICAgICAgdmlldy0+c2V0U2Nyb2xsUG9zaXRpb24ob3Jp Z2luKTsKICAgICB9CisKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gJm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJl ZSgpLnRyYXZlcnNlTmV4dCgpKQorICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+cGFnZVNjYWxl RmFjdG9yQ2hhbmdlZCgpOworI2VuZGlmCiB9CiAKIHZvaWQgUGFnZTo6c2V0RGV2aWNlU2NhbGVG YWN0b3IoZmxvYXQgc2NhbGVGYWN0b3IpCg== 228794 2014-04-07 19:15:03 -0700 2014-04-08 18:43:35 -0700 Patch bug-131319-20140408121441.patch text/plain 8775 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFjZDllZTQxMjQ2OGQ0 OTlkOTY2ODAxM2Q3ODk1MTIyNjk1ODY0Mi4uNDZhNjk2ODYwMWUzNmJjMDdkMmIxMmQxZDQ3ZGNk OTRiYThjOTAyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBlbGVtZW50cyB0byBy ZWdpc3RlciBmb3IgY2hhbmdlcyBpbiBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIHBhcnRzIG9mIFdlYkNvcmUgbmVlZCB0byBy ZWFjdCB0byBjaGFuZ2VzIGluIHRoZSBwYWdlCisgICAgICAgIHNjYWxlIGZhY3Rvciwgc3VjaCBh cyByZXNpemluZyB3aGVuIHRoZSB1c2VyIHpvb21zLiBBIGZvbGxvd3VwCisgICAgICAgIHBhdGNo IHdpbGwgZW5hYmxlIHRoaXMgZm9yIG1lZGlhIGNvbnRyb2xzIC0gdGhpcyBzaW1wbHkgbGF5cwor ICAgICAgICB0aGUgZ3JvdW5kd29yay4KKworICAgICAgICBBdCB0aGUgbW9tZW50IHdlIG9ubHkg YWxsb3cgSFRNTE1lZGlhRWxlbWVudHMgdG8gcmVnaXN0ZXIsIGJ1dCBpZgorICAgICAgICBuZWNl c3NhcnkgdGhpcyBjb3VsZCBiZSBleHBhbmRlZCBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICog ZG9tL0RvY3VtZW50LmNwcDogTmV3IG1ldGhvZHMgdG8ga2VlcCBhIGxpc3Qgb2YgSFRNTE1lZGlh RWxlbWVudHMgdGhhdAorICAgICAgICBhcmUgaW50ZXJlc3RlZCBpbiB1cGRhdGVzLgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFjdG9yQ2hhbmdlZENh bGxiYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5yZWdpc3RlckZvclBhZ2VT Y2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aERvY3VtZW50KTogQWRkIG91cnNlbHZlcyB0byB0aGUK KyAgICAgICAgdGhlIGRvY3VtZW50J3MgcGFnZVNjYWxlIGNhbGxiYWNrLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dW5yZWdpc3RlcldpdGhEb2N1bWVudCk6IFJlbW92ZSBv dXJzZWx2ZXMgZnJvbSB0aGUKKyAgICAgICAgdGhlIGRvY3VtZW50J3MgcGFnZVNjYWxlIGNhbGxi YWNrLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9s c0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKTogQWRkIG91cnNlbHZlcyB0bworICAgICAgICB0aGUg Y2FsbGJhY2sgaWYgbmVjZXNzYXJ5LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCk6IFRoZSBjYWxsYmFjayBmdW5jdGlvbi4gRW1wdHkg Zm9yIG5vdy4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZh Y3Rvcik6IEFjY2Vzc29yLgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlOjpzZXRQYWdlU2NhbGVGYWN0b3IpOiBUZWxsIGFsbCBkb2N1bWVudHMgdGhhdCB0 aGUgdXNlciBoYXMgem9vbWVkLgorCiAyMDE0LTA0LTA1ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5n QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIHR5cGUgY2FzdGluZyBoZWxwZXJz IGZvciBIVE1MVW5rbm93bkVsZW1lbnQuLi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDFl YjgwOTJiNmIyZjMzNmI5NzJkMTkzNDFiNmYyZmYwMzEwYThlNmQuLjk0MWUxZWVkMzhlYzI1NjQz YThiNDY0MjlmOTk4NDlmMGQ0NzY3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDE5 NSw2ICs0MTk1LDI0IEBAIHZvaWQgRG9jdW1lbnQ6OmNhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWQo KQogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQordm9pZCBE b2N1bWVudDo6cmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKEhUTUxN ZWRpYUVsZW1lbnQqIGVsZW1lbnQpCit7CisgICAgbV9wYWdlU2NhbGVGYWN0b3JDaGFuZ2VkRWxl bWVudHMuYWRkKGVsZW1lbnQpOworfQorCit2b2lkIERvY3VtZW50Ojp1bnJlZ2lzdGVyRm9yUGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZENhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50KiBlbGVtZW50KQor eworICAgIG1fcGFnZVNjYWxlRmFjdG9yQ2hhbmdlZEVsZW1lbnRzLnJlbW92ZShlbGVtZW50KTsK K30KKwordm9pZCBEb2N1bWVudDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgpCit7CisgICAgZm9y IChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgOiBtX3BhZ2VTY2FsZUZhY3RvckNoYW5n ZWRFbGVtZW50cykKKyAgICAgICAgbWVkaWFFbGVtZW50LT5wYWdlU2NhbGVGYWN0b3JDaGFuZ2Vk KCk7Cit9CisjZW5kaWYKKwogdm9pZCBEb2N1bWVudDo6c2V0U2hvdWxkQ3JlYXRlUmVuZGVyZXJz KGJvb2wgZikKIHsKICAgICBtX2NyZWF0ZVJlbmRlcmVycyA9IGY7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5o CmluZGV4IGYxMWFjZjY4ZGQ5NWFiMWI3MjZjYzZlZjE3YjRjODIxZGE5OGExZmYuLmZhOTBmOGZh MGE0NTlmMGE0N2ViMGY3MjdiY2NiZThhY2Y1YWI2M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBA IC0xMDksNiArMTA5LDcgQEAgY2xhc3MgSFRNTEhlYWRFbGVtZW50OwogY2xhc3MgSFRNTElGcmFt ZUVsZW1lbnQ7CiBjbGFzcyBIVE1MSW1hZ2VFbGVtZW50OwogY2xhc3MgSFRNTE1hcEVsZW1lbnQ7 CitjbGFzcyBIVE1MTWVkaWFFbGVtZW50OwogY2xhc3MgSFRNTE5hbWVDb2xsZWN0aW9uOwogY2xh c3MgSFRNTFNjcmlwdEVsZW1lbnQ7CiBjbGFzcyBIaXRUZXN0UmVxdWVzdDsKQEAgLTEwNDAsNiAr MTA0MSwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkKCk7 CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgdm9pZCBy ZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MoSFRNTE1lZGlhRWxlbWVu dCopOworICAgIHZvaWQgdW5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFj a3MoSFRNTE1lZGlhRWxlbWVudCopOworICAgIHZvaWQgcGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgp OworI2VuZGlmCisKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICB2b2lkIHJl Z2lzdGVyRm9yVmlzaWJpbGl0eVN0YXRlQ2hhbmdlZENhbGxiYWNrcyhFbGVtZW50Kik7CiAgICAg dm9pZCB1bnJlZ2lzdGVyRm9yVmlzaWJpbGl0eVN0YXRlQ2hhbmdlZENhbGxiYWNrcyhFbGVtZW50 Kik7CkBAIC0xNTMxLDYgKzE1MzgsMTAgQEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PEVsZW1lbnQq PiBtX2NhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWRFbGVtZW50czsKICNlbmRpZgogCisjaWYgRU5B QkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKKyAgICBIYXNoU2V0PEhUTUxNZWRpYUVsZW1lbnQq PiBtX3BhZ2VTY2FsZUZhY3RvckNoYW5nZWRFbGVtZW50czsKKyNlbmRpZgorCiAjaWYgRU5BQkxF KFBBR0VfVklTSUJJTElUWV9BUEkpCiAgICAgSGFzaFNldDxFbGVtZW50Kj4gbV92aXNpYmlsaXR5 U3RhdGVDYWxsYmFja0VsZW1lbnRzOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAppbmRleCA5NjVmNzU5MmQ3Zjk0M2I3NmE5NTBhMjMxZTY2MjAxYWUzZWU0 MzFiLi5lZjEwZjkwMjBmZTA2YjNiZjkxOTQ2MDkxM2EzMWQ2NTkyYWI3OGZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTMzMCw2ICszMzAsOSBAQCBIVE1M TWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05h bWUsIERvY3VtZW50JiBkb2N1bQogI2lmIFBMQVRGT1JNKElPUykKICAgICAsIG1fcmVxdWVzdGlu Z1BsYXkoZmFsc2UpCiAjZW5kaWYKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQor ICAgICwgbV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoZmFsc2UpCisjZW5k aWYKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgLCBtX3RyYWNrc0FyZVJlYWR5KHRydWUp CiAgICAgLCBtX2hhdmVWaXNpYmxlVGV4dFRyYWNrKGZhbHNlKQpAQCAtNDQ5LDYgKzQ1MiwxMSBA QCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBk b2N1bWVudCkKICAgICBkb2N1bWVudC5yZWdpc3RlckZvckNhcHRpb25QcmVmZXJlbmNlc0NoYW5n ZWRDYWxsYmFja3ModGhpcyk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19T Q1JJUFQpCisgICAgaWYgKG1fbWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKQor ICAgICAgICBkb2N1bWVudC5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFj a3ModGhpcyk7CisjZW5kaWYKKwogICAgIGFkZEVsZW1lbnRUb0RvY3VtZW50TWFwKCp0aGlzLCBk b2N1bWVudCk7CiB9CiAKQEAgLTQ2OSw2ICs0NzcsMTEgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50 Ojp1bnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBkb2N1bWVudCkKICAgICBkb2N1bWVu dC51bnJlZ2lzdGVyRm9yQ2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZENhbGxiYWNrcyh0aGlzKTsK ICNlbmRpZgogCisjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKKyAgICBpZiAobV9t ZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IpCisgICAgICAgIGRvY3VtZW50LnVu cmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKHRoaXMpOworI2VuZGlm CisKICAgICByZW1vdmVFbGVtZW50RnJvbURvY3VtZW50TWFwKCp0aGlzLCBkb2N1bWVudCk7CiB9 CiAKQEAgLTU5NzQsNiArNTk4NywyNCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFkZFVz ZXJBZ2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKICAgICBpZiAoZXhlYy0+aGFkRXhj ZXB0aW9uKCkpCiAgICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CiB9CisKK3ZvaWQgSFRN TE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGJv b2wgZGVwZW5kc09uUGFnZVNjYWxlKQoreworICAgIExPRyhNZWRpYSwgIk1lZGlhRWxlbWVudDo6 c2V0TWVkaWFDb250cm9sc0RlcGVuZFBhZ2VTY2FsZUZhY3RvciA9ICVzIiwgYm9vbFN0cmluZyhk ZXBlbmRzT25QYWdlU2NhbGUpKTsKKyAgICBpZiAobV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdl U2NhbGVGYWN0b3IgPT0gZGVwZW5kc09uUGFnZVNjYWxlKQorICAgICAgICByZXR1cm47CisKKyAg ICBtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvciA9IGRlcGVuZHNPblBhZ2VT Y2FsZTsKKworICAgIGlmIChtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcikK KyAgICAgICAgZG9jdW1lbnQoKS5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxs YmFja3ModGhpcyk7CisgICAgZWxzZQorICAgICAgICBkb2N1bWVudCgpLnVucmVnaXN0ZXJGb3JQ YWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKHRoaXMpOworfQorCit2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQoKQoreworfQogI2VuZGlmIC8vIEVOQUJM RShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAKIHVuc2lnbmVkIGxvbmcgbG9uZyBIVE1MTWVkaWFF bGVtZW50OjpmaWxlU2l6ZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCmluZGV4IDQ1Y2MwOTA2OWRlOGJiMjJjOWQ4MzhlYzBkOTk2MDg0YzQ0MGJkZTcuLjY3ODRl MTVlNjUzNjVkMTZiNmQxODE3NGM4YjNlMjdiOWM3ZDViY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCkBAIC00NTYsNiArNDU2LDEwIEBAIHB1YmxpYzoKICAgICBNZWRp YVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX3ByZWxvYWQ7 IH0KICAgICBIVE1MTWVkaWFTZXNzaW9uJiBtZWRpYVNlc3Npb24oKSBjb25zdCB7IHJldHVybiAq bV9tZWRpYVNlc3Npb247IH0KIAorI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCisg ICAgdm9pZCBwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCk7CisjZW5kaWYKKwogcHJvdGVjdGVkOgog ICAgIEhUTUxNZWRpYUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50JiwgYm9v bCk7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhRWxlbWVudCgpOwpAQCAtNDgyLDYgKzQ4NiwxMSBA QCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBjcmVh dGVFbGVtZW50UmVuZGVyZXIoUGFzc1JlZjxSZW5kZXJTdHlsZT4pIG92ZXJyaWRlOwogCisjaWYg RU5BQkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKKyAgICBib29sIG1lZGlhQ29udHJvbHNEZXBl bmRPblBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFDb250cm9sc0RlcGVu ZE9uUGFnZVNjYWxlRmFjdG9yOyB9CisgICAgdm9pZCBzZXRNZWRpYUNvbnRyb2xzRGVwZW5kT25Q YWdlU2NhbGVGYWN0b3IoYm9vbCk7CisjZW5kaWYKKwogcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0 ZU1lZGlhUGxheWVyKCk7CiAKQEAgLTgyOCw2ICs4MzcsMTAgQEAgcHJpdmF0ZToKICAgICBib29s IG1fcmVxdWVzdGluZ1BsYXkgOiAxOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJP TFNfU0NSSVBUKQorICAgIGJvb2wgbV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IgOiAxOworI2VuZGlmCisKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgYm9vbCBtX3Ry YWNrc0FyZVJlYWR5IDogMTsKICAgICBib29sIG1faGF2ZVZpc2libGVUZXh0VHJhY2sgOiAxOwpA QCAtODc3LDYgKzg5MCw3IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IG1fcmVwb3J0ZWRFeHRyYU1l bW9yeUNvc3Q7CiAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIGZyaWVu ZCBjbGFzcyBNZWRpYUNvbnRyb2xzSG9zdDsKICAgICBSZWZQdHI8TWVkaWFDb250cm9sc0hvc3Q+ IG1fbWVkaWFDb250cm9sc0hvc3Q7CiAgICAgUmVmUHRyPERPTVdyYXBwZXJXb3JsZD4gbV9pc29s YXRlZFdvcmxkOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCAyNWY3NjdhZTkxNzc0MDZk YTYyODkxZDM0MTExZTdkYzQ0NDk2ODZiLi4zYzI0YzA2YTFhYTVjNmQwMTk1YjFiZjRjNmJhMjhj MTI1MzA3NDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTczMCw2ICs3MzAsMTEgQEAgdm9pZCBQ YWdlOjpzZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUsIGNvbnN0IEludFBvaW50JiBvcmln aW4pCiAgICAgICAgIGlmICghdmlldy0+ZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCiAgICAgICAgICAg ICB2aWV3LT5zZXRTY3JvbGxQb3NpdGlvbihvcmlnaW4pOwogICAgIH0KKworI2lmIEVOQUJMRShN RURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbWFpbkZyYW1l KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCkpCisgICAgICAg IGZyYW1lLT5kb2N1bWVudCgpLT5wYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCk7CisjZW5kaWYKIH0K IAogdm9pZCBQYWdlOjpzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZUZhY3RvcikK