133205 2014-05-22 22:34:03 -0700 [iOS] WK2: Provide implementation for windowFrame 2014-05-23 14:33:10 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham benjamin bfulgham mitz webkit-bug-importer oldest_to_newest 1011165 0 bfulgham 2014-05-22 22:34:03 -0700 The WK2 layer for iOS was missing an implementation for windowRect, causing DOMWindow::outerWidth and DOMWindow::outerHeight to always return 0, 0. 1011166 1 bfulgham 2014-05-22 22:34:22 -0700 <rdar://problem/16894890> 1011167 2 bfulgham 2014-05-22 22:37:50 -0700 And by windowRect I meant windowFrame. 1011168 3 231942 bfulgham 2014-05-22 22:41:00 -0700 Created attachment 231942 Patch. 1011205 4 231942 benjamin 2014-05-23 02:06:21 -0700 Comment on attachment 231942 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=231942&action=review Let's talk about it tomorrow. After reading http://www.quirksmode.org/blog/archives/2012/03/windowouterwidt.html it looks like we have an extra bug to fix on WebKit1... :( > Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm:252 > + return WebCore::enclosingIntRect(m_uiDelegate.m_webView.frame); I think you want to the bounds, not the frame. We should have an extra step here: -Try to get the UIWindow from the WebView. If there is a window, return that size. -If there is not window, return the WebView bounds. > Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm:309 > + FloatRect userRect(rect); > + userRect.scale(m_webView->_page->deviceScaleFactor()); > + return userRect; Sorry, that's my fault. When you said we need to convert the rect to user space, I thought you meant in the WebProcess to convert to ContentCoordinates. This is not right. I think you can just return the incoming rect here on iOS. 1011357 5 231988 bfulgham 2014-05-23 14:22:39 -0700 Created attachment 231988 Patch 1011359 6 231988 benjamin 2014-05-23 14:24:42 -0700 Comment on attachment 231988 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231988&action=review > Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm:252 > + UIWindow* window = m_uiDelegate.m_webView.window; if (UIWindow* window = m_uiDelegate.m_webView.window) ... > Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm:312 > + return rect; // Nothing to do on iOS Missing period. But I think you should remove the comment. 1011364 7 bfulgham 2014-05-23 14:33:10 -0700 Committed r169281: <http://trac.webkit.org/changeset/169281> 231942 2014-05-22 22:41:00 -0700 2014-05-23 14:22:36 -0700 Patch. windowFrame.patch text/plain 2796 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTI0OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACittYXRlIDIwMTQtMDUtMjIgIEJy ZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gV0syOiBQ cm92aWRlIGltcGxlbWVudGF0aW9uIGZvciB3aW5kb3dGcmFtZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMjA1CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8xNjg5NDg5MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0NvY29hL1VJRGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OlVJRGVsZWdhdGU6OlVJ Q2xpZW50Ojp3aW5kb3dGcmFtZSk6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFn ZUNsaWVudEltcGxJT1MubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjb252 ZXJ0VG9Vc2VyU3BhY2UpOiBBZGRlZC4KKwogMjAxNC0wNS0yMiAgQmVuamFtaW4gUG91bGFpbiAg PGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJdIEFkZCBzdXBwb3J0IGZv ciBtaW5pbWFsLXVpIHZpZXdwb3J0cwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nv Y29hL1VJRGVsZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29jb2EvVUlEZWxlZ2F0ZS5oCShyZXZpc2lvbiAxNjkyMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NSw2ICs2NSw3 IEBAIHByaXZhdGU6CiAgICAgI2lmIFBMQVRGT1JNKElPUykKICAgICAgICAgdmlydHVhbCBSZXRh aW5QdHI8TlNBcnJheT4gYWN0aW9uc0ZvckVsZW1lbnQoX1dLQWN0aXZhdGVkRWxlbWVudEluZm8g KiwgUmV0YWluUHRyPE5TQXJyYXk+IGRlZmF1bHRBY3Rpb25zKSBvdmVycmlkZTsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZE5vdEhhbmRsZVRhcEFzQ2xpY2soY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmKSBvdmVycmlkZTsKKyAgICAgICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3Qgd2luZG93 RnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqKSBvdmVycmlkZTsKICAgICAjZW5kaWYKIAogICAg ICAgICBVSURlbGVnYXRlJiBtX3VpRGVsZWdhdGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMTY5MjI5KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAg LTI0Myw2ICsyNDMsMTQgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGlkTm90SGFuZGxl VAogCiAgICAgW3N0YXRpY19jYXN0PGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPj4oZGVsZWdhdGUp IF93ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgZGlkTm90SGFuZGxlVGFwQXNDbGlja0F0 UG9pbnQ6cG9pbnRdOwogfQorCitXZWJDb3JlOjpGbG9hdFJlY3QgVUlEZWxlZ2F0ZTo6VUlDbGll bnQ6OndpbmRvd0ZyYW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KikKK3sKKyAgICBpZiAoIW1fdWlE ZWxlZ2F0ZS5tX3dlYlZpZXcpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFJlY3QoKTsK KyAgICAKKyAgICByZXR1cm4gV2ViQ29yZTo6ZW5jbG9zaW5nSW50UmVjdChtX3VpRGVsZWdhdGUu bV93ZWJWaWV3LmZyYW1lKTsKK30KICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElP Uy5tbQkocmV2aXNpb24gMTY5MjI5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Q YWdlQ2xpZW50SW1wbElPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzA0LDggKzMwNCw5IEBAIEZs b2F0UmVjdCBQYWdlQ2xpZW50SW1wbDo6Y29udmVydFRvRGV2aWMKIAogRmxvYXRSZWN0IFBhZ2VD bGllbnRJbXBsOjpjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewot ICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIEZsb2F0UmVjdCgpOworICAgIEZsb2F0 UmVjdCB1c2VyUmVjdChyZWN0KTsKKyAgICB1c2VyUmVjdC5zY2FsZShtX3dlYlZpZXctPl9wYWdl LT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICByZXR1cm4gdXNlclJlY3Q7CiB9CiAKIEludFBv aW50IFBhZ2VDbGllbnRJbXBsOjpzY3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IEludFBvaW50JiBwb2lu dCkK 231988 2014-05-23 14:22:39 -0700 2014-05-23 14:24:41 -0700 Patch bug-133205-20140523142215.patch text/plain 2850 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTI3OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTIyICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFdLMjogUHJvdmlk ZSBpbXBsZW1lbnRhdGlvbiBmb3Igd2luZG93RnJhbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzIwNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTY4OTQ4OTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9D b2NvYS9VSURlbGVnYXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVu dDo6d2luZG93RnJhbWUpOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1BhZ2VDbGll bnRJbXBsSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6Y29udmVydFRv VXNlclNwYWNlKTogQWRkZWQuCisKIDIwMTQtMDUtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgYSBwZXIgYXBwIGRpcmVjdG9yeSBzdHJ1Y3R1 cmUgZm9yIHdlYnNpdGUgZGF0YQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L1VJRGVsZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29j b2EvVUlEZWxlZ2F0ZS5oCShyZXZpc2lvbiAxNjkyNzkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NSw2ICs2NSw3IEBA IHByaXZhdGU6CiAgICAgI2lmIFBMQVRGT1JNKElPUykKICAgICAgICAgdmlydHVhbCBSZXRhaW5Q dHI8TlNBcnJheT4gYWN0aW9uc0ZvckVsZW1lbnQoX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKiwg UmV0YWluUHRyPE5TQXJyYXk+IGRlZmF1bHRBY3Rpb25zKSBvdmVycmlkZTsKICAgICAgICAgdmly dHVhbCB2b2lkIGRpZE5vdEhhbmRsZVRhcEFzQ2xpY2soY29uc3QgV2ViQ29yZTo6SW50UG9pbnQm KSBvdmVycmlkZTsKKyAgICAgICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3Qgd2luZG93RnJh bWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqKSBvdmVycmlkZTsKICAgICAjZW5kaWYKIAogICAgICAg ICBVSURlbGVnYXRlJiBtX3VpRGVsZWdhdGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMTY5Mjc5KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTI0 Myw2ICsyNDMsMTggQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGlkTm90SGFuZGxlVAog CiAgICAgW3N0YXRpY19jYXN0PGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPj4oZGVsZWdhdGUpIF93 ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgZGlkTm90SGFuZGxlVGFwQXNDbGlja0F0UG9p bnQ6cG9pbnRdOwogfQorCitXZWJDb3JlOjpGbG9hdFJlY3QgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6 OndpbmRvd0ZyYW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KikKK3sKKyAgICBpZiAoIW1fdWlEZWxl Z2F0ZS5tX3dlYlZpZXcpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFJlY3QoKTsKKwor ICAgIFVJV2luZG93KiB3aW5kb3cgPSBtX3VpRGVsZWdhdGUubV93ZWJWaWV3LndpbmRvdzsKKyAg ICBpZiAod2luZG93KQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6ZW5jbG9zaW5nSW50UmVjdCh3 aW5kb3cuZnJhbWUpOworCisgICAgcmV0dXJuIFdlYkNvcmU6OmVuY2xvc2luZ0ludFJlY3QobV91 aURlbGVnYXRlLm1fd2ViVmlldy5ib3VuZHMpOworfQogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1w bElPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VD bGllbnRJbXBsSU9TLm1tCShyZXZpc2lvbiAxNjkyNzkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMDksOCAr MzA5LDcgQEAgRmxvYXRSZWN0IFBhZ2VDbGllbnRJbXBsOjpjb252ZXJ0VG9EZXZpYwogCiBGbG9h dFJlY3QgUGFnZUNsaWVudEltcGw6OmNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBGbG9hdFJlY3Qm IHJlY3QpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gRmxvYXRSZWN0KCk7 CisgICAgcmV0dXJuIHJlY3Q7IC8vIE5vdGhpbmcgdG8gZG8gb24gaU9TCiB9CiAKIEludFBvaW50 IFBhZ2VDbGllbnRJbXBsOjpzY3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IEludFBvaW50JiBwb2ludCkK