131141 2014-04-02 18:35:16 -0700 [iOS][WK2] Add SPI to handle animated resize 2014-04-03 15:56:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin andersca mitz sam simon.fraser thorton oldest_to_newest 996949 0 benjamin 2014-04-02 18:35:16 -0700 [iOS][WK2] Add SPI to handle animated resize 996950 1 228453 benjamin 2014-04-02 18:36:29 -0700 Created attachment 228453 Patch 997304 2 228453 simon.fraser 2014-04-03 14:12:15 -0700 Comment on attachment 228453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228453&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:181 > + [self _frameOrBoundsChangedFrom:self.bounds]; This is a bit weird. Maybe from:CGZeroRect? > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:447 > + // FIXME: animated resize is gonna be a lot of fun. Some properties need to be updated live, others need to be stored > + // for the end of the animation. I don't think this comment is useful. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:683 > + CGFloat oldWebViewWidhtInContentCoordinate = oldBounds.size.width / contentZoomScale(self); "Widht". Coordinates. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:686 > + CGFloat visibleWebPageWidthInContentCoordinate = std::min([_contentView bounds].size.width, oldWebViewWidhtInContentCoordinate); > + CGFloat targetScale = bounds.size.width / visibleWebPageWidthInContentCoordinate; > + [_scrollView setZoomScale:targetScale]; I'm not really sure what you're trying to do here. 997305 3 228453 thorton 2014-04-03 14:12:50 -0700 Comment on attachment 228453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228453&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:683 > + CGFloat oldWebViewWidhtInContentCoordinate = oldBounds.size.width / contentZoomScale(self); typo "Widht" > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:684 > + CGFloat visibleWebPageWidthInContentCoordinate = std::min([_contentView bounds].size.width, oldWebViewWidhtInContentCoordinate); "WebPage"? > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1160 > + // FIXME: send a single message to the WebProcess to layout and repaint instead. capitals at the beginning of a sentence 997347 4 benjamin 2014-04-03 15:56:08 -0700 Committed r166750: <http://trac.webkit.org/changeset/166750> 228453 2014-04-02 18:36:29 -0700 2014-04-03 14:12:50 -0700 Patch bug-131141-20140402183609.patch text/plain 6460 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNThhZjM1MjBlMTRhNWE5 MTU4MTYzMjM1MWZkOGM4YmRlOTZkNGYwMy4uZmE2YjY2ODMxZjkzOGU0OGJjZDcyNDQ1NWY4YmIy NjIwOTJmMWJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA0LTAyICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g QWRkIFNQSSB0byBoYW5kbGUgYW5pbWF0ZWQgcmVzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzExNDEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgdXAgYSBiYXNpYyBBUEkgdG8gaGFuZGxlIGFu aW1hdGVkIHJlc2l6ZS4gVGhlIGNvZGUgZG9lcyBub3QgZG8gbXVjaCBhdCB0aGUgbW9tZW50LAor ICAgICAgICBpdCBpcyBtb3N0bHkgdG8gaGF2ZSBhbiBpbnRlcmZhY2Ugd2UgY2FuIGltcGxlbWVu dCBsYXRlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgaW5pdFdpdGhGcmFtZTpjb25maWd1cmF0aW9uOl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgc2V0RnJhbWU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBzZXRC b3VuZHM6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOldlYktp dDo6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZnJhbWVPckJvdW5kc0NoYW5nZWRGcm9tOl0p OgorICAgICAgICAoLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVUb1NpemU6b2JzY3Vy ZWRJbnNldHM6bWluaW11bUxheW91dFNpemVPdmVycmlkZTpdKToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9lbmRBbmltYXRlZFJlc2l6ZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2ZyYW1lT3JC b3VuZHNDaGFuZ2VkXSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXdQcml2YXRlLmg6CisKIDIwMTQtMDQtMDEgIEJlbmphbWluIFBvdWxhaW4gIDxicG91 bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2Mjk0NzA0PiBSZW1v dmUgX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBlbnRpcmVseQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBlNTE1YjBjMmY1ZTVm OTI0NTE3YmY1NmQwMDJkODk4YjkwNDc4OTJhLi5kMjA5NTRhYWU3NTgzOTM1M2Q4NTY3N2ViZGEy MjI4ZTIxNDhiYThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQpAQCAtOTQsNiArOTQsNyBAQAogCiAgICAgVUlFZGdlSW5zZXRzIF9vYnNj dXJlZEluc2V0czsKICAgICBib29sIF9pc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2 ZWx5OworICAgIEJPT0wgX2lzQW5pbWF0aW5nUmVzaXplOwogICAgIENHRmxvYXQgX2xhc3RBZGp1 c3RtZW50Rm9yU2Nyb2xsZXI7CiAgICAgQ0dGbG9hdCBfa2V5Ym9hcmRWZXJ0aWNhbE92ZXJsYXA7 CiAKQEAgLTE3Nyw3ICsxNzgsNyBAQAogICAgIFtfY29udGVudFZpZXcgc2V0RnJhbWU6Ym91bmRz XTsKICAgICBbX3Njcm9sbFZpZXcgYWRkU3VidmlldzpfY29udGVudFZpZXcuZ2V0KCldOwogCi0g ICAgW3NlbGYgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkXTsKKyAgICBbc2VsZiBfZnJhbWVPckJvdW5k c0NoYW5nZWRGcm9tOnNlbGYuYm91bmRzXTsKIAogICAgIE5TTm90aWZpY2F0aW9uQ2VudGVyICpj ZW50ZXIgPSBbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl07CiAgICAgW2NlbnRl ciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfa2V5Ym9hcmRXaWxsQ2hhbmdl RnJhbWU6KSBuYW1lOlVJS2V5Ym9hcmRXaWxsQ2hhbmdlRnJhbWVOb3RpZmljYXRpb24gb2JqZWN0 Om5pbF07CkBAIC0zNDAsMTAgKzM0MSwxMSBAQAogLSAodm9pZClzZXRGcmFtZTooQ0dSZWN0KWZy YW1lCiB7CiAgICAgQ0dSZWN0IG9sZEZyYW1lID0gc2VsZi5mcmFtZTsKKyAgICBDR1JlY3Qgb2xk Qm91bmRzID0gc2VsZi5ib3VuZHM7CiAgICAgW3N1cGVyIHNldEZyYW1lOmZyYW1lXTsKIAogICAg IGlmICghQ0dTaXplRXF1YWxUb1NpemUob2xkRnJhbWUuc2l6ZSwgZnJhbWUuc2l6ZSkpCi0gICAg ICAgIFtzZWxmIF9mcmFtZU9yQm91bmRzQ2hhbmdlZF07CisgICAgICAgIFtzZWxmIF9mcmFtZU9y Qm91bmRzQ2hhbmdlZEZyb206b2xkQm91bmRzXTsKIH0KIAogLSAodm9pZClzZXRCb3VuZHM6KENH UmVjdClib3VuZHMKQEAgLTM1Miw3ICszNTQsNyBAQAogICAgIFtzdXBlciBzZXRCb3VuZHM6Ym91 bmRzXTsKIAogICAgIGlmICghQ0dTaXplRXF1YWxUb1NpemUob2xkQm91bmRzLnNpemUsIGJvdW5k cy5zaXplKSkKLSAgICAgICAgW3NlbGYgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkXTsKKyAgICAgICAg W3NlbGYgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkRnJvbTpvbGRCb3VuZHNdOwogfQogCiAtIChVSVNj cm9sbFZpZXcgKilzY3JvbGxWaWV3CkBAIC00NDEsNiArNDQzLDExIEBAIHN0YXRpYyBDR0Zsb2F0 IGNvbnRlbnRab29tU2NhbGUoV0tXZWJWaWV3KiB3ZWJWaWV3KQogewogICAgIEFTU0VSVCghX2N1 c3RvbUNvbnRlbnRWaWV3KTsKIAorICAgIC8vIEZJWE1FOiBhbmltYXRlZCByZXNpemUgaXMgZ29u bmEgYmUgYSBsb3Qgb2YgZnVuLiBTb21lIHByb3BlcnRpZXMgbmVlZCB0byBiZSB1cGRhdGVkIGxp dmUsIG90aGVycyBuZWVkIHRvIGJlIHN0b3JlZAorICAgIC8vIGZvciB0aGUgZW5kIG9mIHRoZSBh bmltYXRpb24uCisgICAgaWYgKF9pc0FuaW1hdGluZ1Jlc2l6ZSkKKyAgICAgICAgcmV0dXJuOwor CiAgICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRTaXplOltfY29udGVudFZpZXcgZnJhbWVdLnNp emVdOwogICAgIFtfc2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOmxheWVyVHJlZVRyYW5z YWN0aW9uLm1pbmltdW1TY2FsZUZhY3RvcigpXTsKICAgICBbX3Njcm9sbFZpZXcgc2V0TWF4aW11 bVpvb21TY2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5tYXhpbXVtU2NhbGVGYWN0b3IoKV07CkBA IC02NjEsNyArNjY4LDcgQEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29u dGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICBbX2NvbnRlbnRW aWV3IGRpZFpvb21Ub1NjYWxlOnNjYWxlXTsKIH0KIAotLSAodm9pZClfZnJhbWVPckJvdW5kc0No YW5nZWQKKy0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkRnJvbTooQ0dSZWN0KW9sZEJvdW5k cwogewogICAgIENHUmVjdCBib3VuZHMgPSBzZWxmLmJvdW5kczsKIApAQCAtNjcxLDYgKzY3OCwx NCBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBjb25zdHJhaW5Db250ZW50T2Zmc2V0KFdl YkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZgogICAgIFtfY29udGVudFZpZXcgc2V0TWluaW11 bVNpemU6Ym91bmRzLnNpemVdOwogICAgIFtfY3VzdG9tQ29udGVudFZpZXcgd2ViX3NldE1pbmlt dW1TaXplOmJvdW5kcy5zaXplXTsKICAgICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 c107CisKKyAgICBpZiAoX2lzQW5pbWF0aW5nUmVzaXplICYmICFfY3VzdG9tQ29udGVudFZpZXcp IHsKKyAgICAgICAgQ0dGbG9hdCBvbGRXZWJWaWV3V2lkaHRJbkNvbnRlbnRDb29yZGluYXRlID0g b2xkQm91bmRzLnNpemUud2lkdGggLyBjb250ZW50Wm9vbVNjYWxlKHNlbGYpOworICAgICAgICBD R0Zsb2F0IHZpc2libGVXZWJQYWdlV2lkdGhJbkNvbnRlbnRDb29yZGluYXRlID0gc3RkOjptaW4o W19jb250ZW50VmlldyBib3VuZHNdLnNpemUud2lkdGgsIG9sZFdlYlZpZXdXaWRodEluQ29udGVu dENvb3JkaW5hdGUpOworICAgICAgICBDR0Zsb2F0IHRhcmdldFNjYWxlID0gYm91bmRzLnNpemUu d2lkdGggLyB2aXNpYmxlV2ViUGFnZVdpZHRoSW5Db250ZW50Q29vcmRpbmF0ZTsKKyAgICAgICAg W19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTp0YXJnZXRTY2FsZV07CisgICAgICAgIC8vIEZJWE1F OiBjb21wdXRlIHRoZSByZWFsIHRhcmdldCBvZmZzZXQgYmFzZWQgb24gdGhlIGZ1dHVyZSBleHBv c2VkIHJlY3QsIHRoZSBjb250ZW50IGFuZCBsaW1pdCBpdCB0byB0aGUgdmFsaWQgcmFuZ2UuCisg ICB9CiB9CiAKIC8vIFVub2JzY3VyZWQgY29udGVudCByZWN0IHdoZXJlIHRoZSB1c2VyIGNhbiBp bnRlcmFjdC4gV2hlbiB0aGUga2V5Ym9hcmQgaXMgdXAsIHRoaXMgc2hvdWxkIGJlIHRoZSBhcmVh IGFib3ZlIG9yIGJlbGxvdyB0aGUga2V5Ym9hcmQsIHdoZXJldmVyIHRoZXJlIGlzIGVub3VnaCBz cGFjZS4KQEAgLTExMjksNiArMTE0NCwzMCBAQCBzdGF0aWMgaW5saW5lIFdlYkNvcmU6OkxheW91 dE1pbGVzdG9uZXMgbGF5b3V0TWlsZXN0b25lcyhfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZQogICAg IFtzZWxmIF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXTsKIH0KIAorLSAodm9pZClfYmVnaW5B bmltYXRlZFJlc2l6ZVRvU2l6ZTooQ0dTaXplKWZ1dHVyZVNpemUgb2JzY3VyZWRJbnNldHM6KFVJ RWRnZUluc2V0cylmdXR1cmVPYnNjdXJlZEluc2V0cyBtaW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRl OihDR1NpemUpZnV0dXJlTWluaW11bUxheW91dFNpemUKK3sKKyAgICBfaXNBbmltYXRpbmdSZXNp emUgPSBZRVM7CisKKyAgICBpZiAoX2N1c3RvbUNvbnRlbnRWaWV3KQorICAgICAgICByZXR1cm47 CisKKyAgICBbX3Njcm9sbFZpZXcgc2V0TWluaW11bVpvb21TY2FsZTpzdGQ6Om1pbihmdXR1cmVT aXplLndpZHRoIC8gW19jb250ZW50VmlldyBib3VuZHNdLnNpemUud2lkdGgsIFtfc2Nyb2xsVmll dyBtaW5pbXVtWm9vbVNjYWxlXSldOworCisgICAgX29ic2N1cmVkSW5zZXRzID0gZnV0dXJlT2Jz Y3VyZWRJbnNldHM7CisgICAgaWYgKF9oYXNTdGF0aWNNaW5pbXVtTGF5b3V0U2l6ZSkKKyAgICAg ICAgX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGUgPSBmdXR1cmVNaW5pbXVtTGF5b3V0U2l6ZTsK KworICAgIC8vIEZJWE1FOiBzZW5kIGEgc2luZ2xlIG1lc3NhZ2UgdG8gdGhlIFdlYlByb2Nlc3Mg dG8gbGF5b3V0IGFuZCByZXBhaW50IGluc3RlYWQuCisgICAgLy8gRklYTUU6IHNlbmQgcmVzaXpl IGV2ZW50LgorICAgIFtfY29udGVudFZpZXcgc2V0TWluaW11bUxheW91dFNpemU6ZnV0dXJlTWlu aW11bUxheW91dFNpemVdOworfQorCistICh2b2lkKV9lbmRBbmltYXRlZFJlc2l6ZQoreworICAg IF9pc0FuaW1hdGluZ1Jlc2l6ZSA9IE5POworICAgIFtzZWxmIF91cGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzXTsKK30KKwogLSAodm9pZClfc2hvd0luc3BlY3RvckluZGljYXRpb24KIHsKICAgICBb X2NvbnRlbnRWaWV3IHNldFNob3dpbmdJbnNwZWN0b3JJbmRpY2F0aW9uOllFU107CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5o CmluZGV4IDRjZDZiNTRhZTEyMDMwZjE0ZDM5YjhiYjc3MmUyN2Y5NjIyYjNlYTMuLmMzMjYyZDg0 NDcyOTZlMzcxNzMzMWU3YmUyOWY4M2RmNzBkNDIzOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC05Miw2ICs5 Miw5IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIF9XS1BhZ2luYXRpb25Nb2RlKSB7CiAt ICh2b2lkKV9iZWdpbkludGVyYWN0aXZlT2JzY3VyZWRJbnNldHNDaGFuZ2U7CiAtICh2b2lkKV9l bmRJbnRlcmFjdGl2ZU9ic2N1cmVkSW5zZXRzQ2hhbmdlOwogCistICh2b2lkKV9iZWdpbkFuaW1h dGVkUmVzaXplVG9TaXplOihDR1NpemUpZnV0dXJlU2l6ZSBvYnNjdXJlZEluc2V0czooVUlFZGdl SW5zZXRzKWZ1dHVyZU9ic2N1cmVkSW5zZXRzIG1pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGU6KENH U2l6ZSlmdXR1cmVNaW5pbXVtTGF5b3V0U2l6ZTsKKy0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXpl OworCiAtICh2b2lkKV9zaG93SW5zcGVjdG9ySW5kaWNhdGlvbjsKIC0gKHZvaWQpX2hpZGVJbnNw ZWN0b3JJbmRpY2F0aW9uOwogCg==