133713 2014-06-10 19:15:08 -0700 [wk2] Don't dispatch view state changes immediately 2014-06-11 13:44:29 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca barraclough mitz simon.fraser oldest_to_newest 1014631 0 thorton 2014-06-10 19:15:08 -0700 If a WKWebView is removed from the view hierarchy and re-added in the same run-loop cycle, we shouldn't dispatch two "is-in-window" updates to the Web process. We should wait until just before CA is going to flush the (UI-process) layer tree, and dispatch them then (at that point, it's too late to re-add a view to the hierarchy for this run-loop cycle anyway). This avoids briefly suspending processes on iOS when moving views around in the hierarchy, and also performs a similar duty to WKView's non-sync variants of {begin, end}DeferringViewInWindowChanges, but without the app's manual intervention via SPI (and should ideally eventually allow us to get rid of that SPI on OS X as well). 1014632 1 232843 thorton 2014-06-10 19:20:59 -0700 Created attachment 232843 patch 1014885 2 thorton 2014-06-11 13:44:29 -0700 http://trac.webkit.org/changeset/169827 232843 2014-06-10 19:20:59 -0700 2014-06-11 11:20:26 -0700 patch defer-null-changes.diff text/plain 7529 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3OWMxMzdjLi45YjU2MjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTQtMDYtMTAgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgogCisgICAgICAgIFt3azJdIERvbid0IGRpc3BhdGNoIHZpZXcgc3RhdGUgY2hhbmdlcyBpbW1l ZGlhdGVseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMzNzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnZpZXdT dGF0ZURpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlzcGF0Y2hW aWV3U3RhdGVDaGFuZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnVwZGF0ZVZp ZXdTdGF0ZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICBPbiBQTEFURk9STShDT0NPQSksIHdhaXQgdW50aWwganVzdCBiZWZvcmUgQ0EgaXMg Z29pbmcgdG8gY29tbWl0IHRoZSBVSSBwcm9jZXNzIGxheWVyCisgICAgICAgIHRyZWUgdG8gZGlz cGF0Y2ggdmlldyBzdGF0ZSBjaGFuZ2VzIHRvIHRoZSBXZWIgcHJvY2Vzcy4gVGhpcyBhdm9pZHMg c2VuZGluZyBtdWx0aXBsZQorICAgICAgICB2aWV3IHN0YXRlIGNoYW5nZSBtZXNzYWdlcyB0byB0 aGUgV2ViIHByb2Nlc3Mgd2l0aGluIG9uZSBydW4tbG9vcCBjeWNsZSwgZm9yIGV4YW1wbGUKKyAg ICAgICAgd2hlbiBhIHZpZXcgaXMgbW92ZWQgYXJvdW5kIGluIHRoZSB2aWV3IGhpZXJhcmNoeSBi dXQgdGhlIHZpZXcgc3RhdGUgb3RoZXJ3aXNlIHJlbWFpbnMgdGhlIHNhbWUuCisKKzIwMTQtMDYt MTAgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCiAgICAgICAg IE1ha2UgaXQgcG9zc2libGUgZm9yIHdhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5IHRvIGJh aWwgaWYgYSBzeW5jIG1lc3NhZ2UgY29tZXMgaW4gZnJvbSB0aGUgb3RoZXIgZGlyZWN0aW9uCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM3MDgKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBlYmM3MzE1Li42 YmYyZGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAt MTMyLDYgKzEzMiw3IEBACiAKICNpZiBQTEFURk9STShDT0NPQSkKICNpbmNsdWRlICJWaWV3U25h cHNob3RTdG9yZS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvUnVuTG9vcE9ic2VydmVyLmg+CiAjZW5k aWYKIAogI2lmIFBMQVRGT1JNKElPUykKQEAgLTM2NCw2ICszNjUsOCBAQCBXZWJQYWdlUHJveHk6 OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHBy b2Nlc3MsIHVpbgogICAgICwgbV93YWl0aW5nRm9yRGlkVXBkYXRlVmlld1N0YXRlKGZhbHNlKQog ICAgICwgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3IoRG9Ob3RQaW4pCiAgICAgLCBtX25hdmlnYXRp b25JRCgwKQorICAgICwgbV9wb3RlbnRpYWxseUNoYW5nZWRWaWV3U3RhdGVGbGFncyhWaWV3U3Rh dGU6Ok5vRmxhZ3MpCisgICAgLCBtX3ZpZXdTdGF0ZUNoYW5nZVdhbnRzUmVwbHkoV2FudHNSZXBs eU9yTm90OjpEb2VzTm90V2FudFJlcGx5KQogewogICAgIGlmIChtX3Byb2Nlc3MtPnN0YXRlKCkg PT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZykgewogICAgICAgICBpZiAobV91c2Vy Q29udGVudENvbnRyb2xsZXIpCkBAIC00MDgsNiArNDExLDEzIEBAIFdlYlBhZ2VQcm94eTo6V2Vi UGFnZVByb3h5KFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz cywgdWluCiAgICAgSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uID0gbV9wcm9jZXNzLT5zdGF0 ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcgPyBtX3Byb2Nlc3MtPmNvbm5l Y3Rpb24oKSA6IG51bGxwdHI7CiAgICAgbV9wcm9jZXNzLT5jb250ZXh0KCkuc3RvcmFnZU1hbmFn ZXIoKS5jcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShtX3BhZ2VJRCwgY29ubmVjdGlvbiwg c3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKTsKICAgICBzZXRTZXNzaW9uKCpj b25maWd1cmF0aW9uLnNlc3Npb24pOworCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgY29uc3Qg Q0ZJbmRleCB2aWV3U3RhdGVDaGFuZ2VSdW5Mb29wT3JkZXIgPSAoQ0ZJbmRleClSdW5Mb29wT2Jz ZXJ2ZXI6OldlbGxLbm93blJ1bkxvb3BPcmRlcnM6OkNvcmVBbmltYXRpb25Db21taXQgLSAxOwor ICAgIG1fdmlld1N0YXRlQ2hhbmdlRGlzcGF0Y2hlciA9IFJ1bkxvb3BPYnNlcnZlcjo6Y3JlYXRl KHZpZXdTdGF0ZUNoYW5nZVJ1bkxvb3BPcmRlciwgW3RoaXNdKCkgeworICAgICAgICB0aGlzLT5k aXNwYXRjaFZpZXdTdGF0ZUNoYW5nZSgpOworICAgIH0pOworI2VuZGlmCiB9CiAKIFdlYlBhZ2VQ cm94eTo6fldlYlBhZ2VQcm94eSgpCkBAIC0xMDc3LDI1ICsxMDg3LDQxIEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojp1cGRhdGVWaWV3U3RhdGUoVmlld1N0YXRlOjpGbGFncyBmbGFnc1RvVXBkYXRlKQog CiB2b2lkIFdlYlBhZ2VQcm94eTo6dmlld1N0YXRlRGlkQ2hhbmdlKFZpZXdTdGF0ZTo6RmxhZ3Mg bWF5SGF2ZUNoYW5nZWQsIFdhbnRzUmVwbHlPck5vdCB3YW50c1JlcGx5KQogeworICAgIG1fcG90 ZW50aWFsbHlDaGFuZ2VkVmlld1N0YXRlRmxhZ3MgfD0gbWF5SGF2ZUNoYW5nZWQ7CisgICAgbV92 aWV3U3RhdGVDaGFuZ2VXYW50c1JlcGx5ID0gKHdhbnRzUmVwbHkgPT0gV2FudHNSZXBseU9yTm90 OjpEb2VzV2FudFJlcGx5IHx8IG1fdmlld1N0YXRlQ2hhbmdlV2FudHNSZXBseSA9PSBXYW50c1Jl cGx5T3JOb3Q6OkRvZXNXYW50UmVwbHkpID8gV2FudHNSZXBseU9yTm90OjpEb2VzV2FudFJlcGx5 IDogV2FudHNSZXBseU9yTm90OjpEb2VzTm90V2FudFJlcGx5OworCisjaWYgUExBVEZPUk0oQ09D T0EpCisgICAgbV92aWV3U3RhdGVDaGFuZ2VEaXNwYXRjaGVyLT5zY2hlZHVsZSgpOworI2Vsc2UK KyAgICBkaXNwYXRjaFZpZXdTdGF0ZUNoYW5nZSgpOworI2VuZGlmCit9CisKK3ZvaWQgV2ViUGFn ZVByb3h5OjpkaXNwYXRjaFZpZXdTdGF0ZUNoYW5nZSgpCit7CisjaWYgUExBVEZPUk0oQ09DT0Ep CisgICAgbV92aWV3U3RhdGVDaGFuZ2VEaXNwYXRjaGVyLT5pbnZhbGlkYXRlKCk7CisjZW5kaWYK KwogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBJZiB0aGUg dmlzaWJpbGl0eSBzdGF0ZSBtYXkgaGF2ZSBjaGFuZ2VkLCB0aGVuIHNvIG1heSB0aGUgdmlzdWFs bHkgaWRsZSAmIG9jY2x1ZGVkIGFnbm9zdGljIHN0YXRlLgotICAgIGlmIChtYXlIYXZlQ2hhbmdl ZCAmIFZpZXdTdGF0ZTo6SXNWaXNpYmxlKQotICAgICAgICBtYXlIYXZlQ2hhbmdlZCB8PSBWaWV3 U3RhdGU6OklzVmlzaWJsZU9yT2NjbHVkZWQgfCBWaWV3U3RhdGU6OklzVmlzdWFsbHlJZGxlOwor ICAgIGlmIChtX3BvdGVudGlhbGx5Q2hhbmdlZFZpZXdTdGF0ZUZsYWdzICYgVmlld1N0YXRlOjpJ c1Zpc2libGUpCisgICAgICAgIG1fcG90ZW50aWFsbHlDaGFuZ2VkVmlld1N0YXRlRmxhZ3MgfD0g Vmlld1N0YXRlOjpJc1Zpc2libGVPck9jY2x1ZGVkIHwgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRs ZTsKIAogICAgIC8vIFJlY29yZCB0aGUgcHJpb3IgdmlldyBzdGF0ZSwgdXBkYXRlIHRoZSBmbGFn cyB0aGF0IG1heSBoYXZlIGNoYW5nZWQsCiAgICAgLy8gYW5kIGNoZWNrIHdoaWNoIGZsYWdzIGhh dmUgYWN0dWFsbHkgY2hhbmdlZC4KICAgICBWaWV3U3RhdGU6OkZsYWdzIHByZXZpb3VzVmlld1N0 YXRlID0gbV92aWV3U3RhdGU7Ci0gICAgdXBkYXRlVmlld1N0YXRlKG1heUhhdmVDaGFuZ2VkKTsK KyAgICB1cGRhdGVWaWV3U3RhdGUobV9wb3RlbnRpYWxseUNoYW5nZWRWaWV3U3RhdGVGbGFncyk7 CiAgICAgVmlld1N0YXRlOjpGbGFncyBjaGFuZ2VkID0gbV92aWV3U3RhdGUgXiBwcmV2aW91c1Zp ZXdTdGF0ZTsKIAogICAgIGlmIChjaGFuZ2VkKQotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldFZpZXdTdGF0ZShtX3ZpZXdTdGF0ZSwgd2FudHNSZXBseSA9PSBX YW50c1JlcGx5T3JOb3Q6OkRvZXNXYW50UmVwbHkpLCBtX3BhZ2VJRCk7Ci0gICAgCisgICAgICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0Vmlld1N0YXRlKG1fdmlld1N0 YXRlLCBtX3ZpZXdTdGF0ZUNoYW5nZVdhbnRzUmVwbHkgPT0gV2FudHNSZXBseU9yTm90OjpEb2Vz V2FudFJlcGx5KSwgbV9wYWdlSUQpOworCiAgICAgLy8gVGhpcyBtdXN0IGhhcHBlbiBhZnRlciB0 aGUgU2V0Vmlld1N0YXRlIG1lc3NhZ2UgaXMgc2VudCwgdG8gZW5zdXJlIHRoZSBwYWdlIHZpc2li aWxpdHkgZXZlbnQgY2FuIGZpcmUuCiAgICAgdXBkYXRlQWN0aXZpdHlUb2tlbigpOwotICAgIAor CiAgICAgaWYgKGNoYW5nZWQgJiBWaWV3U3RhdGU6OklzVmlzdWFsbHlJZGxlKQogICAgICAgICBt X3Byb2Nlc3MtPnBhZ2VTdXBwcmVzc2liaWxpdHlDaGFuZ2VkKHRoaXMpOwogCkBAIC0xMTA1LDcg KzExMzEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6dmlld1N0YXRlRGlkQ2hhbmdlKFZpZXdTdGF0 ZTo6RmxhZ3MgbWF5SGF2ZUNoYW5nZWQsIFdhbnRzUmVwbAogICAgIGlmICgoY2hhbmdlZCAmIFZp ZXdTdGF0ZTo6SXNWaXNpYmxlKSAmJiAhaXNWaWV3VmlzaWJsZSgpKQogICAgICAgICBtX3Byb2Nl c3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RvcCgpOwogCi0gICAgaWYgKChtYXlIYXZlQ2hh bmdlZCAmIFZpZXdTdGF0ZTo6SXNJbldpbmRvdykgJiYgKG1fdmlld1N0YXRlICYgVmlld1N0YXRl OjpJc0luV2luZG93KSkgeworICAgIGlmICgobV9wb3RlbnRpYWxseUNoYW5nZWRWaWV3U3RhdGVG bGFncyAmIFZpZXdTdGF0ZTo6SXNJbldpbmRvdykgJiYgKG1fdmlld1N0YXRlICYgVmlld1N0YXRl OjpJc0luV2luZG93KSkgewogICAgICAgICBMYXllckhvc3RpbmdNb2RlIGxheWVySG9zdGluZ01v ZGUgPSBtX3BhZ2VDbGllbnQudmlld0xheWVySG9zdGluZ01vZGUoKTsKICAgICAgICAgaWYgKG1f bGF5ZXJIb3N0aW5nTW9kZSAhPSBsYXllckhvc3RpbmdNb2RlKSB7CiAgICAgICAgICAgICBtX2xh eWVySG9zdGluZ01vZGUgPSBsYXllckhvc3RpbmdNb2RlOwpAQCAtMTExMyw3ICsxMTM5LDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnZpZXdTdGF0ZURpZENoYW5nZShWaWV3U3RhdGU6OkZsYWdzIG1h eUhhdmVDaGFuZ2VkLCBXYW50c1JlcGwKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICgobWF5 SGF2ZUNoYW5nZWQgJiBWaWV3U3RhdGU6OklzSW5XaW5kb3cpICYmICEobV92aWV3U3RhdGUgJiBW aWV3U3RhdGU6OklzSW5XaW5kb3cpKSB7CisgICAgaWYgKChtX3BvdGVudGlhbGx5Q2hhbmdlZFZp ZXdTdGF0ZUZsYWdzICYgVmlld1N0YXRlOjpJc0luV2luZG93KSAmJiAhKG1fdmlld1N0YXRlICYg Vmlld1N0YXRlOjpJc0luV2luZG93KSkgewogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SX1BP UE9WRVIpCiAgICAgICAgIC8vIFdoZW4gbGVhdmluZyB0aGUgY3VycmVudCBwYWdlLCBjbG9zZSB0 aGUgcG9wb3ZlciBjb2xvciB3ZWxsLgogICAgICAgICBpZiAobV9jb2xvclBpY2tlcikKQEAgLTEx MjcsOCArMTE1MywxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6dmlld1N0YXRlRGlkQ2hhbmdlKFZp ZXdTdGF0ZTo6RmxhZ3MgbWF5SGF2ZUNoYW5nZWQsIFdhbnRzUmVwbAogICAgIH0KIAogICAgIHVw ZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxlU3RhdGUoKTsKKworICAgIG1fcG90ZW50aWFsbHlD aGFuZ2VkVmlld1N0YXRlRmxhZ3MgPSBWaWV3U3RhdGU6Ok5vRmxhZ3M7CisgICAgbV92aWV3U3Rh dGVDaGFuZ2VXYW50c1JlcGx5ID0gV2FudHNSZXBseU9yTm90OjpEb2VzTm90V2FudFJlcGx5Owog fQotICAgIAorCiB2b2lkIFdlYlBhZ2VQcm94eTo6dXBkYXRlQWN0aXZpdHlUb2tlbigpCiB7CiAj aWYgUExBVEZPUk0oSU9TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmlu ZGV4IDNhZjQ5NDcuLjkzNTkyYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKQEAgLTEyNSw2ICsxMjUsNyBAQCBjbGFzcyBGbG9hdFJlY3Q7CiBjbGFzcyBHcmFwaGlj c0xheWVyOwogY2xhc3MgSW50U2l6ZTsKIGNsYXNzIFByb3RlY3Rpb25TcGFjZTsKK2NsYXNzIFJ1 bkxvb3BPYnNlcnZlcjsKIGNsYXNzIFNoYXJlZEJ1ZmZlcjsKIHN0cnVjdCBGaWxlQ2hvb3NlclNl dHRpbmdzOwogc3RydWN0IFRleHRBbHRlcm5hdGl2ZVdpdGhSYW5nZTsKQEAgLTE0NDksNiArMTQ1 MCw4IEBAIHByaXZhdGU6CiAKICAgICB1aW50NjRfdCBnZW5lcmF0ZU5hdmlnYXRpb25JRCgpOwog CisgICAgdm9pZCBkaXNwYXRjaFZpZXdTdGF0ZUNoYW5nZSgpOworCiAgICAgUGFnZUNsaWVudCYg bV9wYWdlQ2xpZW50OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6OkxvYWRlckNsaWVudD4gbV9s b2FkZXJDbGllbnQ7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEFQSTo6UG9saWN5Q2xpZW50PiBtX3Bv bGljeUNsaWVudDsKQEAgLTE3MDksMTEgKzE3MTIsMTUgQEAgcHJpdmF0ZToKICAgICAgICAgCiAj aWYgUExBVEZPUk0oQ09DT0EpCiAgICAgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gbV90ZW1wb3Jh cnlQREZGaWxlczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6UnVuTG9vcE9ic2VydmVy PiBtX3ZpZXdTdGF0ZUNoYW5nZURpc3BhdGNoZXI7CiAjZW5kaWYKICAgICAgICAgCiAgICAgV2Vi Q29yZTo6U2Nyb2xsUGlubmluZ0JlaGF2aW9yIG1fc2Nyb2xsUGlubmluZ0JlaGF2aW9yOwogCiAg ICAgdWludDY0X3QgbV9uYXZpZ2F0aW9uSUQ7CisKKyAgICBXZWJDb3JlOjpWaWV3U3RhdGU6OkZs YWdzIG1fcG90ZW50aWFsbHlDaGFuZ2VkVmlld1N0YXRlRmxhZ3M7CisgICAgV2FudHNSZXBseU9y Tm90IG1fdmlld1N0YXRlQ2hhbmdlV2FudHNSZXBseTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdAo=