36134 2010-03-15 13:34:39 -0700 Drop out of compositing mode when no elements need to composite 2010-03-15 14:49:02 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 199807 0 simon.fraser 2010-03-15 13:34:39 -0700 Currently we never go out of compositing mode on a given page, even if no elements need to be composited. This means that we keep a layer-backed view subview of the WebHTMLView around, which can impact resize performance. 199832 1 50740 simon.fraser 2010-03-15 14:29:19 -0700 Created attachment 50740 Patch 199840 2 50740 mitz 2010-03-15 14:39:27 -0700 Comment on attachment 50740 Patch > + } else { > + m_rootPlatformLayer->setChildren(childList); > + } Braces around one-line block. 199847 3 simon.fraser 2010-03-15 14:47:46 -0700 http://trac.webkit.org/changeset/56017 199848 4 simon.fraser 2010-03-15 14:49:02 -0700 <rdar://problem/7748315> 50740 2010-03-15 14:29:19 -0700 2010-03-15 14:39:26 -0700 Patch bug-36134-20100315142917.patch text/plain 6207 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmQyNzgzZC4uMjA1NWQ0NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMC0wMy0xNSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBEcm9wIG91dCBvZiBjb21wb3NpdGluZyBtb2RlIHdoZW4gbm8g ZWxlbWVudHMgbmVlZCB0byBjb21wb3NpdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM2MTM0CisKKyAgICAgICAgV2hlbiBubyBtb3JlIGVsZW1lbnRz IG9uIHRoZSBwYWdlIG5lZWQgdG8gYmUgY29tcG9zaXRlZCwgZHJvcCBvdXQgb2YgY29tcG9zaXRp bmcKKyAgICAgICAgbW9kZSBhbHRvZ2V0aGVyLCBpbmNsdWRpbmcgcmVtb3ZpbmcgdGhlIGxheWVy LWJhY2tlZCB2aWV3IHRoYXQgaG9zdHMgdGhlIGxheWVycy4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyk6IElmIHRoZSBsaXN0IG9mIGNo aWxkIGxheWVycyB0byBhdHRhY2ggYXQKKyAgICAgICAgdGhlIHJvb3QgaXMgZW1wdHksIHdlIGhh dmUgbm8gY29tcG9zaXRlZCBsYXllcnMsIGFuZCBjYW4gZHJvcCBvdXQgb2YgY29tcG9zaXRpbmcg bW9kZSBieSBjYWxsaW5nCisgICAgICAgIHdpbGxNb3ZlT2Zmc2NyZWVuKCkuCisgICAgICAgIAor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRp bmdSZXF1aXJlbWVudHMpOiBJbiBzZXZlcmFsIHBsYWNlcywKKyAgICAgICAgdXNlIHdpbGxCZUNv bXBvc2l0ZWQgcmF0aGVyIHRoYW4gY2FsbGluZyBuZWVkc1RvQmVDb21wb3NpdGVkKCksIGJlY2F1 c2UgaXQgYXZvaWRzCisgICAgICAgIHJlY29tcHV0aW5nIHN0YXRlIHRoYXQgd2Uga25vdyBhbHJl YWR5IChidXQgYXNzZXJ0IHRoYXQgd2UncmUgZ2V0dGluZyBpdCByaWdodCkuCisgICAgICAgIFdo ZW4gd2UncmUgYXNzZXNzaW5nIHRoZSByb290IGxheWVyIGluIHBvc3Qtb3JkZXIsIHNlZSBpZiB3 ZSBoYXZlIGFueSBjaGlsZCBsYXllcnMgdGhhdAorICAgICAgICBhcmUgY29tcG9zaXRpbmcsIGFu ZCBhbHNvIHdoZXRoZXIgdGhlIHJvb3QgaXRzZWxmIG5lZWRzIHRvIGNvbXBvc2l0ZS4gSWYgbmVp dGhlciBhcmUKKyAgICAgICAgdHJ1ZSwgdGhlbiB3ZSBjYW4gZHJvcCBvdXQgb2YgY29tcG9zaXRp bmcgbW9kZS4KKyAgICAgICAgCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6Om5lZWRzVG9CZUNvbXBvc2l0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIpOiBNb3ZlIHRoZQorICAgICAgICAi aW5Db21wb3NpdGluZ01vZGUoKSAmJiBsYXllci0+aXNSb290TGF5ZXIoKSIgdGVzdCBvdXQgb2Yg cmVxdWlyZXNDb21wb3NpdGluZ0xheWVyKCkKKyAgICAgICAgYW5kIGludG8gbmVlZHNUb0JlQ29t cG9zaXRlZCgpIHNvIHRoYXQgd2UgY2FuIGNhbGwgcmVxdWlyZXNDb21wb3NpdGluZ0xheWVyKCkg c2VwYXJhdGVseQorICAgICAgICBvbiB0aGUgcm9vdCBsYXllciBhYm92ZS4KKwogMjAxMC0wMy0x NSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg Sm9obiBTdWxsaXZhbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu Y3BwCmluZGV4IDg1NGJlMGQuLjRkYTJlZTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMjA5LDggKzIwOSwxNCBAQCB2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBl IHVwZGF0ZQogICAgICAgICByZWJ1aWxkQ29tcG9zaXRpbmdMYXllclRyZWUodXBkYXRlUm9vdCwg Y29tcFN0YXRlLCBjaGlsZExpc3QpOwogCiAgICAgICAgIC8vIEhvc3QgdGhlIGRvY3VtZW50IGxh eWVyIGluIHRoZSBSZW5kZXJWaWV3J3Mgcm9vdCBsYXllci4KLSAgICAgICAgaWYgKHVwZGF0ZVJv b3QgPT0gcm9vdFJlbmRlckxheWVyKCkgJiYgIWNoaWxkTGlzdC5pc0VtcHR5KCkpCi0gICAgICAg ICAgICBtX3Jvb3RQbGF0Zm9ybUxheWVyLT5zZXRDaGlsZHJlbihjaGlsZExpc3QpOworICAgICAg ICBpZiAodXBkYXRlUm9vdCA9PSByb290UmVuZGVyTGF5ZXIoKSkgeworICAgICAgICAgICAgaWYg KGNoaWxkTGlzdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICB3aWxsTW92ZU9mZnNjcmVl bigpOworICAgICAgICAgICAgICAgIG1fcm9vdFBsYXRmb3JtTGF5ZXIgPSAwOworICAgICAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBtX3Jvb3RQbGF0Zm9ybUxheWVyLT5zZXRDaGls ZHJlbihjaGlsZExpc3QpOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfSBlbHNlIGlm IChuZWVkR2VvbWV0cnlVcGRhdGUpIHsKICAgICAgICAgLy8gV2UganVzdCBuZWVkIHRvIGRvIGEg Z2VvbWV0cnkgdXBkYXRlLiBUaGlzIGlzIG9ubHkgdXNlZCBmb3IgcG9zaXRpb246Zml4ZWQgc2Ny b2xsaW5nOwogICAgICAgICAvLyBtb3N0IG9mIHRoZSB0aW1lLCBnZW9tZXRyeSBpcyB1cGRhdGVk IHZpYSBSZW5kZXJMYXllcjo6c3R5bGVDaGFuZ2VkKCkuCkBAIC01NjMsOCArNTY5LDkgQEAgdm9p ZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhS ZW5kZXJMYXllciogbGF5ZXIsIE8KICAgICAgICAgd2lsbEJlQ29tcG9zaXRlZCA9IHRydWU7CiAg ICAgfQogCisgICAgQVNTRVJUKHdpbGxCZUNvbXBvc2l0ZWQgPT0gbmVlZHNUb0JlQ29tcG9zaXRl ZChsYXllcikpOwogICAgIGlmIChsYXllci0+cmVmbGVjdGlvbkxheWVyKCkpCi0gICAgICAgIGxh eWVyLT5yZWZsZWN0aW9uTGF5ZXIoKS0+c2V0TXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJzKG5l ZWRzVG9CZUNvbXBvc2l0ZWQobGF5ZXIpKTsKKyAgICAgICAgbGF5ZXItPnJlZmxlY3Rpb25MYXll cigpLT5zZXRNdXN0T3ZlcmxhcENvbXBvc2l0ZWRMYXllcnMod2lsbEJlQ29tcG9zaXRlZCk7CiAK ICAgICAvLyBTdWJzZXF1ZW50IGxheWVycyBpbiB0aGUgcGFyZW50IHN0YWNraW5nIGNvbnRleHQg YWxzbyBuZWVkIHRvIGNvbXBvc2l0ZS4KICAgICBpZiAoY2hpbGRTdGF0ZS5tX3N1YnRyZWVJc0Nv bXBvc2l0aW5nKQpAQCAtNTgxLDggKzU4OCwxNiBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRv cjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBsYXllciwgTwog ICAgICAgICB3aWxsQmVDb21wb3NpdGVkID0gdHJ1ZTsKICAgICB9CiAKKyAgICAvLyBJZiB3ZSdy ZSBiYWNrIGF0IHRoZSByb290LCBhbmQgbm8gb3RoZXIgbGF5ZXJzIG5lZWQgdG8gYmUgY29tcG9z aXRlZCwgYW5kIHRoZSByb290IGxheWVyIGl0c2VsZiBkb2Vzbid0IG5lZWQKKyAgICAvLyB0byBi ZSBjb21wb3NpdGVkLCB0aGVuIHdlIGNhbiBkcm9wIG91dCBvZiBjb21wb3NpdGluZyBtb2RlIGFs dG9nZXRoZXIuCisgICAgaWYgKGxheWVyLT5pc1Jvb3RMYXllcigpICYmICFjaGlsZFN0YXRlLm1f c3VidHJlZUlzQ29tcG9zaXRpbmcgJiYgIXJlcXVpcmVzQ29tcG9zaXRpbmdMYXllcihsYXllcikp IHsKKyAgICAgICAgbV9jb21wb3NpdGluZyA9IGZhbHNlOworICAgICAgICB3aWxsQmVDb21wb3Np dGVkID0gZmFsc2U7CisgICAgfQorICAgIAogICAgIC8vIElmIHRoZSBsYXllciBpcyBnb2luZyBp bnRvIGNvbXBvc2l0aW5nIG1vZGUsIHJlcGFpbnQgaXRzIG9sZCBsb2NhdGlvbi4KLSAgICBpZiAo IWxheWVyLT5pc0NvbXBvc2l0ZWQoKSAmJiBuZWVkc1RvQmVDb21wb3NpdGVkKGxheWVyKSkKKyAg ICBBU1NFUlQod2lsbEJlQ29tcG9zaXRlZCA9PSBuZWVkc1RvQmVDb21wb3NpdGVkKGxheWVyKSk7 CisgICAgaWYgKCFsYXllci0+aXNDb21wb3NpdGVkKCkgJiYgd2lsbEJlQ29tcG9zaXRlZCkKICAg ICAgICAgcmVwYWludE9uQ29tcG9zaXRpbmdDaGFuZ2UobGF5ZXIpOwogCiAgICAgLy8gVXBkYXRl IGJhY2tpbmcgbm93LCBzbyB0aGF0IHdlIGNhbiB1c2UgaXNDb21wb3NpdGVkKCkgcmVsaWFibHkg ZHVyaW5nIHRyZWUgdHJhdmVyc2FsIGluIHJlYnVpbGRDb21wb3NpdGluZ0xheWVyVHJlZSgpLgpA QCAtOTM0LDcgKzk0OSw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpuZWVkc1RvQmVD b21wb3NpdGVkKGNvbnN0IFJlbmRlckxheWVyKiBsYXllcikgY29uc3QKICAgICBpZiAoIW1faGFz QWNjZWxlcmF0ZWRDb21wb3NpdGluZyB8fCAhbGF5ZXItPmlzU2VsZlBhaW50aW5nTGF5ZXIoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIHJlcXVpcmVzQ29tcG9zaXRpbmdM YXllcihsYXllcikgfHwgbGF5ZXItPm11c3RPdmVybGFwQ29tcG9zaXRlZExheWVycygpOworICAg IHJldHVybiByZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIobGF5ZXIpIHx8IGxheWVyLT5tdXN0T3Zl cmxhcENvbXBvc2l0ZWRMYXllcnMoKSB8fCAoaW5Db21wb3NpdGluZ01vZGUoKSAmJiBsYXllci0+ aXNSb290TGF5ZXIoKSk7CiB9CiAKIC8vIE5vdGU6IHRoaXMgc3BlY2lmaWVzIHdoZXRoZXIgdGhl IFJMIG5lZWRzIGEgY29tcG9zaXRpbmcgbGF5ZXIgZm9yIGludHJpbnNpYyByZWFzb25zLgpAQCAt OTQ5LDE0ICs5NjQsMTMgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcXVpcmVzQ29t cG9zaXRpbmdMYXllcihjb25zdCBSZW5kZXJMYXllciogbGF5ZXIpIGMKICAgICAgICAgbGF5ZXIg PSB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHJlbmRlcmVyKS0+bGF5ZXIoKTsKICAgICB9CiAgICAg Ly8gVGhlIHJvb3QgbGF5ZXIgYWx3YXlzIGhhcyBhIGNvbXBvc2l0aW5nIGxheWVyLCBidXQgaXQg bWF5IG5vdCBoYXZlIGJhY2tpbmcuCi0gICAgcmV0dXJuIChpbkNvbXBvc2l0aW5nTW9kZSgpICYm IGxheWVyLT5pc1Jvb3RMYXllcigpKSB8fAotICAgICAgICAgICAgIHJlcXVpcmVzQ29tcG9zaXRp bmdGb3JUcmFuc2Zvcm0ocmVuZGVyZXIpIHx8Ci0gICAgICAgICAgICAgcmVxdWlyZXNDb21wb3Np dGluZ0ZvclZpZGVvKHJlbmRlcmVyKSB8fAotICAgICAgICAgICAgIHJlcXVpcmVzQ29tcG9zaXRp bmdGb3JDYW52YXMocmVuZGVyZXIpIHx8Ci0gICAgICAgICAgICAgcmVxdWlyZXNDb21wb3NpdGlu Z0ZvclBsdWdpbihyZW5kZXJlcikgfHwKLSAgICAgICAgICAgICByZW5kZXJlci0+c3R5bGUoKS0+ YmFja2ZhY2VWaXNpYmlsaXR5KCkgPT0gQmFja2ZhY2VWaXNpYmlsaXR5SGlkZGVuIHx8Ci0gICAg ICAgICAgICAgY2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRzKGxheWVyKSB8fAotICAgICAgICAg ICAgIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JBbmltYXRpb24ocmVuZGVyZXIpOworICAgIHJldHVy biByZXF1aXJlc0NvbXBvc2l0aW5nRm9yVHJhbnNmb3JtKHJlbmRlcmVyKQorICAgICAgICAgICAg IHx8IHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JWaWRlbyhyZW5kZXJlcikKKyAgICAgICAgICAgICB8 fCByZXF1aXJlc0NvbXBvc2l0aW5nRm9yQ2FudmFzKHJlbmRlcmVyKQorICAgICAgICAgICAgIHx8 IHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JQbHVnaW4ocmVuZGVyZXIpCisgICAgICAgICAgICAgfHwg cmVuZGVyZXItPnN0eWxlKCktPmJhY2tmYWNlVmlzaWJpbGl0eSgpID09IEJhY2tmYWNlVmlzaWJp bGl0eUhpZGRlbgorICAgICAgICAgICAgIHx8IGNsaXBzQ29tcG9zaXRpbmdEZXNjZW5kYW50cyhs YXllcikKKyAgICAgICAgICAgICB8fCByZXF1aXJlc0NvbXBvc2l0aW5nRm9yQW5pbWF0aW9uKHJl bmRlcmVyKTsKIH0KIAogLy8gUmV0dXJuIHRydWUgaWYgdGhlIGdpdmVuIGxheWVyIGhhcyBzb21l IGFuY2VzdG9yIGluIHRoZSBSZW5kZXJMYXllciBoaWVyYXJjaHkgdGhhdCBjbGlwcywK