114742 2013-04-17 07:30:04 -0700 [texmap] draw content if graphics layer displays a video 2013-05-06 08:42:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 86410 0 vjaquez webkit-unassigned andersca cmarcelo commit-queue darin esprehn+autocc koivisto luiz noam pnormand simon.fraser oldest_to_newest 877160 0 vjaquez 2013-04-17 07:30:04 -0700 This patch comes from bug #86410, but I decided to split it, because this part needs more attention since touches the rendering. When the video is rendered through the texture mapper, the graphics layer needs to be displayed as a whole (the complete frame), not just a section of it. We need to enable this behavior, since currently the frame are not displayed if the cursor is not above the video area. 877177 1 198511 vjaquez 2013-04-17 08:00:35 -0700 Created attachment 198511 Patch 877216 2 198528 vjaquez 2013-04-17 08:26:54 -0700 Created attachment 198528 Patch 877325 3 198528 simon.fraser 2013-04-17 09:08:00 -0700 Comment on attachment 198528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=198528&action=review > Source/WebCore/rendering/RenderLayerBacking.cpp:1883 > + if (m_graphicsLayer) { > + if (m_graphicsLayer->hasContentsLayer()) > + m_graphicsLayer->setContentsNeedsDisplay(); > + else if (m_graphicsLayer->drawsContent()) > + m_graphicsLayer->setNeedsDisplay(); > + } Calling setContentsNeedsDisplay is undesirable on platforms that don't need it. It will cauase the contents layer to get backing store in cases where it shouldn't have it (e.g. background color). You also need to do a setNeedsDisplay() on the main graphics layer even if you have a contents layer, since the main graphics layer may be painting backgrounds and borders. 877959 4 198745 vjaquez 2013-04-18 10:31:30 -0700 Created attachment 198745 Patch 879135 5 vjaquez 2013-04-22 07:41:23 -0700 Ping? 879201 6 198745 simon.fraser 2013-04-22 09:31:50 -0700 Comment on attachment 198745 Patch These changes don't really make sense for other platforms (certainly for Mac). I think you're going to have to abstract out the way your contents layers are different from Mac, maybe via GraphicsLayer::contentsLayerDrawsContent() or something. 881268 7 vjaquez 2013-04-25 08:34:41 -0700 Thanks a lot Simon for your kind reviews. I realize that I've failed to explain correctly the bug in question. What we are trying to accomplish (bug #86410) is a composited/accelerated video, using GStreamer and the TextureMapper. Right now we have a prototype rendering 1080p videos using gstreamer-vaapi and the TextureMapper. You can watch a demo here http://youtu.be/ekt3oj5oApo But we found an issue that we traced up to RenderLayerBacking: the video stops of being painted in the texture-mapper layer when no media-control is drawn above it (or, in other words, when the mouse cursor is not above of the video area). The initial patch was based on a patch from Arnaud Renevier for the bug #86410, but this approach, as Simon reviewed, is too invasive for other platforms. So we dug a bit more in the issue, and we found that the m_graphicsLayer (the texturemapper instance) has set its drawContent() to false when the media control is not drawn. Then the problem is, if I understand it correctly, to keep drawContent() true while the video is being played. 881327 8 199679 vjaquez 2013-04-25 10:02:38 -0700 Created attachment 199679 Patch 881341 9 199679 buildbot 2013-04-25 10:29:11 -0700 Comment on attachment 199679 Patch Attachment 199679 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/38564 881366 10 vjaquez 2013-04-25 11:06:32 -0700 (In reply to comment #9) > (From update of attachment 199679 [details]) > Attachment 199679 [details] did not pass win-ews (win): > Output: http://webkit-queues.appspot.com/results/38564 This doesn't seem to be caused by this patch. 881939 11 199840 vjaquez 2013-04-26 10:09:13 -0700 Created attachment 199840 dont' update drawsContents if contents is media This is another approach to this bug, but limiting the changes to GraphicsLayerTextureMapper. If ::setContentsToMedia() is called, then ::setDrawsContent() halts if it is set to false. Sadly this approach somewhat goes in opposite direction of the bug #109658 881950 12 199679 simon.fraser 2013-04-26 10:38:15 -0700 Comment on attachment 199679 Patch This is also wrong. I'm not sure why you think that having accelerated video means that you have to call setDrawsContent() on the main graphics layer. The graphics layer can have a contents layer for various reasons: video, WebGL, image, solid color. On Mac at least, none of those types of content layer need to be explicitly drawn (although WebGL does need a hint that the contents have changed sometimes). In the TextureMapper case, does the video go into a contents layer? In this case, is it considered like painted content that needs backing store? 881966 13 vjaquez 2013-04-26 11:12:16 -0700 Hi Simon, Thanks your patience. (In reply to comment #12) > (From update of attachment 199679 [details]) > This is also wrong. I'm not sure why you think that having accelerated video means that you have to call setDrawsContent() on the main graphics layer. That seems to me more "logical", but yeah, I spent all this day trying to figure out what mac does, and I've realized that what I'm proposing it is not right. > > The graphics layer can have a contents layer for various reasons: video, WebGL, image, solid color. On Mac at least, none of those types of content layer need to be explicitly drawn (although WebGL does need a hint that the contents have changed sometimes). Yes, I saw that today. > > In the TextureMapper case, does the video go into a contents layer? AFAIK, Yes it does. In bug #86410, we defined the MediaPlayerPrivate as a TextureMapperPlatformLayer. After updating the texture with the video buffer, the MediaPlayerPrivate will request a ::repaint() to the RenderObject. Here's a sequence diagram which help to understand the code flow: http://people.igalia.com/vjaquez/images/repaint-seq.png But the buffer won't be draw if setDrawContents() is set to false, and that happens when no media controls are drawn. > In this case, is it considered like painted content that needs backing store? Sorry, I don't follow your question. 883792 14 vjaquez 2013-05-02 07:41:33 -0700 After chatting a bit with Simon, he told me that 20:25 < smfr> so when m_texture->updateContents() is called, something should just tell AcceleratedCompositingContextGL to just render a new scene 20:25 < smfr> you shouldn't be running webcore painting code for every frame I reviewed how WebKitGTK+ paints WebGL and here's a backtrace: http://people.igalia.com/vjaquez/files/webgl-traceback.txt Every time a frame is updated, Hence, if I understand correctly, we should call WebCore::GraphicsLayerTextureMapper:setContentsNeedsDisplay when a new frame is available, directly from WebCore::MediaPlayerPrivateGStreamerBase The question is how WebCore::MediaPlayerPrivateGStreamerBase would access to WebCore::GraphicsLayerTextureMapper, or more abstractly: how MediaPlayerPrivate would access GraphicsLayer in an AC setup. 883794 15 vjaquez 2013-05-02 07:45:33 -0700 (In reply to comment #14) missing text: > Every time a frame is updated, ... WebCore::RenderLayer::contentChanged is called. > Hence.. 883796 16 noam 2013-05-02 07:59:20 -0700 (In reply to comment #14) > After chatting a bit with Simon, he told me that > > 20:25 < smfr> so when m_texture->updateContents() is called, something should just tell AcceleratedCompositingContextGL to just render a new scene > 20:25 < smfr> you shouldn't be running webcore painting code for every frame > > I reviewed how WebKitGTK+ paints WebGL and here's a backtrace: > > http://people.igalia.com/vjaquez/files/webgl-traceback.txt > > Every time a frame is updated, > > Hence, if I understand correctly, we should call WebCore::GraphicsLayerTextureMapper:setContentsNeedsDisplay when a new frame is available, directly from WebCore::MediaPlayerPrivateGStreamerBase > > The question is how WebCore::MediaPlayerPrivateGStreamerBase would access to WebCore::GraphicsLayerTextureMapper, or more abstractly: how MediaPlayerPrivate would access GraphicsLayer in an AC setup. I suggest adding a "Client" to TextureMapperPlatformLayer, that would have something like a setLayerNeedsDisplay. the TextureMapperLayer would inherit from that client and MediaPlayerPrivateGStreamerBase would invoke it when it's ready. 884113 17 200398 vjaquez 2013-05-03 02:53:47 -0700 Created attachment 200398 Patch 884116 18 200400 vjaquez 2013-05-03 03:01:55 -0700 Created attachment 200400 Patch 884151 19 200400 noam 2013-05-03 06:32:23 -0700 Comment on attachment 200400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200400&action=review Where is the code that uses the new function? > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:112 > + virtual void setLayerNeedsDisplay() { setContentsNeedsDisplay(); } Let's call this setPlatformLayerNeedsDisplay? Also add OVERRIDE. > Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h:47 > + void setClient(TextureMapperPlatformLayer::Client* client) { m_client = client; } Maybe new line before and after? > Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h:56 > + void setLayerNeedsDisplay() I think this should be done in the actual layer implementation. 884186 20 200427 vjaquez 2013-05-03 09:50:27 -0700 Created attachment 200427 Patch 884188 21 vjaquez 2013-05-03 09:56:36 -0700 Hi Noam! Thanks a lot for your review. (In reply to comment #19) > (From update of attachment 200400 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=200400&action=review > > Where is the code that uses the new function? It is used in this patch for bug #86410 https://bugs.webkit.org/attachment.cgi?id=200421&action=review > > > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:112 > > + virtual void setLayerNeedsDisplay() { setContentsNeedsDisplay(); } > > Let's call this setPlatformLayerNeedsDisplay? > Also add OVERRIDE. Done > > > Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h:47 > > + void setClient(TextureMapperPlatformLayer::Client* client) { m_client = client; } > > Maybe new line before and after? Done > > > Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h:56 > > + void setLayerNeedsDisplay() > > I think this should be done in the actual layer implementation. Done 884939 22 vjaquez 2013-05-06 07:09:54 -0700 Simon, may I ask for your review? and cq+, if it is possible. :) Thanks! 884948 23 noam 2013-05-06 07:49:46 -0700 (In reply to comment #22) > Simon, may I ask for your review? and cq+, if it is possible. :) > > Thanks! I've already r+ed this, if you want cq? you should set the flag. 884951 24 vjaquez 2013-05-06 08:01:47 -0700 (In reply to comment #23) > (In reply to comment #22) > > Simon, may I ask for your review? and cq+, if it is possible. :) > > > > Thanks! > > I've already r+ed this, if you want cq? you should set the flag. D'oh! Done! Thanks. 885028 25 commit-queue 2013-05-06 08:41:53 -0700 The commit-queue encountered the following flaky tests while processing attachment 200427: http/tests/security/cookies/third-party-cookie-blocking-user-action.html bug 114511 (authors: ap@webkit.org, jochen@chromium.org, and rniwa@webkit.org) http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html bug 114208 (authors: abarth@webkit.org and rniwa@webkit.org) media/video-played-collapse.html bug 58630 (authors: annacc@chromium.org, jamesr@chromium.org, pnormand@igalia.com, and vrk@chromium.org) fast/loader/javascript-url-in-object.html bug 114210 (authors: rniwa@webkit.org and sam@webkit.org) platform/mac/editing/deleting/deletionUI-single-instance.html bug 114181 (author: rniwa@webkit.org) svg/animations/smil-leak-elements.svg bug 114280 (authors: fmalita@chromium.org and timothy_horton@apple.com) svg/animations/smil-leak-dynamically-added-element-instances.svg bug 114281 (authors: fmalita@chromium.org and timothy_horton@apple.com) 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/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/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) The commit-queue is continuing to process your patch. 885030 26 200427 commit-queue 2013-05-06 08:42:47 -0700 Comment on attachment 200427 Patch Clearing flags on attachment: 200427 Committed r149599: <http://trac.webkit.org/changeset/149599> 885031 27 commit-queue 2013-05-06 08:42:52 -0700 All reviewed patches have been landed. Closing bug. 198511 2013-04-17 08:00:35 -0700 2013-04-17 08:26:45 -0700 Patch bug-114742-20130417170006.patch text/plain 3935 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzkyOWJmOWMxZWNiZGIy MzNkODRlNWVjOGZkYTdjNjcyOWE5YzRlNS4uMmE0YzIxOGI5MTRkMTkxNDFmNTFkZmNmMTU2NjVm YTc3MDM5MTJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTE3ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg SWYgdGhlIG1vZGlmaWVkIGdyYXBoaWNzIGxheWVyIGhhcyBhIGNvbnRlbnQgbGF5ZXIsIHJlcXVl c3QgdGhlCisgICAgICAgIGRpc3BsYXkgb2YgYWxsIHRoZSBsYXllciwgYW5kIG5vdCBvbmx5IGEg cGFydCBvZiBpdC4KKworICAgICAgICBUaGlzIGlzIGltcG9ydGFudCBmb3IgdGhlIGNvbXBvc2l0 ZWQgdmlkZW8gdXNpbmcgdGhlIHRleHR1cmUgbWFwcGVyCisgICAgICAgIChidWcgODY0MTApLgor CisgICAgICAgIGNhbGwgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKSBpZiBncmFwaGljcyBsYXll ciBoYXMgYSBjb250ZW50IGxheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTQ3NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpo YXNDb250ZW50c0xheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNO ZWVkRGlzcGxheSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnNldENv bnRlbnRzTmVlZERpc3BsYXlJblJlY3QpOgorCiAyMDEzLTA0LTE0ICBKYWVodW4gTGltICA8bGph ZWh1bi5saW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW2NzczMtdGV4dF0gUGFyc2luZyAtd2Vi a2l0LWhhbmdpbmcgdmFsdWUgZm9yIHRleHQtaW5kZW50IGZyb20gY3NzMy10ZXh0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oCmluZGV4IDYwNDQ0ZWU2MWI2MjZjZGM4ODM3 MWU2YzNkZGU3MDk1MjBiM2U3MGMuLjk1NzIwYmJjMzQ4MGI1YzY3NjlkY2ExODM3MTYyOTYxNTlm ZWEyOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oCkBAIC03MCw2 ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd0RlYnVnQm9yZGVyKGJv b2wpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xv ciYsIGZsb2F0IHdpZHRoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd1JlcGFp bnRDb3VudGVyKGJvb2wpIE9WRVJSSURFOworICAgIHZpcnR1YWwgYm9vbCBoYXNDb250ZW50c0xh eWVyKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50c0xheWVyOyB9CiAgICAgdmlydHVhbCB2b2lk IGZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZv aWQgZmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOwogICAgIHZpcnR1YWwg dm9pZCBzZXROYW1lKGNvbnN0IFN0cmluZyYgbmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGI0MmZlMWQ4ODg3Y2ZlZjAzMWM3 MzMyMWFmN2M5ZGRkM2FmYjdhYmMuLmI3YzdhZDJmN2QzMmJiMzg3YTY3ZTM4MGIyZjU3ZDA2ZDhj NWY1OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCkBAIC0xODc0LDEwICsxODc0LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpz ZXRCbGVuZE1vZGUoQmxlbmRNb2RlKQogdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnNldENvbnRl bnRzTmVlZERpc3BsYXkoKQogewogICAgIEFTU0VSVCghcGFpbnRzSW50b0NvbXBvc2l0ZWRBbmNl c3RvcigpKTsKLSAgICAKLSAgICBpZiAobV9ncmFwaGljc0xheWVyICYmIG1fZ3JhcGhpY3NMYXll ci0+ZHJhd3NDb250ZW50KCkpCi0gICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNw bGF5KCk7Ci0gICAgCisKKyAgICBpZiAobV9ncmFwaGljc0xheWVyKSB7CisgICAgICAgIGlmICht X2dyYXBoaWNzTGF5ZXItPmhhc0NvbnRlbnRzTGF5ZXIoKSkKKyAgICAgICAgICAgIG1fZ3JhcGhp Y3NMYXllci0+c2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKTsKKyAgICAgICAgZWxzZSBpZiAobV9n cmFwaGljc0xheWVyLT5kcmF3c0NvbnRlbnQoKSkKKyAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXll ci0+c2V0TmVlZHNEaXNwbGF5KCk7CisgICAgfQorCiAgICAgaWYgKG1fZm9yZWdyb3VuZExheWVy ICYmIG1fZm9yZWdyb3VuZExheWVyLT5kcmF3c0NvbnRlbnQoKSkKICAgICAgICAgbV9mb3JlZ3Jv dW5kTGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogCkBAIC0xODk2LDEwICsxOTAwLDE1IEBAIHZv aWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpzZXRDb250ZW50c05lZWREaXNwbGF5SW5SZWN0KGNvbnN0 IEludFJlY3QmIHIpCiB7CiAgICAgQVNTRVJUKCFwYWludHNJbnRvQ29tcG9zaXRlZEFuY2VzdG9y KCkpOwogCi0gICAgaWYgKG1fZ3JhcGhpY3NMYXllciAmJiBtX2dyYXBoaWNzTGF5ZXItPmRyYXdz Q29udGVudCgpKSB7Ci0gICAgICAgIEludFJlY3QgbGF5ZXJEaXJ0eVJlY3QgPSByOwotICAgICAg ICBsYXllckRpcnR5UmVjdC5tb3ZlKC1tX2dyYXBoaWNzTGF5ZXItPm9mZnNldEZyb21SZW5kZXJl cigpKTsKLSAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QobGF5 ZXJEaXJ0eVJlY3QpOworICAgIGlmIChtX2dyYXBoaWNzTGF5ZXIpIHsKKyAgICAgICAgaWYgKG1f Z3JhcGhpY3NMYXllci0+aGFzQ29udGVudHNMYXllcigpKSB7CisgICAgICAgICAgICAvLyBwYWlu dCB0aGUgd2hvbGUgZnJhbWUKKyAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVu dHNOZWVkc0Rpc3BsYXkoKTsKKyAgICAgICAgfSBlbHNlIGlmIChtX2dyYXBoaWNzTGF5ZXItPmRy YXdzQ29udGVudCgpKSB7CisgICAgICAgICAgICBJbnRSZWN0IGxheWVyRGlydHlSZWN0ID0gcjsK KyAgICAgICAgICAgIGxheWVyRGlydHlSZWN0Lm1vdmUoLW1fZ3JhcGhpY3NMYXllci0+b2Zmc2V0 RnJvbVJlbmRlcmVyKCkpOworICAgICAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXROZWVkc0Rp c3BsYXlJblJlY3QobGF5ZXJEaXJ0eVJlY3QpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYg KG1fZm9yZWdyb3VuZExheWVyICYmIG1fZm9yZWdyb3VuZExheWVyLT5kcmF3c0NvbnRlbnQoKSkg ewo= 198528 2013-04-17 08:26:54 -0700 2013-04-18 10:31:23 -0700 Patch bug-114742-20130417190344.patch text/plain 4025 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzkyOWJmOWMxZWNiZGIy MzNkODRlNWVjOGZkYTdjNjcyOWE5YzRlNS4uZmYzZGMwMDZhN2MwNjJmOTA0NmU1MjUxZGMzM2Zl MjE1YTZlMzk5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTE3ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W3RleG1hcF0gY2FsbCBzZXRDb250ZW50c05lZWRzRGlzcGxheSgpIGlmIGdyYXBoaWNzIGxheWVy IGhhcyBhIGNvbnRlbnQgbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNDc0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIElmIHRoZSBtb2RpZmllZCBncmFwaGljcyBsYXllciBoYXMgYSBjb250ZW50 IGxheWVyLCByZXF1ZXN0IHRoZQorICAgICAgICBkaXNwbGF5IG9mIGFsbCB0aGUgbGF5ZXIsIGFu ZCBub3Qgb25seSBhIHBhcnQgb2YgaXQuCisgICAgICAgIFRoaXMgaXMgaW1wb3J0YW50IGZvciB0 aGUgY29tcG9zaXRlZCB2aWRlbyB1c2luZyB0aGUgdGV4dHVyZSBtYXBwZXIKKyAgICAgICAgYnVn ICM4NjQxMC4KKyAgICAgICAgQmFzZWQgb24gYSBwYXRjaCBwcm92aWRlZCBieSBBcm5hdWQgUmVu ZXZpZXIgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBObyBuZXcgdGVz dHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaDoKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpoYXNDb250ZW50c0xheWVyKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnNldENvbnRlbnRzTmVlZERpc3BsYXlJblJlY3Qp OgorCiAyMDEzLTA0LTE0ICBKYWVodW4gTGltICA8bGphZWh1bi5saW1Ac2Ftc3VuZy5jb20+CiAK ICAgICAgICAgW2NzczMtdGV4dF0gUGFyc2luZyAtd2Via2l0LWhhbmdpbmcgdmFsdWUgZm9yIHRl eHQtaW5kZW50IGZyb20gY3NzMy10ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlci5oCmluZGV4IDYwNDQ0ZWU2MWI2MjZjZGM4ODM3MWU2YzNkZGU3MDk1MjBiM2U3MGMuLjk1 NzIwYmJjMzQ4MGI1YzY3NjlkY2ExODM3MTYyOTYxNTlmZWEyOTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlci5oCkBAIC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgc2V0U2hvd0RlYnVnQm9yZGVyKGJvb2wpIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBzZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xvciYsIGZsb2F0IHdpZHRoKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd1JlcGFpbnRDb3VudGVyKGJvb2wpIE9WRVJSSURF OworICAgIHZpcnR1YWwgYm9vbCBoYXNDb250ZW50c0xheWVyKCkgY29uc3QgeyByZXR1cm4gbV9j b250ZW50c0xheWVyOyB9CiAgICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZShj b25zdCBGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgZmx1c2hDb21wb3NpdGluZ1N0YXRl Rm9yVGhpc0xheWVyT25seSgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXROYW1lKGNvbnN0IFN0cmlu ZyYgbmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCmluZGV4IGI0MmZlMWQ4ODg3Y2ZlZjAzMWM3MzMyMWFmN2M5ZGRkM2FmYjdhYmMuLmI3 YzdhZDJmN2QzMmJiMzg3YTY3ZTM4MGIyZjU3ZDA2ZDhjNWY1OTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xODc0LDEwICsxODc0 LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpzZXRCbGVuZE1vZGUoQmxlbmRNb2RlKQog dm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnNldENvbnRlbnRzTmVlZERpc3BsYXkoKQogewogICAg IEFTU0VSVCghcGFpbnRzSW50b0NvbXBvc2l0ZWRBbmNlc3RvcigpKTsKLSAgICAKLSAgICBpZiAo bV9ncmFwaGljc0xheWVyICYmIG1fZ3JhcGhpY3NMYXllci0+ZHJhd3NDb250ZW50KCkpCi0gICAg ICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7Ci0gICAgCisKKyAgICBpZiAo bV9ncmFwaGljc0xheWVyKSB7CisgICAgICAgIGlmIChtX2dyYXBoaWNzTGF5ZXItPmhhc0NvbnRl bnRzTGF5ZXIoKSkKKyAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNOZWVk c0Rpc3BsYXkoKTsKKyAgICAgICAgZWxzZSBpZiAobV9ncmFwaGljc0xheWVyLT5kcmF3c0NvbnRl bnQoKSkKKyAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7Cisg ICAgfQorCiAgICAgaWYgKG1fZm9yZWdyb3VuZExheWVyICYmIG1fZm9yZWdyb3VuZExheWVyLT5k cmF3c0NvbnRlbnQoKSkKICAgICAgICAgbV9mb3JlZ3JvdW5kTGF5ZXItPnNldE5lZWRzRGlzcGxh eSgpOwogCkBAIC0xODk2LDEwICsxOTAwLDE1IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpz ZXRDb250ZW50c05lZWREaXNwbGF5SW5SZWN0KGNvbnN0IEludFJlY3QmIHIpCiB7CiAgICAgQVNT RVJUKCFwYWludHNJbnRvQ29tcG9zaXRlZEFuY2VzdG9yKCkpOwogCi0gICAgaWYgKG1fZ3JhcGhp Y3NMYXllciAmJiBtX2dyYXBoaWNzTGF5ZXItPmRyYXdzQ29udGVudCgpKSB7Ci0gICAgICAgIElu dFJlY3QgbGF5ZXJEaXJ0eVJlY3QgPSByOwotICAgICAgICBsYXllckRpcnR5UmVjdC5tb3ZlKC1t X2dyYXBoaWNzTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpKTsKLSAgICAgICAgbV9ncmFwaGlj c0xheWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QobGF5ZXJEaXJ0eVJlY3QpOworICAgIGlmICht X2dyYXBoaWNzTGF5ZXIpIHsKKyAgICAgICAgaWYgKG1fZ3JhcGhpY3NMYXllci0+aGFzQ29udGVu dHNMYXllcigpKSB7CisgICAgICAgICAgICAvLyBwYWludCB0aGUgd2hvbGUgZnJhbWUKKyAgICAg ICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKTsKKyAgICAg ICAgfSBlbHNlIGlmIChtX2dyYXBoaWNzTGF5ZXItPmRyYXdzQ29udGVudCgpKSB7CisgICAgICAg ICAgICBJbnRSZWN0IGxheWVyRGlydHlSZWN0ID0gcjsKKyAgICAgICAgICAgIGxheWVyRGlydHlS ZWN0Lm1vdmUoLW1fZ3JhcGhpY3NMYXllci0+b2Zmc2V0RnJvbVJlbmRlcmVyKCkpOworICAgICAg ICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QobGF5ZXJEaXJ0eVJl Y3QpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKG1fZm9yZWdyb3VuZExheWVyICYmIG1f Zm9yZWdyb3VuZExheWVyLT5kcmF3c0NvbnRlbnQoKSkgewo= 198745 2013-04-18 10:31:30 -0700 2013-04-25 10:02:28 -0700 Patch bug-114742-20130418210819.patch text/plain 3885 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzkyOWJmOWMxZWNiZGIy MzNkODRlNWVjOGZkYTdjNjcyOWE5YzRlNS4uZmYzZGMwMDZhN2MwNjJmOTA0NmU1MjUxZGMzM2Zl MjE1YTZlMzk5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTE3ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W3RleG1hcF0gY2FsbCBzZXRDb250ZW50c05lZWRzRGlzcGxheSgpIGlmIGdyYXBoaWNzIGxheWVy IGhhcyBhIGNvbnRlbnQgbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNDc0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIElmIHRoZSBtb2RpZmllZCBncmFwaGljcyBsYXllciBoYXMgYSBjb250ZW50 IGxheWVyLCByZXF1ZXN0IHRoZQorICAgICAgICBkaXNwbGF5IG9mIGFsbCB0aGUgbGF5ZXIsIGFu ZCBub3Qgb25seSBhIHBhcnQgb2YgaXQuCisgICAgICAgIFRoaXMgaXMgaW1wb3J0YW50IGZvciB0 aGUgY29tcG9zaXRlZCB2aWRlbyB1c2luZyB0aGUgdGV4dHVyZSBtYXBwZXIKKyAgICAgICAgYnVn ICM4NjQxMC4KKyAgICAgICAgQmFzZWQgb24gYSBwYXRjaCBwcm92aWRlZCBieSBBcm5hdWQgUmVu ZXZpZXIgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBObyBuZXcgdGVz dHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaDoKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpoYXNDb250ZW50c0xheWVyKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnNldENvbnRlbnRzTmVlZERpc3BsYXlJblJlY3Qp OgorCiAyMDEzLTA0LTE0ICBKYWVodW4gTGltICA8bGphZWh1bi5saW1Ac2Ftc3VuZy5jb20+CiAK ICAgICAgICAgW2NzczMtdGV4dF0gUGFyc2luZyAtd2Via2l0LWhhbmdpbmcgdmFsdWUgZm9yIHRl eHQtaW5kZW50IGZyb20gY3NzMy10ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlci5oCmluZGV4IDYwNDQ0ZWU2MWI2MjZjZGM4ODM3MWU2YzNkZGU3MDk1MjBiM2U3MGMuLjk1 NzIwYmJjMzQ4MGI1YzY3NjlkY2ExODM3MTYyOTYxNTlmZWEyOTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlci5oCkBAIC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgc2V0U2hvd0RlYnVnQm9yZGVyKGJvb2wpIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBzZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xvciYsIGZsb2F0IHdpZHRoKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd1JlcGFpbnRDb3VudGVyKGJvb2wpIE9WRVJSSURF OworICAgIHZpcnR1YWwgYm9vbCBoYXNDb250ZW50c0xheWVyKCkgY29uc3QgeyByZXR1cm4gbV9j b250ZW50c0xheWVyOyB9CiAgICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZShj b25zdCBGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgZmx1c2hDb21wb3NpdGluZ1N0YXRl Rm9yVGhpc0xheWVyT25seSgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXROYW1lKGNvbnN0IFN0cmlu ZyYgbmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCmluZGV4IGI0MmZlMWQ4ODg3Y2ZlZjAzMWM3MzMyMWFmN2M5ZGRkM2FmYjdhYmMuLjE2 MGQzMTQ3MDM2YzdmMjhlODZmOWU3MGUyYzhhMzRmMGY1ZDJkNTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xODc0LDEwICsxODc0 LDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpzZXRCbGVuZE1vZGUoQmxlbmRNb2RlKQog dm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnNldENvbnRlbnRzTmVlZERpc3BsYXkoKQogewogICAg IEFTU0VSVCghcGFpbnRzSW50b0NvbXBvc2l0ZWRBbmNlc3RvcigpKTsKLSAgICAKLSAgICBpZiAo bV9ncmFwaGljc0xheWVyICYmIG1fZ3JhcGhpY3NMYXllci0+ZHJhd3NDb250ZW50KCkpCisKKyAg ICBpZiAobV9ncmFwaGljc0xheWVyICYmIChtX2dyYXBoaWNzTGF5ZXItPmRyYXdzQ29udGVudCgp IHx8IG1fZ3JhcGhpY3NMYXllci0+aGFzQ29udGVudHNMYXllcigpKSkKICAgICAgICAgbV9ncmFw aGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKLSAgICAKKwogICAgIGlmIChtX2ZvcmVncm91 bmRMYXllciAmJiBtX2ZvcmVncm91bmRMYXllci0+ZHJhd3NDb250ZW50KCkpCiAgICAgICAgIG1f Zm9yZWdyb3VuZExheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKIApAQCAtMTg5NiwxMCArMTg5Niwx NSBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6c2V0Q29udGVudHNOZWVkRGlzcGxheUluUmVj dChjb25zdCBJbnRSZWN0JiByKQogewogICAgIEFTU0VSVCghcGFpbnRzSW50b0NvbXBvc2l0ZWRB bmNlc3RvcigpKTsKIAotICAgIGlmIChtX2dyYXBoaWNzTGF5ZXIgJiYgbV9ncmFwaGljc0xheWVy LT5kcmF3c0NvbnRlbnQoKSkgewotICAgICAgICBJbnRSZWN0IGxheWVyRGlydHlSZWN0ID0gcjsK LSAgICAgICAgbGF5ZXJEaXJ0eVJlY3QubW92ZSgtbV9ncmFwaGljc0xheWVyLT5vZmZzZXRGcm9t UmVuZGVyZXIoKSk7Ci0gICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5S ZWN0KGxheWVyRGlydHlSZWN0KTsKKyAgICBpZiAobV9ncmFwaGljc0xheWVyKSB7CisgICAgICAg IGlmIChtX2dyYXBoaWNzTGF5ZXItPmhhc0NvbnRlbnRzTGF5ZXIoKSkgeworICAgICAgICAgICAg Ly8gcGFpbnQgdGhlIHdob2xlIGZyYW1lCisgICAgICAgICAgICBtX2dyYXBoaWNzTGF5ZXItPnNl dENvbnRlbnRzTmVlZHNEaXNwbGF5KCk7CisgICAgICAgIH0gZWxzZSBpZiAobV9ncmFwaGljc0xh eWVyLT5kcmF3c0NvbnRlbnQoKSkgeworICAgICAgICAgICAgSW50UmVjdCBsYXllckRpcnR5UmVj dCA9IHI7CisgICAgICAgICAgICBsYXllckRpcnR5UmVjdC5tb3ZlKC1tX2dyYXBoaWNzTGF5ZXIt Pm9mZnNldEZyb21SZW5kZXJlcigpKTsKKyAgICAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0 TmVlZHNEaXNwbGF5SW5SZWN0KGxheWVyRGlydHlSZWN0KTsKKyAgICAgICAgfQogICAgIH0KIAog ICAgIGlmIChtX2ZvcmVncm91bmRMYXllciAmJiBtX2ZvcmVncm91bmRMYXllci0+ZHJhd3NDb250 ZW50KCkpIHsK 199679 2013-04-25 10:02:38 -0700 2013-05-03 02:53:32 -0700 Patch bug-114742-20130425203915.patch text/plain 4964 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI0MjcwZTM4MjBiNzFh MDRlNjEzMWJjZDgwYWE2NDQ1OWQ3YzY3MS4uMWViNThhN2E5OTllY2MwZDYzZTBhMzRkYTViYTM0 YTY4NzczOWY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA0LTI1ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W3RleG1hcF0gZHJhdyBjb250ZW50IGlmIGdyYXBoaWNzIGxheWVyIGRpc3BsYXlzIGEgdmlkZW8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDc0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAjODY0 MTAgZm9jdXMgb24gaGF2aW5nIGNvbXBvc2l0ZWQvYWNjZWxlcmF0ZWQgdmlkZW8gdXNpbmcgdGhl CisgICAgICAgIFRleHR1cmVNYXBwZXIuIEJ1dCB0aGUgdmlkZW8gaXMgbm90IHJlbmRlcmVkIGlu IHRoZSBncmFwaGljcyBsYXllcgorICAgICAgICB3aGVuIG5vIG1lZGlhLWNvbnRyb2wgaXMgZHJh d24gYWJvdmUgaXQgKGZvciBleGFtcGxlLCB3aGVuIHRoZSBtb3VzZQorICAgICAgICBjdXJzb3Ig aXMgbm90IGFib3ZlIG9mIHRoZSB2aWRlbyBhcmVhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSBp cyB0aGF0IGRyYXdDb250ZW50KCksIGluIGdyYXBoaWNzIGxheWVyIChUZXh0dXJlTWFwcGVyCisg ICAgICAgIGluc3RhbmNlKSwgaXMgc2V0IHRvIGZhbHNlIHdoZW4gdGhlcmUgaXMgbm8gcGFpbnRl ZCBjb250ZW50IChtZWRpYQorICAgICAgICBjb250cm9scywgZm9yIGV4YW1wbGUpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggc2V0cyB0aGUgZ3JhcGhpY3MgbGF5ZXIncyBkcmF3Q29udGVudCgpIHRv IHRydWUgd2hlbiB0aGUKKyAgICAgICAgcmVuZGVyZXIgaXMgYSBwbGF5aW5nIHZpZGVvIGFuZCB0 aGUgZ3JhcGhpY3MgbGF5ZXIgaGFzIGEgY29udGVudAorICAgICAgICBsYXllci4KKworICAgICAg ICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpoYXNDb250ZW50c0xh eWVyKTogbmV3IGhlbHBlcgorICAgICAgICBtZXRob2QKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2lu Zzo6dXBkYXRlRHJhd3NDb250ZW50KTogY29uc2lkZXJzIGlmIHRoZQorICAgICAgICBncmFwaGlj cyBsYXllciBoYXMgYW4gYWNjZWxlcmF0ZWQgdmlkZW8gcGxheWluZy4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6aGFzQWNjZWxlcmF0ZWRWaWRlbyk6IG5ldyBoZWxwZXIg bWV0aG9kCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmg6IGhlbHBlciBtZXRob2QgZGVmaW5pdGlvbgorICAgICAgICAoUmVuZGVyTGF5 ZXJCYWNraW5nKToKKwogMjAxMy0wNC0yMiAgTWloYWkgTWFlcmVhbiAgPG1tYWVyZWFuQGFkb2Jl LmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIEVsZW1lbnRzIGluIGEgcmVnaW9uIHNob3Vs ZCBiZSBhc3NpZ25hYmxlIHRvIGEgbmFtZWQgZmxvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXIuaAppbmRleCAyZDlkMzc4Mzc1MGEwZTc2OWM2YmNjNDlkYjFmNTAzMmUyZDM4 NGQzLi40ODE0MWNkYmQ1MGU4YjI3YjQ4MjQ4NWMyMTk0NzQxOGMyM2Y4NzU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaApAQCAtNzAsNiArNzAsNyBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB2b2lkIHNldFNob3dEZWJ1Z0JvcmRlcihib29sKSBPVkVSUklERTsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0RGVidWdCb3JkZXIoY29uc3QgQ29sb3ImLCBmbG9hdCB3aWR0aCkg T1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNldFNob3dSZXBhaW50Q291bnRlcihib29sKSBP VkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgaGFzQ29udGVudHNMYXllcigpIGNvbnN0IHsgcmV0 dXJuIG1fY29udGVudHNMYXllcjsgfQogICAgIHZpcnR1YWwgdm9pZCBmbHVzaENvbXBvc2l0aW5n U3RhdGUoY29uc3QgRmxvYXRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRp bmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmFtZShjb25z dCBTdHJpbmcmIG5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcAppbmRleCBlNzM3N2Q2NjIzOTc4ZThjMTE3MDZhMTQ2MjUwNGY1NTBkY2M1 MDUwLi5kMjA3ZWJkMWQxZjQzN2Q2OWM2MzFkYmE3ZjM3MGRiNDI0M2NhNDdlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtOTc5LDcg Kzk3OSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVEcmF3c0NvbnRlbnQoYm9v bCBpc1NpbXBsZUNvbnRhaW5lcikKICAgICBib29sIGhhc1BhaW50ZWRDb250ZW50ID0gIWlzU2lt cGxlQ29udGFpbmVyICYmIGNvbnRhaW5zUGFpbnRlZENvbnRlbnQoKTsKIAogICAgIC8vIEZJWE1F OiB3ZSBjb3VsZCByZWZpbmUgdGhpcyB0byBvbmx5IGFsbG9jYXRlIGJhY2tpbmcgZm9yIG9uZSBv ZiB0aGVzZSBsYXllcnMgaWYgcG9zc2libGUuCi0gICAgbV9ncmFwaGljc0xheWVyLT5zZXREcmF3 c0NvbnRlbnQoaGFzUGFpbnRlZENvbnRlbnQpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0RHJh d3NDb250ZW50KGhhc1BhaW50ZWRDb250ZW50IHx8IGhhc0FjY2VsZXJhdGVkVmlkZW8oKSk7CiAg ICAgaWYgKG1fZm9yZWdyb3VuZExheWVyKQogICAgICAgICBtX2ZvcmVncm91bmRMYXllci0+c2V0 RHJhd3NDb250ZW50KGhhc1BhaW50ZWRDb250ZW50KTsKIApAQCAtMTY0NSw2ICsxNjQ1LDE0IEBA IGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpoYXNWaXNpYmxlTm9uQ29tcG9zaXRpbmdEZXNjZW5k YW50TGF5ZXJzKCkgY29uc3QKICAgICByZXR1cm4gaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVz Y2VuZGFudChtX293bmluZ0xheWVyKTsKIH0KIAorYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6Omhh c0FjY2VsZXJhdGVkVmlkZW8oKSBjb25zdAoreworI2lmIEVOQUJMRShWSURFTykKKyAgICByZXR1 cm4gbV9ncmFwaGljc0xheWVyLT5oYXNDb250ZW50c0xheWVyKCkgJiYgcmVuZGVyZXIoKS0+aXNW aWRlbygpICYmIHRvUmVuZGVyVmlkZW8ocmVuZGVyZXIoKSktPnNob3VsZERpc3BsYXlWaWRlbygp OworI2VuZGlmCisgICAgcmV0dXJuIGZhbHNlOworfQorCiBib29sIFJlbmRlckxheWVyQmFja2lu Zzo6Y29udGFpbnNQYWludGVkQ29udGVudCgpIGNvbnN0CiB7CiAgICAgaWYgKGlzU2ltcGxlQ29u dGFpbmVyQ29tcG9zaXRpbmdMYXllcigpIHx8IHBhaW50c0ludG9XaW5kb3coKSB8fCBwYWludHNJ bnRvQ29tcG9zaXRlZEFuY2VzdG9yKCkgfHwgbV9hcnRpZmljaWFsbHlJbmZsYXRlZEJvdW5kcyB8 fCBtX293bmluZ0xheWVyLT5pc1JlZmxlY3Rpb24oKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAppbmRleCBiMjE0Y2QzMDc0NTMxMTIyM2FhNWJmZGQ5 NmJjYmNhZGM3NWQyOThjLi45OTJkMzBkMDU2NjIzM2M0ZTg2ZWU1MWExZTQ3Mzk3Y2ZmY2RlNzJk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCkBA IC0yNTYsNiArMjU2LDggQEAgcHJpdmF0ZToKICAgICBib29sIGlzU2ltcGxlQ29udGFpbmVyQ29t cG9zaXRpbmdMYXllcigpIGNvbnN0OwogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGlzIGxheWVy IGhhcyBjb250ZW50IHRoYXQgbmVlZHMgdG8gYmUgcmVuZGVyZWQgYnkgcGFpbnRpbmcgaW50byB0 aGUgYmFja2luZyBzdG9yZS4KICAgICBib29sIGNvbnRhaW5zUGFpbnRlZENvbnRlbnQoKSBjb25z dDsKKyAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGdyYXBoaWNzIGxheWVyIGlzIGRpc3BsYXlp bmcgYWNjZWxlcmF0ZWQgdmlkZW8KKyAgICBib29sIGhhc0FjY2VsZXJhdGVkVmlkZW8oKSBjb25z dDsKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIFJlbmRlckxheWVyIGp1c3QgY29udGFpbnMg YW4gaW1hZ2UgdGhhdCB3ZSBjYW4gY29tcG9zaXRlIGRpcmVjdGx5LgogICAgIGJvb2wgaXNEaXJl Y3RseUNvbXBvc2l0ZWRJbWFnZSgpIGNvbnN0OwogICAgIHZvaWQgdXBkYXRlSW1hZ2VDb250ZW50 cygpOwo= 199840 2013-04-26 10:09:13 -0700 2013-05-03 02:53:38 -0700 dont' update drawsContents if contents is media 0001-https-bugs.webkit.org-show_bug.cgi-id-114742-texture.patch text/plain 3511 vjaquez RnJvbSA1ODJhMGIzNDM3MTRjMTg1NDM0MTA5MDc2ZTdmMDc5OTFmNWQ1NjQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Vj1DMz1BRGN0b3I9MjBNYW51ZWw9MjBKPUMz PUExcXVlej0yMExlYWw/PQogPHZqYXF1ZXpAaWdhbGlhLmNvbT4KRGF0ZTogRnJpLCAyNiBBcHIg MjAxMyAxODozMzo0NCArMDQwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NzQyICh0ZXh0dXJlCiBtYXBwZXIpCgotLS0KIC4u Li9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3Bw ICAgICAgfCA5ICsrKysrKysrKwogLi4uL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5oICAgICAgICB8IDkgKysrKysrKysrCiAyIGZpbGVzIGNoYW5n ZWQsIDE4IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFw cGVyLmNwcAppbmRleCA4YTA0NjE3Li4xNWYwNWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTU3LDYgKzU3LDcgQEAgR3JhcGhpY3NMYXllclRleHR1 cmVNYXBwZXI6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKEdyYXBoaWNzTGF5ZXJDbGllbnQq IGNsaWUKICAgICAsIG1fY29udGVudHNMYXllcigwKQogICAgICwgbV9hbmltYXRpb25TdGFydFRp bWUoMCkKICAgICAsIG1faXNTY3JvbGxhYmxlKGZhbHNlKQorICAgICwgbV9jb250ZW50c0xheWVy UHVycG9zZShOb0NvbnRlbnRzTGF5ZXIpCiB7CiB9CiAKQEAgLTI3Nyw2ICsyNzgsOSBAQCB2b2lk IEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXREcmF3c0NvbnRlbnQoYm9vbCB2YWx1ZSkK IHsKICAgICBpZiAodmFsdWUgPT0gZHJhd3NDb250ZW50KCkpCiAgICAgICAgIHJldHVybjsKKyAg ICAvLyBpZiB0aGUgY29udGVudHMgaXMgYSB2aWRlbywgaXQgbmVlZHMgYmVpbmcgY29uc3RhbnRs eSBkcmF3bgorICAgIGlmICghdmFsdWUgJiYgbV9jb250ZW50c0xheWVyUHVycG9zZSA9PSBDb250 ZW50c0xheWVyRm9yTWVkaWEpCisgICAgICAgIHJldHVybjsKICAgICBHcmFwaGljc0xheWVyOjpz ZXREcmF3c0NvbnRlbnQodmFsdWUpOwogICAgIG5vdGlmeUNoYW5nZShEcmF3c0NvbnRlbnRDaGFu Z2UpOwogCkBAIC0zNDIsNiArMzQ2LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl cjo6c2V0Q29udGVudHNUb1NvbGlkQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogICAgICAgICBy ZXR1cm47CiAKICAgICBtX3NvbGlkQ29sb3IgPSBjb2xvcjsKKyAgICBtX2NvbnRlbnRzTGF5ZXJQ dXJwb3NlID0gQ29udGVudHNMYXllckZvckJhY2tncm91bmRDb2xvcjsKICAgICBub3RpZnlDaGFu Z2UoQmFja2dyb3VuZENvbG9yQ2hhbmdlKTsKIH0KIApAQCAtMzczLDYgKzM3OCw3IEBAIHZvaWQg R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldENvbnRlbnRzVG9JbWFnZShJbWFnZSogaW1h Z2UpCiAgICAgc2V0Q29udGVudHNUb01lZGlhKG1fY29tcG9zaXRlZEltYWdlLmdldCgpKTsKICAg ICBub3RpZnlDaGFuZ2UoQ29udGVudENoYW5nZSk7CiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29u dGVudHNUb0ltYWdlKGltYWdlKTsKKyAgICBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlID0gaW1hZ2Ug PyBDb250ZW50c0xheWVyRm9ySW1hZ2UgOiBOb0NvbnRlbnRzTGF5ZXI7CiB9CiAKIHZvaWQgR3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldENvbnRlbnRzVG9NZWRpYShUZXh0dXJlTWFwcGVy UGxhdGZvcm1MYXllciogbWVkaWEpCkBAIC0zODIsNiArMzg4LDggQEAgdm9pZCBHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcjo6c2V0Q29udGVudHNUb01lZGlhKFRleHR1cmVNYXBwZXJQbGF0Zm9y bUxheWVyKgogCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNUb01lZGlhKG1lZGlhKTsK ICAgICBub3RpZnlDaGFuZ2UoQ29udGVudENoYW5nZSk7CisgICAgbV9jb250ZW50c0xheWVyUHVy cG9zZSA9IG1lZGlhID8gQ29udGVudHNMYXllckZvck1lZGlhIDogTm9Db250ZW50c0xheWVyOwor ICAgIHNldERyYXdzQ29udGVudCh0cnVlKTsKICAgICBtX2NvbnRlbnRzTGF5ZXIgPSBtZWRpYTsK IH0KIApAQCAtNjUzLDYgKzY2MSw3IEBAIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6 OnNldEFuaW1hdGlvbnMoY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlvbnMmIGFuCiB2b2lkIEdy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpwYXVzZUFuaW1hdGlvbihjb25zdCBTdHJpbmcmIGFu aW1hdGlvbk5hbWUsIGRvdWJsZSB0aW1lT2Zmc2V0KQogewogICAgIG1fYW5pbWF0aW9ucy5wYXVz ZShhbmltYXRpb25OYW1lLCB0aW1lT2Zmc2V0KTsKKwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJU ZXh0dXJlTWFwcGVyOjpyZW1vdmVBbmltYXRpb24oY29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1l KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaAppbmRleCAyZDlkMzc4Li43 YjA1MWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaApAQCAtMTc0 LDYgKzE3NCwxNSBAQCBwcml2YXRlOgogCiAgICAgSW50U2l6ZSBtX2NvbW1pdHRlZFNjcm9sbE9m ZnNldDsKICAgICBib29sIG1faXNTY3JvbGxhYmxlOworCisgICAgZW51bSBDb250ZW50c0xheWVy UHVycG9zZSB7CisgICAgICAgIE5vQ29udGVudHNMYXllciA9IDAsCisgICAgICAgIENvbnRlbnRz TGF5ZXJGb3JJbWFnZSwKKyAgICAgICAgQ29udGVudHNMYXllckZvck1lZGlhLAorICAgICAgICBD b250ZW50c0xheWVyRm9yQmFja2dyb3VuZENvbG9yCisgICAgfTsKKworICAgIENvbnRlbnRzTGF5 ZXJQdXJwb3NlIG1fY29udGVudHNMYXllclB1cnBvc2U7CiB9OwogCiBpbmxpbmUgc3RhdGljIEdy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKiB0b0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKEdy YXBoaWNzTGF5ZXIqIGxheWVyKQotLSAKMS43LjExLjcKCg== 200398 2013-05-03 02:53:47 -0700 2013-05-03 03:01:43 -0700 Patch bug-114742-20130503133013.patch text/plain 5734 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Mjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE4MTJkNjUxM2ExNGRl NjY1ZjcyOGNlMzQxMzUzZmZmNGMyMjJhOC4uZDkxMmIzNDNiM2MzMThmYTNiM2NkNjg3YjhlOGI4 YWQyMDI3NTdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA1LTAzICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W3RleG1hcF0gZHJhdyBjb250ZW50IGlmIGdyYXBoaWNzIGxheWVyIGRpc3BsYXlzIGEgdmlkZW8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDc0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAjODY0 MTAgZm9jdXMgb24gaGF2aW5nIGNvbXBvc2l0ZWQvYWNjZWxlcmF0ZWQgdmlkZW8gdXNpbmcgdGhl CisgICAgICAgIFRleHR1cmVNYXBwZXIuIEJ1dCB0aGUgdmlkZW8gaXMgbm90IHJlbmRlcmVkIGZh c3QgYnkgdGhlIGdyYXBoaWNzCisgICAgICAgIGxheWVyIHVzaW5nIHRoZSA6OnJlcGFpbnQoKSBt ZXRob2QuIEluIHRoZSBjYXNlIG9mIHRoZSBUZXh0dXJlTWFwcGVyCisgICAgICAgIGl0IGlzIHJl cXVpcmVkIHRvIGNhbGwgYSBjb250ZW50IHJlZnJlc2ggYXMgZmFzdCBhcyBwb3NzaWJsZS4KKwor ICAgICAgICBUaGlzIHBhdGNoIGFkZHMgdGhlIGNsYXNzIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxh eWVyOjpDbGllbnQgd2l0aCB0aGUKKyAgICAgICAgbWV0aG9kIHNldExheWVyTmVlZHNEaXNwbGF5 KCkuIFRoZSBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcgorICAgICAgICBpbXBsZW1lbnRzIHRo aXMgbmV3IGNsYXNzIGFuZCB0aGUgbmV3IG1ldGhvZCBjYWxscworICAgICAgICBzZXRDb250ZW50 c05lZWRzRGlzcGxheSgpLCBjYXVzaW5nIGEgZmFzdGVyIGNvbnRlbnQgZGlzcGxheS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0Q29udGVudHNUb01lZGlhKTogc2V0cyBp dHNlbGYKKyAgICAgICAgYXMgdGhlIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyJ3MgY2xpZW50 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6 c2V0TGF5ZXJOZWVkc0Rpc3BsYXkpOgorICAgICAgICBUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXll cjo6Q2xpZW50OjpzZXRMYXllck5lZWRzRGlzcGxheSBpbXBsZW1lbnRhdGlvbgorICAgICAgICAo R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllci5oOgorICAgICAgICAoQ2xpZW50KTog TmV3IGNsYXNzCisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6 VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1h cHBlclBsYXRmb3JtTGF5ZXI6OnNldENsaWVudCk6IGNsaWVudCBzZXR0ZXIKKyAgICAgICAgKFdl YkNvcmU6OlRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyOjpzZXRMYXllck5lZWRzRGlzcGxheSk6 IGZhY2FkZQorICAgICAgICBmb3IgY2xpZW50J3MgbWV0aG9kCisKIDIwMTMtMDQtMjkgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcAppbmRl eCA4YTA0NjE3MmNkY2VhYjc5MjU0OTg1MjcwYTkzMmI2ODZmNGI0YTU0Li5jZTIzZWQ0NzAzYjZm ZjhmNzdlYWQxMDEyOGE0OWI5ZjNkYzM0MWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlci5jcHAKQEAgLTM4Myw2ICszODMsOCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJU ZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c1RvTWVkaWEoVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5 ZXIqCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNUb01lZGlhKG1lZGlhKTsKICAgICBu b3RpZnlDaGFuZ2UoQ29udGVudENoYW5nZSk7CiAgICAgbV9jb250ZW50c0xheWVyID0gbWVkaWE7 CisKKyAgICBtX2NvbnRlbnRzTGF5ZXItPnNldENsaWVudCh0aGlzKTsKIH0KIAogdm9pZCBHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0U2hvd0RlYnVnQm9yZGVyKGJvb2wgc2hvdykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKaW5kZXggMmQ5ZDM3ODM3NTBhMGU3 NjljNmJjYzQ5ZGIxZjUwMzJlMmQzODRkMy4uOTM2YTkyMDFiMmFlZTQ5NmQwYzBiYmQzMmM2NDlh NGUxZmZmNmMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKQEAg LTI0LDEyICsyNCwxMyBAQAogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXJDbGllbnQuaCIKICNpbmNs dWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIlRleHR1cmVNYXBwZXJMYXllci5oIgorI2luY2x1ZGUg IlRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hcHBlclRp bGVkQmFja2luZ1N0b3JlLmgiCiAjaW5jbHVkZSAiVGltZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCi1jbGFzcyBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciA6IHB1YmxpYyBHcmFwaGlj c0xheWVyIHsKK2NsYXNzIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyIDogcHVibGljIEdyYXBo aWNzTGF5ZXIsIHB1YmxpYyBUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6Q2xpZW50IHsKIHB1 YmxpYzoKICAgICBleHBsaWNpdCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcihHcmFwaGljc0xh eWVyQ2xpZW50Kik7CiAgICAgdmlydHVhbCB+R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIoKTsK QEAgLTEwOCw2ICsxMDksOCBAQCBwcml2YXRlOgogICAgIHZvaWQgcHJlcGFyZUJhY2tpbmdTdG9y ZUlmTmVlZGVkKCk7CiAgICAgYm9vbCBzaG91bGRIYXZlQmFja2luZ1N0b3JlKCkgY29uc3Q7CiAK KyAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJOZWVkc0Rpc3BsYXkoKSB7IHNldENvbnRlbnRzTmVl ZHNEaXNwbGF5KCk7IH0KKwogICAgIC8vIFRoaXMgc2V0IG9mIGZsYWdzIGhlbHAgdXMgZGVmZXIg d2hpY2ggcHJvcGVydGllcyBvZiB0aGUgbGF5ZXIgaGF2ZSBiZWVuCiAgICAgLy8gbW9kaWZpZWQg YnkgdGhlIGNvbXBvc2l0b3IsIHNvIHdlIGNhbiBrbm93IHdoYXQgdG8gbG9vayBmb3IgaW4gdGhl IG5leHQgZmx1c2guCiAgICAgZW51bSBDaGFuZ2VNYXNrIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXll ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJQbGF0Zm9ybUxheWVyLmgKaW5kZXggYzA2ZWIzNWIyYWZhYmI0MTNjY2NlZTdmZTQ0NzJiNDU5 ZWVjMzljZS4uYjlkNjRkN2IyOGFkMGU3MWM1NTQ5YWIyNzFiMmNmNzI3MzQwZGY3OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJQbGF0Zm9ybUxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmgKQEAgLTMxLDYgKzMxLDEyIEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIgewog cHVibGljOgorICAgIGNsYXNzIENsaWVudCB7CisgICAgcHVibGljOgorICAgICAgICB2aXJ0dWFs IHZvaWQgc2V0TGF5ZXJOZWVkc0Rpc3BsYXkoKSA9IDA7CisgICAgfTsKKworICAgIFRleHR1cmVN YXBwZXJQbGF0Zm9ybUxheWVyKCkgOiBtX2NsaWVudCgwKSB7IH0KICAgICB2aXJ0dWFsIH5UZXh0 dXJlTWFwcGVyUGxhdGZvcm1MYXllcigpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBwYWludFRvVGV4 dHVyZU1hcHBlcihUZXh0dXJlTWFwcGVyKiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgVHJhbnNm b3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHJpeCA9IFRyYW5zZm9ybWF0aW9uTWF0cml4KCks IGZsb2F0IG9wYWNpdHkgPSAxLjApID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc3dhcEJ1ZmZlcnMo KSB7IH0KQEAgLTM4LDEyICs0NCwyMyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICB0ZXh0dXJl TWFwcGVyLT5kcmF3Qm9yZGVyKGNvbG9yLCBib3JkZXJXaWR0aCwgdGFyZ2V0UmVjdCwgdHJhbnNm b3JtKTsKICAgICB9CisgICAgdm9pZCBzZXRDbGllbnQoVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5 ZXI6OkNsaWVudCogY2xpZW50KSB7IG1fY2xpZW50ID0gY2xpZW50OyB9CiAjaWYgVVNFKEdSQVBI SUNTX1NVUkZBQ0UpCiAgICAgdmlydHVhbCBJbnRTaXplIHBsYXRmb3JtTGF5ZXJTaXplKCkgY29u c3QgeyByZXR1cm4gSW50U2l6ZSgpOyB9CiAgICAgdmlydHVhbCB1aW50MzJfdCBjb3B5VG9HcmFw aGljc1N1cmZhY2UoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBHcmFwaGljc1N1cmZhY2VU b2tlbiBncmFwaGljc1N1cmZhY2VUb2tlbigpIGNvbnN0IHsgcmV0dXJuIEdyYXBoaWNzU3VyZmFj ZVRva2VuKCk7IH0KICAgICB2aXJ0dWFsIEdyYXBoaWNzU3VyZmFjZTo6RmxhZ3MgZ3JhcGhpY3NT dXJmYWNlRmxhZ3MoKSBjb25zdCB7IHJldHVybiAgR3JhcGhpY3NTdXJmYWNlOjpTdXBwb3J0c1Rl eHR1cmVUYXJnZXQgfCBHcmFwaGljc1N1cmZhY2U6OlN1cHBvcnRzU2hhcmluZzsgfQogI2VuZGlm CisKK3Byb3RlY3RlZDoKKyAgICB2b2lkIHNldExheWVyTmVlZHNEaXNwbGF5KCkKKyAgICB7Cisg ICAgICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAgICAgIG1fY2xpZW50LT5zZXRMYXllck5lZWRz RGlzcGxheSgpOworICAgIH0KKworcHJpdmF0ZToKKyAgICBUZXh0dXJlTWFwcGVyUGxhdGZvcm1M YXllcjo6Q2xpZW50KiBtX2NsaWVudDsKIH07CiAKIH07Cg== 200400 2013-05-03 03:01:55 -0700 2013-05-03 09:50:17 -0700 Patch bug-114742-20130503133820.patch text/plain 5758 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Mjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE4MTJkNjUxM2ExNGRl NjY1ZjcyOGNlMzQxMzUzZmZmNGMyMjJhOC4uM2YwOWMwZmJhZTdkOTAwNDNiYzhmOTBlZDIxZjdm ZDIwZWQyOGFlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTA1LTAzICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W3RleG1hcF0gZHJhdyBjb250ZW50IGlmIGdyYXBoaWNzIGxheWVyIGRpc3BsYXlzIGEgdmlkZW8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDc0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAjODY0 MTAgZm9jdXNlcyBvbiBoYXZpbmcgY29tcG9zaXRlZC9hY2NlbGVyYXRlZCB2aWRlbyB1c2luZyB0 aGUKKyAgICAgICAgVGV4dHVyZU1hcHBlci4gQnV0IHRoZSB2aWRlbyBpcyBub3QgcmVuZGVyZWQg ZmFzdCBieSB1c2luZyB0aGUKKyAgICAgICAgcmVwYWludCgpIG1ldGhvZC4gSW4gdGhlIGNhc2Ug b2YgdGhlIFRleHR1cmVNYXBwZXIgaXQgaXMgcmVxdWlyZWQgdG8KKyAgICAgICAgY2FsbCBhIGNv bnRlbnQgZGlzcGxheSBhcyBmYXN0IGFzIHBvc3NpYmxlLgorCisgICAgICAgIFRoaXMgcGF0Y2gg YWRkcyB0aGUgY2xhc3MgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI6OkNsaWVudCB3aXRoIHRo ZQorICAgICAgICBtZXRob2Qgc2V0TGF5ZXJOZWVkc0Rpc3BsYXkoKS4gVGhlIEdyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyCisgICAgICAgIGltcGxlbWVudHMgdGhpcyBuZXcgY2xhc3MgYW5kIHRo ZSBuZXcgbWV0aG9kIGNhbGxzCisgICAgICAgIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCksIGNh dXNpbmcgYSBmYXN0ZXIgY29udGVudCBkaXNwbGF5IHdoZW4KKyAgICAgICAgcmVxdWVzdGVkLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0 Q29udGVudHNUb01lZGlhKTogc2V0cyBpdHNlbGYKKyAgICAgICAgYXMgdGhlIFRleHR1cmVNYXBw ZXJQbGF0Zm9ybUxheWVyJ3MgY2xpZW50CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0TGF5ZXJOZWVkc0Rpc3BsYXkpOgorICAgICAgICBU ZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6Q2xpZW50OjpzZXRMYXllck5lZWRzRGlzcGxheSBp bXBsZW1lbnRhdGlvbgorICAgICAgICAoR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXll ci5oOgorICAgICAgICAoQ2xpZW50KTogTmV3IGNsYXNzCisgICAgICAgIChXZWJDb3JlOjpUZXh0 dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI6OnNldENsaWVudCk6IGNs aWVudCBzZXR0ZXIKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVy OjpzZXRMYXllck5lZWRzRGlzcGxheSk6IGZhY2FkZQorICAgICAgICBmb3IgY2xpZW50J3MgbWV0 aG9kCisKIDIwMTMtMDQtMjkgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyLmNwcAppbmRleCA4YTA0NjE3MmNkY2VhYjc5MjU0OTg1MjcwYTkzMmI2 ODZmNGI0YTU0Li5jZTIzZWQ0NzAzYjZmZjhmNzdlYWQxMDEyOGE0OWI5ZjNkYzM0MWYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NM YXllclRleHR1cmVNYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTM4Myw2ICszODMs OCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c1RvTWVkaWEo VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIqCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVu dHNUb01lZGlhKG1lZGlhKTsKICAgICBub3RpZnlDaGFuZ2UoQ29udGVudENoYW5nZSk7CiAgICAg bV9jb250ZW50c0xheWVyID0gbWVkaWE7CisKKyAgICBtX2NvbnRlbnRzTGF5ZXItPnNldENsaWVu dCh0aGlzKTsKIH0KIAogdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0U2hvd0Rl YnVnQm9yZGVyKGJvb2wgc2hvdykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmgKaW5kZXggMmQ5ZDM3ODM3NTBhMGU3NjljNmJjYzQ5ZGIxZjUwMzJlMmQzODRkMy4uOTM2YTky MDFiMmFlZTQ5NmQwYzBiYmQzMmM2NDlhNGUxZmZmNmMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNz TGF5ZXJUZXh0dXJlTWFwcGVyLmgKQEAgLTI0LDEyICsyNCwxMyBAQAogI2luY2x1ZGUgIkdyYXBo aWNzTGF5ZXJDbGllbnQuaCIKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIlRleHR1cmVN YXBwZXJMYXllci5oIgorI2luY2x1ZGUgIlRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmgiCiAj aW5jbHVkZSAiVGV4dHVyZU1hcHBlclRpbGVkQmFja2luZ1N0b3JlLmgiCiAjaW5jbHVkZSAiVGlt ZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlciA6IHB1YmxpYyBHcmFwaGljc0xheWVyIHsKK2NsYXNzIEdyYXBoaWNzTGF5ZXJUZXh0 dXJlTWFwcGVyIDogcHVibGljIEdyYXBoaWNzTGF5ZXIsIHB1YmxpYyBUZXh0dXJlTWFwcGVyUGxh dGZvcm1MYXllcjo6Q2xpZW50IHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBHcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlcihHcmFwaGljc0xheWVyQ2xpZW50Kik7CiAgICAgdmlydHVhbCB+R3JhcGhp Y3NMYXllclRleHR1cmVNYXBwZXIoKTsKQEAgLTEwOCw2ICsxMDksOCBAQCBwcml2YXRlOgogICAg IHZvaWQgcHJlcGFyZUJhY2tpbmdTdG9yZUlmTmVlZGVkKCk7CiAgICAgYm9vbCBzaG91bGRIYXZl QmFja2luZ1N0b3JlKCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJOZWVkc0Rp c3BsYXkoKSB7IHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCk7IH0KKwogICAgIC8vIFRoaXMgc2V0 IG9mIGZsYWdzIGhlbHAgdXMgZGVmZXIgd2hpY2ggcHJvcGVydGllcyBvZiB0aGUgbGF5ZXIgaGF2 ZSBiZWVuCiAgICAgLy8gbW9kaWZpZWQgYnkgdGhlIGNvbXBvc2l0b3IsIHNvIHdlIGNhbiBrbm93 IHdoYXQgdG8gbG9vayBmb3IgaW4gdGhlIG5leHQgZmx1c2guCiAgICAgZW51bSBDaGFuZ2VNYXNr IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmgKaW5kZXggYzA2ZWIzNWIy YWZhYmI0MTNjY2NlZTdmZTQ0NzJiNDU5ZWVjMzljZS4uYjlkNjRkN2IyOGFkMGU3MWM1NTQ5YWIy NzFiMmNmNzI3MzQwZGY3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVy LmgKQEAgLTMxLDYgKzMxLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgVGV4dHVy ZU1hcHBlclBsYXRmb3JtTGF5ZXIgewogcHVibGljOgorICAgIGNsYXNzIENsaWVudCB7CisgICAg cHVibGljOgorICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJOZWVkc0Rpc3BsYXkoKSA9IDA7 CisgICAgfTsKKworICAgIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyKCkgOiBtX2NsaWVudCgw KSB7IH0KICAgICB2aXJ0dWFsIH5UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcigpIHsgfQogICAg IHZpcnR1YWwgdm9pZCBwYWludFRvVGV4dHVyZU1hcHBlcihUZXh0dXJlTWFwcGVyKiwgY29uc3Qg RmxvYXRSZWN0JiwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHJpeCA9 IFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIGZsb2F0IG9wYWNpdHkgPSAxLjApID0gMDsKICAgICB2 aXJ0dWFsIHZvaWQgc3dhcEJ1ZmZlcnMoKSB7IH0KQEAgLTM4LDEyICs0NCwyMyBAQCBwdWJsaWM6 CiAgICAgewogICAgICAgICB0ZXh0dXJlTWFwcGVyLT5kcmF3Qm9yZGVyKGNvbG9yLCBib3JkZXJX aWR0aCwgdGFyZ2V0UmVjdCwgdHJhbnNmb3JtKTsKICAgICB9CisgICAgdm9pZCBzZXRDbGllbnQo VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI6OkNsaWVudCogY2xpZW50KSB7IG1fY2xpZW50ID0g Y2xpZW50OyB9CiAjaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCiAgICAgdmlydHVhbCBJbnRTaXpl IHBsYXRmb3JtTGF5ZXJTaXplKCkgY29uc3QgeyByZXR1cm4gSW50U2l6ZSgpOyB9CiAgICAgdmly dHVhbCB1aW50MzJfdCBjb3B5VG9HcmFwaGljc1N1cmZhY2UoKSB7IHJldHVybiAwOyB9CiAgICAg dmlydHVhbCBHcmFwaGljc1N1cmZhY2VUb2tlbiBncmFwaGljc1N1cmZhY2VUb2tlbigpIGNvbnN0 IHsgcmV0dXJuIEdyYXBoaWNzU3VyZmFjZVRva2VuKCk7IH0KICAgICB2aXJ0dWFsIEdyYXBoaWNz U3VyZmFjZTo6RmxhZ3MgZ3JhcGhpY3NTdXJmYWNlRmxhZ3MoKSBjb25zdCB7IHJldHVybiAgR3Jh cGhpY3NTdXJmYWNlOjpTdXBwb3J0c1RleHR1cmVUYXJnZXQgfCBHcmFwaGljc1N1cmZhY2U6OlN1 cHBvcnRzU2hhcmluZzsgfQogI2VuZGlmCisKK3Byb3RlY3RlZDoKKyAgICB2b2lkIHNldExheWVy TmVlZHNEaXNwbGF5KCkKKyAgICB7CisgICAgICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAgICAg IG1fY2xpZW50LT5zZXRMYXllck5lZWRzRGlzcGxheSgpOworICAgIH0KKworcHJpdmF0ZToKKyAg ICBUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6Q2xpZW50KiBtX2NsaWVudDsKIH07CiAKIH07 Cg== 200427 2013-05-03 09:50:27 -0700 2013-05-06 08:42:46 -0700 Patch bug-114742-20130503202652.patch text/plain 5756 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Mjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE4MTJkNjUxM2ExNGRl NjY1ZjcyOGNlMzQxMzUzZmZmNGMyMjJhOC4uM2YwOWMwZmJhZTdkOTAwNDNiYzhmOTBlZDIxZjdm ZDIwZWQyOGFlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTA1LTAzICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W3RleG1hcF0gZHJhdyBjb250ZW50IGlmIGdyYXBoaWNzIGxheWVyIGRpc3BsYXlzIGEgdmlkZW8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDc0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAjODY0 MTAgZm9jdXNlcyBvbiBoYXZpbmcgY29tcG9zaXRlZC9hY2NlbGVyYXRlZCB2aWRlbyB1c2luZyB0 aGUKKyAgICAgICAgVGV4dHVyZU1hcHBlci4gQnV0IHRoZSB2aWRlbyBpcyBub3QgcmVuZGVyZWQg ZmFzdCBieSB1c2luZyB0aGUKKyAgICAgICAgcmVwYWludCgpIG1ldGhvZC4gSW4gdGhlIGNhc2Ug b2YgdGhlIFRleHR1cmVNYXBwZXIgaXQgaXMgcmVxdWlyZWQgdG8KKyAgICAgICAgY2FsbCBhIGNv bnRlbnQgZGlzcGxheSBhcyBmYXN0IGFzIHBvc3NpYmxlLgorCisgICAgICAgIFRoaXMgcGF0Y2gg YWRkcyB0aGUgY2xhc3MgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI6OkNsaWVudCB3aXRoIHRo ZQorICAgICAgICBtZXRob2Qgc2V0TGF5ZXJOZWVkc0Rpc3BsYXkoKS4gVGhlIEdyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyCisgICAgICAgIGltcGxlbWVudHMgdGhpcyBuZXcgY2xhc3MgYW5kIHRo ZSBuZXcgbWV0aG9kIGNhbGxzCisgICAgICAgIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCksIGNh dXNpbmcgYSBmYXN0ZXIgY29udGVudCBkaXNwbGF5IHdoZW4KKyAgICAgICAgcmVxdWVzdGVkLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0 Q29udGVudHNUb01lZGlhKTogc2V0cyBpdHNlbGYKKyAgICAgICAgYXMgdGhlIFRleHR1cmVNYXBw ZXJQbGF0Zm9ybUxheWVyJ3MgY2xpZW50CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0TGF5ZXJOZWVkc0Rpc3BsYXkpOgorICAgICAgICBU ZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6Q2xpZW50OjpzZXRMYXllck5lZWRzRGlzcGxheSBp bXBsZW1lbnRhdGlvbgorICAgICAgICAoR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXll ci5oOgorICAgICAgICAoQ2xpZW50KTogTmV3IGNsYXNzCisgICAgICAgIChXZWJDb3JlOjpUZXh0 dXJlTWFwcGVyUGxhdGZvcm1MYXllcjo6VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI6OnNldENsaWVudCk6IGNs aWVudCBzZXR0ZXIKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVy OjpzZXRMYXllck5lZWRzRGlzcGxheSk6IGZhY2FkZQorICAgICAgICBmb3IgY2xpZW50J3MgbWV0 aG9kCisKIDIwMTMtMDQtMjkgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyLmNwcAppbmRleCA4YTA0NjE3MmNkY2VhYjc5MjU0OTg1MjcwYTkzMmI2 ODZmNGI0YTU0Li5jZTIzZWQ0NzAzYjZmZjhmNzdlYWQxMDEyOGE0OWI5ZjNkYzM0MWYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NM YXllclRleHR1cmVNYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTM4Myw2ICszODMs OCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c1RvTWVkaWEo VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIqCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVu dHNUb01lZGlhKG1lZGlhKTsKICAgICBub3RpZnlDaGFuZ2UoQ29udGVudENoYW5nZSk7CiAgICAg bV9jb250ZW50c0xheWVyID0gbWVkaWE7CisKKyAgICBtX2NvbnRlbnRzTGF5ZXItPnNldENsaWVu dCh0aGlzKTsKIH0KIAogdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0U2hvd0Rl YnVnQm9yZGVyKGJvb2wgc2hvdykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmgKaW5kZXggMmQ5ZDM3ODM3NTBhMGU3NjljNmJjYzQ5ZGIxZjUwMzJlMmQzODRkMy4uMjRkY2Mz ZTUwNWM5YmQ1MzJhMTc0YTM1MDhhZjI3MWY3ZjU3YTkxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNz TGF5ZXJUZXh0dXJlTWFwcGVyLmgKQEAgLTI0LDEyICsyNCwxMyBAQAogI2luY2x1ZGUgIkdyYXBo aWNzTGF5ZXJDbGllbnQuaCIKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIlRleHR1cmVN YXBwZXJMYXllci5oIgorI2luY2x1ZGUgIlRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmgiCiAj aW5jbHVkZSAiVGV4dHVyZU1hcHBlclRpbGVkQmFja2luZ1N0b3JlLmgiCiAjaW5jbHVkZSAiVGlt ZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlciA6IHB1YmxpYyBHcmFwaGljc0xheWVyIHsKK2NsYXNzIEdyYXBoaWNzTGF5ZXJUZXh0 dXJlTWFwcGVyIDogcHVibGljIEdyYXBoaWNzTGF5ZXIsIHB1YmxpYyBUZXh0dXJlTWFwcGVyUGxh dGZvcm1MYXllcjo6Q2xpZW50IHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBHcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlcihHcmFwaGljc0xheWVyQ2xpZW50Kik7CiAgICAgdmlydHVhbCB+R3JhcGhp Y3NMYXllclRleHR1cmVNYXBwZXIoKTsKQEAgLTEwOCw2ICsxMDksOCBAQCBwcml2YXRlOgogICAg IHZvaWQgcHJlcGFyZUJhY2tpbmdTdG9yZUlmTmVlZGVkKCk7CiAgICAgYm9vbCBzaG91bGRIYXZl QmFja2luZ1N0b3JlKCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UGxhdGZvcm1MYXll ck5lZWRzRGlzcGxheSgpIE9WRVJSSURFIHsgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKTsgfQor CiAgICAgLy8gVGhpcyBzZXQgb2YgZmxhZ3MgaGVscCB1cyBkZWZlciB3aGljaCBwcm9wZXJ0aWVz IG9mIHRoZSBsYXllciBoYXZlIGJlZW4KICAgICAvLyBtb2RpZmllZCBieSB0aGUgY29tcG9zaXRv ciwgc28gd2UgY2FuIGtub3cgd2hhdCB0byBsb29rIGZvciBpbiB0aGUgbmV4dCBmbHVzaC4KICAg ICBlbnVtIENoYW5nZU1hc2sgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIu aAppbmRleCBjMDZlYjM1YjJhZmFiYjQxM2NjY2VlN2ZlNDQ3MmI0NTllZWMzOWNlLi4wY2FiOThk YTQ2MmIxYzBlNjQ1NTBjNGIwYjRiODM4OWVlMjdjNTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlclBsYXRmb3JtTGF5ZXIuaApAQCAtMzEsNiArMzEsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBjbGFzcyBUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllciB7CiBwdWJsaWM6CisgICAgY2xh c3MgQ2xpZW50IHsKKyAgICBwdWJsaWM6CisgICAgICAgIHZpcnR1YWwgdm9pZCBzZXRQbGF0Zm9y bUxheWVyTmVlZHNEaXNwbGF5KCkgPSAwOworICAgIH07CisKKyAgICBUZXh0dXJlTWFwcGVyUGxh dGZvcm1MYXllcigpIDogbV9jbGllbnQoMCkgeyB9CiAgICAgdmlydHVhbCB+VGV4dHVyZU1hcHBl clBsYXRmb3JtTGF5ZXIoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRUb1RleHR1cmVNYXBw ZXIoVGV4dHVyZU1hcHBlciosIGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IFRyYW5zZm9ybWF0aW9u TWF0cml4JiBtb2RlbFZpZXdNYXRyaXggPSBUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpLCBmbG9hdCBv cGFjaXR5ID0gMS4wKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHN3YXBCdWZmZXJzKCkgeyB9CkBA IC0zOCwxMiArNDQsMjIgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgdGV4dHVyZU1hcHBlci0+ ZHJhd0JvcmRlcihjb2xvciwgYm9yZGVyV2lkdGgsIHRhcmdldFJlY3QsIHRyYW5zZm9ybSk7CiAg ICAgfQorICAgIHZvaWQgc2V0Q2xpZW50KFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyOjpDbGll bnQqIGNsaWVudCkKKyAgICB7CisgICAgICAgIG1fY2xpZW50ID0gY2xpZW50OworICAgIH0KICNp ZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKICAgICB2aXJ0dWFsIEludFNpemUgcGxhdGZvcm1MYXll clNpemUoKSBjb25zdCB7IHJldHVybiBJbnRTaXplKCk7IH0KICAgICB2aXJ0dWFsIHVpbnQzMl90 IGNvcHlUb0dyYXBoaWNzU3VyZmFjZSgpIHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIEdyYXBo aWNzU3VyZmFjZVRva2VuIGdyYXBoaWNzU3VyZmFjZVRva2VuKCkgY29uc3QgeyByZXR1cm4gR3Jh cGhpY3NTdXJmYWNlVG9rZW4oKTsgfQogICAgIHZpcnR1YWwgR3JhcGhpY3NTdXJmYWNlOjpGbGFn cyBncmFwaGljc1N1cmZhY2VGbGFncygpIGNvbnN0IHsgcmV0dXJuICBHcmFwaGljc1N1cmZhY2U6 OlN1cHBvcnRzVGV4dHVyZVRhcmdldCB8IEdyYXBoaWNzU3VyZmFjZTo6U3VwcG9ydHNTaGFyaW5n OyB9CiAjZW5kaWYKKworcHJvdGVjdGVkOgorICAgIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVy OjpDbGllbnQqIGNsaWVudCgpIHsgcmV0dXJuIG1fY2xpZW50OyB9CisKK3ByaXZhdGU6CisgICAg VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXI6OkNsaWVudCogbV9jbGllbnQ7CiB9OwogCiB9Owo=