110790 2013-02-25 13:43:47 -0800 [texmap] Do not apply clip state if redundant 2013-03-12 10:31:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111065 111566 1 bruno.abinader bruno.abinader cmarcelo igor.oliveira kalyan.kondapally kenneth kondapallykalyan luiz noam tonikitoo webkit.review.bot oldest_to_newest 841253 0 bruno.abinader 2013-02-25 13:43:47 -0800 Adds a pointer from the last context and a bool to check if clip state has been changed since last apply. If the context is the same and the clip state hasn't changed, then do nothing. 841256 1 190118 bruno.abinader 2013-02-25 13:46:51 -0800 Created attachment 190118 Patch Proposed patch 841942 2 190118 tonikitoo 2013-02-26 06:21:34 -0800 Comment on attachment 190118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190118&action=review > Source/WebCore/ChangeLog:12 > + Adds a pointer from the last context and a bool to check if clip state > + has been changed since last apply. If the context is the same and the > + clip state hasn't changed, then do nothing. > + > + No behavior changes, thus covered by existing tests. if it has measurable performance gains, it should be mentioned. > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:182 > + clipStateChangedSinceLastApply = true; should last context be reset as well? 841947 3 bruno.abinader 2013-02-26 06:30:46 -0800 (In reply to comment #2) > (From update of attachment 190118 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190118&action=review > > > Source/WebCore/ChangeLog:12 > > + Adds a pointer from the last context and a bool to check if clip state > > + has been changed since last apply. If the context is the same and the > > + clip state hasn't changed, then do nothing. > > + > > + No behavior changes, thus covered by existing tests. > > if it has measurable performance gains, it should be mentioned. Indeed. I've been using gDEBugger to profile OpenGL calls while running CSS 3D Transforms-related examples, and noticed a ~30% reduction in glGetIntegeri calls, same for glStencil{Op,Func}. > > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:182 > > + clipStateChangedSinceLastApply = true; > > should last context be reset as well? Yes, this is done in TextureMapperGL::ClipStack::apply(), which is the only entry point for the context object pointer. 841948 4 190118 noam 2013-02-26 06:33:48 -0800 Comment on attachment 190118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190118&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperGL.h:93 > + : lastContext(0) Do we ever change the context for a TextureMapperGL?? 841951 5 bruno.abinader 2013-02-26 06:38:26 -0800 (In reply to comment #4) > (From update of attachment 190118 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190118&action=review > > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.h:93 > > + : lastContext(0) > > Do we ever change the context for a TextureMapperGL?? From my tests, lastContext remains with the same points in both Qt/EFL ports, however I'm not sure about the other ports. Said this, this actually makes me think whether it would be good to have the context object pointer passed on a separate function (or even at ClipStack ctor) instead of apply(), what do you think? 841954 6 noam 2013-02-26 06:40:50 -0800 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 190118 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=190118&action=review > > > > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.h:93 > > > + : lastContext(0) > > > > Do we ever change the context for a TextureMapperGL?? > > From my tests, lastContext remains with the same points in both Qt/EFL ports, however I'm not sure about the other ports. Said this, this actually makes me think whether it would be good to have the context object pointer passed on a separate function (or even at ClipStack ctor) instead of apply(), what do you think? TMGL should always have the same context. Your idea seems reasonsable... However let's have only the clipStateIsDirty flag here and not deal with a context change. 841961 7 190274 bruno.abinader 2013-02-26 06:48:48 -0800 Created attachment 190274 Patch Updated patch, now using only the clip state bool check. 841969 8 bruno.abinader 2013-02-26 07:15:56 -0800 While discussing the implementation with Igor, he noticed that for Qt port, the context ownership is from the Qt layer, thus vulnerable to clip state changes not covered by TextureMapperGL. Shall we use #ifdef's to EFL and GTK ports (which has the ownership of the context object) then? 842178 9 kalyan.kondapally 2013-02-26 10:53:47 -0800 (In reply to comment #8) > While discussing the implementation with Igor, he noticed that for Qt port, the context ownership is from the Qt layer, thus vulnerable to clip state changes not covered by TextureMapperGL. Shall we use #ifdef's to EFL and GTK ports (which has the ownership of the context object) then? This is a general issue and Depends on what the context is doing. What textureMapperGL does is it creates a wrapper for the current context and uses it. It manipulates certain states and reset's them to there original values. Now assumption here seems to be that the Context (which texturemapper wraps around) doesn't manipulate the clip state during it's life time. So I think we need some kind of general decision whether TextureMapperGL tracks GL states or is it the caller responsibility. For Qt and EFL ports the main concern should be with the Context created on UI process side. Efl port doesn't manipulate the clip state and apps dont have any control on it (directly atleast). 842219 10 kalyan.kondapally 2013-02-26 11:33:27 -0800 (In reply to comment #9) > (In reply to comment #8) > > While discussing the implementation with Igor, he noticed that for Qt port, the context ownership is from the Qt layer, thus vulnerable to clip state changes not covered by TextureMapperGL. Shall we use #ifdef's to EFL and GTK ports (which has the ownership of the context object) then? > > > doesn't manipulate the clip state during it's life time. So I think we need >some kind of general decision whether TextureMapperGL tracks GL states or is it >the caller responsibility. For Qt and EFL ports the main concern should be with >the Context created on UI process side. Efl port doesn't manipulate the clip >state and apps dont have any control on it (directly atleast). What we could have is a way (perhaps some optimization flag??) to inform TextureMapperGL that it is the only one manipulating the context state and thus doesn't have to worry about resetting and setting the states every frame(i.e in begin painting, begin clip etc). I see a hackish way to do it already by calling beingPainting/clip once and not calling the end counterparts :) Perhaps we need a bit more elegant solution to handle this case where TextureMapperGL is the only one manipulating the Context state. 842253 11 bruno.abinader 2013-02-26 12:12:49 -0800 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > While discussing the implementation with Igor, he noticed that for Qt port, the context ownership is from the Qt layer, thus vulnerable to clip state changes not covered by TextureMapperGL. Shall we use #ifdef's to EFL and GTK ports (which has the ownership of the context object) then? > > > > > > doesn't manipulate the clip state during it's life time. So I think we need >some kind of general decision whether TextureMapperGL tracks GL states or is it >the caller responsibility. For Qt and EFL ports the main concern should be with >the Context created on UI process side. Efl port doesn't manipulate the clip >state and apps dont have any control on it (directly atleast). > > What we could have is a way (perhaps some optimization flag??) to inform TextureMapperGL that it is the only one manipulating the context state and thus doesn't have to worry about resetting and setting the states every frame(i.e in begin painting, begin clip etc). I see a hackish way to do it already by calling beingPainting/clip once and not calling the end counterparts :) Perhaps we need a bit more elegant solution to handle this case where TextureMapperGL is the only one manipulating the Context state. I agree with that, however this approach sounds feasible only on EFL port AFAIK. Shall it be a platform-specific implementation or so? 842410 12 kalyan.kondapally 2013-02-26 15:02:17 -0800 (In reply to comment #11) > (In reply to comment #10) > > (In reply to comment #9) > > > (In reply to comment #8) > I agree with that, however this approach sounds feasible only on EFL port AFAIK. Shall it be a platform-specific implementation or so? In short it would be quite useful in cases where context doesn't manipulate states having an impact on TMGL. Ignore my earlier comments as I was of the impression that we are optimizing the save/restore state of TMGL. I would follow it up with another issue. Sorry for the unnecessary noise. Bit confused as to why patch doesn't apply for Qt. If I understood the patch correctly, we optimize apply() calls between a given combination of reset() and pop() (i.e begin/end calls). Isn't that the case here?? 842893 13 bruno.abinader 2013-02-27 03:26:07 -0800 (In reply to comment #12) > Bit confused as to why patch doesn't apply for Qt. If I understood the patch correctly, we optimize apply() calls between a given combination of reset() and pop() (i.e begin/end calls). Isn't that the case here?? Yes, that is correct. However, on Qt, the context ownership belongs does not belong to WebKit[1], it may be used/clipped elsewhere from TextureMapperGL[2] and might result in unexpected inconsistencies. Links: [1] http://qt.gitorious.org/qt/qtdeclarative/blobs/stable/src/quick/items/qquickthreadedwindowmanager.cpp#line142 [2] http://qt.gitorious.org/qt/qtdeclarative/blobs/stable/src/quick/items/qquickthreadedwindowmanager_p.h#line86 842908 14 bruno.abinader 2013-02-27 03:46:19 -0800 As discussed with No'am, the issue with Qt indeed exists but is out of the scope of this patch (we can create another bug to handle that). I'm going to provide an updated patch with a cleaner variable name in a few mins. 842909 15 190487 bruno.abinader 2013-02-27 03:50:00 -0800 Created attachment 190487 Patch Proposed patch 842921 16 190487 webkit.review.bot 2013-02-27 04:07:54 -0800 Comment on attachment 190487 Patch Clearing flags on attachment: 190487 Committed r144169: <http://trac.webkit.org/changeset/144169> 842922 17 webkit.review.bot 2013-02-27 04:07:59 -0800 All reviewed patches have been landed. Closing bug. 842933 18 bruno.abinader 2013-02-27 04:19:12 -0800 ps: Qt context ownership will be handled on bug 110966. 843959 19 webkit.review.bot 2013-02-28 03:46:45 -0800 Re-opened since this is blocked by bug 111065 853589 20 bruno.abinader 2013-03-12 10:31:55 -0700 All dependencies are now fixed, closing bug. 190118 2013-02-25 13:46:51 -0800 2013-02-26 06:48:41 -0800 Patch bug-110790-20130225174305.patch text/plain 3641 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE5MGU3NjNiYWRhOTZh YjBjMDI3MGI4ZWNlMmJjZTAwNjk1MDg5MS4uYjYwOWUzYTJkNDVmMmYwOTAzNmYyZjM0ZDNlZjg0 NmUyOTdjMzE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEzLTAyLTI1ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KIAor ICAgICAgICBbdGV4bWFwXSBEbyBub3QgYXBwbHkgY2xpcCBzdGF0ZSBpZiByZWR1bmRhbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDc5MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHMgYSBwb2lu dGVyIGZyb20gdGhlIGxhc3QgY29udGV4dCBhbmQgYSBib29sIHRvIGNoZWNrIGlmIGNsaXAgc3Rh dGUKKyAgICAgICAgaGFzIGJlZW4gY2hhbmdlZCBzaW5jZSBsYXN0IGFwcGx5LiBJZiB0aGUgY29u dGV4dCBpcyB0aGUgc2FtZSBhbmQgdGhlCisgICAgICAgIGNsaXAgc3RhdGUgaGFzbid0IGNoYW5n ZWQsIHRoZW4gZG8gbm90aGluZy4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2VzLCB0aHVz IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVN YXBwZXJHTDo6Q2xpcFN0YWNrOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFw cGVyR0w6OkNsaXBTdGFjazo6cG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJH TDo6Q2xpcFN0YWNrOjphcHBseSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJHTC5oOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpD bGlwU3RhY2s6OkNsaXBTdGFjayk6CisgICAgICAgIChDbGlwU3RhY2spOgorCisyMDEzLTAyLTI1 ICBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNv bT4KKwogICAgICAgICBbdGV4bWFwXSBSZW5hbWUgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6 OmluaXQgdG8gcmVzZXQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMDc4MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IDVmMmU3MWNmMjdiMjE0 MTRlMjJlZDA2MzljMjllMTZjZjA3MTZkMmYuLmM5MzZlODg1YTA2MmE2OGY4NmUzOTA3OWE4NDcw NTMzZDg3OTZmY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCkBAIC0xNzksNiArMTc5LDcgQEAg dm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6cmVzZXQoY29uc3QgSW50UmVjdCYgcmVj dCkKIHsKICAgICBjbGlwU3RhY2suY2xlYXIoKTsKICAgICBjbGlwU3RhdGUgPSBUZXh0dXJlTWFw cGVyR0w6OkNsaXBTdGF0ZShyZWN0KTsKKyAgICBjbGlwU3RhdGVDaGFuZ2VkU2luY2VMYXN0QXBw bHkgPSB0cnVlOwogfQogCiB2b2lkIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpwdXNoKCkK QEAgLTE5Miw2ICsxOTMsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpwb3Ao KQogICAgICAgICByZXR1cm47CiAgICAgY2xpcFN0YXRlID0gY2xpcFN0YWNrLmxhc3QoKTsKICAg ICBjbGlwU3RhY2sucmVtb3ZlTGFzdCgpOworICAgIGNsaXBTdGF0ZUNoYW5nZWRTaW5jZUxhc3RB cHBseSA9IHRydWU7CiB9CiAKIHN0YXRpYyB2b2lkIHNjaXNzb3JDbGlwKEdyYXBoaWNzQ29udGV4 dDNEKiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQpAQCAtMjA2LDYgKzIwOCwxMSBAQCBz dGF0aWMgdm9pZCBzY2lzc29yQ2xpcChHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgY29uc3Qg SW50UmVjdCYgcmVjdCkKIAogdm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6YXBwbHko R3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiB7CisgICAgaWYgKGNvbnRleHQgPT0gbGFzdENv bnRleHQgJiYgIWNsaXBTdGF0ZUNoYW5nZWRTaW5jZUxhc3RBcHBseSkKKyAgICAgICAgcmV0dXJu OworICAgIGxhc3RDb250ZXh0ID0gY29udGV4dDsKKyAgICBjbGlwU3RhdGVDaGFuZ2VkU2luY2VM YXN0QXBwbHkgPSBmYWxzZTsKKwogICAgIHNjaXNzb3JDbGlwKGNvbnRleHQsIGNsaXBTdGF0ZS5z Y2lzc29yQm94KTsKICAgICBjb250ZXh0LT5zdGVuY2lsT3AoR3JhcGhpY3NDb250ZXh0M0Q6OktF RVAsIEdyYXBoaWNzQ29udGV4dDNEOjpLRUVQLCBHcmFwaGljc0NvbnRleHQzRDo6S0VFUCk7CiAg ICAgY29udGV4dC0+c3RlbmNpbEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6OkVRVUFMLCBjbGlwU3Rh dGUuc3RlbmNpbEluZGV4IC0gMSwgY2xpcFN0YXRlLnN0ZW5jaWxJbmRleCAtIDEpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJHTC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJHTC5oCmluZGV4IGEyYjQ3ZWE4Y2RkZjM2ZThmYzhlNmY0MDkxZGM5MjQ3ZDk0OTU4NDEu LjJiN2JhZDQ3MDNhZjE4N2RiZWYzNGM0ZmVmZTFjM2FjMTQ4MWNiNjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckdMLmgKQEAgLTg5LDYgKzg5LDExIEBAIHByaXZhdGU6CiAKICAgICBjbGFzcyBDbGlwU3RhY2sg ewogICAgIHB1YmxpYzoKKyAgICAgICAgQ2xpcFN0YWNrKCkKKyAgICAgICAgICAgIDogbGFzdENv bnRleHQoMCkKKyAgICAgICAgICAgICwgY2xpcFN0YXRlQ2hhbmdlZFNpbmNlTGFzdEFwcGx5KGZh bHNlKQorICAgICAgICB7IH0KKwogICAgICAgICB2b2lkIHB1c2goKTsKICAgICAgICAgdm9pZCBw b3AoKTsKICAgICAgICAgdm9pZCBhcHBseShHcmFwaGljc0NvbnRleHQzRCopOwpAQCAtOTgsNiAr MTAzLDggQEAgcHJpdmF0ZToKICAgICBwcml2YXRlOgogICAgICAgICBDbGlwU3RhdGUgY2xpcFN0 YXRlOwogICAgICAgICBWZWN0b3I8Q2xpcFN0YXRlPiBjbGlwU3RhY2s7CisgICAgICAgIEdyYXBo aWNzQ29udGV4dDNEKiBsYXN0Q29udGV4dDsKKyAgICAgICAgYm9vbCBjbGlwU3RhdGVDaGFuZ2Vk U2luY2VMYXN0QXBwbHk7CiAgICAgfTsKIAogICAgIFRleHR1cmVNYXBwZXJHTCgpOwo= 190274 2013-02-26 06:48:48 -0800 2013-02-27 03:49:53 -0800 Patch bug-110790-20130226104502.patch text/plain 3298 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI5NWMxNWI3NDgzNWQ5 MTA4MTE1ZDRjOTc2NDk3Mzg1YmZjYzlhMi4uMzc2ZWQ4ODlmMDA5M2JiMjRhYzIwN2VkODcxN2E5 YmY1ZGViYzBlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAyLTI2ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBbdGV4bWFwXSBEbyBub3QgYXBwbHkgY2xpcCBzdGF0ZSBpZiByZWR1bmRhbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDc5MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHMgYSBib29s IHRvIGNoZWNrIGlmIGNsaXAgc3RhdGUgaGFzIGJlZW4gY2hhbmdlZCBzaW5jZSBsYXN0IGFwcGx5 LgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZXMsIHRodXMgY292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuY3BwIDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNr OjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6 cG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjphcHBs eSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5o OgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OkNsaXBTdGFj ayk6CisgICAgICAgIChDbGlwU3RhY2spOgorCiAyMDEzLTAyLTI2ICBUYWthc2hpIFNha2Ftb3Rv ICA8dGFzYWtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBTaGFkb3cgRE9NIHN0eWxlcyBhcHBlYXIg dG8gYmUgb3Zlci1lYWdlcmx5IHNoYXJlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCA1ZjJl NzFjZjI3YjIxNDE0ZTIyZWQwNjM5YzI5ZTE2Y2YwNzE2ZDJmLi4xYmZkOWQ3ZDM3ZTZjZTNlODg0 MGUyOTU3MTA3NzQ3MTlhYzUwNzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcApAQCAtMTc5LDYg KzE3OSw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnJlc2V0KGNvbnN0IElu dFJlY3QmIHJlY3QpCiB7CiAgICAgY2xpcFN0YWNrLmNsZWFyKCk7CiAgICAgY2xpcFN0YXRlID0g VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhdGUocmVjdCk7CisgICAgY2xpcFN0YXRlQ2hhbmdlZFNp bmNlTGFzdEFwcGx5ID0gdHJ1ZTsKIH0KIAogdm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFj azo6cHVzaCgpCkBAIC0xOTIsNiArMTkzLDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNsaXBT dGFjazo6cG9wKCkKICAgICAgICAgcmV0dXJuOwogICAgIGNsaXBTdGF0ZSA9IGNsaXBTdGFjay5s YXN0KCk7CiAgICAgY2xpcFN0YWNrLnJlbW92ZUxhc3QoKTsKKyAgICBjbGlwU3RhdGVDaGFuZ2Vk U2luY2VMYXN0QXBwbHkgPSB0cnVlOwogfQogCiBzdGF0aWMgdm9pZCBzY2lzc29yQ2xpcChHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTIwNiw2ICsy MDgsMTAgQEAgc3RhdGljIHZvaWQgc2Npc3NvckNsaXAoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRl eHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3Rh Y2s6OmFwcGx5KEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQogeworICAgIGlmICghY2xpcFN0 YXRlQ2hhbmdlZFNpbmNlTGFzdEFwcGx5KQorICAgICAgICByZXR1cm47CisgICAgY2xpcFN0YXRl Q2hhbmdlZFNpbmNlTGFzdEFwcGx5ID0gZmFsc2U7CisKICAgICBzY2lzc29yQ2xpcChjb250ZXh0 LCBjbGlwU3RhdGUuc2Npc3NvckJveCk7CiAgICAgY29udGV4dC0+c3RlbmNpbE9wKEdyYXBoaWNz Q29udGV4dDNEOjpLRUVQLCBHcmFwaGljc0NvbnRleHQzRDo6S0VFUCwgR3JhcGhpY3NDb250ZXh0 M0Q6OktFRVApOwogICAgIGNvbnRleHQtPnN0ZW5jaWxGdW5jKEdyYXBoaWNzQ29udGV4dDNEOjpF UVVBTCwgY2xpcFN0YXRlLnN0ZW5jaWxJbmRleCAtIDEsIGNsaXBTdGF0ZS5zdGVuY2lsSW5kZXgg LSAxKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyR0wuaAppbmRleCBhMmI0N2VhOGNkZGYzNmU4ZmM4ZTZmNDA5MWRj OTI0N2Q5NDk1ODQxLi41NjE4ODM2NjBjM2Y1NTRjNjUyMjMwMWQzNjlkNGYzNTI5MzZmMTZkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlckdMLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJHTC5oCkBAIC04OSw2ICs4OSwxMCBAQCBwcml2YXRlOgogCiAgICAgY2xh c3MgQ2xpcFN0YWNrIHsKICAgICBwdWJsaWM6CisgICAgICAgIENsaXBTdGFjaygpCisgICAgICAg ICAgICA6IGNsaXBTdGF0ZUNoYW5nZWRTaW5jZUxhc3RBcHBseShmYWxzZSkKKyAgICAgICAgeyB9 CisKICAgICAgICAgdm9pZCBwdXNoKCk7CiAgICAgICAgIHZvaWQgcG9wKCk7CiAgICAgICAgIHZv aWQgYXBwbHkoR3JhcGhpY3NDb250ZXh0M0QqKTsKQEAgLTk4LDYgKzEwMiw3IEBAIHByaXZhdGU6 CiAgICAgcHJpdmF0ZToKICAgICAgICAgQ2xpcFN0YXRlIGNsaXBTdGF0ZTsKICAgICAgICAgVmVj dG9yPENsaXBTdGF0ZT4gY2xpcFN0YWNrOworICAgICAgICBib29sIGNsaXBTdGF0ZUNoYW5nZWRT aW5jZUxhc3RBcHBseTsKICAgICB9OwogCiAgICAgVGV4dHVyZU1hcHBlckdMKCk7Cg== 190487 2013-02-27 03:50:00 -0800 2013-02-27 04:07:53 -0800 Patch bug-110790-20130227074613.patch text/plain 3195 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI5NWMxNWI3NDgzNWQ5 MTA4MTE1ZDRjOTc2NDk3Mzg1YmZjYzlhMi4uMDk5YjU2NTIwY2RmMjhmOWYzZDI5NTA5N2IzZDNm YTg2ZTk2OGQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAyLTI3ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBbdGV4bWFwXSBEbyBub3QgYXBwbHkgY2xpcCBzdGF0ZSBpZiByZWR1bmRhbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDc5MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGJvb2wg dG8gY2hlY2sgaWYgY2xpcCBzdGF0ZSBoYXMgY2hhbmdlZCBzaW5jZSBsYXN0IGFwcGx5LgorCisg ICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZXMsIHRodXMgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0 cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnJlc2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpwb3ApOgor ICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OmFwcGx5KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmg6CisgICAg ICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6Q2xpcFN0YWNrKToKKyAg ICAgICAgKENsaXBTdGFjayk6CisKIDIwMTMtMDItMjYgIFRha2FzaGkgU2FrYW1vdG8gIDx0YXNh a0Bnb29nbGUuY29tPgogCiAgICAgICAgIFNoYWRvdyBET00gc3R5bGVzIGFwcGVhciB0byBiZSBv dmVyLWVhZ2VybHkgc2hhcmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IDVmMmU3MWNmMjdi MjE0MTRlMjJlZDA2MzljMjllMTZjZjA3MTZkMmYuLjA0YmZiODJmZDBmNzdkY2JkZTJhY2JmMWU5 MGMxMzYzOTM1NmQ0ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCkBAIC0xNzksNiArMTc5LDcg QEAgdm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6cmVzZXQoY29uc3QgSW50UmVjdCYg cmVjdCkKIHsKICAgICBjbGlwU3RhY2suY2xlYXIoKTsKICAgICBjbGlwU3RhdGUgPSBUZXh0dXJl TWFwcGVyR0w6OkNsaXBTdGF0ZShyZWN0KTsKKyAgICBjbGlwU3RhdGVEaXJ0eSA9IHRydWU7CiB9 CiAKIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnB1c2goKQpAQCAtMTkyLDYgKzE5 Myw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnBvcCgpCiAgICAgICAgIHJl dHVybjsKICAgICBjbGlwU3RhdGUgPSBjbGlwU3RhY2subGFzdCgpOwogICAgIGNsaXBTdGFjay5y ZW1vdmVMYXN0KCk7CisgICAgY2xpcFN0YXRlRGlydHkgPSB0cnVlOwogfQogCiBzdGF0aWMgdm9p ZCBzY2lzc29yQ2xpcChHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgY29uc3QgSW50UmVjdCYg cmVjdCkKQEAgLTIwNiw2ICsyMDgsMTAgQEAgc3RhdGljIHZvaWQgc2Npc3NvckNsaXAoR3JhcGhp Y3NDb250ZXh0M0QqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgVGV4dHVy ZU1hcHBlckdMOjpDbGlwU3RhY2s6OmFwcGx5KEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQog eworICAgIGlmICghY2xpcFN0YXRlRGlydHkpCisgICAgICAgIHJldHVybjsKKyAgICBjbGlwU3Rh dGVEaXJ0eSA9IGZhbHNlOworCiAgICAgc2Npc3NvckNsaXAoY29udGV4dCwgY2xpcFN0YXRlLnNj aXNzb3JCb3gpOwogICAgIGNvbnRleHQtPnN0ZW5jaWxPcChHcmFwaGljc0NvbnRleHQzRDo6S0VF UCwgR3JhcGhpY3NDb250ZXh0M0Q6OktFRVAsIEdyYXBoaWNzQ29udGV4dDNEOjpLRUVQKTsKICAg ICBjb250ZXh0LT5zdGVuY2lsRnVuYyhHcmFwaGljc0NvbnRleHQzRDo6RVFVQUwsIGNsaXBTdGF0 ZS5zdGVuY2lsSW5kZXggLSAxLCBjbGlwU3RhdGUuc3RlbmNpbEluZGV4IC0gMSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckdMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmgKaW5kZXggYTJiNDdlYThjZGRmMzZlOGZjOGU2ZjQwOTFkYzkyNDdkOTQ5NTg0MS4u MmE4MGVkMjk4YThlMWQ4ZGEzZTJmOGRiMWMzNzg4MDUzMjI4MzI0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy R0wuaApAQCAtODksNiArODksMTAgQEAgcHJpdmF0ZToKIAogICAgIGNsYXNzIENsaXBTdGFjayB7 CiAgICAgcHVibGljOgorICAgICAgICBDbGlwU3RhY2soKQorICAgICAgICAgICAgOiBjbGlwU3Rh dGVEaXJ0eShmYWxzZSkKKyAgICAgICAgeyB9CisKICAgICAgICAgdm9pZCBwdXNoKCk7CiAgICAg ICAgIHZvaWQgcG9wKCk7CiAgICAgICAgIHZvaWQgYXBwbHkoR3JhcGhpY3NDb250ZXh0M0QqKTsK QEAgLTk4LDYgKzEwMiw3IEBAIHByaXZhdGU6CiAgICAgcHJpdmF0ZToKICAgICAgICAgQ2xpcFN0 YXRlIGNsaXBTdGF0ZTsKICAgICAgICAgVmVjdG9yPENsaXBTdGF0ZT4gY2xpcFN0YWNrOworICAg ICAgICBib29sIGNsaXBTdGF0ZURpcnR5OwogICAgIH07CiAKICAgICBUZXh0dXJlTWFwcGVyR0wo KTsK