131964 2014-04-21 18:30:53 -0700 [wk2] Don't send intrinsic content size updates with dirty layout 2014-04-21 19:17:42 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton simon.fraser oldest_to_newest 1002742 0 thorton 2014-04-21 18:30:53 -0700 <rdar://problem/14292718> 1002756 1 229848 thorton 2014-04-21 18:45:53 -0700 Created attachment 229848 patch 1002764 2 thorton 2014-04-21 19:17:42 -0700 http://trac.webkit.org/changeset/167645 229848 2014-04-21 18:45:53 -0700 2014-04-21 18:59:28 -0700 patch intrinsic.diff text/plain 5397 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5MTllZjExLi5lNWIzOGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTQtMDQtMjEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gRG9uJ3Qgc2VuZCBpbnRyaW5zaWMgY29udGVudCBzaXplIHVwZGF0ZXMg d2l0aCBkaXJ0eSBsYXlvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMTk2NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTQyOTI3MTg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWE6Om1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZCk6CisgICAgICAgIChX ZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVJbnRyaW5zaWNDb250 ZW50U2l6ZUlmTmVlZGVkKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWE6OmZsdXNoTGF5ZXJzKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplVGltZXJG aXJlZCk6IERlbGV0ZWQuCisgICAgICAgIEluc3RlYWQgb2YgdXNpbmcgYSB0aW1lciAod2hpY2gg Y2FuIGZpcmUgd2hpbGUgbGF5b3V0IGlzIGRpcnR5KSB0byBjb2FsZXNjZQorICAgICAgICBpbnRy aW5zaWMgY29udGVudCBzaXplIGNoYW5nZXMsIHNlbmQgdGhlbSBvbmx5IGZyb20gZmx1c2hMYXll cnMsIGp1c3QgYWZ0ZXIgdXBkYXRpbmcgbGF5b3V0LgorICAgICAgICBUaGlzIGVuc3VyZXMgdGhh dCB3ZSBuZXZlciBnZXQgaW50ZXJtZWRpYXRlIGludHJpbnNpYyBjb250ZW50IHNpemVzIHRoYXQg d29uJ3QgYmUgcGFpbnRlZC4KKwogMjAxNC0wNC0yMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgdG9wQ29udGVudEluc2V0IGRvZXMgbm90IHBsYXkgd2VsbCB3aXRo IGZ1bGxzY3JlZW4gZWxlbWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEuaAppbmRleCA3YjFlNzNjLi45NzQwZGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYS5oCkBAIC0zMyw3ICszMyw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9h dFJlY3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0xheWVyRmx1c2hTY2hlZHVsZXIuaD4KICNpbmNs dWRlIDxXZWJDb3JlL0xheWVyRmx1c2hTY2hlZHVsZXJDbGllbnQuaD4KLSNpbmNsdWRlIDxXZWJD b3JlL1RpbWVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oPgog I2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgpAQCAt MTA3LDcgKzEwNiw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6VGlsZWRCYWNraW5nKiBtYWlu RnJhbWVUaWxlZEJhY2tpbmcoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZURlYnVnSW5mb0xheWVy KGJvb2wgc2hvd0xheWVyKTsKIAotICAgIHZvaWQgdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVU aW1lckZpcmVkKFdlYkNvcmU6OlRpbWVyPFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhPiop OworICAgIHZvaWQgdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVJZk5lZWRlZCgpOwogICAgIHZv aWQgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOwogCiAgICAgYm9vbCBtX2xheWVyVHJlZVN0 YXRlSXNGcm96ZW47CkBAIC0xMjcsNyArMTI2LDYgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpG bG9hdFJlY3QgbV9zY3JvbGxlZEV4cG9zZWRSZWN0OwogCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBt X2xhc3RTZW50SW50cmluc2ljQ29udGVudFNpemU7Ci0gICAgV2ViQ29yZTo6VGltZXI8VGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE+IG1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1l cjsKICAgICBib29sIG1faW5VcGRhdGVHZW9tZXRyeTsKIAogICAgIGRvdWJsZSBtX3RyYW5zaWVu dFpvb21TY2FsZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmlu ZGV4IGFhNTBjZTEuLmQ3MjE4ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbQpAQCAtNzQsNyArNzQsNiBAQCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEoV2ViUGFnZSogd2ViUGFnZSwgYwogICAg ICwgbV9pc1BhaW50aW5nU3VzcGVuZGVkKCEocGFyYW1ldGVycy52aWV3U3RhdGUgJiBWaWV3U3Rh dGU6OklzVmlzaWJsZSkpCiAgICAgLCBtX2V4cG9zZWRSZWN0KEZsb2F0UmVjdDo6aW5maW5pdGVS ZWN0KCkpCiAgICAgLCBtX3Njcm9sbGVkRXhwb3NlZFJlY3QoRmxvYXRSZWN0OjppbmZpbml0ZVJl Y3QoKSkKLSAgICAsIG1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lcih0aGlzLCAmVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplVGlt ZXJGaXJlZCkKICAgICAsIG1fdHJhbnNpZW50Wm9vbVNjYWxlKDEpCiB7CiAgICAgbV93ZWJQYWdl LT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKHRydWUpOwpA QCAtMTk5LDI4ICsxOTgsMjQgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6 dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYKICAgICB1cGRhdGVE ZWJ1Z0luZm9MYXllcihzaG93VGlsZWRTY3JvbGxpbmdJbmRpY2F0b3IpOwogfQogCi12b2lkIFRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjptYWluRnJhbWVDb250ZW50U2l6ZUNoYW5nZWQo Y29uc3QgSW50U2l6ZSYpCit2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjptYWlu RnJhbWVDb250ZW50U2l6ZUNoYW5nZWQoY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICBtX3dl YlBhZ2UtPnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLmRpZENoYW5nZURvY3VtZW50U2l6ZSgpOwor fQogCit2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVJbnRyaW5zaWND b250ZW50U2l6ZUlmTmVlZGVkKCkKK3sKICAgICBpZiAoIW1fd2ViUGFnZS0+bWluaW11bUxheW91 dFNpemUoKS53aWR0aCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9pblVwZGF0ZUdl b21ldHJ5KQorICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV93ZWJQYWdlLT5tYWluRnJhbWVW aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICgh bV91cGRhdGVJbnRyaW5zaWNDb250ZW50U2l6ZVRpbWVyLmlzQWN0aXZlKCkpCi0gICAgICAgIG1f dXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lci5zdGFydE9uZVNob3QoMCk7Ci19Ci0KLXZv aWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUludHJpbnNpY0NvbnRlbnRT aXplVGltZXJGaXJlZChUaW1lcjxUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYT4qKQotewot ICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYWluRnJh bWUoKS52aWV3KCk7Ci0gICAgaWYgKCFmcmFtZVZpZXcpCisgICAgaWYgKGZyYW1lVmlldy0+bmVl ZHNMYXlvdXQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgSW50U2l6ZSBjb250ZW50U2l6ZSA9 IGZyYW1lVmlldy0+YXV0b1NpemluZ0ludHJpbnNpY0NvbnRlbnRTaXplKCk7Ci0KICAgICBpZiAo bV9sYXN0U2VudEludHJpbnNpY0NvbnRlbnRTaXplID09IGNvbnRlbnRTaXplKQogICAgICAgICBy ZXR1cm47CiAKQEAgLTI3Myw2ICsyNjgsOCBAQCBib29sIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjpmbHVzaExheWVycygpCiAKICAgICBtX3dlYlBhZ2UtPmxheW91dElmTmVlZGVkKCk7 CiAKKyAgICB1cGRhdGVJbnRyaW5zaWNDb250ZW50U2l6ZUlmTmVlZGVkKCk7CisKICAgICBpZiAo bV9wZW5kaW5nUm9vdExheWVyKSB7CiAgICAgICAgIHNldFJvb3RDb21wb3NpdGluZ0xheWVyKG1f cGVuZGluZ1Jvb3RMYXllci5nZXQoKSk7CiAgICAgICAgIG1fcGVuZGluZ1Jvb3RMYXllciA9IG51 bGxwdHI7CkBAIC0zODQsOSArMzgxLDYgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYTo6dXBkYXRlR2VvbWV0cnkoY29uc3QgSW50U2l6ZSYgdmlld1NpemUsIGNvbnMKIAogICAg IG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RGlkVXBkYXRlR2Vv bWV0cnkoKSk7CiAKLSAgICBpZiAobV93ZWJQYWdlLT5taW5pbXVtTGF5b3V0U2l6ZSgpLndpZHRo KCkgJiYgIW1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lci5pc0FjdGl2ZSgpKQotICAg ICAgICBtX3VwZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplVGltZXIuc3RhcnRPbmVTaG90KDApOwot CiAgICAgbV9pblVwZGF0ZUdlb21ldHJ5ID0gZmFsc2U7CiB9CiAK