146179 2015-06-19 22:11:25 -0700 [WK2][iOS] Avoid synchronous IPC on view state change when the content is not visible 2015-06-20 13:51:26 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=134623 InRadar P2 Normal --- 1 cdumez cdumez barraclough darin mitz simon.fraser thorton webkit-bug-importer oldest_to_newest 1103572 0 cdumez 2015-06-19 22:11:25 -0700 After <http://trac.webkit.org/changeset/170787>, viewStateChange() would cause a sync IPC between the UIProcess and the WebProcess when the view becomes visible, to avoid painting empty/black tiles when unsuspending the WebProcess (on tab switch), in the event volatile IOSurfaces were purged. This sync IPC has performance implications and is not needed when the content is not visible (e.g. hideContentUntilNextUpdate() was called, or the tab was killed). My proposal is to avoid the sync IPC when the content is hidden and to expose a private API on WKWebView so that the client can ask for the content to be hidden until the next update. This would allow for clients to avoid the sync IPC if they don't need the content to be displayed synchronously. Radar: <rdar://problem/20923432> 1103574 1 255278 cdumez 2015-06-19 22:18:18 -0700 Created attachment 255278 Patch 1103578 2 255278 cdumez 2015-06-19 22:29:59 -0700 Comment on attachment 255278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255278&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:1376 > m_viewStateChangeWantsSynchronousReply = true; I wish we could just call "drawingArea->hideContentUntilNextUpdate()" here but it will display a grey tab until we get the IPC back, and I believe Tim told me this wasn't OK. 1103580 3 thorton 2015-06-19 22:53:30 -0700 (In reply to comment #2) > Comment on attachment 255278 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255278&action=review > > > Source/WebKit2/UIProcess/WebPageProxy.cpp:1376 > > m_viewStateChangeWantsSynchronousReply = true; > > I wish we could just call "drawingArea->hideContentUntilNextUpdate()" here > but it will display a grey tab until we get the IPC back, and I believe Tim > told me this wasn't OK. Right, tab switch isn't allowed to flash unless it's unavoidable (sync IPC in both directions, for example). 1103595 4 255278 thorton 2015-06-20 00:14:53 -0700 Comment on attachment 255278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255278&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:2594 > +- (void)_hideContentUntilNextUpdate Sad to expose this implementation detail, but it's not the worst thing. > Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:426 > + return !m_remoteLayerTreeHost.rootLayer(); Technically this could also mean that we haven't gotten the first commit yet (making the name slightly but probably not meaningfully inaccurate). 1103633 5 255278 cdumez 2015-06-20 09:40:59 -0700 Comment on attachment 255278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255278&action=review >> Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:426 >> + return !m_remoteLayerTreeHost.rootLayer(); > > Technically this could also mean that we haven't gotten the first commit yet (making the name slightly but probably not meaningfully inaccurate). Right, would "hasVisibleContent()" be better? 1103640 6 255278 thorton 2015-06-20 11:27:27 -0700 Comment on attachment 255278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255278&action=review >>> Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:426 >>> + return !m_remoteLayerTreeHost.rootLayer(); >> >> Technically this could also mean that we haven't gotten the first commit yet (making the name slightly but probably not meaningfully inaccurate). > > Right, would "hasVisibleContent()" be better? I think so. 1103641 7 bshafiei 2015-06-20 11:39:48 -0700 rdar://problem/20923432 1103651 8 255296 cdumez 2015-06-20 13:49:53 -0700 Created attachment 255296 Patch 1103653 9 255296 cdumez 2015-06-20 13:51:18 -0700 Comment on attachment 255296 Patch Clearing flags on attachment: 255296 Committed r185799: <http://trac.webkit.org/changeset/185799> 1103654 10 cdumez 2015-06-20 13:51:26 -0700 All reviewed patches have been landed. Closing bug. 255278 2015-06-19 22:18:18 -0700 2015-06-20 13:49:48 -0700 Patch bug-146179-20150619221739.patch text/plain 6673 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODcyODQ0MTk5MGY2OWQw N2Y4ZjlmMDM5YTU5ZDdmNDg3ZWQyMzE3MS4uMGRkOWU1NGJhZjgyNzE1Y2NmNDVhNDQyYzQwMDY2 YWJkM2QyMjliYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTA2LTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl1baU9TXSBBdm9pZCBz eW5jaHJvbm91cyBJUEMgb24gdmlldyBzdGF0ZSBjaGFuZ2Ugd2hlbiB0aGUgY29udGVudCBpcyBu b3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ2MTc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDkyMzQzMj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMTcwNzg3LCB2aWV3 U3RhdGVDaGFuZ2UoKSB3b3VsZCBjYXVzZSBhIHN5bmNocm9ub3VzIElQQyBiZXR3ZWVuCisgICAg ICAgIHRoZSBVSVByb2Nlc3MgYW5kIHRoZSBXZWJQcm9jZXNzIHdoZW4gdGhlIHZpZXcgYmVjb21l cyB2aXNpYmxlLiBUaGlzCisgICAgICAgIHdhcyB0byBhdm9pZCBwYWludGluZyBlbXB0eSAvIGJs YWNrIHRpbGVzIHdoZW4gdW5zdXNwZW5kaW5nIHRoZQorICAgICAgICBXZWJQcm9jZXNzIG9uIHRh YiBzd2l0Y2gsIGluIHRoZSBldmVudCB2b2xhdGlsZSBJT1N1cmZhY2VzIHdlcmUgcHVyZ2VkLgor CisgICAgICAgIEhvd2V2ZXIsIHRoaXMgc3luYyBJUEMgY2FuIGhhdmUgcGVyZm9ybWFuY2UgaW1w bGljYXRpb25zIGFuZCBpcyBub3QKKyAgICAgICAgbmVlZGVkIHdoZW4gdGhlIGNvbnRlbnQgaXMg bm90IGFjdHVhbGx5IHZpc2libGUgeWV0IChlLmcuCisgICAgICAgIGhpZGVDb250ZW50VW50aWxO ZXh0VXBkYXRlKCkgd2FzIGNhbGxlZCwgb3IgdGhlIHRhYiB3YXMga2lsbGVkKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGF2b2lkcyB0aGUgc3luY2hyb25vdXMgSVBDIHdoZW4gdGhlIGNvbnRlbnQg aXMgaGlkZGVuIGFuZAorICAgICAgICBleHBvc2VzIGEgcHJpdmF0ZSBBUEkgb24gV0tXZWJWaWV3 IHNvIHRoYXQgY2xpZW50cyBjYW4gYXNrIGZvciB0aGUKKyAgICAgICAgY29udGVudCB0byBiZSBo aWRkZW4gdW50aWwgdGhlIG5leHQgdXBkYXRlLiBUaGlzIHdvdWxkIGFsbG93IGZvcgorICAgICAg ICBjbGllbnRzIHRvIGF2b2lkIHRoZSBzeW5jaHJvbm91cyBJUEMgaWYgdGhleSBkb24ndCBuZWVk IHRoZSBjb250ZW50CisgICAgICAgIHRvIGJlIGRpc3BsYXllZCBzeW5jaHJvbm91c2x5IChlLmcu IHRoZSB2aWV3IGlzIG9ic2N1cmVkKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2hpZGVDb250ZW50VW50aWxOZXh0 VXBkYXRlXSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRl Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaDoKKyAgICAgICAgKFdl YktpdDo6RHJhd2luZ0FyZWFQcm94eTo6aXNDb250ZW50SGlkZGVuKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aXNwYXRjaFZpZXdTdGF0ZUNoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9SZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9SZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYVByb3h5Ojppc0NvbnRlbnRIaWRkZW4pOgorCiAyMDE1LTA2LTE4 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl IHNob3VsZEludGVycnVwdEphdmFTY3JpcHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYWYwMjZiZWJkNzZlM2JiYTY1OTAxYzY3NmU5 NzAyMzliZGQ4NDczOC4uZjM1ZWEyNjIyMWQ0NTZkMjU1NGQ2YjUzZjUzYTlhODlkM2Q5MTY4NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K QEAgLTI1OTEsNiArMjU5MSwxMiBAQCAtICh2b2lkKV9lbmRJbnRlcmFjdGl2ZU9ic2N1cmVkSW5z ZXRzQ2hhbmdlCiAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdOwogfQogCist ICh2b2lkKV9oaWRlQ29udGVudFVudGlsTmV4dFVwZGF0ZQoreworICAgIGlmIChhdXRvKiBhcmVh ID0gX3BhZ2UtPmRyYXdpbmdBcmVhKCkpCisgICAgICAgIGFyZWEtPmhpZGVDb250ZW50VW50aWxO ZXh0VXBkYXRlKCk7Cit9CisKIC0gKHZvaWQpX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRl czoodm9pZCAoXikodm9pZCkpdXBkYXRlQmxvY2sKIHsKICAgICBDR1JlY3Qgb2xkQm91bmRzID0g c2VsZi5ib3VuZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IDE4ZjAyZDI5MTlhMjI5NzA2YzcyZWRjMzg0YjFi ZWFkOGY2MzRhNmUuLjQ0N2QwODkzNzdkZjA2Mjk3NDE5NTNjMzc2NWMxNGI3NWVkNGJiOTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 UHJpdmF0ZS5oCkBAIC0xMzQsNiArMTM0LDcgQEAgV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3Qg X1dLU2hvdWxkT3BlbkV4dGVybmFsVVJMc0tleSBXS19BVkFJTEFCTEUoV0tfTUFDX1RCQSwKIAog LSAodm9pZClfYmVnaW5JbnRlcmFjdGl2ZU9ic2N1cmVkSW5zZXRzQ2hhbmdlOwogLSAodm9pZClf ZW5kSW50ZXJhY3RpdmVPYnNjdXJlZEluc2V0c0NoYW5nZTsKKy0gKHZvaWQpX2hpZGVDb250ZW50 VW50aWxOZXh0VXBkYXRlOwogCiAtICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0 ZXM6KHZvaWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrOwogLSAodm9pZClfZW5kQW5pbWF0ZWRSZXNp emU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94 eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAppbmRleCBj NWJjZGU0N2FiZmJmYWUzYjIxNzMwYjAyMjM5MmM4MjFjMzg5ZGJkLi5lODY4YzcwMDNiMThjMmQ5 OWFjMDUxNThiMmNjMDgzNTdkZTcyNDVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5LmgKQEAgLTkwLDYgKzkwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBkaXNwYXRjaEFmdGVyRW5zdXJpbmdEcmF3aW5nKHN0ZDo6ZnVuY3Rpb248dm9pZCAoQ2Fs bGJhY2tCYXNlOjpFcnJvcik+KSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAKICAgICB2aXJ0 dWFsIHZvaWQgaGlkZUNvbnRlbnRVbnRpbE5leHRVcGRhdGUoKSB7IEFTU0VSVF9OT1RfUkVBQ0hF RCgpOyB9CisgICAgdmlydHVhbCBib29sIGlzQ29udGVudEhpZGRlbigpIGNvbnN0IHsgcmV0dXJu IGZhbHNlOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRVcGRhdGVHZW9tZXRyeSgpIHsg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDA5MGNh M2Q1MzhiZTNlOTg0ZWEyMDRhNTAyZDY4ODM0NTg2Yjc0ZWQuLjJkNWUzOGQ5OWFkOTdmODkwODJm Zjk1N2NhYzM1Y2MzZmJmYmU3OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC0xMzcyLDcgKzEzNzIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlzcGF0 Y2hWaWV3U3RhdGVDaGFuZ2UoKQogICAgIFZpZXdTdGF0ZTo6RmxhZ3MgY2hhbmdlZCA9IG1fdmll d1N0YXRlIF4gcHJldmlvdXNWaWV3U3RhdGU7CiAKICAgICAvLyBXZSBhbHdheXMgd2FudCB0byB3 YWl0IGZvciB0aGUgV2ViIHByb2Nlc3MgdG8gcmVwbHkgaWYgd2UndmUgYmVlbiBpbi13aW5kb3cg YmVmb3JlIGFuZCBhcmUgY29taW5nIGJhY2sgaW4td2luZG93LgotICAgIGlmIChtX3ZpZXdXYXNF dmVySW5XaW5kb3cgJiYgKGNoYW5nZWQgJiBWaWV3U3RhdGU6OklzSW5XaW5kb3cpICYmIGlzSW5X aW5kb3coKSkKKyAgICBpZiAobV92aWV3V2FzRXZlckluV2luZG93ICYmIChjaGFuZ2VkICYgVmll d1N0YXRlOjpJc0luV2luZG93KSAmJiBpc0luV2luZG93KCkgJiYgIW1fZHJhd2luZ0FyZWEtPmlz Q29udGVudEhpZGRlbigpKQogICAgICAgICBtX3ZpZXdTdGF0ZUNoYW5nZVdhbnRzU3luY2hyb25v dXNSZXBseSA9IHRydWU7CiAKICAgICAvLyBEb24ndCB3YWl0IHN5bmNocm9ub3VzbHkgaWYgdGhl IHZpZXcgc3RhdGUgaXMgbm90IHZpc2libGUuIChUaGlzIG1hdHRlcnMgaW4gcGFydGljdWxhciBv biBpT1MsIHdoZXJlIGEgaGlkZGVuIHBhZ2UgbWF5IGJlIHN1c3BlbmRlZC4pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eS5oCmluZGV4IDQwMDE2YzQxNTVmZGIyZTRkYzk5ZWNkZDA5OTU3ZDNmN2U0 OGFlYWYuLjQzZmM3NjhkNmM0NWY0OTY2ZTMxZmUxNDA3MGYzZjlmYzdhZmQ0MDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWFQcm94eS5oCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CiBjbGFzcyBSZW1vdGVTY3JvbGxp bmdDb29yZGluYXRvclRyYW5zYWN0aW9uOwogCi1jbGFzcyBSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5IDogcHVibGljIERyYXdpbmdBcmVhUHJveHkgeworY2xhc3MgUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWFQcm94eSBmaW5hbCA6IHB1YmxpYyBEcmF3aW5nQXJlYVByb3h5IHsKIHB1 YmxpYzoKICAgICBleHBsaWNpdCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5KFdlYlBh Z2VQcm94eSYpOwogICAgIHZpcnR1YWwgflJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHko KTsKQEAgLTc3LDYgKzc3LDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCB3YWl0Rm9y RGlkVXBkYXRlVmlld1N0YXRlKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGhpZGVDb250 ZW50VW50aWxOZXh0VXBkYXRlKCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIGlzQ29udGVu dEhpZGRlbigpIGNvbnN0IG92ZXJyaWRlOwogICAgIAogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQg aW5kaWNhdG9yTG9jYXRpb24oKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1t CmluZGV4IGUxYWJmZmE1MDlkMThlZTVmZDJiZjUyZGYwMjQ3MmZkZGMxNjIxNDkuLmI0NjU1YTAy NGFmMmVmODZhZDcwNzRlYjBlMjBhNjAyMjE2Mzg5YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkubW0KQEAgLTQyMSw0ICs0MjEsOSBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhUHJveHk6OmhpZGVDb250ZW50VW50aWxOZXh0VXBkYXRlKCkKICAgICBtX3JlbW90ZUxheWVy VHJlZUhvc3QuZGV0YWNoUm9vdExheWVyKCk7CiB9CiAKK2Jvb2wgUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eTo6aXNDb250ZW50SGlkZGVuKCkgY29uc3QKK3sKKyAgICByZXR1cm4gIW1f cmVtb3RlTGF5ZXJUcmVlSG9zdC5yb290TGF5ZXIoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0Cg== 255296 2015-06-20 13:49:53 -0700 2015-06-20 13:51:18 -0700 Patch bug-146179-20150620134913.patch text/plain 6676 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODcyODQ0MTk5MGY2OWQw N2Y4ZjlmMDM5YTU5ZDdmNDg3ZWQyMzE3MS4uOGU5ZjlkMzQzMmJiNWY3MzNjNzllOTY1NjY4ZjQy YWMwNGNlZmY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTA2LTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl1baU9TXSBBdm9pZCBz eW5jaHJvbm91cyBJUEMgb24gdmlldyBzdGF0ZSBjaGFuZ2Ugd2hlbiB0aGUgY29udGVudCBpcyBu b3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ2MTc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDkyMzQzMj4KKworICAgICAgICBS ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFmdGVyIHIxNzA3ODcsIHZpZXdTdGF0 ZUNoYW5nZSgpIHdvdWxkIGNhdXNlIGEgc3luY2hyb25vdXMgSVBDIGJldHdlZW4KKyAgICAgICAg dGhlIFVJUHJvY2VzcyBhbmQgdGhlIFdlYlByb2Nlc3Mgd2hlbiB0aGUgdmlldyBiZWNvbWVzIHZp c2libGUuIFRoaXMKKyAgICAgICAgd2FzIHRvIGF2b2lkIHBhaW50aW5nIGVtcHR5IC8gYmxhY2sg dGlsZXMgd2hlbiB1bnN1c3BlbmRpbmcgdGhlCisgICAgICAgIFdlYlByb2Nlc3Mgb24gdGFiIHN3 aXRjaCwgaW4gdGhlIGV2ZW50IHZvbGF0aWxlIElPU3VyZmFjZXMgd2VyZSBwdXJnZWQuCisKKyAg ICAgICAgSG93ZXZlciwgdGhpcyBzeW5jIElQQyBjYW4gaGF2ZSBwZXJmb3JtYW5jZSBpbXBsaWNh dGlvbnMgYW5kIGlzIG5vdAorICAgICAgICBuZWVkZWQgd2hlbiB0aGUgY29udGVudCBpcyBub3Qg YWN0dWFsbHkgdmlzaWJsZSB5ZXQgKGUuZy4KKyAgICAgICAgaGlkZUNvbnRlbnRVbnRpbE5leHRV cGRhdGUoKSB3YXMgY2FsbGVkLCBvciB0aGUgdGFiIHdhcyBraWxsZWQpLgorCisgICAgICAgIFRo aXMgcGF0Y2ggYXZvaWRzIHRoZSBzeW5jaHJvbm91cyBJUEMgd2hlbiB0aGUgY29udGVudCBpcyBo aWRkZW4gYW5kCisgICAgICAgIGV4cG9zZXMgYSBwcml2YXRlIEFQSSBvbiBXS1dlYlZpZXcgc28g dGhhdCBjbGllbnRzIGNhbiBhc2sgZm9yIHRoZQorICAgICAgICBjb250ZW50IHRvIGJlIGhpZGRl biB1bnRpbCB0aGUgbmV4dCB1cGRhdGUuIFRoaXMgd291bGQgYWxsb3cgZm9yCisgICAgICAgIGNs aWVudHMgdG8gYXZvaWQgdGhlIHN5bmNocm9ub3VzIElQQyBpZiB0aGV5IGRvbid0IG5lZWQgdGhl IGNvbnRlbnQKKyAgICAgICAgdG8gYmUgZGlzcGxheWVkIHN5bmNocm9ub3VzbHkgKGUuZy4gdGhl IHZpZXcgaXMgb2JzY3VyZWQpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfaGlkZUNvbnRlbnRVbnRpbE5leHRVcGRh dGVdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAoV2ViS2l0 OjpEcmF3aW5nQXJlYVByb3h5OjpoYXNWaXNpYmxlQ29udGVudCk6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlz cGF0Y2hWaWV3U3RhdGVDaGFuZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6aXNDb250ZW50SGlkZGVuKToKKwogMjAxNS0wNi0xOCAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBz aG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGFmMDI2YmViZDc2ZTNiYmE2NTkwMWM2NzZlOTcw MjM5YmRkODQ3MzguLmYzNWVhMjYyMjFkNDU2ZDI1NTRkNmI1M2Y1M2E5YTg5ZDNkOTE2ODUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBA IC0yNTkxLDYgKzI1OTEsMTIgQEAgLSAodm9pZClfZW5kSW50ZXJhY3RpdmVPYnNjdXJlZEluc2V0 c0NoYW5nZQogICAgIFtzZWxmIF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXTsKIH0KIAorLSAo dm9pZClfaGlkZUNvbnRlbnRVbnRpbE5leHRVcGRhdGUKK3sKKyAgICBpZiAoYXV0byogYXJlYSA9 IF9wYWdlLT5kcmF3aW5nQXJlYSgpKQorICAgICAgICBhcmVhLT5oaWRlQ29udGVudFVudGlsTmV4 dFVwZGF0ZSgpOworfQorCiAtICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6 KHZvaWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrCiB7CiAgICAgQ0dSZWN0IG9sZEJvdW5kcyA9IHNl bGYuYm91bmRzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlld1ByaXZhdGUuaAppbmRleCAxOGYwMmQyOTE5YTIyOTcwNmM3MmVkYzM4NGIxYmVh ZDhmNjM0YTZlLi40NDdkMDg5Mzc3ZGYwNjI5NzQxOTUzYzM3NjVjMTRiNzVlZDRiYjk3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZh dGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1By aXZhdGUuaApAQCAtMTM0LDYgKzEzNCw3IEBAIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IF9X S1Nob3VsZE9wZW5FeHRlcm5hbFVSTHNLZXkgV0tfQVZBSUxBQkxFKFdLX01BQ19UQkEsCiAKIC0g KHZvaWQpX2JlZ2luSW50ZXJhY3RpdmVPYnNjdXJlZEluc2V0c0NoYW5nZTsKIC0gKHZvaWQpX2Vu ZEludGVyYWN0aXZlT2JzY3VyZWRJbnNldHNDaGFuZ2U7CistICh2b2lkKV9oaWRlQ29udGVudFVu dGlsTmV4dFVwZGF0ZTsKIAogLSAodm9pZClfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVz Oih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jazsKIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXpl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHku aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKaW5kZXggYzVi Y2RlNDdhYmZiZmFlM2IyMTczMGIwMjIzOTJjODIxYzM4OWRiZC4uNDgwZTBlNTE3MzRmNWVjZGUz MzQ5NDg5MmMwYWU0YzNmNmUwOTJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0RyYXdpbmdBcmVhUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJh d2luZ0FyZWFQcm94eS5oCkBAIC05MCw2ICs5MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgZGlzcGF0Y2hBZnRlckVuc3VyaW5nRHJhd2luZyhzdGQ6OmZ1bmN0aW9uPHZvaWQgKENhbGxi YWNrQmFzZTo6RXJyb3IpPikgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQogCiAgICAgdmlydHVh bCB2b2lkIGhpZGVDb250ZW50VW50aWxOZXh0VXBkYXRlKCkgeyBBU1NFUlRfTk9UX1JFQUNIRUQo KTsgfQorICAgIHZpcnR1YWwgYm9vbCBoYXNWaXNpYmxlQ29udGVudCgpIGNvbnN0IHsgcmV0dXJu IHRydWU7IH0KIAogICAgIHZpcnR1YWwgdm9pZCB3aWxsU2VuZFVwZGF0ZUdlb21ldHJ5KCkgeyB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMDkwY2Ez ZDUzOGJlM2U5ODRlYTIwNGE1MDJkNjg4MzQ1ODZiNzRlZC4uOWNhYzM1ODZiYWNiMWMxOGZhMzll NTc5OGRmN2VjMTExOGMwMzM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTEzNzIsNyArMTM3Miw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaXNwYXRj aFZpZXdTdGF0ZUNoYW5nZSgpCiAgICAgVmlld1N0YXRlOjpGbGFncyBjaGFuZ2VkID0gbV92aWV3 U3RhdGUgXiBwcmV2aW91c1ZpZXdTdGF0ZTsKIAogICAgIC8vIFdlIGFsd2F5cyB3YW50IHRvIHdh aXQgZm9yIHRoZSBXZWIgcHJvY2VzcyB0byByZXBseSBpZiB3ZSd2ZSBiZWVuIGluLXdpbmRvdyBi ZWZvcmUgYW5kIGFyZSBjb21pbmcgYmFjayBpbi13aW5kb3cuCi0gICAgaWYgKG1fdmlld1dhc0V2 ZXJJbldpbmRvdyAmJiAoY2hhbmdlZCAmIFZpZXdTdGF0ZTo6SXNJbldpbmRvdykgJiYgaXNJbldp bmRvdygpKQorICAgIGlmIChtX3ZpZXdXYXNFdmVySW5XaW5kb3cgJiYgKGNoYW5nZWQgJiBWaWV3 U3RhdGU6OklzSW5XaW5kb3cpICYmIGlzSW5XaW5kb3coKSAmJiBtX2RyYXdpbmdBcmVhLT5oYXNW aXNpYmxlQ29udGVudCgpKQogICAgICAgICBtX3ZpZXdTdGF0ZUNoYW5nZVdhbnRzU3luY2hyb25v dXNSZXBseSA9IHRydWU7CiAKICAgICAvLyBEb24ndCB3YWl0IHN5bmNocm9ub3VzbHkgaWYgdGhl IHZpZXcgc3RhdGUgaXMgbm90IHZpc2libGUuIChUaGlzIG1hdHRlcnMgaW4gcGFydGljdWxhciBv biBpT1MsIHdoZXJlIGEgaGlkZGVuIHBhZ2UgbWF5IGJlIHN1c3BlbmRlZC4pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWFQcm94eS5oCmluZGV4IDQwMDE2YzQxNTVmZGIyZTRkYzk5ZWNkZDA5OTU3ZDNmN2U0 OGFlYWYuLjIyZmI0NGUwMmNjMTNmZDdlY2M3OTY1MjMxMTViYTY2ZTE3MDg3ZTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWFQcm94eS5oCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogY2xhc3MgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb247CiBjbGFzcyBSZW1vdGVTY3JvbGxp bmdDb29yZGluYXRvclRyYW5zYWN0aW9uOwogCi1jbGFzcyBSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5IDogcHVibGljIERyYXdpbmdBcmVhUHJveHkgeworY2xhc3MgUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWFQcm94eSBmaW5hbCA6IHB1YmxpYyBEcmF3aW5nQXJlYVByb3h5IHsKIHB1 YmxpYzoKICAgICBleHBsaWNpdCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5KFdlYlBh Z2VQcm94eSYpOwogICAgIHZpcnR1YWwgflJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHko KTsKQEAgLTc3LDYgKzc3LDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCB3YWl0Rm9y RGlkVXBkYXRlVmlld1N0YXRlKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGhpZGVDb250 ZW50VW50aWxOZXh0VXBkYXRlKCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29sIGhhc1Zpc2li bGVDb250ZW50KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgCiAgICAgV2ViQ29yZTo6RmxvYXRQb2lu dCBpbmRpY2F0b3JMb2NhdGlvbigpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHku bW0KaW5kZXggZTFhYmZmYTUwOWQxOGVlNWZkMmJmNTJkZjAyNDcyZmRkYzE2MjE0OS4uNGFjZGMw OTI3MTYyMmE1MTEyZTI2ZjkxZjdlMTMxODY4NzEzODUzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWFQcm94eS5tbQpAQCAtNDIxLDQgKzQyMSw5IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWFQcm94eTo6aGlkZUNvbnRlbnRVbnRpbE5leHRVcGRhdGUoKQogICAgIG1fcmVtb3RlTGF5 ZXJUcmVlSG9zdC5kZXRhY2hSb290TGF5ZXIoKTsKIH0KIAorYm9vbCBSZW1vdGVMYXllclRyZWVE cmF3aW5nQXJlYVByb3h5OjpoYXNWaXNpYmxlQ29udGVudCgpIGNvbnN0Cit7CisgICAgcmV0dXJu IG1fcmVtb3RlTGF5ZXJUcmVlSG9zdC5yb290TGF5ZXIoKTsKK30KKwogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0Cg==