73733 2011-12-02 19:53:35 -0800 Inline RenderObject::view() 2011-12-06 15:38:59 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix darin simon.fraser webkit.review.bot oldest_to_newest 514385 0 jchaffraix 2011-12-02 19:53:35 -0800 The function is super hot and is showing up in some benchmarks (~4-5 percent under pprof). For some reason, it is not inlined when it should be (it's just a function call + a cast in release). Let's just inline it! 514390 1 117737 jchaffraix 2011-12-02 20:10:38 -0800 Created attachment 117737 Proposed inlining, moved the method to RenderView.h 514606 2 117737 darin 2011-12-03 19:36:03 -0800 Comment on attachment 117737 Proposed inlining, moved the method to RenderView.h View in context: https://bugs.webkit.org/attachment.cgi?id=117737&action=review Concept is great. The .exp file needs to be updated to avoid breaking the Mac build. > Source/WebCore/rendering/RenderObject.h:517 > + // Inlined into RenderView for performance and to avoid a cyclic dependency. This comment is confusing as written. I don’t know what it means to “inline something into RenderView”. Maybe if you said RenderView.h it’d be easier to understand. 515295 3 117916 jchaffraix 2011-12-05 12:31:20 -0800 Created attachment 117916 Updated patch: updated WebCore.exp.in and fixed the comment. 516171 4 117916 jchaffraix 2011-12-06 12:49:34 -0800 Comment on attachment 117916 Updated patch: updated WebCore.exp.in and fixed the comment. The patch seems to be causing some crashes mostly in svg in the cq. I will investigate what's going on. s 516194 5 118101 jchaffraix 2011-12-06 13:24:17 -0800 Created attachment 118101 Fix 3: re-add the client->view() to RenderSVGResourcesContainer as it looks fine for an SVGDocument not to have a RenderView and yet the render tree being rooted. 516311 6 118101 webkit.review.bot 2011-12-06 15:38:55 -0800 Comment on attachment 118101 Fix 3: re-add the client->view() to RenderSVGResourcesContainer as it looks fine for an SVGDocument not to have a RenderView and yet the render tree being rooted. Clearing flags on attachment: 118101 Committed r102185: <http://trac.webkit.org/changeset/102185> 516312 7 webkit.review.bot 2011-12-06 15:38:59 -0800 All reviewed patches have been landed. Closing bug. 117737 2011-12-02 20:10:38 -0800 2011-12-05 12:31:17 -0800 Proposed inlining, moved the method to RenderView.h bug-73733-20111202201037.patch text/plain 4103 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDJiNDQ3MmEwNjdmMmFh NWE3NzM2MWFiZjgyOGQ2OGNkYzM1MjFiNS4uMzUyZjFiNDg1ZTk2ZjUzNzBmOTg0N2Y2NmVlMGUx OTY4Y2U1ODA0MCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTEyLTAyICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIElubGluZSBS ZW5kZXJPYmplY3Q6OnZpZXcoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzM3MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNaWNyby1wZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIG5vIGNoYW5nZSBpbiBi ZWhhdmlvci4KKworICAgICAgICBSZW5kZXJPYmplY3Q6OnZpZXcoKSBpcyBzdXBlciBob3QgYW5k IGlzIHRha2luZyB+NC01JSBvZiB0aGUgdGltZSBpbiBzb21lCisgICAgICAgIGJlbmNobWFya3Mg YXMgaXQgaXMgY2FsbGVkIHNldmVyYWwgaHVuZHJlZCB0aG91c2FuZHMgdGltZXMuIEZvciBzb21l IHJlYXNvbiwKKyAgICAgICAgdGhlIGNvbXBpbGVyIGRpZCBub3QgaW5saW5lIGl0IGV2ZW4gdGhv dWdoIGl0IGlzIHZlcnkgc2ltcGxlIGluIHJlbGVhc2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcDogTW92ZWQgdGhlIGltcGxlbWVudGF0aW9uIGZyb20gaGVyZSAuLi4K KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyT2JqZWN0Ojp2aWV3KTogLi4uIHRvIGhlcmUgdG8gYXZvaWQgYSBjeWNsaWMKKyAgICAgICAg ZGVwZW5kZW5jeSBiZXR3ZWVuIFJlbmRlck9iamVjdCBhbmQgUmVuZGVyVmlldy4gQWxzbyBtYXJr ZWQgdGhlCisgICAgICAgIGZ1bmN0aW9uIGFzIEFMV0FZU19JTkxJTkUuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZUNvbnRhaW5lci5jcHA6CisgICAgICAgIFJlbW92ZWQgYSBib2d1cyBjaGVjayBm b3IgdmlldygpIGJlZm9yZSByZXBhaW50aW5nLiB2aWV3KCkgZG9lcyBub3QKKyAgICAgICAgZ2l2 ZSBhbnkgZ3VhcmFudGVlIHRoYXQgdGhlIHRyZWUgaXMgcm9vdGVkIGFuZCBSZW5kZXJPYmplY3Q6 OnJlcGFpbnQKKyAgICAgICAgKmRvZXMqIGFscmVhZHkgY2hlY2sgZm9yIHRoYXQgaW4gdGhlIHBy b3BlciB3YXkuCisKIDIwMTEtMTEtMjggIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgRml4IEFzcGVjdCBSYXRpbyBQcm9wZXJ0eSBJbmhlcml0YW5jZSBBbmQg TWFrZSB0aGUgQ29tcHV0ZWQgVmFsdWUgRXF1YWwgdGhlIFNwZWNpZmllZCBWYWx1ZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAwZjlkODM5OTM5ZTczNDI0 YzM5ZTQ1NWY4ZjI2MjUwMjNlMWNkODViLi5jNWJkMzQ1Zjc0YmIxYWZiZDVjZjlkNDczNTdkYTQx MWZkMWQxYmE1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApA QCAtMjExNiwxMSArMjExNiw2IEBAIExheW91dFJlY3QgUmVuZGVyT2JqZWN0Ojpsb2NhbENhcmV0 UmVjdChJbmxpbmVCb3gqLCBpbnQsIExheW91dFVuaXQqIGV4dHJhV2lkdGhUCiAgICAgcmV0dXJu IExheW91dFJlY3QoKTsKIH0KIAotUmVuZGVyVmlldyogUmVuZGVyT2JqZWN0Ojp2aWV3KCkgY29u c3QKLXsKLSAgICByZXR1cm4gdG9SZW5kZXJWaWV3KGRvY3VtZW50KCktPnJlbmRlcmVyKCkpOwot fQotCiBib29sIFJlbmRlck9iamVjdDo6aXNSb290ZWQoUmVuZGVyVmlldyoqIHZpZXcpCiB7CiAg ICAgUmVuZGVyT2JqZWN0KiBvID0gdGhpczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJP YmplY3QuaAppbmRleCBiOTQxMTZlMTM3YzJhOGM1MTZhNTdlNWIzODJkMDNhNDkzN2M0Y2Y3Li4x NWVkYmE0OTZjZGQwNmE1NWQxMjc3OTBkMzFkMmJmMjU3MjAzYjVkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC01MTQsNiArNTE0LDcgQEAgcHVibGljOgogICAg IAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVEcmFnU3RhdGUoYm9vbCBkcmFnT24pOwogCisgICAg Ly8gSW5saW5lZCBpbnRvIFJlbmRlclZpZXcgZm9yIHBlcmZvcm1hbmNlIGFuZCB0byBhdm9pZCBh IGN5Y2xpYyBkZXBlbmRlbmN5LgogICAgIFJlbmRlclZpZXcqIHZpZXcoKSBjb25zdDsKIAogICAg IC8vIFJldHVybnMgdHJ1ZSBpZiB0aGlzIHJlbmRlcmVyIGlzIHJvb3RlZCwgYW5kIG9wdGlvbmFs bHkgcmV0dXJucyB0aGUgaG9zdGluZyB2aWV3ICh0aGUgcm9vdCBvZiB0aGUgaGllcmFyY2h5KS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmluZGV4IDYxNTAxMGM4NTc3MjRhMjNi YjAzMWZiNWY0OGQ4MmI4NDQyOTg4NDQuLmFjMmNhMDE2ZTkxY2JiNGUyODYzOThjNWJkN2Y0Yjk5 YjA2NzNiYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaApAQCAtMjg5LDYg KzI4OSwxMSBAQCBpbmxpbmUgY29uc3QgUmVuZGVyVmlldyogdG9SZW5kZXJWaWV3KGNvbnN0IFJl bmRlck9iamVjdCogb2JqZWN0KQogdm9pZCB0b1JlbmRlclZpZXcoY29uc3QgUmVuZGVyVmlldyop OwogCiAKK0FMV0FZU19JTkxJTkUgUmVuZGVyVmlldyogUmVuZGVyT2JqZWN0Ojp2aWV3KCkgY29u c3QKK3sKKyAgICByZXR1cm4gdG9SZW5kZXJWaWV3KGRvY3VtZW50KCktPnJlbmRlcmVyKCkpOwor fQorCiAvLyBTdGFjay1iYXNlZCBjbGFzcyB0byBhc3Npc3Qgd2l0aCBMYXlvdXRTdGF0ZSBwdXNo L3BvcAogY2xhc3MgTGF5b3V0U3RhdGVNYWludGFpbmVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZ QUJMRShMYXlvdXRTdGF0ZU1haW50YWluZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcAppbmRleCAy OWQzNWU5YzhmMjRmYWQ4MzYxZWUxMTI1NmViOGM3ZWI2NThjOGM5Li4wMzE5MWM3NDIyOTVkMTJj NWIwNThjNDU0NDY1NWUwYzMyMjRhZjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcApAQCAtMTM1 LDggKzEzNSw3IEBAIHZvaWQgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI6Om1hcmtDbGllbnRG b3JJbnZhbGlkYXRpb24oUmVuZGVyT2JqZWN0KiBjbGllbnQsCiAgICAgICAgIGNsaWVudC0+c2V0 TmVlZHNCb3VuZGFyaWVzVXBkYXRlKCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgUmVwYWlu dEludmFsaWRhdGlvbjoKLSAgICAgICAgaWYgKGNsaWVudC0+dmlldygpKQotICAgICAgICAgICAg Y2xpZW50LT5yZXBhaW50KCk7CisgICAgICAgIGNsaWVudC0+cmVwYWludCgpOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIFBhcmVudE9ubHlJbnZhbGlkYXRpb246CiAgICAgICAgIGJyZWFrOwo= 117916 2011-12-05 12:31:20 -0800 2011-12-06 13:24:14 -0800 Updated patch: updated WebCore.exp.in and fixed the comment. bug-73733-20111205123118.patch text/plain 4824 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE0YWY4Y2QzMjM2MDA1 ZTdiYzg1YzljMTRlODc5NGZkMWFiMzUzMi4uZThjZWJkOWI5YmQ1YTFkZTc3YTljNWQ3ZWQ3YTIw ZWQzMjllZTc2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDExLTEyLTA1ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIElubGluZSBS ZW5kZXJPYmplY3Q6OnZpZXcoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzM3MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNaWNyby1wZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIG5vIGNoYW5nZSBpbiBi ZWhhdmlvci4KKworICAgICAgICBSZW5kZXJPYmplY3Q6OnZpZXcoKSBpcyBzdXBlciBob3QgYW5k IGlzIHRha2luZyB+NC01JSBvZiB0aGUgdGltZSBpbiBzb21lCisgICAgICAgIGJlbmNobWFya3Mg YXMgaXQgaXMgY2FsbGVkIHNldmVyYWwgaHVuZHJlZCB0aG91c2FuZHMgdGltZXMuIEZvciBzb21l IHJlYXNvbiwKKyAgICAgICAgdGhlIGNvbXBpbGVyIGRpZCBub3QgaW5saW5lIGl0IGV2ZW4gdGhv dWdoIGl0IGlzIHZlcnkgc2ltcGxlIGluIHJlbGVhc2UgYnVpbGRzLgorCisgICAgICAgICogV2Vi Q29yZS5leHAuaW46IFJlbW92ZWQgUmVuZGVyT2JqZWN0Ojp2aWV3KCkgYXMgaXQgaXMgaW5saW5l ZCBub3cuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDogTW92ZWQgdGhl IGltcGxlbWVudGF0aW9uIGZyb20gaGVyZSAuLi4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy Vmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojp2aWV3KTogLi4uIHRvIGhl cmUgdG8gYXZvaWQgYSBjeWNsaWMKKyAgICAgICAgZGVwZW5kZW5jeSBiZXR3ZWVuIFJlbmRlck9i amVjdCBhbmQgUmVuZGVyVmlldy4gQWxzbyBtYXJrZWQgdGhlCisgICAgICAgIGZ1bmN0aW9uIGFz IEFMV0FZU19JTkxJTkUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6Cisg ICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHA6Cisg ICAgICAgIFJlbW92ZWQgYSBib2d1cyBjaGVjayBmb3IgdmlldygpIGJlZm9yZSByZXBhaW50aW5n LiB2aWV3KCkgZG9lcyBub3QKKyAgICAgICAgZ2l2ZSBhbnkgZ3VhcmFudGVlIHRoYXQgdGhlIHRy ZWUgaXMgcm9vdGVkIGFuZCBSZW5kZXJPYmplY3Q6OnJlcGFpbnQKKyAgICAgICAgKmRvZXMqIGFs cmVhZHkgY2hlY2sgZm9yIHRoYXQgaW4gdGhlIHByb3BlciB3YXkuCisKIDIwMTEtMTItMDUgIE1p a2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBbQ2hyb21pdW1dIEhlYXAgcHJvZmlsZXIgc2hvdWxkIGRlc2lnbmF0ZSB3ZWFrIHJl ZmVyZW5jZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGQxYTk4ZDEzZDk2ODM4YzRiZjNiNWQ1 YjI0OTRlMWIwZWNhODE0YTcuLmRkZTMzMDcwYzFkMzU4OGZlOTI3ZGFjYTVmMzcwOTM2ODdjMGZl N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0xMTc5LDcgKzExNzksNiBAQCBfX1pOSzdXZWJD b3JlMTJJY29uRGF0YWJhc2U5aXNFbmFibGVkRXYKIF9fWk5LN1dlYkNvcmUxMlJlbmRlck9iamVj dDIzYWJzb2x1dGVCb3VuZGluZ0JveFJlY3RFYgogX19aTks3V2ViQ29yZTEyUmVuZGVyT2JqZWN0 MTRlbmNsb3NpbmdMYXllckV2CiBfX1pOSzdXZWJDb3JlMTJSZW5kZXJPYmplY3QxNWxvY2FsVG9B YnNvbHV0ZUVSS05TXzEwRmxvYXRQb2ludEViYgotX19aTks3V2ViQ29yZTEyUmVuZGVyT2JqZWN0 NHZpZXdFdgogX19aTks3V2ViQ29yZTEyUmVuZGVyT2JqZWN0N2NoaWxkQXRFagogX19aTks3V2Vi Q29yZTEyUmVuZGVyV2lkZ2V0MTR3aW5kb3dDbGlwUmVjdEV2CiBfX1pOSzdXZWJDb3JlMTJTaGFy ZWRCdWZmZXIxMWdldFNvbWVEYXRhRVJQS2NqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuY3BwCmluZGV4IGFlMzlhZjg3MGJlZTQ4OGIwNmUzYWEzZjQxMDJiZWYxMDhjNGJj ZWUuLjgyYjEyOTM2YjU5YzBiNGY4MGQ4MjMyN2RiYmNlOWU5ZGYwYTA1MTMgMTAwNzU1Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0yMTIyLDExICsyMTIyLDYgQEAg TGF5b3V0UmVjdCBSZW5kZXJPYmplY3Q6OmxvY2FsQ2FyZXRSZWN0KElubGluZUJveCosIGludCwg TGF5b3V0VW5pdCogZXh0cmFXaWR0aFQKICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOwogfQogCi1S ZW5kZXJWaWV3KiBSZW5kZXJPYmplY3Q6OnZpZXcoKSBjb25zdAotewotICAgIHJldHVybiB0b1Jl bmRlclZpZXcoZG9jdW1lbnQoKS0+cmVuZGVyZXIoKSk7Ci19Ci0KIGJvb2wgUmVuZGVyT2JqZWN0 Ojppc1Jvb3RlZChSZW5kZXJWaWV3KiogdmlldykKIHsKICAgICBSZW5kZXJPYmplY3QqIG8gPSB0 aGlzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDg2OTVmMzU4 MDgxY2M2YTdiODMyNzVmNWNlMDAzY2U3NjI4MWM0YTEuLjU3YTc1YTEyNjAwZTA2MTlhMTJiN2Ez MDdkMGJlMzY2NDk3NWIwNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmgKQEAgLTUxNiw2ICs1MTYsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZURyYWdTdGF0ZShib29sIGRyYWdPbik7CiAKKyAgICAvLyBJbmxpbmVkIGludG8gUmVuZGVy Vmlldy5oIGZvciBwZXJmb3JtYW5jZSBhbmQgdG8gYXZvaWQgYSBjeWNsaWMgZGVwZW5kZW5jeS4K ICAgICBSZW5kZXJWaWV3KiB2aWV3KCkgY29uc3Q7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYg dGhpcyByZW5kZXJlciBpcyByb290ZWQsIGFuZCBvcHRpb25hbGx5IHJldHVybnMgdGhlIGhvc3Rp bmcgdmlldyAodGhlIHJvb3Qgb2YgdGhlIGhpZXJhcmNoeSkuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuaAppbmRleCBjOGMxNTBkNGQ0ZGY4MTRkOTlmY2M3NmYwYTM0OWI2MTEyM2I1 OGY1Li5hNWU5NGU2MTA2MDhkZTZmMDJkY2I1M2MwNTNhNjg0YjliMGFkZjA0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKQEAgLTI5MSw2ICsyOTEsMTEgQEAgaW5saW5lIGNv bnN0IFJlbmRlclZpZXcqIHRvUmVuZGVyVmlldyhjb25zdCBSZW5kZXJPYmplY3QqIG9iamVjdCkK IHZvaWQgdG9SZW5kZXJWaWV3KGNvbnN0IFJlbmRlclZpZXcqKTsKIAogCitBTFdBWVNfSU5MSU5F IFJlbmRlclZpZXcqIFJlbmRlck9iamVjdDo6dmlldygpIGNvbnN0Cit7CisgICAgcmV0dXJuIHRv UmVuZGVyVmlldyhkb2N1bWVudCgpLT5yZW5kZXJlcigpKTsKK30KKwogLy8gU3RhY2stYmFzZWQg Y2xhc3MgdG8gYXNzaXN0IHdpdGggTGF5b3V0U3RhdGUgcHVzaC9wb3AKIGNsYXNzIExheW91dFN0 YXRlTWFpbnRhaW5lciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTGF5b3V0U3RhdGVNYWlu dGFpbmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHUmVzb3VyY2VDb250YWluZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKaW5kZXggYWRhNjkxM2QyMDE2YmUzMWEyZDNl ZWE4Mjc5ZDk2MDY2YjU1NTJjNi4uYTk0YmMwYjgzNmY4NGJkYzFlNTkyZWFjOGY4YzY0NDZiNmNj ZWU5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUNvbnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKQEAgLTEzNSw4ICsxMzUsNyBAQCB2b2lkIFJl bmRlclNWR1Jlc291cmNlQ29udGFpbmVyOjptYXJrQ2xpZW50Rm9ySW52YWxpZGF0aW9uKFJlbmRl ck9iamVjdCogY2xpZW50LAogICAgICAgICBjbGllbnQtPnNldE5lZWRzQm91bmRhcmllc1VwZGF0 ZSgpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFJlcGFpbnRJbnZhbGlkYXRpb246Ci0gICAg ICAgIGlmIChjbGllbnQtPnZpZXcoKSkKLSAgICAgICAgICAgIGNsaWVudC0+cmVwYWludCgpOwor ICAgICAgICBjbGllbnQtPnJlcGFpbnQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQYXJl bnRPbmx5SW52YWxpZGF0aW9uOgogICAgICAgICBicmVhazsK 118101 2011-12-06 13:24:17 -0800 2011-12-06 15:38:55 -0800 Fix 3: re-add the client->view() to RenderSVGResourcesContainer as it looks fine for an SVGDocument not to have a RenderView and yet the render tree being rooted. bug-73733-20111206132416.patch text/plain 4545 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA5Y2Q4ZjNmNjNhYWNj OTY4MGE3ZTQ1ZjA3ZTZhZjU2NTY3MzY1OC4uMGZmNjRjNTQ1ZmZmODk5MDFhZjhjMjZmZDdmZjJm ODZjZGY4M2E5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTEyLTA2ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIElubGluZSBS ZW5kZXJPYmplY3Q6OnZpZXcoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzM3MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNaWNyby1wZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIG5vIGNoYW5nZSBpbiBi ZWhhdmlvci4KKworICAgICAgICBSZW5kZXJPYmplY3Q6OnZpZXcoKSBpcyBzdXBlciBob3QgYW5k IGlzIHRha2luZyB+NC01JSBvZiB0aGUgdGltZSBpbiBzb21lCisgICAgICAgIGJlbmNobWFya3Mg YXMgaXQgaXMgY2FsbGVkIHNldmVyYWwgaHVuZHJlZCB0aG91c2FuZHMgdGltZXMuIEZvciBzb21l IHJlYXNvbiwKKyAgICAgICAgdGhlIGNvbXBpbGVyIGRpZCBub3QgaW5saW5lIGl0IGV2ZW4gdGhv dWdoIGl0IGlzIHZlcnkgc2ltcGxlIGluIHJlbGVhc2UgYnVpbGRzLgorCisgICAgICAgICogV2Vi Q29yZS5leHAuaW46IFJlbW92ZWQgUmVuZGVyT2JqZWN0Ojp2aWV3KCkgYXMgaXQgaXMgaW5saW5l ZCBub3cuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDogTW92ZWQgdGhl IGltcGxlbWVudGF0aW9uIGZyb20gaGVyZSAuLi4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy Vmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojp2aWV3KTogLi4uIHRvIGhl cmUgdG8gYXZvaWQgYSBjeWNsaWMKKyAgICAgICAgZGVwZW5kZW5jeSBiZXR3ZWVuIFJlbmRlck9i amVjdCBhbmQgUmVuZGVyVmlldy4gQWxzbyBtYXJrZWQgdGhlCisgICAgICAgIGZ1bmN0aW9uIGFz IEFMV0FZU19JTkxJTkUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6Cisg ICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHA6Cisg ICAgICAgIEFkZGVkICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiIGFzIHRoZSBjb2RlIGNoZWNrcyBm b3IgdmlldygpIGR1cmluZyByZXBhaW50LgorCiAyMDExLTEyLTA2ICBOb2VsIEdvcmRvbiAgPG5v ZWwuZ29yZG9uQGdtYWlsLmNvbT4KIAogICAgICAgICBXZWJQSW1hZ2VEZWNvZGVyIGNvbXB1dGVz IGltYWdlIHdpZHRoIGFuZCBoZWlnaHQgbXVsdGlwbGUgdGltZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4K aW5kZXggZDFhOThkMTNkOTY4MzhjNGJmM2I1ZDViMjQ5NGUxYjBlY2E4MTRhNy4uZGRlMzMwNzBj MWQzNTg4ZmU5MjdkYWNhNWYzNzA5MzY4N2MwZmU3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAg LTExNzksNyArMTE3OSw2IEBAIF9fWk5LN1dlYkNvcmUxMkljb25EYXRhYmFzZTlpc0VuYWJsZWRF dgogX19aTks3V2ViQ29yZTEyUmVuZGVyT2JqZWN0MjNhYnNvbHV0ZUJvdW5kaW5nQm94UmVjdEVi CiBfX1pOSzdXZWJDb3JlMTJSZW5kZXJPYmplY3QxNGVuY2xvc2luZ0xheWVyRXYKIF9fWk5LN1dl YkNvcmUxMlJlbmRlck9iamVjdDE1bG9jYWxUb0Fic29sdXRlRVJLTlNfMTBGbG9hdFBvaW50RWJi Ci1fX1pOSzdXZWJDb3JlMTJSZW5kZXJPYmplY3Q0dmlld0V2CiBfX1pOSzdXZWJDb3JlMTJSZW5k ZXJPYmplY3Q3Y2hpbGRBdEVqCiBfX1pOSzdXZWJDb3JlMTJSZW5kZXJXaWRnZXQxNHdpbmRvd0Ns aXBSZWN0RXYKIF9fWk5LN1dlYkNvcmUxMlNoYXJlZEJ1ZmZlcjExZ2V0U29tZURhdGFFUlBLY2oK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggYWUzOWFmODcw YmVlNDg4YjA2ZTNhYTNmNDEwMmJlZjEwOGM0YmNlZS4uODJiMTI5MzZiNTljMGI0ZjgwZDgyMzI3 ZGJiY2U5ZTlkZjBhMDUxMyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKQEAgLTIxMjIsMTEgKzIxMjIsNiBAQCBMYXlvdXRSZWN0IFJlbmRlck9iamVjdDo6bG9j YWxDYXJldFJlY3QoSW5saW5lQm94KiwgaW50LCBMYXlvdXRVbml0KiBleHRyYVdpZHRoVAogICAg IHJldHVybiBMYXlvdXRSZWN0KCk7CiB9CiAKLVJlbmRlclZpZXcqIFJlbmRlck9iamVjdDo6dmll dygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHRvUmVuZGVyVmlldyhkb2N1bWVudCgpLT5yZW5kZXJl cigpKTsKLX0KLQogYm9vbCBSZW5kZXJPYmplY3Q6OmlzUm9vdGVkKFJlbmRlclZpZXcqKiB2aWV3 KQogewogICAgIFJlbmRlck9iamVjdCogbyA9IHRoaXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmgKaW5kZXggODY5NWYzNTgwODFjYzZhN2I4MzI3NWY1Y2UwMDNjZTc2Mjgx YzRhMS4uNTdhNzVhMTI2MDBlMDYxOWExMmI3YTMwN2QwYmUzNjY0OTc1YjA1MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtNTE2LDYgKzUxNiw3IEBAIHB1Ymxp YzoKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRHJhZ1N0YXRlKGJvb2wgZHJhZ09uKTsK IAorICAgIC8vIElubGluZWQgaW50byBSZW5kZXJWaWV3LmggZm9yIHBlcmZvcm1hbmNlIGFuZCB0 byBhdm9pZCBhIGN5Y2xpYyBkZXBlbmRlbmN5LgogICAgIFJlbmRlclZpZXcqIHZpZXcoKSBjb25z dDsKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGlzIHJlbmRlcmVyIGlzIHJvb3RlZCwgYW5k IG9wdGlvbmFsbHkgcmV0dXJucyB0aGUgaG9zdGluZyB2aWV3ICh0aGUgcm9vdCBvZiB0aGUgaGll cmFyY2h5KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmluZGV4IGM4YzE1MGQ0 ZDRkZjgxNGQ5OWZjYzc2ZjBhMzQ5YjYxMTIzYjU4ZjUuLmE1ZTk0ZTYxMDYwOGRlNmYwMmRjYjUz YzA1M2E2ODRiOWIwYWRmMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaApA QCAtMjkxLDYgKzI5MSwxMSBAQCBpbmxpbmUgY29uc3QgUmVuZGVyVmlldyogdG9SZW5kZXJWaWV3 KGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0KQogdm9pZCB0b1JlbmRlclZpZXcoY29uc3QgUmVu ZGVyVmlldyopOwogCiAKK0FMV0FZU19JTkxJTkUgUmVuZGVyVmlldyogUmVuZGVyT2JqZWN0Ojp2 aWV3KCkgY29uc3QKK3sKKyAgICByZXR1cm4gdG9SZW5kZXJWaWV3KGRvY3VtZW50KCktPnJlbmRl cmVyKCkpOworfQorCiAvLyBTdGFjay1iYXNlZCBjbGFzcyB0byBhc3Npc3Qgd2l0aCBMYXlvdXRT dGF0ZSBwdXNoL3BvcAogY2xhc3MgTGF5b3V0U3RhdGVNYWludGFpbmVyIHsKICAgICBXVEZfTUFL RV9OT05DT1BZQUJMRShMYXlvdXRTdGF0ZU1haW50YWluZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNw cAppbmRleCBhZGE2OTEzZDIwMTZiZTMxYTJkM2VlYTgyNzlkOTYwNjZiNTU1MmM2Li4wNDAzYmI2 ZjY3ZjlmYjhlMDY0YjYxMTYxNDU3YzcxMjI1NTAxZGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNw cApAQCAtMjMsNiArMjMsNyBAQAogI2luY2x1ZGUgIlJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVy LmgiCiAKICNpbmNsdWRlICJSZW5kZXJTVkdTaGFkb3dUcmVlUm9vdENvbnRhaW5lci5oIgorI2lu Y2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJTVkdSZXNvdXJjZXNDYWNoZS5oIgogI2lu Y2x1ZGUgIlNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmgiCiAK