72578 2011-11-16 18:58:25 -0800 [Chromium] Add flag to allow bypassing root surface clear 2013-04-12 07:24:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 0 sievers sievers cc-bugs dglazkov jamesr nduca piman schenney shawnsingh skyostil vangelis webkit.review.bot oldest_to_newest 504508 0 sievers 2011-11-16 18:58:25 -0800 [Chromium] Restrict clearing render surface on each frame to debug builds 504512 1 115513 sievers 2011-11-16 19:00:17 -0800 Created attachment 115513 Patch 504513 2 115514 sievers 2011-11-16 19:05:42 -0800 Created attachment 115514 Patch 504750 3 115514 webkit.review.bot 2011-11-17 04:41:01 -0800 Comment on attachment 115514 Patch Attachment 115514 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10312137 New failing tests: platform/chromium/compositing/layout-width-change.html compositing/geometry/fixed-in-composited.html compositing/masks/multiple-masks.html compositing/masks/masked-ancestor.html compositing/geometry/ancestor-overflow-change.html compositing/geometry/video-fixed-scrolling.html compositing/direct-image-compositing.html compositing/geometry/tall-page-composited.html compositing/masks/simple-composited-mask.html 511003 4 skyostil 2011-11-29 12:30:48 -0800 We should also use EXT_discard_framebuffer where available to make the "clear" even more efficient: http://www.khronos.org/registry/gles/extensions/EXT/EXT_discard_framebuffer.txt 511198 5 jamesr 2011-11-29 16:27:06 -0800 (In reply to comment #4) > We should also use EXT_discard_framebuffer where available to make the "clear" even more efficient: > http://www.khronos.org/registry/gles/extensions/EXT/EXT_discard_framebuffer.txt Do you know where this is implemented? 513956 6 nduca 2011-12-02 11:16:34 -0800 (In reply to comment #5) > We should also use EXT_discard_framebuffer where available to make the "clear" even more efficient: We should make that a separate bug. Lets get this patch landed. 513970 7 skyostil 2011-12-02 11:30:21 -0800 (In reply to comment #6) > (In reply to comment #5) > > We should also use EXT_discard_framebuffer where available to make the "clear" even more efficient: > > We should make that a separate bug. > > Lets get this patch landed. Definitely agreed, that's a future improvement and not a blocker for this one. I've opened https://bugs.webkit.org/show_bug.cgi?id=73679. 514022 8 115514 jamesr 2011-12-02 12:48:16 -0800 Comment on attachment 115514 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115514&action=review We still want the clear to blue to happen for release builds since we're getting reports from the wild where we fail to draw parts of the screen and blue is a lot easier to debug than corruption. Maybe instead we make this a per-platform setting, so we can leave it on for desktop platforms while we chase these issues down? > Source/WebCore/ChangeLog:9 > + Reviewed by James Robinson. This is wrong, please take it out. I haven't review+'d this patch. 514232 9 nduca 2011-12-02 15:38:28 -0800 (In reply to comment #8) > (From update of attachment 115514 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=115514&action=review > > We still want the clear to blue to happen for release builds since we're getting reports from the wild where we fail to draw parts of the screen and blue is a lot easier to debug than corruption. > > Maybe instead we make this a per-platform setting, so we can leave it on for desktop platforms while we chase these issues down? Lets do this and kill a few birds with one stone: enum OptimizationLevel { OPTIMIZATION_LEVEL_0 = 0, // default OPTIMIZATION_LEVEL_1 = 1, // cros OPTIMIZATION_LEVEL_2 = 2, // android } Put an OptimizationLevel on CCSettings. Use that to drive the clears. 514337 10 117726 sievers 2011-12-02 18:18:15 -0800 Created attachment 117726 Patch 514340 11 sievers 2011-12-02 18:19:36 -0800 What about keeping it more specific for now as in the attached patch? (In reply to comment #9) > (In reply to comment #8) > > (From update of attachment 115514 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=115514&action=review > > > > We still want the clear to blue to happen for release builds since we're getting reports from the wild where we fail to draw parts of the screen and blue is a lot easier to debug than corruption. > > > > Maybe instead we make this a per-platform setting, so we can leave it on for desktop platforms while we chase these issues down? > > Lets do this and kill a few birds with one stone: > > enum OptimizationLevel { > OPTIMIZATION_LEVEL_0 = 0, // default > OPTIMIZATION_LEVEL_1 = 1, // cros > OPTIMIZATION_LEVEL_2 = 2, // android > } > > Put an OptimizationLevel on CCSettings. Use that to drive the clears. 514344 12 117726 jamesr 2011-12-02 18:21:20 -0800 Comment on attachment 117726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117726&action=review > Source/WebCore/ChangeLog:9 > + Reviewed by <your name here>. Just leave this line alone. The script doesn't know what to do with this format, it looks very specifically for the string generated by the tools which is "Reviewed by NOBODY (OOPS!)" Without that line we can't use the commit queue to land this patch. 514347 13 nduca 2011-12-02 18:25:21 -0800 (In reply to comment #11) > What about keeping it more specific for now as in the attached patch? Because that's too specific. CCSettings is our public api for settings. At the end of the day, I do not see a point in propagating details about our optimizaiton levels all the way out to webkit or to chromium. From the point of the end user, Please please, just an optimization level? The 0,1,2 is intentional because I'm going to set kmaxswaps to 1 for 0 and 2 for 1+. You'll set clear for 2 only. It works. 514353 14 nduca 2011-12-02 18:30:12 -0800 Correcting some typos: > I do not see a point in propagating details about our optimizaiton algorithms all the way out to webkit or to chromium. From the point of the end user, all this complexity boils down to "i'm on a desktop, netbook or laptop." That's 0, 1, and 2. And that gives us a ton of flexibility internally to "do the right thing." 514363 15 117726 piman 2011-12-02 18:48:25 -0800 Comment on attachment 117726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117726&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h:85 > + static const bool clearRootSurface; I personally don't like to have this static. Statics always end up biting me. What if I want a different setting for the UI vs the web contents? 514366 16 117726 nduca 2011-12-02 18:50:38 -0800 Comment on attachment 117726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117726&action=review >> Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h:85 >> + static const bool clearRootSurface; > > I personally don't like to have this static. Statics always end up biting me. > What if I want a different setting for the UI vs the web contents? Why is this static? This should be just straight up bool. Set it from WebViewImpl and WebCompositorImpl. 514367 17 nduca 2011-12-02 18:51:23 -0800 (In reply to comment #16) > Set it from WebViewImpl and WebCompositorImpl. Even better, set the optimization level in CCSettings constructor 514368 18 piman 2011-12-02 18:58:10 -0800 Also, I don't think we can make a straight up decision clear vs not clear based on a linear "optimization level". Tiling architectures will benefit from a clear. Some traditional architecture also benefit from a clear because it resets acceleration hardware (e.g. frame buffer compression). But some don't (it sucks bandwidth). It's fairly orthogonal to the raw speed of the GPU. 514380 19 117735 sievers 2011-12-02 19:41:13 -0800 Created attachment 117735 Patch 514393 20 nduca 2011-12-02 20:29:47 -0800 (In reply to comment #18) > Also, I don't think we can make a straight up decision clear vs not clear based on a linear "optimization level". > Tiling architectures will benefit from a clear. Some traditional architecture also benefit from a clear because it resets acceleration hardware (e.g. frame buffer compression). But some don't (it sucks bandwidth). It's fairly orthogonal to the raw speed of the GPU. Sure, in the long term, you're right. But, we don't have the code maturity for a renderer-string-based probe either. I think for now we can get by establishing some basic precedent that the per-optimization determinations are internal and embedders just give broad hints. We need this for memory managment too. In the long term, I suspect we're headed toward yet-another "device->settings" table based on probing. :/ I'll also keep my eyes on android perf and do something smarter if I see render times drop. 529642 21 nduca 2012-01-04 11:29:24 -0800 Where do we stand on this bug? 561540 22 117735 jamesr 2012-02-21 20:23:03 -0800 Comment on attachment 117735 Patch The root layer clear is disabled on ToT in release builds, so I think this is unnecessary now. 115513 2011-11-16 19:00:17 -0800 2011-11-16 19:05:38 -0800 Patch bug-72578-20111116190015.patch text/plain 2360 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM5N2Q5YTViZDU5Y2Ix YmZjYTBjNTgyMTJhZTAwMDJmZDAxOTA3YS4uZjM3ODVjNTAwYTJkMDYxMmRlZTA2N2Y0Y2IxOTE5 YjhkZmMwYjE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTE2ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g UmVzdHJpY3QgY2xlYXJpbmcgcmVuZGVyIHN1cmZhY2Ugb24gZWFjaCBmcmFtZSB0byBkZWJ1ZyBi dWlsZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcy NTc4CisKKyAgICAgICAgVGhlIG5lZWQgZm9yIGRvaW5nIHRoaXMgc2hvdWxkIGhhdmUgYmVlbiBy ZW1vdmVkIHdpdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcyNDUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIG9ubHkgcmVtb3ZlcyBhbiB1bm5lY2Vzc2FyeSBjbGVh ci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJD aHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmRy YXdMYXllcnNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21p dW06OnVzZVJlbmRlclN1cmZhY2UpOgorCiAyMDExLTExLTE2ICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSA4IEJpdCBTdHJpbmdzIGluIEphdmFT Y3JpcHRDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBiYzlm MDAwYzIyMjY2OGFmOGE3YTZkYTc1NGQyZDYwYzZiMTgwYmMzLi5kZmI4NTYxZWE2ZTZiZmM1NmYw OTc1M2VkYjY4NGY4NGIxYjYxYjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5jcHAKQEAgLTM5NCwxMCArMzk0LDEyIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpk cmF3TGF5ZXJzSW50ZXJuYWwoKQogCiAgICAgdXNlUmVuZGVyU3VyZmFjZShtX2RlZmF1bHRSZW5k ZXJTdXJmYWNlKTsKIAorI2lmbmRlZiBOREVCVUcKICAgICAvLyBDbGVhciB0byBibHVlIHRvIG1h a2UgaXQgZWFzaWVyIHRvIHNwb3QgdW5yZW5kZXJlZCByZWdpb25zLgogICAgIG1fY29udGV4dC0+ Y2xlYXJDb2xvcigwLCAwLCAxLCAxKTsKICAgICBtX2NvbnRleHQtPmNvbG9yTWFzayh0cnVlLCB0 cnVlLCB0cnVlLCB0cnVlKTsKICAgICBtX2NvbnRleHQtPmNsZWFyKEdyYXBoaWNzQ29udGV4dDNE OjpDT0xPUl9CVUZGRVJfQklUKTsKKyNlbmRpZgogCiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwg bV9jb250ZXh0LT5lbmFibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7CiAgICAgR0xDKG1f Y29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9O RSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKQEAgLTU2Nyw3ICs1 NjksNyBAQCBib29sIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXNlUmVuZGVyU3VyZmFjZShDQ1Jl bmRlclN1cmZhY2UqIHJlbmRlclN1cmZhY2UpCiAKICAgICByZW5kZXJTdXJmYWNlLT5jb250ZW50 c1RleHR1cmUoKS0+ZnJhbWVidWZmZXJUZXh0dXJlMkQobV9jb250ZXh0LmdldCgpLCBtX3JlbmRl clN1cmZhY2VUZXh0dXJlQWxsb2NhdG9yLmdldCgpKTsKIAotI2lmICFkZWZpbmVkICggTkRFQlVH ICkKKyNpZm5kZWYgTkRFQlVHCiAgICAgaWYgKG1fY29udGV4dC0+Y2hlY2tGcmFtZWJ1ZmZlclN0 YXR1cyhHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpICE9IEdyYXBoaWNzQ29udGV4dDNE OjpGUkFNRUJVRkZFUl9DT01QTEVURSkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwo= 115514 2011-11-16 19:05:42 -0800 2011-12-02 18:18:09 -0800 Patch bug-72578-20111116190541.patch text/plain 2435 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM5N2Q5YTViZDU5Y2Ix YmZjYTBjNTgyMTJhZTAwMDJmZDAxOTA3YS4uZjM3ODVjNTAwYTJkMDYxMmRlZTA2N2Y0Y2IxOTE5 YjhkZmMwYjE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTE2ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g UmVzdHJpY3QgY2xlYXJpbmcgcmVuZGVyIHN1cmZhY2Ugb24gZWFjaCBmcmFtZSB0byBkZWJ1ZyBi dWlsZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcy NTc4CisKKyAgICAgICAgVGhlIG5lZWQgZm9yIGRvaW5nIHRoaXMgc2hvdWxkIGhhdmUgYmVlbiBy ZW1vdmVkIHdpdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcyNDUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIG9ubHkgcmVtb3ZlcyBhbiB1bm5lY2Vzc2FyeSBjbGVh ci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJD aHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmRy YXdMYXllcnNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21p dW06OnVzZVJlbmRlclN1cmZhY2UpOgorCiAyMDExLTExLTE2ICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSA4IEJpdCBTdHJpbmdzIGluIEphdmFT Y3JpcHRDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBiYzlm MDAwYzIyMjY2OGFmOGE3YTZkYTc1NGQyZDYwYzZiMTgwYmMzLi4wODQ0N2M3MDcwNmRlZTU3NDhk MzRlMDY1NDkzMTczOTdkNTc2YTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5jcHAKQEAgLTM5NCwxMCArMzk0LDEzIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpk cmF3TGF5ZXJzSW50ZXJuYWwoKQogCiAgICAgdXNlUmVuZGVyU3VyZmFjZShtX2RlZmF1bHRSZW5k ZXJTdXJmYWNlKTsKIAorICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+Y29sb3JN YXNrKHRydWUsIHRydWUsIHRydWUsIHRydWUpKTsKKworI2lmbmRlZiBOREVCVUcKICAgICAvLyBD bGVhciB0byBibHVlIHRvIG1ha2UgaXQgZWFzaWVyIHRvIHNwb3QgdW5yZW5kZXJlZCByZWdpb25z LgogICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigwLCAwLCAxLCAxKTsKLSAgICBtX2NvbnRleHQt PmNvbG9yTWFzayh0cnVlLCB0cnVlLCB0cnVlLCB0cnVlKTsKICAgICBtX2NvbnRleHQtPmNsZWFy KEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUKTsKKyNlbmRpZgogCiAgICAgR0xD KG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5lbmFibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJM RU5EKSk7CiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5ibGVuZEZ1bmMoR3Jh cGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQ SEEpKTsKQEAgLTU2Nyw3ICs1NzAsNyBAQCBib29sIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXNl UmVuZGVyU3VyZmFjZShDQ1JlbmRlclN1cmZhY2UqIHJlbmRlclN1cmZhY2UpCiAKICAgICByZW5k ZXJTdXJmYWNlLT5jb250ZW50c1RleHR1cmUoKS0+ZnJhbWVidWZmZXJUZXh0dXJlMkQobV9jb250 ZXh0LmdldCgpLCBtX3JlbmRlclN1cmZhY2VUZXh0dXJlQWxsb2NhdG9yLmdldCgpKTsKIAotI2lm ICFkZWZpbmVkICggTkRFQlVHICkKKyNpZm5kZWYgTkRFQlVHCiAgICAgaWYgKG1fY29udGV4dC0+ Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpICE9 IEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9DT01QTEVURSkgewogICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwo= 117726 2011-12-02 18:18:15 -0800 2011-12-02 19:41:09 -0800 Patch bug-72578-20111202181814.patch text/plain 3437 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcwMTRmYjRkMDNmNGMy Y2E3NDk3OWUwM2M1MWQzOThlNTE5YTBmNy4uZDNiNjEwMzY5MGIyYmNhNGRmZDNjZDQzYjZhYTFk NmRjMDUwODk0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTE2ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g QWRkIGZsYWcgdG8gYWxsb3cgYnlwYXNzaW5nIHJvb3Qgc3VyZmFjZSBjbGVhcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI1NzgKKworICAgICAgICBU aGUgbmVlZCBmb3IgZG9pbmcgdGhpcyBzaG91bGQgaGF2ZSBiZWVuIG1vc3RseSByZW1vdmVkIHdp dGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDUy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgPHlvdXIgbmFtZSBoZXJlPi4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYWRkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJl ckNocm9taXVtOjpkcmF3TGF5ZXJzSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJS ZW5kZXJlckNocm9taXVtOjp1c2VSZW5kZXJTdXJmYWNlKToKKwogMjAxMS0xMi0wMiAgQWFyb24g Q29sd2VsbCAgPGFjb2x3ZWxsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggbWl4ZWQgY29u dGVudCBoYW5kbGluZyBmb3IgdmlkZW8gaW4gQ2hyb21pdW0gYnkgaGF2aW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVy Q2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v TGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCAwNzk3NGRmOWM4YmM4YmM4MDJkY2U5M2Qy Yzg0NDYxYzg2MzUyZTBjLi4zOTZmOWI4ODM3NmI1NDViZWU1MzZkZTcyMTRmNjFmN2E5OGIzZjhj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTM5OCwxMCArMzk4 LDEzIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzSW50ZXJuYWwoKQog CiAgICAgdXNlUmVuZGVyU3VyZmFjZShtX2RlZmF1bHRSZW5kZXJTdXJmYWNlKTsKIAotICAgIC8v IENsZWFyIHRvIGJsdWUgdG8gbWFrZSBpdCBlYXNpZXIgdG8gc3BvdCB1bnJlbmRlcmVkIHJlZ2lv bnMuCi0gICAgbV9jb250ZXh0LT5jbGVhckNvbG9yKDAsIDAsIDEsIDEpOwogICAgIG1fY29udGV4 dC0+Y29sb3JNYXNrKHRydWUsIHRydWUsIHRydWUsIHRydWUpOwotICAgIG1fY29udGV4dC0+Y2xl YXIoR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0JVRkZFUl9CSVQpOworCisgICAgaWYgKHNldHRp bmdzKCkuY2xlYXJSb290U3VyZmFjZSkgeworICAgICAgICAvLyBDbGVhciB0byBibHVlIHRvIG1h a2UgaXQgZWFzaWVyIHRvIHNwb3QgdW5yZW5kZXJlZCByZWdpb25zLgorICAgICAgICBtX2NvbnRl eHQtPmNsZWFyQ29sb3IoMCwgMCwgMSwgMSk7CisgICAgICAgIG1fY29udGV4dC0+Y2xlYXIoR3Jh cGhpY3NDb250ZXh0M0Q6OkNPTE9SX0JVRkZFUl9CSVQpOworICAgIH0KIAogICAgIEdMQyhtX2Nv bnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpCTEVORCkp OwogICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+YmxlbmRGdW5jKEdyYXBoaWNz Q29udGV4dDNEOjpPTkUsIEdyYXBoaWNzQ29udGV4dDNEOjpPTkVfTUlOVVNfU1JDX0FMUEhBKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAppbmRleCBkYjE4MDllMDhjYmZiZTcxMjQ0 Y2Q4ZGM1YThkYThiYTU2NTA4YmEwLi42ODkwNTU0NWNmMTg5ZDdjZDY5YTQxZTE5ZWI5NjNkZjY5 MjM2ZGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTQzLDYgKzQzLDEy IEBAIHN0YXRpYyBpbnQgbnVtTGF5ZXJUcmVlSW5zdGFuY2VzOwogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKKyNpZiBPUyhBTkRST0lEKQorY29uc3QgYm9vbCBDQ1NldHRpbmdzOjpjbGVhclJvb3RT dXJmYWNlID0gZmFsc2U7CisjZWxzZQorY29uc3QgYm9vbCBDQ1NldHRpbmdzOjpjbGVhclJvb3RT dXJmYWNlID0gdHJ1ZTsKKyNlbmRpZgorCiBib29sIENDTGF5ZXJUcmVlSG9zdDo6YW55TGF5ZXJU cmVlSG9zdEluc3RhbmNlRXhpc3RzKCkKIHsKICAgICByZXR1cm4gbnVtTGF5ZXJUcmVlSW5zdGFu Y2VzID4gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKaW5kZXggOTY1MmQ1ODRhOGU2M2Zj ZGRlZjdlYzg0OWZjNzAxYjViYWVmMGFhYi4uMmFhZTliYWE4ZWNhNDE1MzQ2MDQzMjk1ZmJjNmRm YzJkOGFjZDAxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKQEAgLTgyLDYgKzgyLDcg QEAgc3RydWN0IENDU2V0dGluZ3MgewogICAgIGJvb2wgc2hvd1BsYXRmb3JtTGF5ZXJUcmVlOwog ICAgIGJvb2wgdXNlRGFtYWdlVHJhY2tlcjsKICAgICBkb3VibGUgcmVmcmVzaFJhdGU7CisgICAg c3RhdGljIGNvbnN0IGJvb2wgY2xlYXJSb290U3VyZmFjZTsKIH07CiAKIC8vIFByb3ZpZGVzIGlu Zm9ybWF0aW9uIG9uIGFuIEltcGwncyByZW5kZXJpbmcgY2FwYWJpbGl0aWVzIGJhY2sgdG8gdGhl IENDTGF5ZXJUcmVlSG9zdAo= 117735 2011-12-02 19:41:13 -0800 2012-02-21 20:23:03 -0800 Patch bug-72578-20111202194112.patch text/plain 3447 sievers U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcwMTRmYjRkMDNmNGMy Y2E3NDk3OWUwM2M1MWQzOThlNTE5YTBmNy4uZjBlZGVhZWFhMDY5YTYxNDg3MGUzOTI1OGQ0ZDNi NDdmNzM4NTViOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTE2ICBEYW5p ZWwgU2lldmVycyAgPHNpZXZlcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g QWRkIGZsYWcgdG8gYWxsb3cgYnlwYXNzaW5nIHJvb3Qgc3VyZmFjZSBjbGVhcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI1NzgKKworICAgICAgICBU aGUgbmVlZCBmb3IgZG9pbmcgdGhpcyBzaG91bGQgaGF2ZSBiZWVuIG1vc3RseSByZW1vdmVkIHdp dGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDUy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGFkZGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJD aHJvbWl1bTo6ZHJhd0xheWVyc0ludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVu ZGVyZXJDaHJvbWl1bTo6dXNlUmVuZGVyU3VyZmFjZSk6CisKIDIwMTEtMTItMDIgIEFhcm9uIENv bHdlbGwgIDxhY29sd2VsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IG1peGVkIGNvbnRl bnQgaGFuZGxpbmcgZm9yIHZpZGVvIGluIENocm9taXVtIGJ5IGhhdmluZwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXggMDc5NzRkZjljOGJjOGJjODAyZGNlOTNkMmM4 NDQ2MWM4NjM1MmUwYy4uYTRmY2QzMDRiMGEyNmQ0NjkwZWExMTE1NDllNjM4YzJlMTZiN2IwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0zOTgsMTAgKzM5OCwx MyBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVyc0ludGVybmFsKCkKIAog ICAgIHVzZVJlbmRlclN1cmZhY2UobV9kZWZhdWx0UmVuZGVyU3VyZmFjZSk7CiAKLSAgICAvLyBD bGVhciB0byBibHVlIHRvIG1ha2UgaXQgZWFzaWVyIHRvIHNwb3QgdW5yZW5kZXJlZCByZWdpb25z LgotICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigwLCAwLCAxLCAxKTsKICAgICBtX2NvbnRleHQt PmNvbG9yTWFzayh0cnVlLCB0cnVlLCB0cnVlLCB0cnVlKTsKLSAgICBtX2NvbnRleHQtPmNsZWFy KEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUKTsKKworICAgIGlmIChzZXR0aW5n cygpLm9wdGltaXphdGlvbkxldmVsID09IENDU2V0dGluZ3M6Ok9QVElNSVpBVElPTl9MRVZFTF8w KSB7CisgICAgICAgIC8vIENsZWFyIHRvIGJsdWUgdG8gbWFrZSBpdCBlYXNpZXIgdG8gc3BvdCB1 bnJlbmRlcmVkIHJlZ2lvbnMuCisgICAgICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigwLCAwLCAx LCAxKTsKKyAgICAgICAgbV9jb250ZXh0LT5jbGVhcihHcmFwaGljc0NvbnRleHQzRDo6Q09MT1Jf QlVGRkVSX0JJVCk7CisgICAgfQogCiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0 LT5lbmFibGUoR3JhcGhpY3NDb250ZXh0M0Q6OkJMRU5EKSk7CiAgICAgR0xDKG1fY29udGV4dC5n ZXQoKSwgbV9jb250ZXh0LT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6Ok9ORSwgR3JhcGhp Y3NDb250ZXh0M0Q6Ok9ORV9NSU5VU19TUkNfQUxQSEEpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmgKaW5kZXggOTY1MmQ1ODRhOGU2M2ZjZGRlZjdlYzg0OWZjNzAxYjViYWVmMGFhYi4uODJm ZDEzYjNlMDJlYTgwODU1ZDBlYWM1YzY3MGQ5NTVkODhiMWU2MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0LmgKQEAgLTc0LDcgKzc0LDIyIEBAIHN0cnVjdCBDQ1NldHRpbmdzIHsKICAgICAg ICAgICAgICwgc2hvd0ZQU0NvdW50ZXIoZmFsc2UpCiAgICAgICAgICAgICAsIHNob3dQbGF0Zm9y bUxheWVyVHJlZShmYWxzZSkKICAgICAgICAgICAgICwgdXNlRGFtYWdlVHJhY2tlcihmYWxzZSkK LSAgICAgICAgICAgICwgcmVmcmVzaFJhdGUoMCkgeyB9CisgICAgICAgICAgICAsIHJlZnJlc2hS YXRlKDApCisjaWYgT1MoQU5EUk9JRCkKKyAgICAgICAgICAgICwgb3B0aW1pemF0aW9uTGV2ZWwo T1BUSU1JWkFUSU9OX0xFVkVMXzIpCisjZWxpZiBkZWZpbmVkKENIUk9NRU9TKQorICAgICAgICAg ICAgLCBvcHRpbWl6YXRpb25MZXZlbChPUFRJTUlaQVRJT05fTEVWRUxfMSkKKyNlbHNlCisgICAg ICAgICAgICAsIG9wdGltaXphdGlvbkxldmVsKE9QVElNSVpBVElPTl9MRVZFTF8wKQorI2VuZGlm CisgICAgeworICAgIH0KKworICAgIGVudW0gT3B0aW1pemF0aW9uTGV2ZWwgeworICAgICAgICBP UFRJTUlaQVRJT05fTEVWRUxfMCA9IDAsCisgICAgICAgIE9QVElNSVpBVElPTl9MRVZFTF8xID0g MSwKKyAgICAgICAgT1BUSU1JWkFUSU9OX0xFVkVMXzIgPSAyLAorICAgIH07CiAKICAgICBib29s IGFjY2VsZXJhdGVQYWludGluZzsKICAgICBib29sIGNvbXBvc2l0ZU9mZnNjcmVlbjsKQEAgLTgy LDYgKzk3LDcgQEAgc3RydWN0IENDU2V0dGluZ3MgewogICAgIGJvb2wgc2hvd1BsYXRmb3JtTGF5 ZXJUcmVlOwogICAgIGJvb2wgdXNlRGFtYWdlVHJhY2tlcjsKICAgICBkb3VibGUgcmVmcmVzaFJh dGU7CisgICAgT3B0aW1pemF0aW9uTGV2ZWwgb3B0aW1pemF0aW9uTGV2ZWw7CiB9OwogCiAvLyBQ cm92aWRlcyBpbmZvcm1hdGlvbiBvbiBhbiBJbXBsJ3MgcmVuZGVyaW5nIGNhcGFiaWxpdGllcyBi YWNrIHRvIHRoZSBDQ0xheWVyVHJlZUhvc3QK