42771 2010-07-21 10:52:39 -0700 Composited layers don't scroll in WebKit2 2010-08-16 16:48:56 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser abarth eric fishd jamesr webkit.review.bot oldest_to_newest 254418 0 simon.fraser 2010-07-21 10:52:39 -0700 In WebKit2, composited layers don't scroll with the rest of the page. 254446 1 62217 simon.fraser 2010-07-21 12:20:37 -0700 Created attachment 62217 Patch for some prep work 254511 2 62217 simon.fraser 2010-07-21 14:07:47 -0700 Comment on attachment 62217 Patch for some prep work http://trac.webkit.org/changeset/63856 254656 3 jamesr 2010-07-21 21:54:26 -0700 I tried the patch at http://pastie.org/1054420 in a Chromium mac build and it appears to work fine - the scrolling repaint pixel tests all pass and the scrolling behavior appears correct when manually tested as well. 254909 4 62322 simon.fraser 2010-07-22 11:54:00 -0700 Created attachment 62322 More prep work: single bottleneck method 254945 5 62322 simon.fraser 2010-07-22 13:19:12 -0700 Comment on attachment 62322 More prep work: single bottleneck method http://trac.webkit.org/changeset/63907 255097 6 62365 simon.fraser 2010-07-22 17:29:06 -0700 Created attachment 62365 Patch 255141 7 62217 eric 2010-07-22 18:41:28 -0700 Comment on attachment 62217 Patch for some prep work Cleared Anders Carlsson's review+ from obsolete attachment 62217 so that this bug does not appear in http://webkit.org/pending-commit. 255142 8 62322 eric 2010-07-22 18:41:34 -0700 Comment on attachment 62322 More prep work: single bottleneck method Cleared Darin Adler's review+ from obsolete attachment 62322 so that this bug does not appear in http://webkit.org/pending-commit. 256089 9 62365 andersca 2010-07-26 10:18:09 -0700 Comment on attachment 62365 Patch > diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp > index 234ad7f270191ef8a7ba5870b072d875bf6f7423..14d45927b3ca31cce19bce537343bbd90ccf8553 100644 > --- a/WebCore/rendering/RenderLayerCompositor.cpp > +++ b/WebCore/rendering/RenderLayerCompositor.cpp > -void RenderLayerCompositor::updateContentLayerScrollPosition(const IntPoint& scrollPosition) > +void RenderLayerCompositor::frameViewDidScroll(const IntPoint& scrollPosition) > { > if (m_scrollLayer) > m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y())); > @@ -1039,6 +1039,9 @@ bool RenderLayerCompositor::shouldPropagateCompositingToEnclosingIFrame() const > // On non-Mac platforms, let compositing propagate for all iframes. > return true; > #else > + if (!m_renderView->frameView()->platformWidget()) > + return true; > + Could you add a comment about why we check for a null platform widget here? Looks fine otherwise! 256102 10 simon.fraser 2010-07-26 10:48:49 -0700 http://trac.webkit.org/changeset/64054 256148 11 webkit.review.bot 2010-07-26 11:58:48 -0700 http://trac.webkit.org/changeset/64054 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/64053 http://trac.webkit.org/changeset/64054 265296 12 fishd 2010-08-16 16:36:35 -0700 This patch broke scrolling in Chromium when there is a fixed position element. Chromium bug: http://code.google.com/p/chromium/issues/detail?id=52332 It seems like we end up missing some invalidates after scrolling. 265300 13 simon.fraser 2010-08-16 16:48:56 -0700 (In reply to comment #12) > This patch broke scrolling in Chromium when there is a fixed position element. > > Chromium bug: > http://code.google.com/p/chromium/issues/detail?id=52332 > > It seems like we end up missing some invalidates after scrolling. Sounds like bug 42949. 62217 2010-07-21 12:20:37 -0700 2010-07-22 18:41:28 -0700 Patch for some prep work bug-42771-20100721122036.patch text/plain 4319 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjEzN2IyOTkwMTQ3ZWI1NmYyM2VkMjU4OWFkZTk3NDg2NTNhNWVkYi4uYjU3YjMzNzZhMmRmYTli M2M0NTBhNTQ2ZTc4ZWEzMmQ1OWNiMjA4ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNy0yMSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wb3NpdGVkIGxheWVycyBkb24ndCBzY3Jv bGwgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDI3NzEKKworICAgICAgICBQcmVwIHdvcms6IHJlbmFtZSBGcmFtZVZpZXc6OnNjcm9s bFBvc2l0aW9uQ2hhbmdlZCgpIHNvdW5kcyBsaWtlIGEgZ2VuZXJpYyAiZGlkIHNjcm9sbCIgYm90 dGxlbmVjaywKKyAgICAgICAgYnV0IHRoaXMgaXMgZGVjZWl2aW5nLiBJdCdzIG9ubHkgZXZlcnkg Y2FsbGVkIG9uIG9uZSBwbGF0Zm9ybSAoTWFjKSB3aGVuIHRoZSBOU1Njcm9sbFZpZXcgZ2V0cwor ICAgICAgICBzY3JvbGxlZCwgc28gcmVuYW1lIGl0IHRvIEZyYW1lVmlldzo6c2Nyb2xsUG9zaXRp b25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRnZXQoKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmlu OgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRnZXQpOgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIwMTAtMDctMjEgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6 a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CmluZGV4IGQzZGI3YjJhYzg0ODBkMDg0ZmI5OGQyNmFkMjU4MTJmNTQxNzRkNTYuLmNmNjYyODVm OWFkMzk2ZWE5ZDUyNjg5ODJiZTJkYWVmOTY4ZGIxYTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2Vi Q29yZS5leHAuaW4KKysrIGIvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtNzI2LDcgKzcyNiw3 IEBAIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcxNnNldFBhaW50QmVoYXZpb3JFagogX19aTjdXZWJD b3JlOUZyYW1lVmlldzE4dXBkYXRlQ29udHJvbFRpbnRzRXYKIF9fWk43V2ViQ29yZTlGcmFtZVZp ZXcyMGVudGVyQ29tcG9zaXRpbmdNb2RlRXYKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyMWZsdXNo RGVmZXJyZWRSZXBhaW50c0V2Ci1fX1pON1dlYkNvcmU5RnJhbWVWaWV3MjFzY3JvbGxQb3NpdGlv bkNoYW5nZWRFdgorX19aTjdXZWJDb3JlOUZyYW1lVmlldzM4c2Nyb2xsUG9zaXRpb25DaGFuZ2Vk VmlhUGxhdGZvcm1XaWRnZXRFdgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzIyc2V0QmFzZUJhY2tn cm91bmRDb2xvckVOU181Q29sb3JFCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjNsYXlvdXRJZk5l ZWRlZFJlY3Vyc2l2ZUV2CiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjN1cGRhdGVDYW5IYXZlU2Ny b2xsYmFyc0V2CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDA5ZmRjMzdmMDg4OGZhMjM3ZWFlYjAzNjI5YTIz ZDk5MGE4MzhjM2QuLjlmZjNlNTQ2NTk5YTQzOTJjZTg2NmI5ODBlZGRmYjdiNWYyNDc4MTMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCkBAIC0xMTAyLDcgKzExMDIsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2V0U2Ny b2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvaW50KQogICAgIG1faW5Qcm9ncmFt bWF0aWNTY3JvbGwgPSB3YXNJblByb2dyYW1tYXRpY1Njcm9sbDsKIH0KIAotdm9pZCBGcmFtZVZp ZXc6OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZCgpCit2b2lkIEZyYW1lVmlldzo6c2Nyb2xsUG9zaXRp b25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRnZXQoKQogewogICAgIGZyYW1lKCktPmV2ZW50SGFuZGxl cigpLT5zZW5kU2Nyb2xsRXZlbnQoKTsKICAgICByZXBhaW50Rml4ZWRFbGVtZW50c0FmdGVyU2Ny b2xsaW5nKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggYjA0N2RiMGVlMjQ3YzQxM2IxMjhjOGVhMWUxNzNiMTQ5 NDkzYTYxNi4uODY4YTE1Zjk1MTJlNDc0YzViYzQ2OGJlOTM1NmZmNTc0Yjg3MDJjYSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuaApAQCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFJlY3Qgd2lu ZG93UmVzaXplclJlY3QoKSBjb25zdDsKIAogICAgIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29u c3QgSW50UG9pbnQmKTsKLSAgICB2b2lkIHNjcm9sbFBvc2l0aW9uQ2hhbmdlZCgpOworICAgIHZv aWQgc2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRnZXQoKTsKICAgICB2aXJ0dWFs IHZvaWQgcmVwYWludEZpeGVkRWxlbWVudHNBZnRlclNjcm9sbGluZygpOwogCiAgICAgU3RyaW5n IG1lZGlhVHlwZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9X ZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA2M2U3MzJkNzg5MDZkYzdmNzEwYmNmZDA0NTE0ZDA5 ZTc4NDhiMmJjLi42MGQzYzg3YTA0OWU4YWFmN2NhZTJmYWFiMTk5ZDQ5NmM5OWU5M2RiIDEwMDY0 NAotLS0gYS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9XZWJLaXQvbWFjL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDEwLTA3LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENvbXBvc2l0ZWQgbGF5ZXJzIGRvbid0IHNjcm9sbCBpbiBXZWJLaXQyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjc3MQorCisgICAgICAgIFBy ZXAgd29yazogcmVuYW1lIEZyYW1lVmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkKCkgc291bmRz IGxpa2UgYSBnZW5lcmljICJkaWQgc2Nyb2xsIiBib3R0bGVuZWNrLAorICAgICAgICBidXQgdGhp cyBpcyBkZWNlaXZpbmcuIEl0J3Mgb25seSBldmVyeSBjYWxsZWQgb24gb25lIHBsYXRmb3JtIChN YWMpIHdoZW4gdGhlIE5TU2Nyb2xsVmlldyBnZXRzCisgICAgICAgIHNjcm9sbGVkLCBzbyByZW5h bWUgaXQgdG8gRnJhbWVWaWV3OjpzY3JvbGxQb3NpdGlvbkNoYW5nZWRWaWFQbGF0Zm9ybVdpZGdl dCgpLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2Vi SFRNTFZpZXcgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkXSk6CisKIDIwMTAtMDctMTkgIENocmlzIE1h cnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tIGIvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCmluZGV4IGU0MDUwMGMxZjgyZWYxOTY2MTZh ZmRjYzBkYmY0OGM3OGQ4ZWI1OGMuLjA4Yzg5MTE4YmMyYzY1OTBjYzY3YzcyZjFhMWI5M2Q0YWQx YmMzZTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysg Yi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KQEAgLTEyMDEsNyArMTIwMSw3IEBA IHN0YXRpYyB2b2lkIF91cGRhdGVNb3VzZW92ZXJUaW1lckNhbGxiYWNrKENGUnVuTG9vcFRpbWVy UmVmIHRpbWVyLCB2b2lkICppbmZvKQogI2lmbmRlZiBCVUlMRElOR19PTl9USUdFUgogICAgICAg ICAgICAgICAgIF9wcml2YXRlLT5pblNjcm9sbFBvc2l0aW9uQ2hhbmdlZCA9IFlFUzsKICNlbmRp ZgotICAgICAgICAgICAgICAgIGNvcmVWaWV3LT5zY3JvbGxQb3NpdGlvbkNoYW5nZWQoKTsKKyAg ICAgICAgICAgICAgICBjb3JlVmlldy0+c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1X aWRnZXQoKTsKICNpZm5kZWYgQlVJTERJTkdfT05fVElHRVIKICAgICAgICAgICAgICAgICBfcHJp dmF0ZS0+aW5TY3JvbGxQb3NpdGlvbkNoYW5nZWQgPSBOTzsKICNlbmRpZgo= 62322 2010-07-22 11:54:00 -0700 2010-07-22 18:41:34 -0700 More prep work: single bottleneck method bug-42771-20100722115359.patch text/plain 3510 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDE3MTQ4ZDkwYTQ2ZWQ2YjU5Y2E5YzllM2I2YTU2MDA2OTVhNWMyZC4uNzFlZGJhNDA2MGMwZDQ3 N2ZiZGNiMTA1MjRhM2IxMzQzYTBlZDlkNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNy0yMiAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wb3NpdGVkIGxheWVycyBkb24ndCBzY3Jv bGwgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDI3NzEKKworICAgICAgICBNb3JlIHByZXAgd29yazogbWFrZSBhIHNpbmdsZSBzY3Jv bGxQb3NpdGlvbkNoYW5nZWQoKSBib3R0bGVuZWNrIG1ldGhvZCwgYW5kIHVzZSBpdCB0byAKKyAg ICAgICAgc2VuZCB0aGUgc2Nyb2xsIGV2ZW50LCByZXBhaW50IGZpeGVkIGVsZW1lbnRzLCBhbmQg dXBkYXRlIGNvbXBvc2l0aW5nIGxheWVycy4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlh UGxhdGZvcm1XaWRnZXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxQb3Np dGlvbkNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpyZXBhaW50Rml4ZWRF bGVtZW50c0FmdGVyU2Nyb2xsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dmFs dWVDaGFuZ2VkKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRm b3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6dmFsdWVD aGFuZ2VkKToKKwogMjAxMC0wNy0yMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IDlmZjNlNTQ2NTk5YTQzOTJjZTg2NmI5ODBlZGRmYjdiNWYyNDc4MTMuLmFjZDIyZjBh MWVjMDFiNzQ3ZTI5ZTEzOGJlYzcwOGE5ZmUwOWM1NWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0xMTA0 LDggKzExMDQsMjAgQEAgdm9pZCBGcmFtZVZpZXc6OnNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IElu dFBvaW50JiBzY3JvbGxQb2ludCkKIAogdm9pZCBGcmFtZVZpZXc6OnNjcm9sbFBvc2l0aW9uQ2hh bmdlZFZpYVBsYXRmb3JtV2lkZ2V0KCkKIHsKKyAgICBzY3JvbGxQb3NpdGlvbkNoYW5nZWQoKTsK K30KKwordm9pZCBGcmFtZVZpZXc6OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZCgpCit7CiAgICAgZnJh bWUoKS0+ZXZlbnRIYW5kbGVyKCktPnNlbmRTY3JvbGxFdmVudCgpOwogICAgIHJlcGFpbnRGaXhl ZEVsZW1lbnRzQWZ0ZXJTY3JvbGxpbmcoKTsKKworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKKyAgICBpZiAoUmVuZGVyVmlldyogcm9vdCA9IG1fZnJhbWUtPmNvbnRlbnRSZW5kZXJl cigpKSB7CisgICAgICAgIGlmIChyb290LT51c2VzQ29tcG9zaXRpbmcoKSkKKyAgICAgICAgICAg IHJvb3QtPmNvbXBvc2l0b3IoKS0+dXBkYXRlQ29udGVudExheWVyU2Nyb2xsUG9zaXRpb24oc2Ny b2xsUG9zaXRpb24oKSk7CisgICAgfQorI2VuZGlmCiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpyZXBh aW50Rml4ZWRFbGVtZW50c0FmdGVyU2Nyb2xsaW5nKCkKQEAgLTExMjEsMTMgKzExMzMsNiBAQCB2 b2lkIEZyYW1lVmlldzo6cmVwYWludEZpeGVkRWxlbWVudHNBZnRlclNjcm9sbGluZygpCiAjZW5k aWYKICAgICAgICAgfQogICAgIH0KLQotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK LSAgICBpZiAoUmVuZGVyVmlldyogcm9vdCA9IG1fZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpKSB7 Ci0gICAgICAgIGlmIChyb290LT51c2VzQ29tcG9zaXRpbmcoKSkKLSAgICAgICAgICAgIHJvb3Qt PmNvbXBvc2l0b3IoKS0+dXBkYXRlQ29udGVudExheWVyU2Nyb2xsUG9zaXRpb24oc2Nyb2xsUG9z aXRpb24oKSk7Ci0gICAgfQotI2VuZGlmCiB9CiAKIEhvc3RXaW5kb3cqIEZyYW1lVmlldzo6aG9z dFdpbmRvdygpIGNvbnN0CkBAIC0xNzA3LDcgKzE3MTIsNyBAQCB2b2lkIEZyYW1lVmlldzo6dmFs dWVDaGFuZ2VkKFNjcm9sbGJhciogYmFyKQogICAgIEludFNpemUgb2Zmc2V0ID0gc2Nyb2xsT2Zm c2V0KCk7CiAgICAgU2Nyb2xsVmlldzo6dmFsdWVDaGFuZ2VkKGJhcik7CiAgICAgaWYgKG9mZnNl dCAhPSBzY3JvbGxPZmZzZXQoKSkKLSAgICAgICAgZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPnNl bmRTY3JvbGxFdmVudCgpOworICAgICAgICBzY3JvbGxQb3NpdGlvbkNoYW5nZWQoKTsKICAgICBm cmFtZSgpLT5sb2FkZXIoKS0+Y2xpZW50KCktPmRpZENoYW5nZVNjcm9sbE9mZnNldCgpOwogfQog CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKaW5kZXggODY4YTE1Zjk1MTJlNDc0YzViYzQ2OGJlOTM1NmZmNTc0Yjg3MDJjYS4u YjA1YjA3ODNlYmM4MWIwNzBjNzE5MjczNjdiOWJiMGI2OWYxM2Y1MSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAt Mjc5LDYgKzI3OSw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIHVwZGF0ZVdpZGdldHMoKTsKICAg ICB2b2lkIHNjcm9sbFRvQW5jaG9yKCk7CisgICAgdm9pZCBzY3JvbGxQb3NpdGlvbkNoYW5nZWQo KTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCog aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5k ZXggYjM5ZGRjMThhMmEwOWEzNTg2YzU1ODI3ODAyZjExY2UyMWExZmIxNC4uZTJkNjI1ZTRiYjJm YzlmMzZiMjhiZmUyODQ2NDkwOGVmZmQ1MzdjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxWaWV3LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBA IC0yOTIsNyArMjkyLDYgQEAgdm9pZCBTY3JvbGxWaWV3Ojp2YWx1ZUNoYW5nZWQoU2Nyb2xsYmFy KiBzY3JvbGxiYXIpCiAgICAgaWYgKHNjcm9sbGJhcnNTdXBwcmVzc2VkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIHJlcGFpbnRGaXhlZEVsZW1lbnRzQWZ0ZXJTY3JvbGxpbmcoKTsKICAgICBz Y3JvbGxDb250ZW50cyhzY3JvbGxEZWx0YSk7CiB9CiAK 62365 2010-07-22 17:29:06 -0700 2010-07-26 10:18:09 -0700 Patch bug-42771-20100722172905.patch text/plain 12355 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzcxNGY2OWYzMjkxZWUyMzRiZGRmY2ViZTNmOTY2NjA4ZjVhYTU3Yi4uZjNmMTc5NDc1NzQyOTIx ZTdkNWQ5Mzc0YmYxNjIyNTY2MGRlMzc2MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMC0wNy0yMiAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wb3NpdGVkIGxheWVycyBkb24ndCBzY3Jv bGwgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDI3NzEKKworICAgICAgICBSZW5hbWUgdHdvIG1ldGhvZHMgb24gUmVuZGVyTGF5ZXJD b21wb3NpdG9yIHRvIG1ha2UgdGhlaXIgdXNlIG1vcmUgY2xlYXIsIGFuZCBjYWxsIHRoZW0KKyAg ICAgICAgd2hlbiB0aGUgRnJhbWVWaWV3IGdldHMgcmVzaXplZCBhbmQgc2Nyb2xsZWQuCisKKyAg ICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2V0RnJhbWVSZWN0KTogb3ZlcnJpZGUgc28g d2Uga25vdyB3aGVuIHRoZSBzaXplIG9mIHRoZSBGcmFtZVZpZXcgY2hhbmdlcywgc28gdGhhdCB0 aGUKKyAgICAgICAgUmVuZGVyTGF5ZXJDb21wb3NpdG9yIGNhbiB1cGRhdGUgaXRzIGNsaXBwaW5n IGxheWVyLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxQb3NpdGlvbkNoYW5n ZWQpOiBDYWxsIGNvbXBvc2l0b3IoKS0+ZnJhbWVWaWV3RGlkU2Nyb2xsKCkuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJXaWRnZXRSZXNpemUpOiB1cGRhdGVDb250ZW50 TGF5ZXJPZmZzZXQoKSB3YXMgcmVuYW1lZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVW aWV3RGlkQ2hhbmdlU2l6ZSk6IFJlbmFtZWQgZnJvbSB1cGRhdGVDb250ZW50TGF5ZXJPZmZzZXQo KS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVWaWV3RGlk U2Nyb2xsKTogUmVuYW1lZCBmcm9tIHVwZGF0ZUNvbnRlbnRMYXllclNjcm9sbFBvc2l0aW9uKCku CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNob3VsZFByb3BhZ2F0 ZUNvbXBvc2l0aW5nVG9FbmNsb3NpbmdJRnJhbWUpOiBQcm9wYWdhdGUgY29tcG9zaXRpbmcgb24g TWFjCisgICAgICAgIGZvciBhbnkgRnJhbWVWaWV3IHRoYXQgZG9lc24ndCBoYXZlIGEgbmF0aXZl IHdpZGdldCwgd2hpY2ggaXMgdGhlIGNhc2Ugd2l0aCBXZWJLaXQyLgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc1Njcm9sbExheWVyKTogTmV3IG1ldGhv ZCB0byB0ZWxsIHVzIHdoZXRoZXIgd2UgbmVlZCB0byBoYW5kbGUKKyAgICAgICAgc2Nyb2xsaW5n IChhbmQgY2xpcHBpbmcpIG91cnNlbHZlcy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6ZW5zdXJlUm9vdFBsYXRmb3JtTGF5ZXIpOiBEbyBnZW9tZXRyeSBmbGlwcGlu ZyBvbiB0aGUgcm9vdCBwbGF0Zm9ybQorICAgICAgICBsYXllciBvbmx5IGlmIHdlJ3JlIG5vdCBk b2luZyBvdXIgb3duIHNjcm9sbGluZywgYW5kIHVzZSB0aGUgbmV3IHJlcXVpcmVzU2Nyb2xsTGF5 ZXIoKSBtZXRob2QuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmF0 dGFjaFJvb3RQbGF0Zm9ybUxheWVyKTogU2VuZCBvdXQgdGhlIHJvb3RQbGF0Zm9ybUxheWVyKCks CisgICAgICAgIHNvIHRoYXQgaXQgcmV0dXJucyB0aGUgY2xpcHBpbmcgbGF5ZXIgaWYgd2UgaGF2 ZSBvbmUuCisKIDIwMTAtMDctMjIgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBMYXN6bG8gR29tYm9zLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRl eCBhY2QyMmYwYTFlYzAxYjc0N2UyOWUxMzhiZWM3MDhhOWZlMDljNTVjLi45OGNhOGY5NmE1ODhh MTQ1ZTgxMDBkMGQ2NzU2YTUwMWQzMDdkNDQ3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzI4LDYgKzMy OCwyMiBAQCB2b2lkIEZyYW1lVmlldzo6aW52YWxpZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYgcmVj dCkKICAgICByZW5kZXJlci0+cmVwYWludFJlY3RhbmdsZShyZXBhaW50UmVjdCk7CiB9CiAKK3Zv aWQgRnJhbWVWaWV3OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgbmV3UmVjdCkKK3sKKyAg ICBJbnRSZWN0IG9sZFJlY3QgPSBmcmFtZVJlY3QoKTsKKyAgICBpZiAobmV3UmVjdCA9PSBvbGRS ZWN0KQorICAgICAgICByZXR1cm47CisKKyAgICBTY3JvbGxWaWV3OjpzZXRGcmFtZVJlY3QobmV3 UmVjdCk7CisKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYgKFJlbmRl clZpZXcqIHJvb3QgPSBtX2ZyYW1lLT5jb250ZW50UmVuZGVyZXIoKSkgeworICAgICAgICBpZiAo cm9vdC0+dXNlc0NvbXBvc2l0aW5nKCkpCisgICAgICAgICAgICByb290LT5jb21wb3NpdG9yKCkt PmZyYW1lVmlld0RpZENoYW5nZVNpemUoKTsKKyAgICB9CisjZW5kaWYKK30KKwogdm9pZCBGcmFt ZVZpZXc6OnNldE1hcmdpbldpZHRoKGludCB3KQogewogICAgIC8vIG1ha2UgaXQgdXBkYXRlIHRo ZSByZW5kZXJpbmcgYXJlYSB3aGVuIHNldApAQCAtMTExNSw3ICsxMTMxLDcgQEAgdm9pZCBGcmFt ZVZpZXc6OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZCgpCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogICAgIGlmIChSZW5kZXJWaWV3KiByb290ID0gbV9mcmFtZS0+Y29udGVudFJlbmRl cmVyKCkpIHsKICAgICAgICAgaWYgKHJvb3QtPnVzZXNDb21wb3NpdGluZygpKQotICAgICAgICAg ICAgcm9vdC0+Y29tcG9zaXRvcigpLT51cGRhdGVDb250ZW50TGF5ZXJTY3JvbGxQb3NpdGlvbihz Y3JvbGxQb3NpdGlvbigpKTsKKyAgICAgICAgICAgIHJvb3QtPmNvbXBvc2l0b3IoKS0+ZnJhbWVW aWV3RGlkU2Nyb2xsKHNjcm9sbFBvc2l0aW9uKCkpOwogICAgIH0KICNlbmRpZgogfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o CmluZGV4IGIwNWIwNzgzZWJjODFiMDcwYzcxOTI3MzY3YjliYjBiNjlmMTNmNTEuLjcxOGI3OTNl YzhlYjczZjY4MDQ5NmVhOTY0MjM0ODUzZjZjODAwYzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuaAorKysgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTYzLDYgKzYz LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgSG9zdFdpbmRvdyogaG9zdFdpbmRvdygpIGNvbnN0 OwogICAgIAogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlUmVjdChjb25zdCBJbnRSZWN0Jik7 CisgICAgdmlydHVhbCB2b2lkIHNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0Jik7CiAKICAgICBG cmFtZSogZnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lLmdldCgpOyB9CiAgICAgdm9pZCBj bGVhckZyYW1lKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRl eCBlOTZjOTQ3NmQxM2VhOTBhY2M1ZjZiZTZhZDBkMGUzODA2NGJlMDU0Li44ODhmZTMyOTcxZWEw MGZlNWQ2YjYxZGI5NDY5NDQ1NjZjMzNjYmVkIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHAKQEAgLTIxMSw3ICsyMTEsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2lu Zzo6dXBkYXRlQWZ0ZXJXaWRnZXRSZXNpemUoKQogewogICAgIGlmIChyZW5kZXJlcigpLT5pc1Jl bmRlcklGcmFtZSgpKSB7CiAgICAgICAgIGlmIChSZW5kZXJMYXllckNvbXBvc2l0b3IqIGlubmVy Q29tcG9zaXRvciA9IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6aWZyYW1lQ29udGVudHNDb21wb3Np dG9yKHRvUmVuZGVySUZyYW1lKHJlbmRlcmVyKCkpKSkKLSAgICAgICAgICAgIGlubmVyQ29tcG9z aXRvci0+dXBkYXRlQ29udGVudExheWVyT2Zmc2V0KGNvbnRlbnRzQm94KCkubG9jYXRpb24oKSk7 CisgICAgICAgICAgICBpbm5lckNvbXBvc2l0b3ItPmZyYW1lVmlld0RpZENoYW5nZVNpemUoY29u dGVudHNCb3goKS5sb2NhdGlvbigpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDIzNGFkN2YyNzAxOTFlZjhhN2JhNTg3MGIw NzJkODc1YmY2Zjc0MjMuLjE0ZDQ1OTI3YjNjYTMxY2NlMTliY2U1MzczNDNiYmQ5MGNjZjg1NTMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK KysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtNzgz LDcgKzc4Myw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZWJ1aWxkQ29tcG9zaXRp bmdMYXllclRyZWUoUmVuZGVyTGF5ZXIqIGxheWVyLCBjb25zCiAgICAgfQogfQogCi12b2lkIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29udGVudExheWVyT2Zmc2V0KGNvbnN0IEludFBv aW50JiBjb250ZW50c09mZnNldCkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpmcmFtZVZp ZXdEaWRDaGFuZ2VTaXplKGNvbnN0IEludFBvaW50JiBjb250ZW50c09mZnNldCkKIHsKICAgICBp ZiAobV9jbGlwTGF5ZXIpIHsKICAgICAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3JlbmRl clZpZXctPmZyYW1lVmlldygpOwpAQCAtNzk1LDcgKzc5NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjp1cGRhdGVDb250ZW50TGF5ZXJPZmZzZXQoY29uc3QgSW50UG9pbnQmIGNvbnRl bnRzT2ZmCiAgICAgfQogfQogCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29u dGVudExheWVyU2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQor dm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZyYW1lVmlld0RpZFNjcm9sbChjb25zdCBJbnRQ b2ludCYgc2Nyb2xsUG9zaXRpb24pCiB7CiAgICAgaWYgKG1fc2Nyb2xsTGF5ZXIpCiAgICAgICAg IG1fc2Nyb2xsTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoLXNjcm9sbFBvc2l0aW9uLngo KSwgLXNjcm9sbFBvc2l0aW9uLnkoKSkpOwpAQCAtMTAzOSw2ICsxMDM5LDkgQEAgYm9vbCBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnNob3VsZFByb3BhZ2F0ZUNvbXBvc2l0aW5nVG9FbmNsb3NpbmdJ RnJhbWUoKSBjb25zdAogICAgIC8vIE9uIG5vbi1NYWMgcGxhdGZvcm1zLCBsZXQgY29tcG9zaXRp bmcgcHJvcGFnYXRlIGZvciBhbGwgaWZyYW1lcy4KICAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCisg ICAgaWYgKCFtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5wbGF0Zm9ybVdpZGdldCgpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIC8vIE9uIE1hYywgb25seSBwcm9wYWdhdGUgY29tcG9z aXRpbmcgaWYgdGhlIGlmcmFtZSBpcyBvdmVybGFwcGVkIGluIHRoZSBwYXJlbnQKICAgICAvLyBk b2N1bWVudCwgb3IgdGhlIHBhcmVudCBpcyBhbHJlYWR5IGNvbXBvc2l0aW5nLgogICAgIFJlbmRl cklGcmFtZSogaWZyYW1lUmVuZGVyZXIgPSB0b1JlbmRlcklGcmFtZShyZW5kZXJlcik7CkBAIC0x MjU5LDYgKzEyNjIsMjAgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6Om5lZWRzQ29udGVu dHNDb21wb3NpdGluZ0xheWVyKGNvbnN0IFJlbmRlckxheWVyKiBsYXkKICAgICByZXR1cm4gKGxh eWVyLT5tX25lZ1pPcmRlckxpc3QgJiYgbGF5ZXItPm1fbmVnWk9yZGVyTGlzdC0+c2l6ZSgpID4g MCk7CiB9CiAKK2Jvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc1Njcm9sbExheWVy KFJvb3RMYXllckF0dGFjaG1lbnQgYXR0YWNobWVudCkgY29uc3QKK3sKKyAgICBpZiAoYXR0YWNo bWVudCA9PSBSb290TGF5ZXJBdHRhY2hlZFZpYUVuY2xvc2luZ0lmcmFtZSkKKyAgICAgICAgcmV0 dXJuIHRydWU7CisKKyNpZiBQTEFURk9STShNQUMpCisgICAgLy8gSWYgd2UncmUgdmlld2xlc3Mg KGkuZS4gV2ViS2l0MiksIHdlIG5lZWQgdG8gc2Nyb2xsIG91cnNlbHZlcy4KKyAgICAvLyBGSVhN RTogZXZlbnR1YWxseSB3ZSBzaG91bGQgZG8gdGhpcyBvbiBvdGhlciBwbGF0Zm9ybXMgdG9vLgor ICAgIGlmICghbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXcoKS0+cGxhdGZvcm1XaWRnZXQoKSkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisjZW5kaWYKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjplbnN1cmVSb290UGxhdGZvcm1MYXllcigpCiB7CiAgICAg Um9vdExheWVyQXR0YWNobWVudCBleHBlY3RlZEF0dGFjaG1lbnQgPSBzaG91bGRQcm9wYWdhdGVD b21wb3NpdGluZ1RvRW5jbG9zaW5nSUZyYW1lKCkgPyBSb290TGF5ZXJBdHRhY2hlZFZpYUVuY2xv c2luZ0lmcmFtZSA6IFJvb3RMYXllckF0dGFjaGVkVmlhQ2hyb21lQ2xpZW50OwpAQCAtMTI3Nywx MCArMTI5NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjplbnN1cmVSb290UGxhdGZv cm1MYXllcigpCiAgICAgICAgIG1fcm9vdFBsYXRmb3JtTGF5ZXItPnNldE1hc2tzVG9Cb3VuZHMo dHJ1ZSk7CiAgICAgfQogCi0gICAgLy8gVGhlIHJvb3QgbGF5ZXIgZG9lcyBmbGlwcGluZyBpZiB3 ZSBuZWVkIGl0IG9uIHRoaXMgcGxhdGZvcm0uCi0gICAgbV9yb290UGxhdGZvcm1MYXllci0+c2V0 R2VvbWV0cnlPcmllbnRhdGlvbihleHBlY3RlZEF0dGFjaG1lbnQgPT0gUm9vdExheWVyQXR0YWNo ZWRWaWFFbmNsb3NpbmdJZnJhbWUgPyBHcmFwaGljc0xheWVyOjpDb21wb3NpdGluZ0Nvb3JkaW5h dGVzVG9wRG93biA6IEdyYXBoaWNzTGF5ZXI6OmNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRh dGlvbigpKTsKLSAgICAKLSAgICBpZiAoZXhwZWN0ZWRBdHRhY2htZW50ID09IFJvb3RMYXllckF0 dGFjaGVkVmlhRW5jbG9zaW5nSWZyYW1lKSB7CisgICAgaWYgKHJlcXVpcmVzU2Nyb2xsTGF5ZXIo ZXhwZWN0ZWRBdHRhY2htZW50KSkgewogICAgICAgICBpZiAoIW1fY2xpcExheWVyKSB7CiAgICAg ICAgICAgICBBU1NFUlQoIW1fc2Nyb2xsTGF5ZXIpOwogICAgICAgICAgICAgLy8gQ3JlYXRlIGEg Y2xpcHBpbmcgbGF5ZXIgaWYgdGhpcyBpcyBhbiBpZnJhbWUKQEAgLTEyOTgsMTUgKzEzMTIsMjIg QEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVuc3VyZVJvb3RQbGF0Zm9ybUxheWVyKCkK ICAgICAgICAgICAgIG1fY2xpcExheWVyLT5hZGRDaGlsZChtX3Njcm9sbExheWVyLmdldCgpKTsK ICAgICAgICAgICAgIG1fc2Nyb2xsTGF5ZXItPmFkZENoaWxkKG1fcm9vdFBsYXRmb3JtTGF5ZXIu Z2V0KCkpOwogICAgICAgICAgICAgCi0gICAgICAgICAgICB1cGRhdGVDb250ZW50TGF5ZXJTY3Jv bGxQb3NpdGlvbihtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5zY3JvbGxQb3NpdGlvbigpKTsK KyAgICAgICAgICAgIGZyYW1lVmlld0RpZENoYW5nZVNpemUoKTsKKyAgICAgICAgICAgIGZyYW1l Vmlld0RpZFNjcm9sbChtX3JlbmRlclZpZXctPmZyYW1lVmlldygpLT5zY3JvbGxQb3NpdGlvbigp KTsKICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAobV9jbGlwTGF5ZXIpIHsKLSAgICAgICAgbV9j bGlwTGF5ZXItPnJlbW92ZUFsbENoaWxkcmVuKCk7Ci0gICAgICAgIG1fY2xpcExheWVyLT5yZW1v dmVGcm9tUGFyZW50KCk7Ci0gICAgICAgIG1fY2xpcExheWVyID0gMDsKLSAgICAgICAgCi0gICAg ICAgIG1fc2Nyb2xsTGF5ZXItPnJlbW92ZUFsbENoaWxkcmVuKCk7Ci0gICAgICAgIG1fc2Nyb2xs TGF5ZXIgPSAwOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChtX2NsaXBMYXllcikgeworICAg ICAgICAgICAgbV9jbGlwTGF5ZXItPnJlbW92ZUFsbENoaWxkcmVuKCk7CisgICAgICAgICAgICBt X2NsaXBMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOworICAgICAgICAgICAgbV9jbGlwTGF5ZXIg PSAwOworICAgICAgICAgICAgCisgICAgICAgICAgICBtX3Njcm9sbExheWVyLT5yZW1vdmVBbGxD aGlsZHJlbigpOworICAgICAgICAgICAgbV9zY3JvbGxMYXllciA9IDA7CisgICAgICAgIH0KKwor ICAgICAgICAvLyBUaGUgcm9vdCBsYXllciBkb2VzIGdlb21ldHJ5IGZsaXBwaW5nIGlmIHdlIG5l ZWQgaXQuCisgICAgICAgIG1fcm9vdFBsYXRmb3JtTGF5ZXItPnNldEdlb21ldHJ5T3JpZW50YXRp b24oZXhwZWN0ZWRBdHRhY2htZW50ID09IFJvb3RMYXllckF0dGFjaGVkVmlhRW5jbG9zaW5nSWZy YW1lCisgICAgICAgICAgICA/IEdyYXBoaWNzTGF5ZXI6OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNU b3BEb3duIDogR3JhcGhpY3NMYXllcjo6Y29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9u KCkpOwogICAgIH0KIAogICAgIC8vIENoZWNrIHRvIHNlZSBpZiB3ZSBoYXZlIHRvIGNoYW5nZSB0 aGUgYXR0YWNobWVudApAQCAtMTM0OCw3ICsxMzY5LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBv c2l0b3I6OmF0dGFjaFJvb3RQbGF0Zm9ybUxheWVyKFJvb3RMYXllckF0dGFjaG1lbnQgYXR0YWNo bWUKICAgICAgICAgICAgIGlmICghcGFnZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgICAgIHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+YXR0YWNoUm9vdEdyYXBoaWNzTGF5 ZXIoZnJhbWUsIG1fcm9vdFBsYXRmb3JtTGF5ZXIuZ2V0KCkpOworICAgICAgICAgICAgcGFnZS0+ Y2hyb21lKCktPmNsaWVudCgpLT5hdHRhY2hSb290R3JhcGhpY3NMYXllcihmcmFtZSwgcm9vdFBs YXRmb3JtTGF5ZXIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBj YXNlIFJvb3RMYXllckF0dGFjaGVkVmlhRW5jbG9zaW5nSWZyYW1lOiB7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IDYzM2VjZDExYmUzNmYyZGVlYjFjNzI3 Yzc3NDZiNzJhYTVhMTliNGYuLjBjZTgwYTk4NmU1NjYzMzQ0MWIyZTcyNTU5ZmMwMzNlZTU4ZDAx Y2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5o CisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0xNTgs OCArMTU4LDggQEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIHBhcmVudElGcmFtZUNvbnRlbnRM YXllcnMoUmVuZGVySUZyYW1lKik7CiAKICAgICAvLyBVcGRhdGUgdGhlIGdlb21ldHJ5IG9mIHRo ZSBsYXllcnMgdXNlZCBmb3IgY2xpcHBpbmcgYW5kIHNjcm9sbGluZyBpbiBmcmFtZXMuCi0gICAg dm9pZCB1cGRhdGVDb250ZW50TGF5ZXJPZmZzZXQoY29uc3QgSW50UG9pbnQmIGNvbnRlbnRzT2Zm c2V0KTsKLSAgICB2b2lkIHVwZGF0ZUNvbnRlbnRMYXllclNjcm9sbFBvc2l0aW9uKGNvbnN0IElu dFBvaW50Jik7CisgICAgdm9pZCBmcmFtZVZpZXdEaWRDaGFuZ2VTaXplKGNvbnN0IEludFBvaW50 JiBjb250ZW50c09mZnNldCA9IEludFBvaW50KCkpOworICAgIHZvaWQgZnJhbWVWaWV3RGlkU2Ny b2xsKGNvbnN0IEludFBvaW50JiA9IEludFBvaW50KCkpOwogCiBwcml2YXRlOgogICAgIC8vIFdo ZXRoZXIgdGhlIGdpdmVuIFJMIG5lZWRzIGEgY29tcG9zaXRpbmcgbGF5ZXIuCkBAIC0yMTQsNiAr MjE0LDggQEAgcHJpdmF0ZToKICAgICBib29sIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JJRnJhbWUo UmVuZGVyT2JqZWN0KikgY29uc3Q7CiAgICAgYm9vbCByZXF1aXJlc0NvbXBvc2l0aW5nV2hlbkRl c2NlbmRhbnRzQXJlQ29tcG9zaXRpbmcoUmVuZGVyT2JqZWN0KikgY29uc3Q7CiAKKyAgICBib29s IHJlcXVpcmVzU2Nyb2xsTGF5ZXIoUm9vdExheWVyQXR0YWNobWVudCkgY29uc3Q7CisgICAgCiBw cml2YXRlOgogICAgIFJlbmRlclZpZXcqIG1fcmVuZGVyVmlldzsKICAgICBPd25QdHI8R3JhcGhp Y3NMYXllcj4gbV9yb290UGxhdGZvcm1MYXllcjsKZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdl TG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2RlYmUwMzEzMTIyYWIxNDMwYWVmMzUzY2Uz YzdjMmFiNjY3MjhmNi4uYTk3ZDczMzRkZTNmMGM5ZGQzODVkZWEzODA5OWVlY2MzYTNlNDkwYyAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAxMC0wNy0yMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb21wb3NpdGVkIGxheWVycyBkb24ndCBzY3JvbGwgaW4gV2ViS2l0MgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3NzEKKyAgICAgICAgCisgICAg ICAgIEluIFdlYktpdDIsIGRvIHRoZSBjb21wb3NpdGluZyBsYXllciBnZW9tZXRyeSBmbGlwcGlu ZyBvbiB0aGUgZHJhd2luZyBhcmVhJ3MgbWFpbiAKKyAgICAgICAgYmFja2luZyBsYXllci4gVGhp cyBib3RoIGF2b2lkcyB1cyBoYXZpbmcgdG8gZmxpcCB0aGUgbGF5ZXIgY29udGVudHMsIGFuZCBh bHNvIGF2b2lkcyBpc3N1ZXMKKyAgICAgICAgd2l0aCB0aGUgcG9zaXRpb25pbmcgb2YgdGhlIHJv b3QgcGxhdGZvcm0gbGF5ZXIsIHdoaWNoIHdlIHdhbnQgdG9wLWxlZnQuIERvaW5nIHRoZSBmbGlw cGluZworICAgICAgICBsb3dlciBkb3duIHdvdWxkIHJlcXVpcmUgdGhhdCB0aGUgcm9vdCBwbGF0 Zm9ybSBsYXllciBrbm93IHdoZXJlIHRoZSBzY3JvbGxiYXIgaXMuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYS5jcHA6CisgICAgICAgIChXZWJL aXQ6OkxheWVyQmFja2VkRHJhd2luZ0FyZWE6OkxheWVyQmFja2VkRHJhd2luZ0FyZWEpOgorCiAy MDEwLTA3LTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL0xheWVyQmFja2VkRHJhd2luZ0FyZWEuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYS5jcHAKaW5kZXggZjNmY2RkYWM0ZWM5ZDU4 YmY4NWJhMjhkZThlZTIxNzhjNjc3NDg0ZC4uY2NhMWNkZjRkZmQzYjM0ZjcwYWJhNTUyZTljNGQ5 ZmU4ZDhkYTcwYSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJC YWNrZWREcmF3aW5nQXJlYS5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5 ZXJCYWNrZWREcmF3aW5nQXJlYS5jcHAKQEAgLTU0LDcgKzU0LDkgQEAgTGF5ZXJCYWNrZWREcmF3 aW5nQXJlYTo6TGF5ZXJCYWNrZWREcmF3aW5nQXJlYShXZWJQYWdlKiB3ZWJQYWdlKQogICAgIG1f YmFja2luZ0xheWVyLT5zZXROYW1lKCJEcmF3aW5nQXJlYSBiYWNraW5nIGxheWVyIik7CiAjZW5k aWYKICAgICBtX2JhY2tpbmdMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJP bmx5KCk7Ci0gICAgbV9iYWNraW5nTGF5ZXItPnNldENvbnRlbnRzT3JpZW50YXRpb24oR3JhcGhp Y3NMYXllcjo6Q29tcG9zaXRpbmdDb29yZGluYXRlc0JvdHRvbVVwKTsKKyAgICAKKyAgICAvLyBE byBnZW9tZXRyeSBmbGlwcGluZyBvbiB0aGlzIGxheWVyLgorICAgIG1fYmFja2luZ0xheWVyLT5z ZXRHZW9tZXRyeU9yaWVudGF0aW9uKEdyYXBoaWNzTGF5ZXI6OkNvbXBvc2l0aW5nQ29vcmRpbmF0 ZXNCb3R0b21VcCk7CiAgICAgCiAgICAgcGxhdGZvcm1Jbml0KCk7CiB9Cg==