130152 2014-03-12 12:10:06 -0700 Do not show extended background during a pinch gesture on iOS 2014-03-13 15:45:59 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin benjamin jonlee mitz sam simon.fraser thorton oldest_to_newest 989790 0 bdakin 2014-03-12 12:10:06 -0700 Do not show extended background during a pinch gesture. <rdar://problem/16303819> 989792 1 226543 bdakin 2014-03-12 12:14:22 -0700 Created attachment 226543 Patch 989797 2 226543 benjamin 2014-03-12 12:54:40 -0700 Comment on attachment 226543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226543&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:403 > + UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor]; > + if (pageExtendedBackgroundColor && [self _backgroundExtendsBeyondPage] && [_scrollView zoomScale] >= [_scrollView minimumZoomScale] && ![_scrollView isZoomBouncing]) > + [_scrollView setBackgroundColor:pageExtendedBackgroundColor]; > + else > + [_scrollView setBackgroundColor:nil]; You'll need the same code executed in response to scrollViewDidZoom: 989798 3 226543 simon.fraser 2014-03-12 13:03:18 -0700 Comment on attachment 226543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226543&action=review >> Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:403 >> + [_scrollView setBackgroundColor:nil]; > > You'll need the same code executed in response to scrollViewDidZoom: Yeah, I don't think this is the right place to set the scrollView's background color. I think we should just store the color coming in from the layer commit, then decide where to apply it in response to gestures elsewhere. 989811 4 bdakin 2014-03-12 13:32:50 -0700 (In reply to comment #3) > (From update of attachment 226543 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226543&action=review > > >> Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:403 > >> + [_scrollView setBackgroundColor:nil]; > > > > You'll need the same code executed in response to scrollViewDidZoom: > > Yeah, I don't think this is the right place to set the scrollView's background color. I think we should just store the color coming in from the layer commit, then decide where to apply it in response to gestures elsewhere. Just so you know, we do already cache the color. We cache it in WebPageProxy::didCommitLayerTree. New patch forthcoming! 989814 5 226548 bdakin 2014-03-12 13:36:13 -0700 Created attachment 226548 Patch 990073 6 226548 mitz 2014-03-13 11:06:21 -0700 Comment on attachment 226548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226548&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:388 > +- (void)updateScrollViewBackground This internal method’s name should have an underscore prefix. 990096 7 bdakin 2014-03-13 11:46:43 -0700 (In reply to comment #6) > (From update of attachment 226548 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226548&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:388 > > +- (void)updateScrollViewBackground > > This internal method’s name should have an underscore prefix. Done! 990187 8 bdakin 2014-03-13 15:45:59 -0700 http://trac.webkit.org/changeset/165573 226543 2014-03-12 12:14:22 -0700 2014-03-12 13:36:13 -0700 Patch for-review.txt text/plain 2248 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTQ5MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3Qgc2hvdyBleHRlbmRlZCBi YWNrZ3JvdW5kIGR1cmluZyBhIHBpbmNoIGdlc3R1cmUgb24gaU9TCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAxNTIKKyAgICAgICAgLWFuZCBjb3Jy ZXNwb25kaW5nLQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYzMDM4MTk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25seSBzZXQgdGhlIFVJU2Ny b2xsVmlld+KAmXMgYmFja2dyb3VuZCBjb2xvciB3aGVuIHRoZSB6b29tU2NhbGUgaXMgZ3JlYXRl ciB0aGFuIG9yIAorICAgICAgICBlcXVhbCB0byB0aGUgbWluaW11bVpvb21TY2FsZS4gQWxzbyBk byBub3Qgc2V0IGl0IGR1cmluZyB0aGUgem9vbSBib3VuY2UgCisgICAgICAgIGFuaW1hdGlvbi4g T3RoZXJ3aXNlLCBjbGVhciB0aGUgYmFja2dyb3VuZCBjb2xvciBieSBzZXR0aW5nIGl0IHRvIG5p bC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6V2ViS2l0OjpdKToKKwogMjAxNC0wMy0x MiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBIYXZl IHRoZSBzY3JvbGxpbmcgdHJlZSB0cmFjayB0aGUgdmlld3BvcnQgc2l6ZSwgbm90IHRoZSB2aWV3 cG9ydCByZWN0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQkocmV2aXNpb24gMTY1NDU0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5NiwxMCArMzk2 LDExIEBAIC0gKHZvaWQpX2RpZENvbW1pdExheWVyVHJlZTooY29uc3QgV2ViS2kKICAgICBpZiAo IWxheWVyVHJlZVRyYW5zYWN0aW9uLnNjYWxlV2FzU2V0QnlVSVByb2Nlc3MoKSAmJiAhW19zY3Jv bGxWaWV3IGlzWm9vbWluZ10gJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10gJiYgIVtf c2Nyb2xsVmlldyBfaXNBbmltYXRpbmdab29tXSkKICAgICAgICAgW19zY3JvbGxWaWV3IHNldFpv b21TY2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKV07CiAKLSAgICBp ZiAoVUlDb2xvciAqcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yID0gW3NlbGYgcGFnZUV4dGVu ZGVkQmFja2dyb3VuZENvbG9yXSkgewotICAgICAgICBpZiAoW3NlbGYgX2JhY2tncm91bmRFeHRl bmRzQmV5b25kUGFnZV0pCi0gICAgICAgICAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENv bG9yOnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcl07Ci0gICAgfQorICAgIFVJQ29sb3IgKnBh Z2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciA9IFtzZWxmIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRD b2xvcl07CisgICAgaWYgKHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciAmJiBbc2VsZiBfYmFj a2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlXSAmJiBbX3Njcm9sbFZpZXcgem9vbVNjYWxlXSA+PSBb X3Njcm9sbFZpZXcgbWluaW11bVpvb21TY2FsZV0gJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21Cb3Vu Y2luZ10pCisgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRCYWNrZ3JvdW5kQ29sb3I6cGFnZUV4dGVu ZGVkQmFja2dyb3VuZENvbG9yXTsKKyAgICBlbHNlCisgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRC YWNrZ3JvdW5kQ29sb3I6bmlsXTsKIAogICAgIGlmIChfZ2VzdHVyZUNvbnRyb2xsZXIpCiAgICAg ICAgIF9nZXN0dXJlQ29udHJvbGxlci0+c2V0UmVuZGVyVHJlZVNpemUobGF5ZXJUcmVlVHJhbnNh Y3Rpb24ucmVuZGVyVHJlZVNpemUoKSk7Cg== 226548 2014-03-12 13:36:13 -0700 2014-03-13 15:37:17 -0700 Patch for-review-2.txt text/plain 3231 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTQ5NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBEbyBub3Qgc2hvdyBleHRlbmRlZCBi YWNrZ3JvdW5kIGR1cmluZyBhIHBpbmNoIGdlc3R1cmUgb24gaU9TCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAxNTIKKyAgICAgICAgLWFuZCBjb3Jy ZXNwb25kaW5nLQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYzMDM4MTk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3Rv cnMgdGhlIGJhY2tncm91bmRDb2xvci1zZXR0aW5nIGxvZ2ljIGludG8gaXRzIG93biBtZXRob2Qg c28gdGhhdCAKKyAgICAgICAgaXQgY2FuIGJlIGNhbGxlZCBmcm9tIGJvdGggX2RpZENvbW1pdExh eWVyVHJlZSBhbmQgc2Nyb2xsVmlld0RpZFpvb20uCisKKyAgICAgICAgT25seSBzZXQgdGhlIFVJ U2Nyb2xsVmlld+KAmXMgYmFja2dyb3VuZCBjb2xvciB3aGVuIHRoZSB6b29tU2NhbGUgaXMgZ3Jl YXRlciB0aGFuIG9yIAorICAgICAgICBlcXVhbCB0byB0aGUgbWluaW11bVpvb21TY2FsZS4gQWxz byBkbyBub3Qgc2V0IGl0IGR1cmluZyB0aGUgem9vbSBib3VuY2UgCisgICAgICAgIGFuaW1hdGlv bi4gT3RoZXJ3aXNlLCBjbGVhciB0aGUgYmFja2dyb3VuZCBjb2xvciBieSBzZXR0aW5nIGl0IHRv IG5pbC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IHVwZGF0ZVNjcm9sbFZpZXdCYWNrZ3JvdW5kXSk6CisgICAgICAgICgt W1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOldlYktpdDo6XSk6CisgICAgICAgICgtW1dL V2ViVmlldyBzY3JvbGxWaWV3RGlkWm9vbTpdKToKKwogMjAxNC0wMy0xMiAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBIYXZlIHRoZSBzY3JvbGxpbmcg dHJlZSB0cmFjayB0aGUgdmlld3BvcnQgc2l6ZSwgbm90IHRoZSB2aWV3cG9ydCByZWN0CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQko cmV2aXNpb24gMTY1NDU0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM4NSw2ICszODUsMTUgQEAgLSAoVUlDb2xv ciAqKXBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgogICAgIHJldHVybiBbVUlDb2xvciBjb2xv cldpdGhSZWQ6KGNvbG9yLnJlZCgpIC8gMjU1LjApIGdyZWVuOihjb2xvci5ncmVlbigpIC8gMjU1 LjApIGJsdWU6KGNvbG9yLmJsdWUoKSAvIDI1NS4wKSBhbHBoYTooY29sb3IuYWxwaGEoKSAvIDI1 NS4wKV07CiB9CiAKKy0gKHZvaWQpdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmQKK3sKKyAgICBV SUNvbG9yICpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IgPSBbc2VsZiBwYWdlRXh0ZW5kZWRC YWNrZ3JvdW5kQ29sb3JdOworICAgIGlmIChwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IgJiYg W3NlbGYgX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZV0gJiYgW19zY3JvbGxWaWV3IHpvb21T Y2FsZV0gPj0gW19zY3JvbGxWaWV3IG1pbmltdW1ab29tU2NhbGVdICYmICFbX3Njcm9sbFZpZXcg aXNab29tQm91bmNpbmddKQorICAgICAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9y OnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcl07CisgICAgZWxzZQorICAgICAgICBbX3Njcm9s bFZpZXcgc2V0QmFja2dyb3VuZENvbG9yOm5pbF07Cit9CisKIC0gKHZvaWQpX2RpZENvbW1pdExh eWVyVHJlZTooY29uc3QgV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYpbGF5ZXJU cmVlVHJhbnNhY3Rpb24KIHsKICAgICBBU1NFUlQoIV9jdXN0b21Db250ZW50Vmlldyk7CkBAIC0z OTUsMTEgKzQwNCw4IEBAIC0gKHZvaWQpX2RpZENvbW1pdExheWVyVHJlZTooY29uc3QgV2ViS2kK ICAgICBbX3Njcm9sbFZpZXcgc2V0Wm9vbUVuYWJsZWQ6bGF5ZXJUcmVlVHJhbnNhY3Rpb24uYWxs b3dzVXNlclNjYWxpbmcoKV07CiAgICAgaWYgKCFsYXllclRyZWVUcmFuc2FjdGlvbi5zY2FsZVdh c1NldEJ5VUlQcm9jZXNzKCkgJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21pbmddICYmICFbX3Njcm9s bFZpZXcgaXNab29tQm91bmNpbmddICYmICFbX3Njcm9sbFZpZXcgX2lzQW5pbWF0aW5nWm9vbV0p CiAgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRab29tU2NhbGU6bGF5ZXJUcmVlVHJhbnNhY3Rpb24u cGFnZVNjYWxlRmFjdG9yKCldOwotCi0gICAgaWYgKFVJQ29sb3IgKnBhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvciA9IFtzZWxmIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcl0pIHsKLSAgICAg ICAgaWYgKFtzZWxmIF9iYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2VdKQotICAgICAgICAgICAg W19zY3JvbGxWaWV3IHNldEJhY2tncm91bmRDb2xvcjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3JdOwotICAgIH0KKyAgICAKKyAgICBbc2VsZiB1cGRhdGVTY3JvbGxWaWV3QmFja2dyb3VuZF07 CiAKICAgICBpZiAoX2dlc3R1cmVDb250cm9sbGVyKQogICAgICAgICBfZ2VzdHVyZUNvbnRyb2xs ZXItPnNldFJlbmRlclRyZWVTaXplKGxheWVyVHJlZVRyYW5zYWN0aW9uLnJlbmRlclRyZWVTaXpl KCkpOwpAQCAtNjAwLDYgKzYwNiw3IEBAIC0gKHZvaWQpc2Nyb2xsVmlld0RpZFNjcm9sbDooVUlT Y3JvbGxWaWUKIAogLSAodm9pZClzY3JvbGxWaWV3RGlkWm9vbTooVUlTY3JvbGxWaWV3ICopc2Ny b2xsVmlldwogeworICAgIFtzZWxmIHVwZGF0ZVNjcm9sbFZpZXdCYWNrZ3JvdW5kXTsKICAgICBb c2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c107CiB9CiAK