147047 2015-07-17 13:54:40 -0700 [iOS] Menu drop down such as on nike.com does not stay 2015-08-10 13:32:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified REOPENED InRadar P2 Normal --- 147839 1 zalan zalan benjamin commit-queue simon.fraser oldest_to_newest 1110199 0 zalan 2015-07-17 13:54:40 -0700 1. Navigate to nike.com 2. Tap on the top menu bar: Men, Women, Boys etc.. 3. The pull down menu does not stay. 1110200 1 zalan 2015-07-17 13:55:12 -0700 rdar://problem/21046961 1110299 2 257014 zalan 2015-07-17 19:17:42 -0700 Created attachment 257014 Patch 1110300 3 257015 zalan 2015-07-17 19:18:26 -0700 Created attachment 257015 Patch 1110312 4 257015 simon.fraser 2015-07-17 20:13:02 -0700 Comment on attachment 257015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257015&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:969 > + if (!oldUnobscuredContentRect.isEmpty() && oldUnobscuredContentRect.y() < 1) { oldUnobscuredContentRect.y() < 1 is true for RTL pages. Please test one. 1110441 5 zalan 2015-07-18 21:33:40 -0700 (In reply to comment #4) > Comment on attachment 257015 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257015&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:969 > > + if (!oldUnobscuredContentRect.isEmpty() && oldUnobscuredContentRect.y() < 1) { > > oldUnobscuredContentRect.y() < 1 is true for RTL pages. Please test one. Works fine on nike.com with body dir=rtl 1110725 6 257015 benjamin 2015-07-20 13:11:40 -0700 Comment on attachment 257015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257015&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:967 > + // FIXME: We need to support programmatic scroll-after-viewport update. I think this is no longer true. In RemoteLayerTreeDrawingAreaProxy::commitLayerTree(), didCommitLayerTree() is before requestScroll(). > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:974 > + [_scrollView zoomToRect: { newTopLeft, rectToZoomSize } animated:NO]; Can you double check that the zoom rect used here does not depend on the ContentInset of UIScrollView? Here we are only using the bounds. 1111051 7 257202 zalan 2015-07-21 14:20:56 -0700 Created attachment 257202 Patch 1111052 8 zalan 2015-07-21 14:21:34 -0700 (In reply to comment #6) > Comment on attachment 257015 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257015&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:967 > > + // FIXME: We need to support programmatic scroll-after-viewport update. > > I think this is no longer true. In > RemoteLayerTreeDrawingAreaProxy::commitLayerTree(), didCommitLayerTree() is > before requestScroll(). > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:974 > > + [_scrollView zoomToRect: { newTopLeft, rectToZoomSize } animated:NO]; > > Can you double check that the zoom rect used here does not depend on the > ContentInset of UIScrollView? > > Here we are only using the bounds. Tested with landscape mode with the sidebar open. 1111089 9 257202 commit-queue 2015-07-21 15:37:16 -0700 Comment on attachment 257202 Patch Clearing flags on attachment: 257202 Committed r187131: <http://trac.webkit.org/changeset/187131> 1111090 10 commit-queue 2015-07-21 15:37:19 -0700 All reviewed patches have been landed. Closing bug. 1116306 11 commit-queue 2015-08-10 13:32:47 -0700 Re-opened since this is blocked by bug 147839 257014 2015-07-17 19:17:42 -0700 2015-07-17 19:18:22 -0700 Patch bug-147047-20150717191632.patch text/plain 3310 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjk3OGE3ODgyMWZmZjE0 NTEwMjk5YzM5NDk1MjcwOWI1MGRmMjgxMi4uMDgxMzAwMDYxYzkyOTE1ZmJjMzlkNTFkNGVjNTU0 Nzk0MWNlZmVhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWVudSBkcm9wIGRv d24gc3VjaCBhcyBvbiBuaWtlLmNvbSBkb2VzIG5vdCBzdGF5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwNDcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgd29ya2Fyb3VuZCBmb3IgdW5p bnRlbmRlZCBzY3JvbGxpbmcgd2hpbGUgc2NhbGluZy4KKyAgICAgICAgKEJhc2VkIG9uIEJlbmph bWluIFBvdWxhaW4ncyBXSVAgcGF0Y2ggZm9yIHdlYmtpdC5vcmcvYi8xMzY5MDQpCisKKyAgICAg ICAgSW4gY2VydGFpbiBjYXNlcyB3aGVuIHNjYWxpbmcgd291bGQgcmVzdWx0IGluIG1vdmluZyB0 aGUgc2Nyb2xsdmlldyAod2hpY2ggd291bGQgdHJpZ2dlcgorICAgICAgICBhIHNjcm9sbCBldmVu dCBvbiBXZWJDb3JlIHNpZGUpLCB6b29tUmVjdCBpcyBjYWxsZWQgaW5zdGVhZCBvZiBzZXRab29t U2NhbGUgdG8gZW5zdXJlCisgICAgICAgIHRoYXQgdGhlIHNjcm9sbCBwb3NpdGlvbiBzdGF5cyBp bnRhY3QuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6XSk6CisKIDIwMTUtMDctMTcg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgaU9TIFRl eHRJbmRpY2F0b3JzIGluY2x1ZGUgdGV4dCB0aGF0IGlzIG5vdCBzdXBwb3NlZCB0byBiZSBpbmRp Y2F0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KaW5kZXggY2UwMWJkMzhjMDZhMGMxMzE3ODIyN2UyNjUzMDQxYjYzY2FlMTE4NC4uOWY3ZmIy ZmMxZWEyNzY5ODVmMDhhNzE4YmJkNDNkNTYzODIwZTY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTk1OSw4ICs5NTksMjMgQEAg LSAodm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uJilsYXllclRyZWUKICAgICBbX3Njcm9sbFZpZXcgc2V0TWluaW11bVpvb21T Y2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5taW5pbXVtU2NhbGVGYWN0b3IoKV07CiAgICAgW19z Y3JvbGxWaWV3IHNldE1heGltdW1ab29tU2NhbGU6bGF5ZXJUcmVlVHJhbnNhY3Rpb24ubWF4aW11 bVNjYWxlRmFjdG9yKCldOwogICAgIFtfc2Nyb2xsVmlldyBzZXRab29tRW5hYmxlZDpsYXllclRy ZWVUcmFuc2FjdGlvbi5hbGxvd3NVc2VyU2NhbGluZygpXTsKLSAgICBpZiAoIWxheWVyVHJlZVRy YW5zYWN0aW9uLnNjYWxlV2FzU2V0QnlVSVByb2Nlc3MoKSAmJiAhW19zY3JvbGxWaWV3IGlzWm9v bWluZ10gJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10gJiYgIVtfc2Nyb2xsVmlldyBf aXNBbmltYXRpbmdab29tXSkKLSAgICAgICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTpsYXll clRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKV07CisgICAgaWYgKCFsYXllclRyZWVU cmFuc2FjdGlvbi5zY2FsZVdhc1NldEJ5VUlQcm9jZXNzKCkgJiYgIVtfc2Nyb2xsVmlldyBpc1pv b21pbmddICYmICFbX3Njcm9sbFZpZXcgaXNab29tQm91bmNpbmddICYmICFbX3Njcm9sbFZpZXcg X2lzQW5pbWF0aW5nWm9vbV0pIHsKKyAgICAgICAgZmxvYXQgbmV3UGFnZVNjYWxlRmFjdG9yID0g bGF5ZXJUcmVlVHJhbnNhY3Rpb24ucGFnZVNjYWxlRmFjdG9yKCk7CisKKyAgICAgICAgaWYgKCFh cmVFc3NlbnRpYWxseUVxdWFsQXNGbG9hdChjb250ZW50Wm9vbVNjYWxlKHNlbGYpLCBuZXdQYWdl U2NhbGVGYWN0b3IpKSB7CisgICAgICAgICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBoYW5kbGUg c3RpY2sgdG8gYm90dG9tLgorICAgICAgICAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gc3VwcG9y dCBwcm9ncmFtbWF0aWMgc2Nyb2xsLWFmdGVyLXZpZXdwb3J0IHVwZGF0ZS4KKyAgICAgICAgICAg IFdlYkNvcmU6OkZsb2F0UmVjdCBvbGRVbm9ic2N1cmVkQ29udGVudFJlY3QgPSBfcGFnZS0+dW5v YnNjdXJlZENvbnRlbnRSZWN0KCk7CisgICAgICAgICAgICBpZiAoIW9sZFVub2JzY3VyZWRDb250 ZW50UmVjdC5pc0VtcHR5KCkgJiYgb2xkVW5vYnNjdXJlZENvbnRlbnRSZWN0LnkoKSA8IDEpIHsK KyAgICAgICAgICAgICAgICBDR0Zsb2F0IHJlbGF0aXZlSG9yaXpvbnRhbFBvc2l0aW9uID0gb2xk VW5vYnNjdXJlZENvbnRlbnRSZWN0LngoKSAvIG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC53aWR0 aCgpOworICAgICAgICAgICAgICAgIENHUG9pbnQgbmV3VG9wTGVmdCA9IFtzZWxmIF9hZGp1c3Rl ZENvbnRlbnRPZmZzZXQ6IHsgcmVsYXRpdmVIb3Jpem9udGFsUG9zaXRpb24gKiBuZXdDb250ZW50 U2l6ZS53aWR0aCwgMCB9XTsKKyAgICAgICAgICAgICAgICBDR1NpemUgc2Nyb2xsVmlld1NpemUg PSBbX3Njcm9sbFZpZXcgYm91bmRzXS5zaXplOworICAgICAgICAgICAgICAgIENHU2l6ZSByZWN0 VG9ab29tU2l6ZSA9IENHU2l6ZU1ha2Uoc2Nyb2xsVmlld1NpemUud2lkdGggKiBuZXdQYWdlU2Nh bGVGYWN0b3IsIHNjcm9sbFZpZXdTaXplLmhlaWdodCAqIG5ld1BhZ2VTY2FsZUZhY3Rvcik7Cisg ICAgICAgICAgICAgICAgW19zY3JvbGxWaWV3IHpvb21Ub1JlY3Q6IHsgbmV3VG9wTGVmdCwgcmVj dFRvWm9vbVNpemUgfSBhbmltYXRlZDpOT107CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgICAgICBbX3Njcm9sbFZpZXcgc2V0Wm9vbVNjYWxlOm5ld1BhZ2VTY2FsZUZhY3Rvcl07Cisg ICAgICAgIH0KKyAgICB9CiAKICAgICBbc2VsZiBfdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmRd OwogCg== 257015 2015-07-17 19:18:26 -0700 2015-07-21 14:20:53 -0700 Patch bug-147047-20150717191716.patch text/plain 3343 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjk3OGE3ODgyMWZmZjE0 NTEwMjk5YzM5NDk1MjcwOWI1MGRmMjgxMi4uMGUwMTUyNjc4OThhOTZjYjI1YThjNWU3Y2M0M2Q1 Y2ZkNDc1MDc2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA3LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWVudSBkcm9wIGRv d24gc3VjaCBhcyBvbiBuaWtlLmNvbSBkb2VzIG5vdCBzdGF5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwNDcKKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vMjEwNDY5NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGlzIGEgd29ya2Fyb3VuZCBmb3IgdW5pbnRlbmRlZCBzY3JvbGxpbmcgd2hpbGUg c2NhbGluZy4KKyAgICAgICAgKEJhc2VkIG9uIEJlbmphbWluIFBvdWxhaW4ncyBXSVAgcGF0Y2gg Zm9yIHdlYmtpdC5vcmcvYi8xMzY5MDQpCisKKyAgICAgICAgSW4gY2VydGFpbiBjYXNlcyB3aGVu IHNjYWxpbmcgd291bGQgcmVzdWx0IGluIG1vdmluZyB0aGUgc2Nyb2xsdmlldyAod2hpY2ggd291 bGQgdHJpZ2dlcgorICAgICAgICBhIHNjcm9sbCBldmVudCBvbiBXZWJDb3JlIHNpZGUpLCB6b29t UmVjdCBpcyBjYWxsZWQgaW5zdGVhZCBvZiBzZXRab29tU2NhbGUgdG8gZW5zdXJlCisgICAgICAg IHRoYXQgdGhlIHNjcm9sbCBwb3NpdGlvbiBzdGF5cyBpbnRhY3QuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRD b21taXRMYXllclRyZWU6XSk6CisKIDIwMTUtMDctMTcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hv cnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgaU9TIFRleHRJbmRpY2F0b3JzIGluY2x1ZGUgdGV4 dCB0aGF0IGlzIG5vdCBzdXBwb3NlZCB0byBiZSBpbmRpY2F0ZWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggY2UwMWJkMzhjMDZhMGMx MzE3ODIyN2UyNjUzMDQxYjYzY2FlMTE4NC4uOWY3ZmIyZmMxZWEyNzY5ODVmMDhhNzE4YmJkNDNk NTYzODIwZTY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KQEAgLTk1OSw4ICs5NTksMjMgQEAgLSAodm9pZClfZGlkQ29tbWl0TGF5ZXJU cmVlOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJilsYXllclRyZWUK ICAgICBbX3Njcm9sbFZpZXcgc2V0TWluaW11bVpvb21TY2FsZTpsYXllclRyZWVUcmFuc2FjdGlv bi5taW5pbXVtU2NhbGVGYWN0b3IoKV07CiAgICAgW19zY3JvbGxWaWV3IHNldE1heGltdW1ab29t U2NhbGU6bGF5ZXJUcmVlVHJhbnNhY3Rpb24ubWF4aW11bVNjYWxlRmFjdG9yKCldOwogICAgIFtf c2Nyb2xsVmlldyBzZXRab29tRW5hYmxlZDpsYXllclRyZWVUcmFuc2FjdGlvbi5hbGxvd3NVc2Vy U2NhbGluZygpXTsKLSAgICBpZiAoIWxheWVyVHJlZVRyYW5zYWN0aW9uLnNjYWxlV2FzU2V0QnlV SVByb2Nlc3MoKSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbWluZ10gJiYgIVtfc2Nyb2xsVmlldyBp c1pvb21Cb3VuY2luZ10gJiYgIVtfc2Nyb2xsVmlldyBfaXNBbmltYXRpbmdab29tXSkKLSAgICAg ICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2Nh bGVGYWN0b3IoKV07CisgICAgaWYgKCFsYXllclRyZWVUcmFuc2FjdGlvbi5zY2FsZVdhc1NldEJ5 VUlQcm9jZXNzKCkgJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21pbmddICYmICFbX3Njcm9sbFZpZXcg aXNab29tQm91bmNpbmddICYmICFbX3Njcm9sbFZpZXcgX2lzQW5pbWF0aW5nWm9vbV0pIHsKKyAg ICAgICAgZmxvYXQgbmV3UGFnZVNjYWxlRmFjdG9yID0gbGF5ZXJUcmVlVHJhbnNhY3Rpb24ucGFn ZVNjYWxlRmFjdG9yKCk7CisKKyAgICAgICAgaWYgKCFhcmVFc3NlbnRpYWxseUVxdWFsQXNGbG9h dChjb250ZW50Wm9vbVNjYWxlKHNlbGYpLCBuZXdQYWdlU2NhbGVGYWN0b3IpKSB7CisgICAgICAg ICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBoYW5kbGUgc3RpY2sgdG8gYm90dG9tLgorICAgICAg ICAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gc3VwcG9ydCBwcm9ncmFtbWF0aWMgc2Nyb2xsLWFm dGVyLXZpZXdwb3J0IHVwZGF0ZS4KKyAgICAgICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBvbGRV bm9ic2N1cmVkQ29udGVudFJlY3QgPSBfcGFnZS0+dW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7Cisg ICAgICAgICAgICBpZiAoIW9sZFVub2JzY3VyZWRDb250ZW50UmVjdC5pc0VtcHR5KCkgJiYgb2xk VW5vYnNjdXJlZENvbnRlbnRSZWN0LnkoKSA8IDEpIHsKKyAgICAgICAgICAgICAgICBDR0Zsb2F0 IHJlbGF0aXZlSG9yaXpvbnRhbFBvc2l0aW9uID0gb2xkVW5vYnNjdXJlZENvbnRlbnRSZWN0Lngo KSAvIG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC53aWR0aCgpOworICAgICAgICAgICAgICAgIENH UG9pbnQgbmV3VG9wTGVmdCA9IFtzZWxmIF9hZGp1c3RlZENvbnRlbnRPZmZzZXQ6IHsgcmVsYXRp dmVIb3Jpem9udGFsUG9zaXRpb24gKiBuZXdDb250ZW50U2l6ZS53aWR0aCwgMCB9XTsKKyAgICAg ICAgICAgICAgICBDR1NpemUgc2Nyb2xsVmlld1NpemUgPSBbX3Njcm9sbFZpZXcgYm91bmRzXS5z aXplOworICAgICAgICAgICAgICAgIENHU2l6ZSByZWN0VG9ab29tU2l6ZSA9IENHU2l6ZU1ha2Uo c2Nyb2xsVmlld1NpemUud2lkdGggKiBuZXdQYWdlU2NhbGVGYWN0b3IsIHNjcm9sbFZpZXdTaXpl LmhlaWdodCAqIG5ld1BhZ2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICAgICAgW19zY3JvbGxW aWV3IHpvb21Ub1JlY3Q6IHsgbmV3VG9wTGVmdCwgcmVjdFRvWm9vbVNpemUgfSBhbmltYXRlZDpO T107CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBbX3Njcm9sbFZpZXcgc2V0 Wm9vbVNjYWxlOm5ld1BhZ2VTY2FsZUZhY3Rvcl07CisgICAgICAgIH0KKyAgICB9CiAKICAgICBb c2VsZiBfdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmRdOwogCg== 257202 2015-07-21 14:20:56 -0700 2015-07-21 15:37:16 -0700 Patch bug-147047-20150721141944.patch text/plain 3251 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmZiN2U5NTA1MjgyOWI3 NDMwOWVjYzk2M2EyN2QyMmYyNjEyNmVlYS4uMzM0MzkxMmI4NGFkMTljZTFiZjUzMTY5NjI5NjI4 MDIwMGQ2N2YyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA3LTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWVudSBkcm9wIGRv d24gc3VjaCBhcyBvbiBuaWtlLmNvbSBkb2VzIG5vdCBzdGF5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwNDcKKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vMjEwNDY5NjEKKworICAgICAgICBSZXZpZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgorCisg ICAgICAgIFRoaXMgaXMgYSB3b3JrYXJvdW5kIGZvciB1bmludGVuZGVkIHNjcm9sbGluZyB3aGls ZSBzY2FsaW5nLgorICAgICAgICAoQmFzZWQgb24gQmVuamFtaW4gUG91bGFpbidzIFdJUCBwYXRj aCBmb3Igd2Via2l0Lm9yZy9iLzEzNjkwNCkKKworICAgICAgICBJbiBjZXJ0YWluIGNhc2VzIHdo ZW4gc2NhbGluZyB3b3VsZCByZXN1bHQgaW4gbW92aW5nIHRoZSBzY3JvbGx2aWV3ICh3aGljaCB3 b3VsZCB0cmlnZ2VyCisgICAgICAgIGEgc2Nyb2xsIGV2ZW50IG9uIFdlYkNvcmUgc2lkZSksIHpv b21SZWN0IGlzIGNhbGxlZCBpbnN0ZWFkIG9mIHNldFpvb21TY2FsZSB0byBlbnN1cmUKKyAgICAg ICAgdGhhdCB0aGUgc2Nyb2xsIHBvc2l0aW9uIHN0YXlzIGludGFjdC4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2Rp ZENvbW1pdExheWVyVHJlZTpdKToKKwogMjAxNS0wNy0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIEFQSSB0byBiZSBub3Rp ZmllZCBhYm91dCBlZGl0b3Igc3RhdGUgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBjZTAxYmQzOGMwNmEwYzEzMTc4MjI3 ZTI2NTMwNDFiNjNjYWUxMTg0Li4zNDljNjM3M2E3MjMyN2NmZGIyOGZjMDYxMGYyYTg5ZDgzMDhh MmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbQpAQCAtOTU5LDggKzk1OSwyMiBAQCAtICh2b2lkKV9kaWRDb21taXRMYXllclRyZWU6KGNv bnN0IFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKWxheWVyVHJlZQogICAgIFtf c2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOmxheWVyVHJlZVRyYW5zYWN0aW9uLm1pbmlt dW1TY2FsZUZhY3RvcigpXTsKICAgICBbX3Njcm9sbFZpZXcgc2V0TWF4aW11bVpvb21TY2FsZTps YXllclRyZWVUcmFuc2FjdGlvbi5tYXhpbXVtU2NhbGVGYWN0b3IoKV07CiAgICAgW19zY3JvbGxW aWV3IHNldFpvb21FbmFibGVkOmxheWVyVHJlZVRyYW5zYWN0aW9uLmFsbG93c1VzZXJTY2FsaW5n KCldOwotICAgIGlmICghbGF5ZXJUcmVlVHJhbnNhY3Rpb24uc2NhbGVXYXNTZXRCeVVJUHJvY2Vz cygpICYmICFbX3Njcm9sbFZpZXcgaXNab29taW5nXSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbUJv dW5jaW5nXSAmJiAhW19zY3JvbGxWaWV3IF9pc0FuaW1hdGluZ1pvb21dKQotICAgICAgICBbX3Nj cm9sbFZpZXcgc2V0Wm9vbVNjYWxlOmxheWVyVHJlZVRyYW5zYWN0aW9uLnBhZ2VTY2FsZUZhY3Rv cigpXTsKKyAgICBpZiAoIWxheWVyVHJlZVRyYW5zYWN0aW9uLnNjYWxlV2FzU2V0QnlVSVByb2Nl c3MoKSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbWluZ10gJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21C b3VuY2luZ10gJiYgIVtfc2Nyb2xsVmlldyBfaXNBbmltYXRpbmdab29tXSkgeworICAgICAgICBm bG9hdCBuZXdQYWdlU2NhbGVGYWN0b3IgPSBsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVG YWN0b3IoKTsKKworICAgICAgICBpZiAoIWFyZUVzc2VudGlhbGx5RXF1YWxBc0Zsb2F0KGNvbnRl bnRab29tU2NhbGUoc2VsZiksIG5ld1BhZ2VTY2FsZUZhY3RvcikpIHsKKyAgICAgICAgICAgIC8v IEZJWE1FOiBXZSBuZWVkIHRvIGhhbmRsZSBzdGljayB0byBib3R0b20uCisgICAgICAgICAgICBX ZWJDb3JlOjpGbG9hdFJlY3Qgb2xkVW5vYnNjdXJlZENvbnRlbnRSZWN0ID0gX3BhZ2UtPnVub2Jz Y3VyZWRDb250ZW50UmVjdCgpOworICAgICAgICAgICAgaWYgKCFvbGRVbm9ic2N1cmVkQ29udGVu dFJlY3QuaXNFbXB0eSgpICYmIG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC55KCkgPCAxKSB7Cisg ICAgICAgICAgICAgICAgQ0dGbG9hdCByZWxhdGl2ZUhvcml6b250YWxQb3NpdGlvbiA9IG9sZFVu b2JzY3VyZWRDb250ZW50UmVjdC54KCkgLyBvbGRVbm9ic2N1cmVkQ29udGVudFJlY3Qud2lkdGgo KTsKKyAgICAgICAgICAgICAgICBDR1BvaW50IG5ld1RvcExlZnQgPSBbc2VsZiBfYWRqdXN0ZWRD b250ZW50T2Zmc2V0OiB7IHJlbGF0aXZlSG9yaXpvbnRhbFBvc2l0aW9uICogbmV3Q29udGVudFNp emUud2lkdGgsIDAgfV07CisgICAgICAgICAgICAgICAgQ0dTaXplIHNjcm9sbFZpZXdTaXplID0g W19zY3JvbGxWaWV3IGJvdW5kc10uc2l6ZTsKKyAgICAgICAgICAgICAgICBDR1NpemUgcmVjdFRv Wm9vbVNpemUgPSBDR1NpemVNYWtlKHNjcm9sbFZpZXdTaXplLndpZHRoICogbmV3UGFnZVNjYWxl RmFjdG9yLCBzY3JvbGxWaWV3U2l6ZS5oZWlnaHQgKiBuZXdQYWdlU2NhbGVGYWN0b3IpOworICAg ICAgICAgICAgICAgIFtfc2Nyb2xsVmlldyB6b29tVG9SZWN0OiB7IG5ld1RvcExlZnQsIHJlY3RU b1pvb21TaXplIH0gYW5pbWF0ZWQ6Tk9dOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICAgICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTpuZXdQYWdlU2NhbGVGYWN0b3JdOworICAg ICAgICB9CisgICAgfQogCiAgICAgW3NlbGYgX3VwZGF0ZVNjcm9sbFZpZXdCYWNrZ3JvdW5kXTsK IAo=