120770 2013-09-05 06:42:31 -0700 Call createTextRenderersForSiblingsAfterAttachIfNeeded only for the attach root 2013-09-07 08:51:18 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 120685 1 koivisto webkit-unassigned kling oldest_to_newest 925000 0 koivisto 2013-09-05 06:42:31 -0700 There is no need to call this during recursive attach as siblings are going to be attached normally anyway. 925001 1 210610 koivisto 2013-09-05 06:47:55 -0700 Created attachment 210610 patch 925026 2 koivisto 2013-09-05 07:45:18 -0700 https://trac.webkit.org/r155116 210610 2013-09-05 06:47:55 -0700 2013-09-05 07:34:42 -0700 patch text-sibling-attach-root.patch text/plain 6072 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NTExMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA5LTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsIGNyZWF0ZVRleHRSZW5k ZXJlcnNGb3JTaWJsaW5nc0FmdGVyQXR0YWNoSWZOZWVkZWQgb25seSBmb3IgdGhlIGF0dGFjaCBy b290CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA3 NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVy ZSBpcyBubyBuZWVkIHRvIGNhbGwgdGhpcyBkdXJpbmcgcmVjdXJzaXZlIGF0dGFjaCBhcyBzaWJs aW5ncyBhcmUgZ29pbmcgdG8gYmUgYXR0YWNoZWQgbm9ybWFsbHkgYW55d2F5LgorICAgICAgICBN b3ZlIGNhbGwgc2l0ZXMgdG8gYXR0YWNoIHJvb3RzIG9ubHkuCisKKyAgICAgICAgKiBzdHlsZS9T dHlsZVJlc29sdmVUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpjcmVhdGVUZXh0 UmVuZGVyZXJzRm9yU2libGluZ3NBZnRlckF0dGFjaElmTmVlZGVkKToKKyAgICAgICAgCisgICAg ICAgICAgICBGYWN0b3IgdG8gdGFrZSByZWZlcmVuY2UgYW5kIGRvIHRoZSBpbml0YWwgdGVzdHMg aXRzZWxmLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6Y3JlYXRlVGV4dFJlbmRlcmVySWZO ZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OnVwZGF0ZVRleHRSZW5kZXJlckFmdGVy Q29udGVudENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6YXR0YWNoQ2hpbGRyZW4p OgorICAgICAgICAKKyAgICAgICAgICAgIEFsc28gdGlnaHRlbmVkIHRoZSBjb25kaXRpb24gd2hl cmUgcHJldmlvdXNseSBhdHRhY2hlZCBjaGlsZHJlbiBtYXkgYmUgZW5jb3VudGVyZWQuCisKKyAg ICAgICAgKFdlYkNvcmU6OlN0eWxlOjphdHRhY2hSZW5kZXJUcmVlKToKKyAgICAgICAgKFdlYkNv cmU6OlN0eWxlOjpyZXNvbHZlTG9jYWwpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OnVwZGF0 ZVRleHRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6cmVhdHRhY2hSZW5kZXJUcmVl KToKKwogMjAxMy0wOS0wNSAgUHJhdmVlbiBSIEphZGhhdiAgPHByYXZlZW4uakBzYW1zdW5nLmNv bT4KIAogICAgICAgICBQcmVjaXNpb24gdXBkYXRlcyBpbiBXZWJBdWRpby4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCShyZXZpc2lvbiAxNTQ5NjkpCisr KyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjc5LDIyICsyNzksMTkgQEAgc3RhdGljIFJlbmRlck9iamVjdCogbmV4dFNpYmxpbmdS ZW5kZXJlcgogICAgIHJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBjcmVhdGVUZXh0UmVuZGVy ZXJzRm9yU2libGluZ3NBZnRlckF0dGFjaElmTmVlZGVkKE5vZGUqIHNpYmxpbmcpCitzdGF0aWMg dm9pZCBjcmVhdGVUZXh0UmVuZGVyZXJzRm9yU2libGluZ3NBZnRlckF0dGFjaElmTmVlZGVkKE5v ZGUmIG5vZGUpCiB7Ci0gICAgQVNTRVJUKHNpYmxpbmctPnByZXZpb3VzU2libGluZygpKTsKLSAg ICBBU1NFUlQoc2libGluZy0+cHJldmlvdXNTaWJsaW5nKCktPnJlbmRlcmVyKCkpOwotICAgIEFT U0VSVCghc2libGluZy0+cmVuZGVyZXIoKSk7Ci0gICAgQVNTRVJUKHNpYmxpbmctPmF0dGFjaGVk KCkpOworICAgIGlmICghbm9kZS5yZW5kZXJlcigpKQorICAgICAgICByZXR1cm47CiAgICAgLy8g SWYgdGhpcyBub2RlIGdvdCBhIHJlbmRlcmVyIGl0IG1heSBiZSB0aGUgcHJldmlvdXNSZW5kZXJl cigpIG9mIHNpYmxpbmcgdGV4dCBub2RlcyBhbmQgdGh1cyBhZmZlY3QgdGhlCiAgICAgLy8gcmVz dWx0IG9mIFRleHQ6OnRleHRSZW5kZXJlcklzTmVlZGVkKCkgZm9yIHRob3NlIG5vZGVzLgotICAg IGZvciAoOyBzaWJsaW5nOyBzaWJsaW5nID0gc2libGluZy0+bmV4dFNpYmxpbmcoKSkgeworICAg IGZvciAoTm9kZSogc2libGluZyA9IG5vZGUubmV4dFNpYmxpbmcoKTsgc2libGluZzsgc2libGlu ZyA9IHNpYmxpbmctPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgaWYgKHNpYmxpbmctPnJlbmRl cmVyKCkpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgaWYgKCFzaWJsaW5nLT5hdHRhY2hl ZCgpKQogICAgICAgICAgICAgYnJlYWs7IC8vIEFzc3VtZSB0aGlzIG1lYW5zIG5vbmUgb2YgdGhl IGZvbGxvd2luZyBzaWJsaW5ncyBhcmUgYXR0YWNoZWQuCiAgICAgICAgIGlmICghc2libGluZy0+ aXNUZXh0Tm9kZSgpKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIEFTU0VSVCghc2li bGluZy0+cmVuZGVyZXIoKSk7CiAgICAgICAgIGF0dGFjaFRleHRSZW5kZXJlcigqdG9UZXh0KHNp YmxpbmcpKTsKICAgICAgICAgLy8gSWYgd2UgYWdhaW4gZGVjaWRlZCBub3QgdG8gY3JlYXRlIGEg cmVuZGVyZXIgZm9yIG5leHQsIHdlIGNhbiBiYWlsIG91dCB0aGUgbG9vcCwKICAgICAgICAgLy8g YmVjYXVzZSBpdCB3b24ndCBhZmZlY3QgdGhlIHJlc3VsdCBvZiBUZXh0Ojp0ZXh0UmVuZGVyZXJJ c05lZWRlZCgpIGZvciB0aGUgcmVzdApAQCAtMzg0LDEwICszODEsNiBAQCBzdGF0aWMgdm9pZCBj cmVhdGVUZXh0UmVuZGVyZXJJZk5lZWRlZChUCiAgICAgLy8gUGFyZW50IHRha2VzIGNhcmUgb2Yg dGhlIGFuaW1hdGlvbnMsIG5vIG5lZWQgdG8gY2FsbCBzZXRBbmltYXRhYmxlU3R5bGUuCiAgICAg bmV3UmVuZGVyZXItPnNldFN0eWxlKHN0eWxlLnJlbGVhc2UoKSk7CiAgICAgcGFyZW50UmVuZGVy ZXItPmFkZENoaWxkKG5ld1JlbmRlcmVyLCBuZXh0UmVuZGVyZXIpOwotCi0gICAgTm9kZSogc2li bGluZyA9IHRleHROb2RlLm5leHRTaWJsaW5nKCk7Ci0gICAgaWYgKHNpYmxpbmcgJiYgIXNpYmxp bmctPnJlbmRlcmVyKCkgJiYgc2libGluZy0+YXR0YWNoZWQoKSkKLSAgICAgICAgY3JlYXRlVGV4 dFJlbmRlcmVyc0ZvclNpYmxpbmdzQWZ0ZXJBdHRhY2hJZk5lZWRlZChzaWJsaW5nKTsKIH0KIAog dm9pZCBhdHRhY2hUZXh0UmVuZGVyZXIoVGV4dCYgdGV4dE5vZGUpCkBAIC00MTMsNiArNDA2LDcg QEAgdm9pZCB1cGRhdGVUZXh0UmVuZGVyZXJBZnRlckNvbnRlbnRDaGFuZwogICAgIFJlbmRlclRl eHQqIHRleHRSZW5kZXJlciA9IHRvUmVuZGVyVGV4dCh0ZXh0Tm9kZS5yZW5kZXJlcigpKTsKICAg ICBpZiAoIXRleHRSZW5kZXJlcikgewogICAgICAgICBhdHRhY2hUZXh0UmVuZGVyZXIodGV4dE5v ZGUpOworICAgICAgICBjcmVhdGVUZXh0UmVuZGVyZXJzRm9yU2libGluZ3NBZnRlckF0dGFjaElm TmVlZGVkKHRleHROb2RlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBSZW5kZXJPYmpl Y3QqIHBhcmVudFJlbmRlcmVyID0gTm9kZVJlbmRlcmluZ1RyYXZlcnNhbDo6cGFyZW50KCZ0ZXh0 Tm9kZSktPnJlbmRlcmVyKCk7CkBAIC00MjQsMjMgKzQxOCwxMCBAQCB2b2lkIHVwZGF0ZVRleHRS ZW5kZXJlckFmdGVyQ29udGVudENoYW5nCiAgICAgdGV4dFJlbmRlcmVyLT5zZXRUZXh0V2l0aE9m ZnNldCh0ZXh0Tm9kZS5kYXRhSW1wbCgpLCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgbGVuZ3RoT2ZS ZXBsYWNlZERhdGEpOwogfQogCi0jaWZuZGVmIE5ERUJVRwotc3RhdGljIGJvb2wgY2hpbGRBdHRh Y2hlZEFsbG93ZWRXaGVuQXR0YWNoaW5nQ2hpbGRyZW4oQ29udGFpbmVyTm9kZSYgbm9kZSkKLXsK LSAgICBpZiAobm9kZS5pc1NoYWRvd1Jvb3QoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg aWYgKG5vZGUuaXNJbnNlcnRpb25Qb2ludCgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICBp ZiAobm9kZS5pc0VsZW1lbnROb2RlKCkgJiYgdG9FbGVtZW50KCZub2RlKS0+c2hhZG93Um9vdCgp KQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0jZW5kaWYKLQog c3RhdGljIHZvaWQgYXR0YWNoQ2hpbGRyZW4oQ29udGFpbmVyTm9kZSYgY3VycmVudCkKIHsKICAg ICBmb3IgKE5vZGUqIGNoaWxkID0gY3VycmVudC5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9 IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIEFTU0VSVCghY2hpbGQtPmF0dGFjaGVk KCkgfHwgY2hpbGRBdHRhY2hlZEFsbG93ZWRXaGVuQXR0YWNoaW5nQ2hpbGRyZW4oY3VycmVudCkp OworICAgICAgICBBU1NFUlQoIWNoaWxkLT5hdHRhY2hlZCgpIHx8IGN1cnJlbnQuc2hhZG93Um9v dCgpKTsKICAgICAgICAgaWYgKGNoaWxkLT5hdHRhY2hlZCgpKQogICAgICAgICAgICAgY29udGlu dWU7CiAgICAgICAgIGlmIChjaGlsZC0+aXNUZXh0Tm9kZSgpKSB7CkBAIC00OTMsMTAgKzQ3NCw2 IEBAIHN0YXRpYyB2b2lkIGF0dGFjaFJlbmRlclRyZWUoRWxlbWVudCYgY3UKIAogICAgIGF0dGFj aENoaWxkcmVuKGN1cnJlbnQpOwogCi0gICAgTm9kZSogc2libGluZyA9IGN1cnJlbnQubmV4dFNp YmxpbmcoKTsKLSAgICBpZiAoY3VycmVudC5yZW5kZXJlcigpICYmIHNpYmxpbmcgJiYgIXNpYmxp bmctPnJlbmRlcmVyKCkgJiYgc2libGluZy0+YXR0YWNoZWQoKSkKLSAgICAgICAgY3JlYXRlVGV4 dFJlbmRlcmVyc0ZvclNpYmxpbmdzQWZ0ZXJBdHRhY2hJZk5lZWRlZChzaWJsaW5nKTsKLQogICAg IGN1cnJlbnQuc2V0QXR0YWNoZWQodHJ1ZSk7CiAgICAgY3VycmVudC5jbGVhck5lZWRzU3R5bGVS ZWNhbGMoKTsKIApAQCAtNjExLDYgKzU4OCw4IEBAIHN0YXRpYyBDaGFuZ2UgcmVzb2x2ZUxvY2Fs KEVsZW1lbnQmIGN1cnIKICAgICAgICAgaWYgKGN1cnJlbnQuYXR0YWNoZWQoKSkKICAgICAgICAg ICAgIGRldGFjaFJlbmRlclRyZWUoY3VycmVudCwgUmVhdHRhY2hEZXRhY2gpOwogICAgICAgICBh dHRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIG5ld1N0eWxlLmdldCgpKTsKKyAgICAgICAgY3JlYXRl VGV4dFJlbmRlcmVyc0ZvclNpYmxpbmdzQWZ0ZXJBdHRhY2hJZk5lZWRlZChjdXJyZW50KTsKKwog ICAgICAgICByZXR1cm4gRGV0YWNoOwogICAgIH0KIApAQCAtNjUxLDggKzYzMCwxMCBAQCBzdGF0 aWMgdm9pZCB1cGRhdGVUZXh0U3R5bGUoVGV4dCYgdGV4dCwgCiAgICAgICAgIHJldHVybjsKICAg ICBpZiAocmVuZGVyZXIpCiAgICAgICAgIHJlbmRlcmVyLT5zZXRUZXh0KHRleHQuZGF0YUltcGwo KSk7Ci0gICAgZWxzZQorICAgIGVsc2UgewogICAgICAgICBhdHRhY2hUZXh0UmVuZGVyZXIodGV4 dCk7CisgICAgICAgIGNyZWF0ZVRleHRSZW5kZXJlcnNGb3JTaWJsaW5nc0FmdGVyQXR0YWNoSWZO ZWVkZWQodGV4dCk7CisgICAgfQogICAgIHRleHQuY2xlYXJOZWVkc1N0eWxlUmVjYWxjKCk7CiB9 CiAKQEAgLTgzNSw2ICs4MTYsNyBAQCB2b2lkIHJlc29sdmVUcmVlKERvY3VtZW50JiBkb2N1bWVu dCwgQ2hhCiB2b2lkIGF0dGFjaFJlbmRlclRyZWUoRWxlbWVudCYgZWxlbWVudCkKIHsKICAgICBh dHRhY2hSZW5kZXJUcmVlKGVsZW1lbnQsIG51bGxwdHIpOworICAgIGNyZWF0ZVRleHRSZW5kZXJl cnNGb3JTaWJsaW5nc0FmdGVyQXR0YWNoSWZOZWVkZWQoZWxlbWVudCk7CiB9CiAKIHZvaWQgZGV0 YWNoUmVuZGVyVHJlZShFbGVtZW50JiBlbGVtZW50KQpAQCAtODUxLDcgKzgzMyw3IEBAIHZvaWQg cmVhdHRhY2hSZW5kZXJUcmVlKEVsZW1lbnQmIGN1cnJlbnQKIHsKICAgICBpZiAoY3VycmVudC5h dHRhY2hlZCgpKQogICAgICAgICBkZXRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIFJlYXR0YWNoRGV0 YWNoKTsKLSAgICBhdHRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIG51bGxwdHIpOworICAgIGF0dGFj aFJlbmRlclRyZWUoY3VycmVudCk7CiB9CiAKIH0K