117222 2013-06-04 22:20:54 -0700 [Coordinated Graphics] Prevent a recursive painting in CoordinatedGraphicsLayer 2013-06-05 06:33:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108899 0 yoon webkit-unassigned cmarcelo commit-queue jaepark luiz noam zeno oldest_to_newest 897133 0 yoon 2013-06-04 22:20:54 -0700 CoordinatedGraphicsLayer::flushCompositingState() will cross frame boundaries if the GraphicsLayers are connected. In this case, updateContentBuffers will invoke a painting of a sub-frame that causes flushCompositingState recursively. To prevent this behavior this patch extracts updateContentBuffers from flushCompositingState, and places it in updateContentBuffersIncludeSublayers, which is another tree traveler for painting. 897215 1 203779 yoon 2013-06-05 02:59:36 -0700 Created attachment 203779 Patch 897220 2 203779 noam 2013-06-05 03:09:11 -0700 Comment on attachment 203779 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203779&action=review Needs some renames, but I like the approach. > Source/WebKit2/ChangeLog:16 > + updateContentBuffersIncludeSublayers, which is another tree traveler for > + painting. "tree traveler" you mean which traverses the tree separately from flushing the state. > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:114 > + void requestSyncStateChangesIncludeSubLayers(); syncPendingStateChangesIncludingSubLayers > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:115 > + void updateContentBuffersIncludeSubLayers(); updateContentBuffersIncludingSubLayeres 897269 3 203801 yoon 2013-06-05 04:28:44 -0700 Created attachment 203801 Patch 897271 4 yoon 2013-06-05 04:30:10 -0700 (In reply to comment #2) > (From update of attachment 203779 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203779&action=review > > Needs some renames, but I like the approach. > > > Source/WebKit2/ChangeLog:16 > > + updateContentBuffersIncludeSublayers, which is another tree traveler for > > + painting. > > "tree traveler" you mean which traverses the tree separately from flushing the state. Yes. thanks for suggesting nice phrase. > > > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:114 > > + void requestSyncStateChangesIncludeSubLayers(); > > syncPendingStateChangesIncludingSubLayers > > > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:115 > > + void updateContentBuffersIncludeSubLayers(); > > updateContentBuffersIncludingSubLayeres Good naming. I changed names of methods. 897310 5 203801 noam 2013-06-05 05:27:16 -0700 Comment on attachment 203801 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203801&action=review Has a typo, otherwise LGTM > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:1001 > +void CoordinatedGraphicsLayer::updateContentBuffersIncludingSubLayeres() Layeres -> Layers 897319 6 203812 yoon 2013-06-05 05:46:20 -0700 Created attachment 203812 Patch 897320 7 yoon 2013-06-05 05:47:06 -0700 (In reply to comment #5) > (From update of attachment 203801 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203801&action=review > > Has a typo, otherwise LGTM > > > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:1001 > > +void CoordinatedGraphicsLayer::updateContentBuffersIncludingSubLayeres() > > Layeres -> Layers Thanks for review. I had fixed typo. 897324 8 203813 yoon 2013-06-05 06:00:52 -0700 Created attachment 203813 Patch 897393 9 commit-queue 2013-06-05 06:32:16 -0700 The commit-queue encountered the following flaky tests while processing attachment 203812: platform/mac/editing/deleting/deletionUI-single-instance.html bug 114181 (author: rniwa@webkit.org) transitions/color-transition-rounding.html bug 114182 (author: simon.fraser@apple.com) transitions/cubic-bezier-overflow-svg-length.html bug 114183 (author: peter@chromium.org) transitions/interrupt-zero-duration.html bug 114184 (authors: cmarrin@apple.com, rniwa@webkit.org, and simon.fraser@apple.com) transitions/multiple-background-transitions.html bug 114185 (author: simon.fraser@apple.com) transitions/cubic-bezier-overflow-color.html bug 114186 (author: peter@chromium.org) transitions/multiple-shadow-transitions.html bug 114187 (author: simon.fraser@apple.com) transitions/mismatched-shadow-transitions.html bug 114188 (author: simon.fraser@apple.com) transitions/color-transition-all.html bug 114189 (authors: ossy@webkit.org and simon.fraser@apple.com) transitions/negative-delay.html bug 114190 (author: simon.fraser@apple.com) transitions/cubic-bezier-overflow-shadow.html bug 114191 (author: peter@chromium.org) transitions/min-max-width-height-transitions.html bug 114192 (author: simon.fraser@apple.com) transitions/cancel-transition.html bug 114193 (authors: ojan@chromium.org, rniwa@webkit.org, and simon.fraser@apple.com) transitions/border-radius-transition.html bug 114194 (author: simon.fraser@apple.com) transitions/flex-transitions.html bug 114195 (author: tony@chromium.org) transitions/mixed-type.html bug 114196 (author: mikelawther@chromium.org) transitions/multiple-mask-transitions.html bug 114197 (author: simon.fraser@apple.com) transitions/color-transition-premultiplied.html bug 114198 (author: simon.fraser@apple.com) transitions/mismatched-shadow-styles.html bug 114199 (author: simon.fraser@apple.com) transitions/mask-transitions.html bug 114200 (authors: ojan@chromium.org, oliver@apple.com, and simon.fraser@apple.com) transitions/cubic-bezier-overflow-length.html bug 114201 (author: peter@chromium.org) transitions/multiple-background-size-transitions.html bug 114202 (authors: mitz@webkit.org and simon.fraser@apple.com) transitions/clip-transition.html bug 114203 (authors: dglazkov@chromium.org, krit@webkit.org, and simon.fraser@apple.com) transitions/cubic-bezier-overflow-transform.html bug 114204 (author: peter@chromium.org) transitions/interrupted-accelerated-transition.html bug 56242 (authors: rniwa@webkit.org, simon.fraser@apple.com, and tonyg@chromium.org) transitions/background-transitions.html bug 114206 (author: simon.fraser@apple.com) http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html bug 114208 (authors: abarth@webkit.org and rniwa@webkit.org) http/tests/inspector/inspect-element.html bug 78869 (author: pfeldman@chromium.org) fast/loader/javascript-url-in-object.html bug 114210 (authors: rniwa@webkit.org and sam@webkit.org) svg/animations/smil-leak-dynamically-added-element-instances.svg bug 114281 (authors: fmalita@chromium.org and thorton@apple.com) The commit-queue is continuing to process your patch. 897395 10 203813 commit-queue 2013-06-05 06:33:51 -0700 Comment on attachment 203813 Patch Clearing flags on attachment: 203813 Committed r151220: <http://trac.webkit.org/changeset/151220> 897396 11 commit-queue 2013-06-05 06:33:54 -0700 All reviewed patches have been landed. Closing bug. 203779 2013-06-05 02:59:36 -0700 2013-06-05 04:28:38 -0700 Patch bug-117222-20130605185805.patch text/plain 6855 yoon U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhiNTIxMjk1ODc4Nzcx M2Q3OThlMGUyNDdhMTUzYjgyNDE2YjY1YS4uNzljNGEzMTJmOTNkOTk2Njg5MWJkMzNjMDgwYjA4 MTU4ZTUzZjk3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA2LTA0ICBHd2Fu ZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBbQ29vcmRp bmF0ZWQgR3JhcGhpY3NdIFByZXZlbnQgYSByZWN1cnNpdmUgcGFpbnRpbmcgaW4gQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZSgp IHdpbGwgY3Jvc3MgZnJhbWUKKyAgICAgICAgYm91bmRhcmllcyBpZiB0aGUgR3JhcGhpY3NMYXll cnMgYXJlIGNvbm5lY3RlZC4gSW4gdGhpcyBjYXNlLAorICAgICAgICB1cGRhdGVDb250ZW50QnVm ZmVycyB3aWxsIGludm9rZSBhIHBhaW50aW5nIG9mIGEgc3ViLWZyYW1lIHRoYXQgY2F1c2VzCisg ICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSByZWN1cnNpdmVseS4KKworICAgICAgICBUbyBw cmV2ZW50IHRoaXMgYmVoYXZpb3IgdGhpcyBwYXRjaCBleHRyYWN0cyB1cGRhdGVDb250ZW50QnVm ZmVycyBmcm9tCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSwgYW5kIHBsYWNlcyBpdCBp bgorICAgICAgICB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGVTdWJsYXllcnMsIHdoaWNoIGlz IGFub3RoZXIgdHJlZSB0cmF2ZWxlciBmb3IKKyAgICAgICAgcGFpbnRpbmcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6 Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSk6CisgICAgICAgIChXZWJDb3Jl OjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlcXVlc3RTeW5jU3RhdGVDaGFuZ2VzSW5jbHVk ZVN1YkxheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnVwZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkZVN1YkxheWVycyk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5o OgorCiAyMDEzLTAzLTEwICBHd2FuZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5l dD4KIAogICAgICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFJlbmFtZSBjbGllbnQgY2xhc3Nl cyBmb3IgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcgYW5kIFVwZGF0ZUF0bGFzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDMyZjc5MWVmMGYxM2E5ZGFlNmQzYWI1ZWE3NzU4NjRmYWU0M2Q4MTcuLjZlZjVlNzJiMzBh ZTYyN2U2MDcyNDM0NmIwZjM0MDllMTM4MjUxNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBA QAorMjAxMy0wNi0wNCAgR3dhbmcgWW9vbiBId2FuZyAgPHJ5dW1pZWxAY29tcGFueTEwMC5uZXQ+ CisKKyAgICAgICAgW0Nvb3JkaW5hdGVkIEdyYXBoaWNzXSBQcmV2ZW50IGEgcmVjdXJzaXZlIHBh aW50aW5nIGluIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpmbHVz aENvbXBvc2l0aW5nU3RhdGUoKSB3aWxsIGNyb3NzIGZyYW1lCisgICAgICAgIGJvdW5kYXJpZXMg aWYgdGhlIEdyYXBoaWNzTGF5ZXJzIGFyZSBjb25uZWN0ZWQuIEluIHRoaXMgY2FzZSwKKyAgICAg ICAgdXBkYXRlQ29udGVudEJ1ZmZlcnMgd2lsbCBpbnZva2UgYSBwYWludGluZyBvZiBhIHN1Yi1m cmFtZSB0aGF0IGNhdXNlcworICAgICAgICBmbHVzaENvbXBvc2l0aW5nU3RhdGUgcmVjdXJzaXZl bHkuCisKKyAgICAgICAgVG8gcHJldmVudCB0aGlzIGJlaGF2aW9yIHRoaXMgcGF0Y2ggZXh0cmFj dHMgdXBkYXRlQ29udGVudEJ1ZmZlcnMgZnJvbQorICAgICAgICBmbHVzaENvbXBvc2l0aW5nU3Rh dGUsIGFuZCBwbGFjZXMgaXQgaW4KKyAgICAgICAgdXBkYXRlQ29udGVudEJ1ZmZlcnNJbmNsdWRl U3VibGF5ZXJzLCB3aGljaCBpcyBhbm90aGVyIHRyZWUgdHJhdmVsZXIgZm9yCisgICAgICAgIHBh aW50aW5nLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29vcmRp bmF0ZWRMYXllclRyZWVIb3N0OjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMpOgorCiAyMDEzLTAz LTEwICBHd2FuZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4KIAogICAgICAg ICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFJlbmFtZSBjbGllbnQgY2xhc3NlcyBmb3IgQ29vcmRp bmF0ZWRJbWFnZUJhY2tpbmcgYW5kIFVwZGF0ZUF0bGFzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3Jh cGhpY3NMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv Y29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAppbmRleCBhMGU5MTZmMjlm ZGJkYzE3NDNkNTEwNGNlMzExMDVhMjk4YTBjZjQ1Li5kMDE2ZDAyMGNlYmJiNGJkOTliZmM4ZmY4 NTE5NWM2OGJhYTIzNTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcApAQCAtNzkwLDE5ICs3OTAsMjQgQEAgdm9pZCBDb29y ZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9u bHkoKQogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKICAgICBzeW5jRmlsdGVycygpOwogI2VuZGlm Ci0gICAgdXBkYXRlQ29udGVudEJ1ZmZlcnMoKTsKICNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkK ICAgICBzeW5jQ2FudmFzKCk7CiAjZW5kaWYKIAorICAgIC8vIE9ubHkgdW5zZXQgbV9tb3ZpbmdW aXNpYmxlUmVjdCBhZnRlciB3ZSBoYXZlIHVwZGF0ZWQgdGhlIHZpc2libGUgcmVjdCBhZnRlciB0 aGUgYW5pbWF0aW9uIHN0b3BwZWQuCisgICAgaWYgKCFoYXNBY3RpdmVUcmFuc2Zvcm1BbmltYXRp b24pCisgICAgICAgIG1fbW92aW5nVmlzaWJsZVJlY3QgPSBmYWxzZTsKK30KKwordm9pZCBDb29y ZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlcXVlc3RTeW5jU3RhdGVDaGFuZ2VzSW5jbHVkZVN1Ykxh eWVycygpCit7CiAgICAgaWYgKG1fbGF5ZXJTdGF0ZS5oYXNQZW5kaW5nQ2hhbmdlcygpKSB7CiAg ICAgICAgIG1fY29vcmRpbmF0b3ItPnN5bmNMYXllclN0YXRlKG1faWQsIG1fbGF5ZXJTdGF0ZSk7 CiAgICAgICAgIHJlc2V0TGF5ZXJTdGF0ZSgpOwogICAgIH0KIAotICAgIC8vIE9ubHkgdW5zZXQg bV9tb3ZpbmdWaXNpYmxlUmVjdCBhZnRlciB3ZSBoYXZlIHVwZGF0ZWQgdGhlIHZpc2libGUgcmVj dCBhZnRlciB0aGUgYW5pbWF0aW9uIHN0b3BwZWQuCi0gICAgaWYgKCFoYXNBY3RpdmVUcmFuc2Zv cm1BbmltYXRpb24pCi0gICAgICAgIG1fbW92aW5nVmlzaWJsZVJlY3QgPSBmYWxzZTsKKyAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGNoaWxkcmVuKCkuc2l6ZSgpOyArK2kpCisgICAgICAgIHRv Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKGNoaWxkcmVuKClbaV0pLT5yZXF1ZXN0U3luY1N0YXRl Q2hhbmdlc0luY2x1ZGVTdWJMYXllcnMoKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNz TGF5ZXI6OnJlc2V0TGF5ZXJTdGF0ZSgpCkBAIC05OTMsNiArOTk4LDIwIEBAIHZvaWQgQ29vcmRp bmF0ZWRHcmFwaGljc0xheWVyOjpyZW1vdmVUaWxlKHVpbnQzMl90IHRpbGVJRCkKICAgICBtX2xh eWVyU3RhdGUudGlsZXNUb1JlbW92ZS5hcHBlbmQodGlsZUlEKTsKIH0KIAordm9pZCBDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXI6OnVwZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkZVN1YkxheWVycygp Cit7CisgICAgaWYgKENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciogbWFzayA9IHRvQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyKG1hc2tMYXllcigpKSkKKyAgICAgICAgbWFzay0+dXBkYXRlQ29udGVu dEJ1ZmZlcnMoKTsKKworICAgIGlmIChDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIqIHJlcGxpY2Eg PSB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihyZXBsaWNhTGF5ZXIoKSkpCisgICAgICAgIHJl cGxpY2EtPnVwZGF0ZUNvbnRlbnRCdWZmZXJzKCk7CisKKyAgICB1cGRhdGVDb250ZW50QnVmZmVy cygpOworCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbigpLnNpemUoKTsgKytp KQorICAgICAgICB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihjaGlsZHJlbigpW2ldKS0+dXBk YXRlQ29udGVudEJ1ZmZlcnNJbmNsdWRlU3ViTGF5ZXJzKCk7Cit9CisKIHZvaWQgQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyOjp1cGRhdGVDb250ZW50QnVmZmVycygpCiB7CiAgICAgaWYgKCFzaG91 bGRIYXZlQmFja2luZ1N0b3JlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9D b29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaAppbmRleCA0ZDcwY2QyNmE0N2QzMWMxOGM3MmIzM2E2 MDg5MDQwZTgyYjk3ZDViLi5lNTIyY2JmYjA3NTMyM2Y2MDIwMWI0NWQwZWUzMzAwZmM5YzViNmM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NM YXllci5oCkBAIC0xMTEsNiArMTExLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzdXNw ZW5kQW5pbWF0aW9ucyhkb3VibGUgdGltZSkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHJl c3VtZUFuaW1hdGlvbnMoKSBPVkVSUklERTsKIAorICAgIHZvaWQgcmVxdWVzdFN5bmNTdGF0ZUNo YW5nZXNJbmNsdWRlU3ViTGF5ZXJzKCk7CisgICAgdm9pZCB1cGRhdGVDb250ZW50QnVmZmVyc0lu Y2x1ZGVTdWJMYXllcnMoKTsKKwogICAgIEZsb2F0UG9pbnQgY29tcHV0ZVBvc2l0aW9uUmVsYXRp dmVUb0Jhc2UoKTsKICAgICB2b2lkIGNvbXB1dGVQaXhlbEFsaWdubWVudChGbG9hdFBvaW50JiBw b3NpdGlvbiwgRmxvYXRTaXplJiwgRmxvYXRQb2ludDNEJiBhbmNob3JQb2ludCwgRmxvYXRTaXpl JiBhbGlnbm1lbnRPZmZzZXQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3Qu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcAppbmRleCBkMWI2YTM1NDhiYTFiMzkyNDNk NDM0MjA2M2MyNTJjZmMyNGE1NDA2Li5mMDJhNTNmZjAwZGNmYzQxZjdjNjhlMDdkYTE4MWNmM2Rm M2YyNmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29v cmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5h dGVkTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTI0OCw2ICsyNDgsOSBAQCBib29sIENvb3JkaW5hdGVk TGF5ZXJUcmVlSG9zdDo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkKIAogICAgIGJvb2wgZGlk U3luYyA9IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+Zmx1c2hD b21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiAKKyAgICB0b0Nvb3JkaW5hdGVk R3JhcGhpY3NMYXllcihtX3Jvb3RMYXllci5nZXQoKSktPnVwZGF0ZUNvbnRlbnRCdWZmZXJzSW5j bHVkZVN1YkxheWVycygpOworICAgIHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKG1fcm9vdExh eWVyLmdldCgpKS0+cmVxdWVzdFN5bmNTdGF0ZUNoYW5nZXNJbmNsdWRlU3ViTGF5ZXJzKCk7CisK ICAgICBmbHVzaFBlbmRpbmdJbWFnZUJhY2tpbmdDaGFuZ2VzKCk7CiAKICAgICBpZiAobV9zaG91 bGRTeW5jRnJhbWUpIHsK 203801 2013-06-05 04:28:44 -0700 2013-06-05 05:49:52 -0700 Patch bug-117222-20130605202712.patch text/plain 7013 yoon U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhiNTIxMjk1ODc4Nzcx M2Q3OThlMGUyNDdhMTUzYjgyNDE2YjY1YS4uNDgyYzMxOWU4YWIzOGNiMzllYzE3YzliYjAyZGFj MTkwNDFlYmVmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA2LTA0ICBHd2Fu ZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBbQ29vcmRp bmF0ZWQgR3JhcGhpY3NdIFByZXZlbnQgYSByZWN1cnNpdmUgcGFpbnRpbmcgaW4gQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZSgp IHdpbGwgY3Jvc3MgZnJhbWUKKyAgICAgICAgYm91bmRhcmllcyBpZiB0aGUgR3JhcGhpY3NMYXll cnMgYXJlIGNvbm5lY3RlZC4gSW4gdGhpcyBjYXNlLAorICAgICAgICB1cGRhdGVDb250ZW50QnVm ZmVycyB3aWxsIGludm9rZSBhIHBhaW50aW5nIG9mIGEgc3ViLWZyYW1lIHRoYXQgY2F1c2VzCisg ICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSByZWN1cnNpdmVseS4KKworICAgICAgICBUbyBw cmV2ZW50IHRoaXMgYmVoYXZpb3IgdGhpcyBwYXRjaCBleHRyYWN0cyB1cGRhdGVDb250ZW50QnVm ZmVycyBmcm9tCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSwgYW5kIHBsYWNlcyBpdCBp bgorICAgICAgICB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGVTdWJsYXllcnMsIHdoaWNoIGlz IGFub3RoZXIgdHJlZSB0cmF2ZWxlciBmb3IKKyAgICAgICAgcGFpbnRpbmcuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXll ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNo Q29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkpOgorICAgICAgICAoV2ViQ29yZTo6Q29v cmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzeW5jUGVuZGluZ1N0YXRlQ2hhbmdlc0luY2x1ZGluZ1N1 YkxheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVw ZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJlcyk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5o OgorCiAyMDEzLTAzLTEwICBHd2FuZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5l dD4KIAogICAgICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFJlbmFtZSBjbGllbnQgY2xhc3Nl cyBmb3IgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcgYW5kIFVwZGF0ZUF0bGFzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDMyZjc5MWVmMGYxM2E5ZGFlNmQzYWI1ZWE3NzU4NjRmYWU0M2Q4MTcuLjNjNmNjYjY5YTNj NmFlMzM5Y2Q0ZmIyODNjM2Y5OTE1NmUzNGYwOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBA QAorMjAxMy0wNi0wNCAgR3dhbmcgWW9vbiBId2FuZyAgPHJ5dW1pZWxAY29tcGFueTEwMC5uZXQ+ CisKKyAgICAgICAgW0Nvb3JkaW5hdGVkIEdyYXBoaWNzXSBQcmV2ZW50IGEgcmVjdXJzaXZlIHBh aW50aW5nIGluIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpmbHVz aENvbXBvc2l0aW5nU3RhdGUoKSB3aWxsIGNyb3NzIGZyYW1lCisgICAgICAgIGJvdW5kYXJpZXMg aWYgdGhlIEdyYXBoaWNzTGF5ZXJzIGFyZSBjb25uZWN0ZWQuIEluIHRoaXMgY2FzZSwKKyAgICAg ICAgdXBkYXRlQ29udGVudEJ1ZmZlcnMgd2lsbCBpbnZva2UgYSBwYWludGluZyBvZiBhIHN1Yi1m cmFtZSB0aGF0IGNhdXNlcworICAgICAgICBmbHVzaENvbXBvc2l0aW5nU3RhdGUgcmVjdXJzaXZl bHkuCisKKyAgICAgICAgVG8gcHJldmVudCB0aGlzIGJlaGF2aW9yIHRoaXMgcGF0Y2ggZXh0cmFj dHMgdXBkYXRlQ29udGVudEJ1ZmZlcnMgZnJvbQorICAgICAgICBmbHVzaENvbXBvc2l0aW5nU3Rh dGUsIGFuZCBwbGFjZXMgaXQgaW4KKyAgICAgICAgdXBkYXRlQ29udGVudEJ1ZmZlcnNJbmNsdWRl U3VibGF5ZXJzLCB3aGljaCB0cmF2ZXJzZXMgdGhlIHRyZWUKKyAgICAgICAgc2VwYXJhdGVseSBm cm9tIGZsdXNoaW5nIHRoZSBzdGF0ZSBmb3IgcGFpbnRpbmcuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcDoK KyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0OjpmbHVzaFBlbmRpbmdM YXllckNoYW5nZXMpOgorCiAyMDEzLTAzLTEwICBHd2FuZyBZb29uIEh3YW5nICA8cnl1bWllbEBj b21wYW55MTAwLm5ldD4KIAogICAgICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFJlbmFtZSBj bGllbnQgY2xhc3NlcyBmb3IgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcgYW5kIFVwZGF0ZUF0bGFz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nv b3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyLmNwcAppbmRleCBhMGU5MTZmMjlmZGJkYzE3NDNkNTEwNGNlMzExMDVhMjk4YTBjZjQ1Li44 Y2UzZDZhOThiYzY2MjhlYjJkNTNlNTA3MTRjZjkzMTA4OGQ4NTVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcApAQCAtNzkw LDE5ICs3OTAsMjQgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9z aXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKICAg ICBzeW5jRmlsdGVycygpOwogI2VuZGlmCi0gICAgdXBkYXRlQ29udGVudEJ1ZmZlcnMoKTsKICNp ZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKICAgICBzeW5jQ2FudmFzKCk7CiAjZW5kaWYKIAorICAg IC8vIE9ubHkgdW5zZXQgbV9tb3ZpbmdWaXNpYmxlUmVjdCBhZnRlciB3ZSBoYXZlIHVwZGF0ZWQg dGhlIHZpc2libGUgcmVjdCBhZnRlciB0aGUgYW5pbWF0aW9uIHN0b3BwZWQuCisgICAgaWYgKCFo YXNBY3RpdmVUcmFuc2Zvcm1BbmltYXRpb24pCisgICAgICAgIG1fbW92aW5nVmlzaWJsZVJlY3Qg PSBmYWxzZTsKK30KKwordm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnN5bmNQZW5kaW5n U3RhdGVDaGFuZ2VzSW5jbHVkaW5nU3ViTGF5ZXJzKCkKK3sKICAgICBpZiAobV9sYXllclN0YXRl Lmhhc1BlbmRpbmdDaGFuZ2VzKCkpIHsKICAgICAgICAgbV9jb29yZGluYXRvci0+c3luY0xheWVy U3RhdGUobV9pZCwgbV9sYXllclN0YXRlKTsKICAgICAgICAgcmVzZXRMYXllclN0YXRlKCk7CiAg ICAgfQogCi0gICAgLy8gT25seSB1bnNldCBtX21vdmluZ1Zpc2libGVSZWN0IGFmdGVyIHdlIGhh dmUgdXBkYXRlZCB0aGUgdmlzaWJsZSByZWN0IGFmdGVyIHRoZSBhbmltYXRpb24gc3RvcHBlZC4K LSAgICBpZiAoIWhhc0FjdGl2ZVRyYW5zZm9ybUFuaW1hdGlvbikKLSAgICAgICAgbV9tb3ZpbmdW aXNpYmxlUmVjdCA9IGZhbHNlOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY2hpbGRyZW4o KS5zaXplKCk7ICsraSkKKyAgICAgICAgdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIoY2hpbGRy ZW4oKVtpXSktPnN5bmNQZW5kaW5nU3RhdGVDaGFuZ2VzSW5jbHVkaW5nU3ViTGF5ZXJzKCk7CiB9 CiAKIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZXNldExheWVyU3RhdGUoKQpAQCAt OTkzLDYgKzk5OCwyMCBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6cmVtb3ZlVGls ZSh1aW50MzJfdCB0aWxlSUQpCiAgICAgbV9sYXllclN0YXRlLnRpbGVzVG9SZW1vdmUuYXBwZW5k KHRpbGVJRCk7CiB9CiAKK3ZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjp1cGRhdGVDb250 ZW50QnVmZmVyc0luY2x1ZGluZ1N1YkxheWVyZXMoKQoreworICAgIGlmIChDb29yZGluYXRlZEdy YXBoaWNzTGF5ZXIqIG1hc2sgPSB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihtYXNrTGF5ZXIo KSkpCisgICAgICAgIG1hc2stPnVwZGF0ZUNvbnRlbnRCdWZmZXJzKCk7CisKKyAgICBpZiAoQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyKiByZXBsaWNhID0gdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5 ZXIocmVwbGljYUxheWVyKCkpKQorICAgICAgICByZXBsaWNhLT51cGRhdGVDb250ZW50QnVmZmVy cygpOworCisgICAgdXBkYXRlQ29udGVudEJ1ZmZlcnMoKTsKKworICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgY2hpbGRyZW4oKS5zaXplKCk7ICsraSkKKyAgICAgICAgdG9Db29yZGluYXRlZEdy YXBoaWNzTGF5ZXIoY2hpbGRyZW4oKVtpXSktPnVwZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkaW5n U3ViTGF5ZXJlcygpOworfQorCiB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6dXBkYXRl Q29udGVudEJ1ZmZlcnMoKQogewogICAgIGlmICghc2hvdWxkSGF2ZUJhY2tpbmdTdG9yZSgpKSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy LmgKaW5kZXggNGQ3MGNkMjZhNDdkMzFjMThjNzJiMzNhNjA4OTA0MGU4MmI5N2Q1Yi4uNTlkYmZi NjZlYzhjN2QyYWNlMzNkNDU4MWQzZWZjMGIxODE0MzMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3Jh cGhpY3NMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaApAQCAtMTExLDYgKzExMSw5 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZEFuaW1hdGlvbnMoZG91YmxlIHRp bWUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCkgT1ZFUlJJ REU7CiAKKyAgICB2b2lkIHN5bmNQZW5kaW5nU3RhdGVDaGFuZ2VzSW5jbHVkaW5nU3ViTGF5ZXJz KCk7CisgICAgdm9pZCB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGluZ1N1YkxheWVyZXMoKTsK KwogICAgIEZsb2F0UG9pbnQgY29tcHV0ZVBvc2l0aW9uUmVsYXRpdmVUb0Jhc2UoKTsKICAgICB2 b2lkIGNvbXB1dGVQaXhlbEFsaWdubWVudChGbG9hdFBvaW50JiBwb3NpdGlvbiwgRmxvYXRTaXpl JiwgRmxvYXRQb2ludDNEJiBhbmNob3JQb2ludCwgRmxvYXRTaXplJiBhbGlnbm1lbnRPZmZzZXQp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRp bmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXll clRyZWVIb3N0LmNwcAppbmRleCBkMWI2YTM1NDhiYTFiMzkyNDNkNDM0MjA2M2MyNTJjZmMyNGE1 NDA2Li41N2VjNTVkYzUxYmQ3NTlhYjFlMzI2YzA2NGE4OWIxYjBkNTgzNWQ4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9D b29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5j cHAKQEAgLTI0OCw2ICsyNDgsOSBAQCBib29sIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6Zmx1 c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkKIAogICAgIGJvb2wgZGlkU3luYyA9IG1fd2ViUGFnZS0+ Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlSW5j bHVkaW5nU3ViZnJhbWVzKCk7CiAKKyAgICB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihtX3Jv b3RMYXllci5nZXQoKSktPnVwZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJlcygp OworICAgIHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKG1fcm9vdExheWVyLmdldCgpKS0+c3lu Y1BlbmRpbmdTdGF0ZUNoYW5nZXNJbmNsdWRpbmdTdWJMYXllcnMoKTsKKwogICAgIGZsdXNoUGVu ZGluZ0ltYWdlQmFja2luZ0NoYW5nZXMoKTsKIAogICAgIGlmIChtX3Nob3VsZFN5bmNGcmFtZSkg ewo= 203812 2013-06-05 05:46:20 -0700 2013-06-05 06:06:02 -0700 Patch bug-117222-20130605214449.patch text/plain 7009 yoon U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhiNTIxMjk1ODc4Nzcx M2Q3OThlMGUyNDdhMTUzYjgyNDE2YjY1YS4uNTVkMDI2MmFkZmJhODZhMGE4Y2MzYTE0MzdjZWJm YTY4YTM2YmJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA2LTA0ICBHd2Fu ZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBbQ29vcmRp bmF0ZWQgR3JhcGhpY3NdIFByZXZlbnQgYSByZWN1cnNpdmUgcGFpbnRpbmcgaW4gQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOb2FtIFJvc2VudGhhbC4KKwor ICAgICAgICBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZSgp IHdpbGwgY3Jvc3MgZnJhbWUKKyAgICAgICAgYm91bmRhcmllcyBpZiB0aGUgR3JhcGhpY3NMYXll cnMgYXJlIGNvbm5lY3RlZC4gSW4gdGhpcyBjYXNlLAorICAgICAgICB1cGRhdGVDb250ZW50QnVm ZmVycyB3aWxsIGludm9rZSBhIHBhaW50aW5nIG9mIGEgc3ViLWZyYW1lIHRoYXQgY2F1c2VzCisg ICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSByZWN1cnNpdmVseS4KKworICAgICAgICBUbyBw cmV2ZW50IHRoaXMgYmVoYXZpb3IgdGhpcyBwYXRjaCBleHRyYWN0cyB1cGRhdGVDb250ZW50QnVm ZmVycyBmcm9tCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSwgYW5kIHBsYWNlcyBpdCBp bgorICAgICAgICB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGVTdWJsYXllcnMsIHdoaWNoIGlz IGFub3RoZXIgdHJlZSB0cmF2ZWxlciBmb3IKKyAgICAgICAgcGFpbnRpbmcuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXll ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNo Q29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkpOgorICAgICAgICAoV2ViQ29yZTo6Q29v cmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzeW5jUGVuZGluZ1N0YXRlQ2hhbmdlc0luY2x1ZGluZ1N1 YkxheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVw ZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmg6 CisKIDIwMTMtMDMtMTAgIEd3YW5nIFlvb24gSHdhbmcgIDxyeXVtaWVsQGNvbXBhbnkxMDAubmV0 PgogCiAgICAgICAgIFtDb29yZGluYXRlZCBHcmFwaGljc10gUmVuYW1lIGNsaWVudCBjbGFzc2Vz IGZvciBDb29yZGluYXRlZEltYWdlQmFja2luZyBhbmQgVXBkYXRlQXRsYXMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggMzJmNzkxZWYwZjEzYTlkYWU2ZDNhYjVlYTc3NTg2NGZhZTQzZDgxNy4uMDgyMmRjNmE0MWM4 MjQ4NjUzMDkwYTc5MTY3Nzc1YzE3OGNiNWIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBA CisyMDEzLTA2LTA0ICBHd2FuZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4K KworICAgICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFByZXZlbnQgYSByZWN1cnNpdmUgcGFp bnRpbmcgaW4gQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBO b2FtIFJvc2VudGhhbC4KKworICAgICAgICBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNo Q29tcG9zaXRpbmdTdGF0ZSgpIHdpbGwgY3Jvc3MgZnJhbWUKKyAgICAgICAgYm91bmRhcmllcyBp ZiB0aGUgR3JhcGhpY3NMYXllcnMgYXJlIGNvbm5lY3RlZC4gSW4gdGhpcyBjYXNlLAorICAgICAg ICB1cGRhdGVDb250ZW50QnVmZmVycyB3aWxsIGludm9rZSBhIHBhaW50aW5nIG9mIGEgc3ViLWZy YW1lIHRoYXQgY2F1c2VzCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSByZWN1cnNpdmVs eS4KKworICAgICAgICBUbyBwcmV2ZW50IHRoaXMgYmVoYXZpb3IgdGhpcyBwYXRjaCBleHRyYWN0 cyB1cGRhdGVDb250ZW50QnVmZmVycyBmcm9tCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0 ZSwgYW5kIHBsYWNlcyBpdCBpbgorICAgICAgICB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGVT dWJsYXllcnMsIHdoaWNoIHRyYXZlcnNlcyB0aGUgdHJlZQorICAgICAgICBzZXBhcmF0ZWx5IGZy b20gZmx1c2hpbmcgdGhlIHN0YXRlIGZvciBwYWludGluZy4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwOgor ICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OmZsdXNoUGVuZGluZ0xh eWVyQ2hhbmdlcyk6CisKIDIwMTMtMDMtMTAgIEd3YW5nIFlvb24gSHdhbmcgIDxyeXVtaWVsQGNv bXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtDb29yZGluYXRlZCBHcmFwaGljc10gUmVuYW1lIGNs aWVudCBjbGFzc2VzIGZvciBDb29yZGluYXRlZEltYWdlQmFja2luZyBhbmQgVXBkYXRlQXRsYXMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5 ZXIuY3BwCmluZGV4IGEwZTkxNmYyOWZkYmRjMTc0M2Q1MTA0Y2UzMTEwNWEyOThhMGNmNDUuLjcz NWEzZjY1ZThhMzQ0N2I4YjFmYmM0ZjFmMzhhOTdjMDUwYjYzNDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC03OTAs MTkgKzc5MCwyNCBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpCiAjaWYgRU5BQkxFKENTU19GSUxURVJTKQogICAg IHN5bmNGaWx0ZXJzKCk7CiAjZW5kaWYKLSAgICB1cGRhdGVDb250ZW50QnVmZmVycygpOwogI2lm IFVTRShHUkFQSElDU19TVVJGQUNFKQogICAgIHN5bmNDYW52YXMoKTsKICNlbmRpZgogCisgICAg Ly8gT25seSB1bnNldCBtX21vdmluZ1Zpc2libGVSZWN0IGFmdGVyIHdlIGhhdmUgdXBkYXRlZCB0 aGUgdmlzaWJsZSByZWN0IGFmdGVyIHRoZSBhbmltYXRpb24gc3RvcHBlZC4KKyAgICBpZiAoIWhh c0FjdGl2ZVRyYW5zZm9ybUFuaW1hdGlvbikKKyAgICAgICAgbV9tb3ZpbmdWaXNpYmxlUmVjdCA9 IGZhbHNlOworfQorCit2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c3luY1BlbmRpbmdT dGF0ZUNoYW5nZXNJbmNsdWRpbmdTdWJMYXllcnMoKQorewogICAgIGlmIChtX2xheWVyU3RhdGUu aGFzUGVuZGluZ0NoYW5nZXMoKSkgewogICAgICAgICBtX2Nvb3JkaW5hdG9yLT5zeW5jTGF5ZXJT dGF0ZShtX2lkLCBtX2xheWVyU3RhdGUpOwogICAgICAgICByZXNldExheWVyU3RhdGUoKTsKICAg ICB9CiAKLSAgICAvLyBPbmx5IHVuc2V0IG1fbW92aW5nVmlzaWJsZVJlY3QgYWZ0ZXIgd2UgaGF2 ZSB1cGRhdGVkIHRoZSB2aXNpYmxlIHJlY3QgYWZ0ZXIgdGhlIGFuaW1hdGlvbiBzdG9wcGVkLgot ICAgIGlmICghaGFzQWN0aXZlVHJhbnNmb3JtQW5pbWF0aW9uKQotICAgICAgICBtX21vdmluZ1Zp c2libGVSZWN0ID0gZmFsc2U7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbigp LnNpemUoKTsgKytpKQorICAgICAgICB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihjaGlsZHJl bigpW2ldKS0+c3luY1BlbmRpbmdTdGF0ZUNoYW5nZXNJbmNsdWRpbmdTdWJMYXllcnMoKTsKIH0K IAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlc2V0TGF5ZXJTdGF0ZSgpCkBAIC05 OTMsNiArOTk4LDIwIEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZW1vdmVUaWxl KHVpbnQzMl90IHRpbGVJRCkKICAgICBtX2xheWVyU3RhdGUudGlsZXNUb1JlbW92ZS5hcHBlbmQo dGlsZUlEKTsKIH0KIAordm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVwZGF0ZUNvbnRl bnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJzKCkKK3sKKyAgICBpZiAoQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyKiBtYXNrID0gdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobWFza0xheWVyKCkp KQorICAgICAgICBtYXNrLT51cGRhdGVDb250ZW50QnVmZmVycygpOworCisgICAgaWYgKENvb3Jk aW5hdGVkR3JhcGhpY3NMYXllciogcmVwbGljYSA9IHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy KHJlcGxpY2FMYXllcigpKSkKKyAgICAgICAgcmVwbGljYS0+dXBkYXRlQ29udGVudEJ1ZmZlcnMo KTsKKworICAgIHVwZGF0ZUNvbnRlbnRCdWZmZXJzKCk7CisKKyAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGNoaWxkcmVuKCkuc2l6ZSgpOyArK2kpCisgICAgICAgIHRvQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyKGNoaWxkcmVuKClbaV0pLT51cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGluZ1N1 YkxheWVycygpOworfQorCiB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6dXBkYXRlQ29u dGVudEJ1ZmZlcnMoKQogewogICAgIGlmICghc2hvdWxkSGF2ZUJhY2tpbmdTdG9yZSgpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgK aW5kZXggNGQ3MGNkMjZhNDdkMzFjMThjNzJiMzNhNjA4OTA0MGU4MmI5N2Q1Yi4uNTlkYmZiNjZl YzhjN2QyYWNlMzNkNDU4MWQzZWZjMGIxODE0MzMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhp Y3NMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaApAQCAtMTExLDYgKzExMSw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZEFuaW1hdGlvbnMoZG91YmxlIHRpbWUp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCkgT1ZFUlJJREU7 CiAKKyAgICB2b2lkIHN5bmNQZW5kaW5nU3RhdGVDaGFuZ2VzSW5jbHVkaW5nU3ViTGF5ZXJzKCk7 CisgICAgdm9pZCB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGluZ1N1YkxheWVyZXMoKTsKKwog ICAgIEZsb2F0UG9pbnQgY29tcHV0ZVBvc2l0aW9uUmVsYXRpdmVUb0Jhc2UoKTsKICAgICB2b2lk IGNvbXB1dGVQaXhlbEFsaWdubWVudChGbG9hdFBvaW50JiBwb3NpdGlvbiwgRmxvYXRTaXplJiwg RmxvYXRQb2ludDNEJiBhbmNob3JQb2ludCwgRmxvYXRTaXplJiBhbGlnbm1lbnRPZmZzZXQpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRy ZWVIb3N0LmNwcAppbmRleCBkMWI2YTM1NDhiYTFiMzkyNDNkNDM0MjA2M2MyNTJjZmMyNGE1NDA2 Li4wNjQ3ZGI3YTBhYmY3Nzg5MzA2ZGUzNGM5YTRiMzU1MzdmNWFhNmRkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29y ZGluYXRlZExheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5jcHAK QEAgLTI0OCw2ICsyNDgsOSBAQCBib29sIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6Zmx1c2hQ ZW5kaW5nTGF5ZXJDaGFuZ2VzKCkKIAogICAgIGJvb2wgZGlkU3luYyA9IG1fd2ViUGFnZS0+Y29y ZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlSW5jbHVk aW5nU3ViZnJhbWVzKCk7CiAKKyAgICB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihtX3Jvb3RM YXllci5nZXQoKSktPnVwZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJzKCk7Cisg ICAgdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobV9yb290TGF5ZXIuZ2V0KCkpLT5zeW5jUGVu ZGluZ1N0YXRlQ2hhbmdlc0luY2x1ZGluZ1N1YkxheWVycygpOworCiAgICAgZmx1c2hQZW5kaW5n SW1hZ2VCYWNraW5nQ2hhbmdlcygpOwogCiAgICAgaWYgKG1fc2hvdWxkU3luY0ZyYW1lKSB7Cg== 203813 2013-06-05 06:00:52 -0700 2013-06-05 06:33:51 -0700 Patch bug-117222-20130605215920.patch text/plain 7008 yoon U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhiNTIxMjk1ODc4Nzcx M2Q3OThlMGUyNDdhMTUzYjgyNDE2YjY1YS4uNTVkMDI2MmFkZmJhODZhMGE4Y2MzYTE0MzdjZWJm YTY4YTM2YmJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA2LTA0ICBHd2Fu ZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBbQ29vcmRp bmF0ZWQgR3JhcGhpY3NdIFByZXZlbnQgYSByZWN1cnNpdmUgcGFpbnRpbmcgaW4gQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOb2FtIFJvc2VudGhhbC4KKwor ICAgICAgICBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZSgp IHdpbGwgY3Jvc3MgZnJhbWUKKyAgICAgICAgYm91bmRhcmllcyBpZiB0aGUgR3JhcGhpY3NMYXll cnMgYXJlIGNvbm5lY3RlZC4gSW4gdGhpcyBjYXNlLAorICAgICAgICB1cGRhdGVDb250ZW50QnVm ZmVycyB3aWxsIGludm9rZSBhIHBhaW50aW5nIG9mIGEgc3ViLWZyYW1lIHRoYXQgY2F1c2VzCisg ICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSByZWN1cnNpdmVseS4KKworICAgICAgICBUbyBw cmV2ZW50IHRoaXMgYmVoYXZpb3IgdGhpcyBwYXRjaCBleHRyYWN0cyB1cGRhdGVDb250ZW50QnVm ZmVycyBmcm9tCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSwgYW5kIHBsYWNlcyBpdCBp bgorICAgICAgICB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGVTdWJsYXllcnMsIHdoaWNoIGlz IGFub3RoZXIgdHJlZSB0cmF2ZWxlciBmb3IKKyAgICAgICAgcGFpbnRpbmcuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXll ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNo Q29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkpOgorICAgICAgICAoV2ViQ29yZTo6Q29v cmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzeW5jUGVuZGluZ1N0YXRlQ2hhbmdlc0luY2x1ZGluZ1N1 YkxheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVw ZGF0ZUNvbnRlbnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmg6 CisKIDIwMTMtMDMtMTAgIEd3YW5nIFlvb24gSHdhbmcgIDxyeXVtaWVsQGNvbXBhbnkxMDAubmV0 PgogCiAgICAgICAgIFtDb29yZGluYXRlZCBHcmFwaGljc10gUmVuYW1lIGNsaWVudCBjbGFzc2Vz IGZvciBDb29yZGluYXRlZEltYWdlQmFja2luZyBhbmQgVXBkYXRlQXRsYXMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggMzJmNzkxZWYwZjEzYTlkYWU2ZDNhYjVlYTc3NTg2NGZhZTQzZDgxNy4uMDgyMmRjNmE0MWM4 MjQ4NjUzMDkwYTc5MTY3Nzc1YzE3OGNiNWIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBA CisyMDEzLTA2LTA0ICBHd2FuZyBZb29uIEh3YW5nICA8cnl1bWllbEBjb21wYW55MTAwLm5ldD4K KworICAgICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFByZXZlbnQgYSByZWN1cnNpdmUgcGFp bnRpbmcgaW4gQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBO b2FtIFJvc2VudGhhbC4KKworICAgICAgICBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNo Q29tcG9zaXRpbmdTdGF0ZSgpIHdpbGwgY3Jvc3MgZnJhbWUKKyAgICAgICAgYm91bmRhcmllcyBp ZiB0aGUgR3JhcGhpY3NMYXllcnMgYXJlIGNvbm5lY3RlZC4gSW4gdGhpcyBjYXNlLAorICAgICAg ICB1cGRhdGVDb250ZW50QnVmZmVycyB3aWxsIGludm9rZSBhIHBhaW50aW5nIG9mIGEgc3ViLWZy YW1lIHRoYXQgY2F1c2VzCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZSByZWN1cnNpdmVs eS4KKworICAgICAgICBUbyBwcmV2ZW50IHRoaXMgYmVoYXZpb3IgdGhpcyBwYXRjaCBleHRyYWN0 cyB1cGRhdGVDb250ZW50QnVmZmVycyBmcm9tCisgICAgICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0 ZSwgYW5kIHBsYWNlcyBpdCBpbgorICAgICAgICB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGVT dWJsYXllcnMsIHdoaWNoIHRyYXZlcnNlcyB0aGUgdHJlZQorICAgICAgICBzZXBhcmF0ZWx5IGZy b20gZmx1c2hpbmcgdGhlIHN0YXRlIGZvciBwYWludGluZy4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwOgor ICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OmZsdXNoUGVuZGluZ0xh eWVyQ2hhbmdlcyk6CisKIDIwMTMtMDMtMTAgIEd3YW5nIFlvb24gSHdhbmcgIDxyeXVtaWVsQGNv bXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtDb29yZGluYXRlZCBHcmFwaGljc10gUmVuYW1lIGNs aWVudCBjbGFzc2VzIGZvciBDb29yZGluYXRlZEltYWdlQmFja2luZyBhbmQgVXBkYXRlQXRsYXMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5 ZXIuY3BwCmluZGV4IGEwZTkxNmYyOWZkYmRjMTc0M2Q1MTA0Y2UzMTEwNWEyOThhMGNmNDUuLjcz NWEzZjY1ZThhMzQ0N2I4YjFmYmM0ZjFmMzhhOTdjMDUwYjYzNDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC03OTAs MTkgKzc5MCwyNCBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpCiAjaWYgRU5BQkxFKENTU19GSUxURVJTKQogICAg IHN5bmNGaWx0ZXJzKCk7CiAjZW5kaWYKLSAgICB1cGRhdGVDb250ZW50QnVmZmVycygpOwogI2lm IFVTRShHUkFQSElDU19TVVJGQUNFKQogICAgIHN5bmNDYW52YXMoKTsKICNlbmRpZgogCisgICAg Ly8gT25seSB1bnNldCBtX21vdmluZ1Zpc2libGVSZWN0IGFmdGVyIHdlIGhhdmUgdXBkYXRlZCB0 aGUgdmlzaWJsZSByZWN0IGFmdGVyIHRoZSBhbmltYXRpb24gc3RvcHBlZC4KKyAgICBpZiAoIWhh c0FjdGl2ZVRyYW5zZm9ybUFuaW1hdGlvbikKKyAgICAgICAgbV9tb3ZpbmdWaXNpYmxlUmVjdCA9 IGZhbHNlOworfQorCit2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c3luY1BlbmRpbmdT dGF0ZUNoYW5nZXNJbmNsdWRpbmdTdWJMYXllcnMoKQorewogICAgIGlmIChtX2xheWVyU3RhdGUu aGFzUGVuZGluZ0NoYW5nZXMoKSkgewogICAgICAgICBtX2Nvb3JkaW5hdG9yLT5zeW5jTGF5ZXJT dGF0ZShtX2lkLCBtX2xheWVyU3RhdGUpOwogICAgICAgICByZXNldExheWVyU3RhdGUoKTsKICAg ICB9CiAKLSAgICAvLyBPbmx5IHVuc2V0IG1fbW92aW5nVmlzaWJsZVJlY3QgYWZ0ZXIgd2UgaGF2 ZSB1cGRhdGVkIHRoZSB2aXNpYmxlIHJlY3QgYWZ0ZXIgdGhlIGFuaW1hdGlvbiBzdG9wcGVkLgot ICAgIGlmICghaGFzQWN0aXZlVHJhbnNmb3JtQW5pbWF0aW9uKQotICAgICAgICBtX21vdmluZ1Zp c2libGVSZWN0ID0gZmFsc2U7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbigp LnNpemUoKTsgKytpKQorICAgICAgICB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihjaGlsZHJl bigpW2ldKS0+c3luY1BlbmRpbmdTdGF0ZUNoYW5nZXNJbmNsdWRpbmdTdWJMYXllcnMoKTsKIH0K IAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlc2V0TGF5ZXJTdGF0ZSgpCkBAIC05 OTMsNiArOTk4LDIwIEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZW1vdmVUaWxl KHVpbnQzMl90IHRpbGVJRCkKICAgICBtX2xheWVyU3RhdGUudGlsZXNUb1JlbW92ZS5hcHBlbmQo dGlsZUlEKTsKIH0KIAordm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVwZGF0ZUNvbnRl bnRCdWZmZXJzSW5jbHVkaW5nU3ViTGF5ZXJzKCkKK3sKKyAgICBpZiAoQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyKiBtYXNrID0gdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobWFza0xheWVyKCkp KQorICAgICAgICBtYXNrLT51cGRhdGVDb250ZW50QnVmZmVycygpOworCisgICAgaWYgKENvb3Jk aW5hdGVkR3JhcGhpY3NMYXllciogcmVwbGljYSA9IHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy KHJlcGxpY2FMYXllcigpKSkKKyAgICAgICAgcmVwbGljYS0+dXBkYXRlQ29udGVudEJ1ZmZlcnMo KTsKKworICAgIHVwZGF0ZUNvbnRlbnRCdWZmZXJzKCk7CisKKyAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGNoaWxkcmVuKCkuc2l6ZSgpOyArK2kpCisgICAgICAgIHRvQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyKGNoaWxkcmVuKClbaV0pLT51cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGluZ1N1 YkxheWVycygpOworfQorCiB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6dXBkYXRlQ29u dGVudEJ1ZmZlcnMoKQogewogICAgIGlmICghc2hvdWxkSGF2ZUJhY2tpbmdTdG9yZSgpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgK aW5kZXggNGQ3MGNkMjZhNDdkMzFjMThjNzJiMzNhNjA4OTA0MGU4MmI5N2Q1Yi4uNjdiODQyNDMz OTc1YzE0MTAyMzAyNzQ1M2I4NDRlNTU3YWE1NGQxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhp Y3NMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaApAQCAtMTExLDYgKzExMSw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZEFuaW1hdGlvbnMoZG91YmxlIHRpbWUp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCkgT1ZFUlJJREU7 CiAKKyAgICB2b2lkIHN5bmNQZW5kaW5nU3RhdGVDaGFuZ2VzSW5jbHVkaW5nU3ViTGF5ZXJzKCk7 CisgICAgdm9pZCB1cGRhdGVDb250ZW50QnVmZmVyc0luY2x1ZGluZ1N1YkxheWVycygpOworCiAg ICAgRmxvYXRQb2ludCBjb21wdXRlUG9zaXRpb25SZWxhdGl2ZVRvQmFzZSgpOwogICAgIHZvaWQg Y29tcHV0ZVBpeGVsQWxpZ25tZW50KEZsb2F0UG9pbnQmIHBvc2l0aW9uLCBGbG9hdFNpemUmLCBG bG9hdFBvaW50M0QmIGFuY2hvclBvaW50LCBGbG9hdFNpemUmIGFsaWdubWVudE9mZnNldCk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJl ZUhvc3QuY3BwCmluZGV4IGQxYjZhMzU0OGJhMWIzOTI0M2Q0MzQyMDYzYzI1MmNmYzI0YTU0MDYu LjA2NDdkYjdhMGFiZjc3ODkzMDZkZTM0YzlhNGIzNTUzN2Y1YWE2ZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3Jk aW5hdGVkTGF5ZXJUcmVlSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcApA QCAtMjQ4LDYgKzI0OCw5IEBAIGJvb2wgQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0OjpmbHVzaFBl bmRpbmdMYXllckNoYW5nZXMoKQogCiAgICAgYm9vbCBkaWRTeW5jID0gbV93ZWJQYWdlLT5jb3Jl UGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpLT5mbHVzaENvbXBvc2l0aW5nU3RhdGVJbmNsdWRp bmdTdWJmcmFtZXMoKTsKIAorICAgIHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKG1fcm9vdExh eWVyLmdldCgpKS0+dXBkYXRlQ29udGVudEJ1ZmZlcnNJbmNsdWRpbmdTdWJMYXllcnMoKTsKKyAg ICB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihtX3Jvb3RMYXllci5nZXQoKSktPnN5bmNQZW5k aW5nU3RhdGVDaGFuZ2VzSW5jbHVkaW5nU3ViTGF5ZXJzKCk7CisKICAgICBmbHVzaFBlbmRpbmdJ bWFnZUJhY2tpbmdDaGFuZ2VzKCk7CiAKICAgICBpZiAobV9zaG91bGRTeW5jRnJhbWUpIHsK