123351 2013-10-25 11:40:30 -0700 Merge viewInWindowStateDidChange into viewStateDidChange 2013-10-25 12:43:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough webkit-unassigned oldest_to_newest 943680 0 barraclough 2013-10-25 11:40:30 -0700 We want to unify all these messages. 943684 1 215196 barraclough 2013-10-25 11:46:47 -0700 Created attachment 215196 Fix 943687 2 215196 thorton 2013-10-25 11:52:24 -0700 Comment on attachment 215196 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=215196&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:1032 > +#if ENABLE(INPUT_TYPE_COLOR_POPOVER) > + else { > + // When leaving the current page, close the popover color well. > + if (m_colorPicker) > + endColorPicker(); > + } > +#endif oO 943698 3 barraclough 2013-10-25 12:43:25 -0700 Fixed in r158034 215196 2013-10-25 11:46:47 -0700 2013-10-25 11:52:24 -0700 Fix 123351.patch text/plain 7250 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODAzMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTI1ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBNZXJnZSB2aWV3 SW5XaW5kb3dTdGF0ZURpZENoYW5nZSBpbnRvIHZpZXdTdGF0ZURpZENoYW5nZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzMzUxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBlbmREZWZlcnJpbmdWaWV3SW5XaW5kb3dD aGFuZ2VzXSk6CisgICAgICAgICgtW1dLVmlldyBlbmREZWZlcnJpbmdWaWV3SW5XaW5kb3dDaGFu Z2VzU3luY10pOgorICAgICAgICAgICAgLSB2aWV3SW5XaW5kb3dTdGF0ZURpZENoYW5nZSAtPiB2 aWV3U3RhdGVEaWRDaGFuZ2UKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aWV3U3RhdGVEaWRDaGFuZ2UpOgorICAg ICAgICAgICAgLSByZW1vdmVkIHZpZXdJbldpbmRvd1N0YXRlRGlkQ2hhbmdlLCByZW5hbWVkIHBh cmFtZXRlciB0byB2aWV3U3RhdGVEaWRDaGFuZ2UKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lmg6CisgICAgICAgICAgICAtIHJlbW92ZWQgdmlld0luV2luZG93U3RhdGVEaWRDaGFu Z2UsIG5hbWVkIHBhcmFtZXRlciB0byB2aWV3U3RhdGVEaWRDaGFuZ2UKKwogMjAxMy0xMC0yNSAg R2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgTW92 ZSBWaWV3U3RhdGVGbGFncyBvdXQgb2YgV2ViUGFnZVByb3h5CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTU4MDI4KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk2 NCw1MiArOTY0LDI4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzY3JvbGxWaWV3KGNvbnN0IEludFIK ICAgICBtX3BhZ2VDbGllbnQtPnNjcm9sbFZpZXcoc2Nyb2xsUmVjdCwgc2Nyb2xsT2Zmc2V0KTsK IH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnZpZXdJbldpbmRvd1N0YXRlRGlkQ2hhbmdlKFdhbnRz UmVwbHlPck5vdCB3YW50c1JlcGx5KQordm9pZCBXZWJQYWdlUHJveHk6OnZpZXdTdGF0ZURpZENo YW5nZShWaWV3U3RhdGU6OkZsYWdzIG1heUhhdmVDaGFuZ2VkLCBXYW50c1JlcGx5T3JOb3Qgd2Fu dHNSZXBseSkKIHsKLSAgICBpZiAoIWlzVmFsaWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg Ym9vbCBpc0luV2luZG93ID0gbV9wYWdlQ2xpZW50LT5pc1ZpZXdJbldpbmRvdygpOwotICAgIGlm IChtX2lzSW5XaW5kb3cgIT0gaXNJbldpbmRvdykgewotICAgICAgICBtX2lzSW5XaW5kb3cgPSBp c0luV2luZG93OwotICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNl dElzSW5XaW5kb3coaXNJbldpbmRvdywgd2FudHNSZXBseSA9PSBXYW50c1JlcGx5T3JOb3Q6OkRv ZXNXYW50UmVwbHkpLCBtX3BhZ2VJRCk7Ci0gICAgfQorICAgIC8vIFdhbnRzIHJlcGx5IGN1cnJl bnRseSBvbmx5IGFwcGxpZXMgdG8gdGhlIElzSW5XaW5kb3cgZmxhZywgc28gY2hlY2sgb25seSB0 aGlzIGlzIHNldC4KKyAgICBBU1NFUlQod2FudHNSZXBseSA9PSBXYW50c1JlcGx5T3JOb3Q6OkRv ZXNOb3RXYW50UmVwbHkgfHwgbWF5SGF2ZUNoYW5nZWQgPT0gVmlld1N0YXRlOjpJc0luV2luZG93 KTsKIAotICAgIGlmIChpc0luV2luZG93KSB7Ci0gICAgICAgIExheWVySG9zdGluZ01vZGUgbGF5 ZXJIb3N0aW5nTW9kZSA9IG1fcGFnZUNsaWVudC0+dmlld0xheWVySG9zdGluZ01vZGUoKTsKLSAg ICAgICAgaWYgKG1fbGF5ZXJIb3N0aW5nTW9kZSAhPSBsYXllckhvc3RpbmdNb2RlKSB7Ci0gICAg ICAgICAgICBtX2xheWVySG9zdGluZ01vZGUgPSBsYXllckhvc3RpbmdNb2RlOwotICAgICAgICAg ICAgbV9kcmF3aW5nQXJlYS0+bGF5ZXJIb3N0aW5nTW9kZURpZENoYW5nZSgpOwotICAgICAgICB9 Ci0gICAgfQotI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SX1BPUE9WRVIpCi0gICAgZWxzZSB7 Ci0gICAgICAgIC8vIFdoZW4gbGVhdmluZyB0aGUgY3VycmVudCBwYWdlLCBjbG9zZSB0aGUgcG9w b3ZlciBjb2xvciB3ZWxsLgotICAgICAgICBpZiAobV9jb2xvclBpY2tlcikKLSAgICAgICAgICAg IGVuZENvbG9yUGlja2VyKCk7Ci0gICAgfQotI2VuZGlmCi19Ci0KLXZvaWQgV2ViUGFnZVByb3h5 Ojp2aWV3U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpGbGFncyBmbGFncykKLXsKICAgICBpZiAo IWlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGZsYWdzICYgVmlld1N0YXRl OjpXaW5kb3dJc1Zpc2libGUpCisgICAgaWYgKG1heUhhdmVDaGFuZ2VkICYgVmlld1N0YXRlOjpX aW5kb3dJc1Zpc2libGUpCiAgICAgICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0V2luZG93SXNWaXNpYmxlKG1fcGFnZUNsaWVudC0+aXNXaW5kb3dWaXNpYmxlKCkpLCBt X3BhZ2VJRCk7CiAKLSAgICBpZiAoZmxhZ3MgJiBWaWV3U3RhdGU6OklzRm9jdXNlZCkKKyAgICBp ZiAobWF5SGF2ZUNoYW5nZWQgJiBWaWV3U3RhdGU6OklzRm9jdXNlZCkKICAgICAgICAgbV9wcm9j ZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRGb2N1c2VkKG1fcGFnZUNsaWVudC0+aXNW aWV3Rm9jdXNlZCgpKSwgbV9wYWdlSUQpOwogCiAgICAgLy8gV2Ugd2FudCB0byBtYWtlIHN1cmUg dG8gdXBkYXRlIHRoZSBhY3RpdmUgc3RhdGUgd2hpbGUgaGlkZGVuLCBzbyBpZiB0aGUgdmlldyBp cyBoaWRkZW4gdGhlbiB1cGRhdGUgdGhlIGFjdGl2ZSBzdGF0ZQogICAgIC8vIGVhcmx5IChpbiBj YXNlIGl0IGJlY29tZXMgdmlzaWJsZSksIGFuZCBpZiB0aGUgdmlldyB3YXMgdmlzaWJsZSB0aGVu IHVwZGF0ZSBhY3RpdmUgc3RhdGUgbGF0ZXIgKGluIGNhc2UgaXQgaGlkZXMpLgogICAgIGJvb2wg dmlld1dhc1Zpc2libGUgPSBtX2lzVmlzaWJsZTsKICAgICAKLSAgICBpZiAoZmxhZ3MgJiBWaWV3 U3RhdGU6OldpbmRvd0lzQWN0aXZlICYmICF2aWV3V2FzVmlzaWJsZSkKKyAgICBpZiAobWF5SGF2 ZUNoYW5nZWQgJiBWaWV3U3RhdGU6OldpbmRvd0lzQWN0aXZlICYmICF2aWV3V2FzVmlzaWJsZSkK ICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRBY3RpdmUobV9w YWdlQ2xpZW50LT5pc1ZpZXdXaW5kb3dBY3RpdmUoKSksIG1fcGFnZUlEKTsKIAotICAgIGlmIChm bGFncyAmIFZpZXdTdGF0ZTo6SXNWaXNpYmxlKSB7CisgICAgaWYgKG1heUhhdmVDaGFuZ2VkICYg Vmlld1N0YXRlOjpJc1Zpc2libGUpIHsKICAgICAgICAgYm9vbCBpc1Zpc2libGUgPSBtX3BhZ2VD bGllbnQtPmlzVmlld1Zpc2libGUoKTsKICAgICAgICAgaWYgKGlzVmlzaWJsZSAhPSBtX2lzVmlz aWJsZSkgewogICAgICAgICAgICAgbV9pc1Zpc2libGUgPSBpc1Zpc2libGU7CkBAIC0xMDMwLDEx ICsxMDA2LDMxIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3U3RhdGVEaWRDaGFuZ2UoVmkKICAg ICAgICAgfQogICAgIH0KIAotICAgIGlmIChmbGFncyAmIFZpZXdTdGF0ZTo6V2luZG93SXNBY3Rp dmUgJiYgdmlld1dhc1Zpc2libGUpCisgICAgaWYgKG1heUhhdmVDaGFuZ2VkICYgVmlld1N0YXRl OjpXaW5kb3dJc0FjdGl2ZSAmJiB2aWV3V2FzVmlzaWJsZSkKICAgICAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRBY3RpdmUobV9wYWdlQ2xpZW50LT5pc1ZpZXdXaW5k b3dBY3RpdmUoKSksIG1fcGFnZUlEKTsKIAotICAgIGlmIChmbGFncyAmIFZpZXdTdGF0ZTo6SXNJ bldpbmRvdykKLSAgICAgICAgdmlld0luV2luZG93U3RhdGVEaWRDaGFuZ2UoKTsKKyAgICBpZiAo bWF5SGF2ZUNoYW5nZWQgJiBWaWV3U3RhdGU6OklzSW5XaW5kb3cpIHsKKyAgICAgICAgYm9vbCBp c0luV2luZG93ID0gbV9wYWdlQ2xpZW50LT5pc1ZpZXdJbldpbmRvdygpOworICAgICAgICBpZiAo bV9pc0luV2luZG93ICE9IGlzSW5XaW5kb3cpIHsKKyAgICAgICAgICAgIG1faXNJbldpbmRvdyA9 IGlzSW5XaW5kb3c7CisgICAgICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlNldElzSW5XaW5kb3coaXNJbldpbmRvdywgd2FudHNSZXBseSA9PSBXYW50c1JlcGx5T3JO b3Q6OkRvZXNXYW50UmVwbHkpLCBtX3BhZ2VJRCk7CisgICAgICAgIH0KKworICAgICAgICBpZiAo aXNJbldpbmRvdykgeworICAgICAgICAgICAgTGF5ZXJIb3N0aW5nTW9kZSBsYXllckhvc3RpbmdN b2RlID0gbV9wYWdlQ2xpZW50LT52aWV3TGF5ZXJIb3N0aW5nTW9kZSgpOworICAgICAgICAgICAg aWYgKG1fbGF5ZXJIb3N0aW5nTW9kZSAhPSBsYXllckhvc3RpbmdNb2RlKSB7CisgICAgICAgICAg ICAgICAgbV9sYXllckhvc3RpbmdNb2RlID0gbGF5ZXJIb3N0aW5nTW9kZTsKKyAgICAgICAgICAg ICAgICBtX2RyYXdpbmdBcmVhLT5sYXllckhvc3RpbmdNb2RlRGlkQ2hhbmdlKCk7CisgICAgICAg ICAgICB9CisgICAgICAgIH0KKyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUl9QT1BPVkVSKQor ICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIC8vIFdoZW4gbGVhdmluZyB0aGUgY3VycmVudCBw YWdlLCBjbG9zZSB0aGUgcG9wb3ZlciBjb2xvciB3ZWxsLgorICAgICAgICAgICAgaWYgKG1fY29s b3JQaWNrZXIpCisgICAgICAgICAgICAgICAgZW5kQ29sb3JQaWNrZXIoKTsKKyAgICAgICAgfQor I2VuZGlmCisgICAgfQogCiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElUWV9BUEkpCiAgICAgUGFn ZVZpc2liaWxpdHlTdGF0ZSB2aXNpYmlsaXR5U3RhdGUgPSBQYWdlVmlzaWJpbGl0eVN0YXRlSGlk ZGVuOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNp b24gMTU4MDI4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMjQsOSArMzI0LDggQEAgcHVibGljOgogICAgIGJvb2wgY2FuU2Ny b2xsVmlldygpOwogICAgIHZvaWQgc2Nyb2xsVmlldyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBz Y3JvbGxSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpOwogCi0gICAg dm9pZCB2aWV3U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpGbGFncyk7CiAgICAgZW51bSBjbGFz cyBXYW50c1JlcGx5T3JOb3QgeyBEb2VzTm90V2FudFJlcGx5LCBEb2VzV2FudFJlcGx5IH07Ci0g ICAgdm9pZCB2aWV3SW5XaW5kb3dTdGF0ZURpZENoYW5nZShXYW50c1JlcGx5T3JOb3QgPSBXYW50 c1JlcGx5T3JOb3Q6OkRvZXNOb3RXYW50UmVwbHkpOworICAgIHZvaWQgdmlld1N0YXRlRGlkQ2hh bmdlKFZpZXdTdGF0ZTo6RmxhZ3MgbWF5SGF2ZUNoYW5nZWQsIFdhbnRzUmVwbHlPck5vdCA9IFdh bnRzUmVwbHlPck5vdDo6RG9lc05vdFdhbnRSZXBseSk7CiAgICAgYm9vbCBpc0luV2luZG93KCkg Y29uc3QgeyByZXR1cm4gbV9pc0luV2luZG93OyB9CiAgICAgdm9pZCB3YWl0Rm9yRGlkVXBkYXRl SW5XaW5kb3dTdGF0ZSgpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tCShyZXZpc2lvbiAxNTgwMjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTMxNTcsNyArMzE1Nyw3IEBA IC0gKHZvaWQpZW5kRGVmZXJyaW5nVmlld0luV2luZG93Q2hhbmdlcwogICAgIF9kYXRhLT5fc2hv dWxkRGVmZXJWaWV3SW5XaW5kb3dDaGFuZ2VzID0gTk87CiAKICAgICBpZiAoX2RhdGEtPl92aWV3 SW5XaW5kb3dDaGFuZ2VXYXNEZWZlcnJlZCkgewotICAgICAgICBfZGF0YS0+X3BhZ2UtPnZpZXdJ bldpbmRvd1N0YXRlRGlkQ2hhbmdlKCk7CisgICAgICAgIF9kYXRhLT5fcGFnZS0+dmlld1N0YXRl RGlkQ2hhbmdlKFZpZXdTdGF0ZTo6SXNJbldpbmRvdyk7CiAgICAgICAgIF9kYXRhLT5fdmlld0lu V2luZG93Q2hhbmdlV2FzRGVmZXJyZWQgPSBOTzsKICAgICB9CiB9CkBAIC0zMTc1LDcgKzMxNzUs NyBAQCAtICh2b2lkKWVuZERlZmVycmluZ1ZpZXdJbldpbmRvd0NoYW5nZXNTCiAgICAgX2RhdGEt Pl9zaG91bGREZWZlclZpZXdJbldpbmRvd0NoYW5nZXMgPSBOTzsKIAogICAgIGlmIChfZGF0YS0+ X3ZpZXdJbldpbmRvd0NoYW5nZVdhc0RlZmVycmVkKSB7Ci0gICAgICAgIF9kYXRhLT5fcGFnZS0+ dmlld0luV2luZG93U3RhdGVEaWRDaGFuZ2UoaGFzUGVuZGluZ1ZpZXdJbldpbmRvd0NoYW5nZSA/ IFdlYlBhZ2VQcm94eTo6V2FudHNSZXBseU9yTm90OjpEb2VzV2FudFJlcGx5IDogV2ViUGFnZVBy b3h5OjpXYW50c1JlcGx5T3JOb3Q6OkRvZXNOb3RXYW50UmVwbHkpOworICAgICAgICBfZGF0YS0+ X3BhZ2UtPnZpZXdTdGF0ZURpZENoYW5nZShWaWV3U3RhdGU6OklzSW5XaW5kb3csIGhhc1BlbmRp bmdWaWV3SW5XaW5kb3dDaGFuZ2UgPyBXZWJQYWdlUHJveHk6OldhbnRzUmVwbHlPck5vdDo6RG9l c1dhbnRSZXBseSA6IFdlYlBhZ2VQcm94eTo6V2FudHNSZXBseU9yTm90OjpEb2VzTm90V2FudFJl cGx5KTsKICAgICAgICAgX2RhdGEtPl92aWV3SW5XaW5kb3dDaGFuZ2VXYXNEZWZlcnJlZCA9IE5P OwogICAgIH0KIAo=