129188 2014-02-21 17:20:13 -0800 [iOS][WebKit2] Adopt SPI for managing tabs 2014-02-26 12:34:04 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 psolanki psolanki andersca barraclough psolanki sam oldest_to_newest 983455 0 psolanki 2014-02-21 17:20:13 -0800 Adopt assertion SPI for managing tab lifecycle. 983456 1 psolanki 2014-02-21 17:20:31 -0800 <rdar://problem/15939827> 983460 2 224933 psolanki 2014-02-21 17:30:26 -0800 Created attachment 224933 Patch 983461 3 psolanki 2014-02-21 17:31:20 -0800 Member variables and functions could do with a better name but I couldn't come up with anything. Let me know if this is fitting in well architecturally or if it needs to be somewhere else. 983741 4 224933 sam 2014-02-23 13:34:09 -0800 Comment on attachment 224933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224933&action=review > Source/WebKit2/Configurations/WebKit2.xcconfig:35 > +FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework WebKit -lMobileGestalt -lassertion_extension; Why is this only needed in the simulator? > Source/WebKit2/Platform/IPC/Connection.h:283 > +public: > + xpc_connection_t xpcConnection() { return m_xpcConnection; } > + I would move this up to just below the line that reads: static bool identifierIsNull(Identifier identifier) { return identifier.port == MACH_PORT_NULL; } > Source/WebKit2/UIProcess/WebPageProxy.cpp:1031 > +#if PLATFORM(IOS) > + if (mayHaveChanged & ViewState::IsInWindow) > + process().setProcessState(m_viewState & ViewState::IsInWindow ? WebProcessProxy::Foreground : WebProcessProxy::Background); > +#endif Is this accounting for the case where a process has multiple WebPageProxies? > Source/WebKit2/UIProcess/WebProcessProxy.h:228 > +#if PLATFORM(IOS) > +public: > + enum ProcessState { > + Background, > + Foreground > + }; > + > + void setProcessState(ProcessState); > + > +private: > + void updateProcessState(); > + > + ProcessState m_processState; > +#endif If possible, I would love to keep this not iOS specific (with other ports just always being in the Foreground state). I would bet Gavin has opinions on this as well, given all the time he has spent lately, cleaning up ViewState stuff. 983951 5 224933 psolanki 2014-02-24 11:00:12 -0800 Comment on attachment 224933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224933&action=review >> Source/WebKit2/Configurations/WebKit2.xcconfig:35 >> +FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework WebKit -lMobileGestalt -lassertion_extension; > > Why is this only needed in the simulator? FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos (below) includes FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator. iphonesimucator seems to be for frameworks applicable to both. iphoneos is hardware specific. >> Source/WebKit2/UIProcess/WebPageProxy.cpp:1031 >> +#endif > > Is this accounting for the case where a process has multiple WebPageProxies? Hmm.. So you mean when we have one web process handling multiple WebPageProxy. I don't think this is handling that. I see we have a vector of WebPageProxy objects in WebProcessProxy. Should we be going through this list every time so we don't mark a process as being background inadvertently? >> Source/WebKit2/UIProcess/WebProcessProxy.h:228 >> +#endif > > If possible, I would love to keep this not iOS specific (with other ports just always being in the Foreground state). I would bet Gavin has opinions on this as well, given all the time he has spent lately, cleaning up ViewState stuff. Ok. I can do that and have empty implementations for other ports. 984408 6 225165 psolanki 2014-02-25 11:27:19 -0800 Created attachment 225165 Patch 984409 7 psolanki 2014-02-25 11:28:16 -0800 Simpler patch that doesn't keep the state in WebProcessProxy. We don't really need to. Though it might be advantageous to have a local state for debugging purposes. 984755 8 225165 barraclough 2014-02-26 08:59:28 -0800 Comment on attachment 225165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225165&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:1028 > + if (mayHaveChanged & ViewState::IsInWindow) Hey Pratik, I think you should be able to check "changed" instead of "mayHaveChanged" – you should probably only need to update the process state if visibility actually has changed, right? (I'm probably going to remove mayHaveChanged soon). > Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm:83 > + copyValuesToVector(m_pageMap, pages); I think you could just iterate the page map directly, instead of copying to a vector, using: for (const auto& page : m_pageMap.values()) 984849 9 psolanki 2014-02-26 12:34:04 -0800 Committed r164737: <http://trac.webkit.org/changeset/164737> 224933 2014-02-21 17:30:26 -0800 2014-02-25 11:27:17 -0800 Patch bug-129188-20140221173025.patch text/plain 6975 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDVhZTEzYjE1MjJhMjc4 ZjdiZDQ0NzJlNjA3ZWU5YmE0MmY5YjE5NS4uMDdlNTBkOTA4NWI5YmM1YjkzNDM1MTlmYTI3YmNk ODE5OWViMWVjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAyLTIxICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXVtXZWJLaXQy XSBBZG9wdCBTUEkgZm9yIG1hbmFnaW5nIHRhYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTE4OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU5 Mzk4Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2FsbCBpbnRvIGFzc2VydGlvbnMgU1BJIHRvIG1hcmsgdGFicyBhcyBmb3JlZ3JvdW5kIGFuZCBi YWNrZ3JvdW5kLgorCisgICAgICAgICogQ29uZmlndXJhdGlvbnMvV2ViS2l0Mi54Y2NvbmZpZzoK KyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAoSVBDOjpDb25u ZWN0aW9uOjp4cGNDb25uZWN0aW9uKTogRXhwb3NlIHRoZSB4cGNfY29ubmVjdGlvbl90LgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnZpZXdTdGF0ZURpZENoYW5nZSk6IE1hcmsgdGhlIHByb2Nlc3MgYXMgZm9yZWdy b3VuZCBpZiB3ZSdyZSBpbiBhCisgICAgICAgIHdpbmRvdywgb3RoZXJ3c2llIG1hcmsgaXQgYXMg YmFja2dyb3VuZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpXZWJQcm9jZXNzUHJveHkpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V2ViUHJvY2Vzc1Byb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6 OnVwZGF0ZVByb2Nlc3NTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6 c2V0UHJvY2Vzc1N0YXRlKToKKwogMjAxNC0wMi0yMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSByZWR1bmRhbnQgZGV2aWNlU2NhbGVGYWN0b3IoKSBm dW5jdGlvbnMgYW5kIG1ha2UgY2FsbGVycyB1c2UgRG9jdW1lbnQ6OmRldmljZVNjYWxlRmFjdG9y KCkgd2hlbiBhY2Nlc3NpYmxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ29uZmlndXJh dGlvbnMvV2ViS2l0Mi54Y2NvbmZpZyBiL1NvdXJjZS9XZWJLaXQyL0NvbmZpZ3VyYXRpb25zL1dl YktpdDIueGNjb25maWcKaW5kZXggYWQxMWJiM2U5ODQxZDcyZjQwNzMyMDZhNzE1MTQxZjVmM2I4 MTgxYS4uMmYxYTNhNmQ2Mzk2MTRkYWNlZTdkMGU2NTY4MzFiOTk3ZDIxZTIxYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlvbnMvV2ViS2l0Mi54Y2NvbmZpZworKysgYi9T b3VyY2UvV2ViS2l0Mi9Db25maWd1cmF0aW9ucy9XZWJLaXQyLnhjY29uZmlnCkBAIC0zMiw3ICsz Miw3IEBAIElOU1RBTExfUEFUSF9BQ1RVQUxfaXBob25lc2ltdWxhdG9yID0gJChOT1JNQUxfV0VC S0lUMl9GUkFNRVdPUktTX0RJUl9pcGhvbmVvcyk7CiBEWUxJQl9JTlNUQUxMX05BTUVfQkFTRSA9 ICQoTk9STUFMX1dFQktJVDJfRlJBTUVXT1JLU19ESVIpOwogCiBGUkFNRVdPUktfQU5EX0xJQlJB UllfTERGTEFHUyA9ICQoRlJBTUVXT1JLX0FORF9MSUJSQVJZX0xERkxBR1NfJChQTEFURk9STV9O QU1FKSk7Ci1GUkFNRVdPUktfQU5EX0xJQlJBUllfTERGTEFHU19pcGhvbmVzaW11bGF0b3IgPSAt bG9iamMgLWZyYW1ld29yayBDRk5ldHdvcmsgLWZyYW1ld29yayBDb3JlRm91bmRhdGlvbiAtZnJh bWV3b3JrIENvcmVHcmFwaGljcyAtZnJhbWV3b3JrIENvcmVUZXh0IC1mcmFtZXdvcmsgRm91bmRh dGlvbiAtZnJhbWV3b3JrIEdyYXBoaWNzU2VydmljZXMgLWZyYW1ld29yayBJbWFnZUlPIC1mcmFt ZXdvcmsgVUlLaXQgLWZyYW1ld29yayBXZWJLaXQgLWxNb2JpbGVHZXN0YWx0OworRlJBTUVXT1JL X0FORF9MSUJSQVJZX0xERkxBR1NfaXBob25lc2ltdWxhdG9yID0gLWxvYmpjIC1mcmFtZXdvcmsg Q0ZOZXR3b3JrIC1mcmFtZXdvcmsgQ29yZUZvdW5kYXRpb24gLWZyYW1ld29yayBDb3JlR3JhcGhp Y3MgLWZyYW1ld29yayBDb3JlVGV4dCAtZnJhbWV3b3JrIEZvdW5kYXRpb24gLWZyYW1ld29yayBH cmFwaGljc1NlcnZpY2VzIC1mcmFtZXdvcmsgSW1hZ2VJTyAtZnJhbWV3b3JrIFVJS2l0IC1mcmFt ZXdvcmsgV2ViS2l0IC1sTW9iaWxlR2VzdGFsdCAtbGFzc2VydGlvbl9leHRlbnNpb247CiBGUkFN RVdPUktfQU5EX0xJQlJBUllfTERGTEFHU19pcGhvbmVvcyA9ICQoRlJBTUVXT1JLX0FORF9MSUJS QVJZX0xERkxBR1NfaXBob25lc2ltdWxhdG9yKSAtZnJhbWV3b3JrIElPU3VyZmFjZTsKIEZSQU1F V09SS19BTkRfTElCUkFSWV9MREZMQUdTX21hY29zeCA9IC1mcmFtZXdvcmsgQXBwbGljYXRpb25T ZXJ2aWNlcyAtZnJhbWV3b3JrIENhcmJvbiAtZnJhbWV3b3JrIENvY29hIC1mcmFtZXdvcmsgQ29y ZVNlcnZpY2VzIC1mcmFtZXdvcmsgSU9LaXQgLWZyYW1ld29yayBDb3JlQXVkaW8gLWZyYW1ld29y ayBJT1N1cmZhY2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9D b25uZWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCmlu ZGV4IDEwZGU2OTQ3ODFkMjg4OGNhMTZiOWRkMzNjYjExYzk5YmMzMWY5ODQuLmFiZGVmMmViZGRk NWEwZDIxMTU0Y2QzYjRiYTQ1Mzg5MjFiOGRmZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v SVBDL0Nvbm5lY3Rpb24uaApAQCAtMjc4LDYgKzI3OCwxMCBAQCBwcml2YXRlOgogICAgIFNlY29u ZGFyeVRocmVhZFBlbmRpbmdTeW5jUmVwbHlNYXAgbV9zZWNvbmRhcnlUaHJlYWRQZW5kaW5nU3lu Y1JlcGx5TWFwOwogCiAjaWYgT1MoREFSV0lOKQorcHVibGljOgorICAgIHhwY19jb25uZWN0aW9u X3QgeHBjQ29ubmVjdGlvbigpIHsgcmV0dXJuIG1feHBjQ29ubmVjdGlvbjsgfQorCitwcml2YXRl OgogICAgIC8vIENhbGxlZCBvbiB0aGUgY29ubmVjdGlvbiBxdWV1ZS4KICAgICB2b2lkIHJlY2Vp dmVTb3VyY2VFdmVudEhhbmRsZXIoKTsKICAgICB2b2lkIGluaXRpYWxpemVEZWFkTmFtZVNvdXJj ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBjOWU0 ZTk4NzA5ODU5MmEwNzU0N2NjYjg4YmNmZDFhZWMzNzNiOTFjLi41MTQ5ZmYyMDVkN2I2Mzg5MDk0 MzA2YWY1ZmZmNjdhODMxZWFlMWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtMTAyNSw2ICsxMDI1LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3 U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpGbGFncyBtYXlIYXZlQ2hhbmdlZCwgV2FudHNSZXBs CiAgICAgfQogI2VuZGlmCiAKKyNpZiBQTEFURk9STShJT1MpCisgICAgaWYgKG1heUhhdmVDaGFu Z2VkICYgVmlld1N0YXRlOjpJc0luV2luZG93KQorICAgICAgICBwcm9jZXNzKCkuc2V0UHJvY2Vz c1N0YXRlKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc0luV2luZG93ID8gV2ViUHJvY2Vzc1By b3h5OjpGb3JlZ3JvdW5kIDogV2ViUHJvY2Vzc1Byb3h5OjpCYWNrZ3JvdW5kKTsKKyNlbmRpZgor CiAgICAgdXBkYXRlQmFja2luZ1N0b3JlRGlzY2FyZGFibGVTdGF0ZSgpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGRmMTNhZmIwNTIw OTIyNGE4MThhY2M2N2EwNTY3YjMxZDYzMWZmNmUuLjVjZTU3ODM3MTgxMGFlMzgwMzE3OGUxMjcy NzE1OTA1MTBhNGMyNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwCkBAIC05Nyw2ICs5Nyw5IEBAIFdlYlByb2Nlc3NQcm94eTo6V2ViUHJvY2Vzc1By b3h5KFdlYkNvbnRleHQmIGNvbnRleHQpCiAgICAgLCBtX3Byb2Nlc3NTdXBwcmVzc2lvbkVuYWJs ZWQoZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fbnVtYmVyT2ZUaW1lc1N1ZGRlblRlcm1pbmF0aW9u V2FzRGlzYWJsZWQoMCkKKyNpZiBQTEFURk9STShJT1MpCisgICAgLCBtX3Byb2Nlc3NTdGF0ZShG b3JlZ3JvdW5kKQorI2VuZGlmCiB7CiAgICAgY29ubmVjdCgpOwogfQpAQCAtNDUzLDYgKzQ1Niw5 IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5j aGVyKiBsYXVuY2hlciwgSVBDOjpDb25uZWN0CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdXBk YXRlUHJvY2Vzc1N1cHByZXNzaW9uU3RhdGUoKTsKICNlbmRpZgorI2lmIFBMQVRGT1JNKElPUykK KyAgICB1cGRhdGVQcm9jZXNzU3RhdGUoKTsKKyNlbmRpZgogfQogCiBXZWJGcmFtZVByb3h5KiBX ZWJQcm9jZXNzUHJveHk6OndlYkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpIGNvbnN0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggZDAwNjkyOWQ3Mjc0MDJm Y2JmMzFlMzU2ZjVhYzI1YjRkNWEwMWQxMS4uYWNhM2JmNTE2OWVkNDA0Y2M3ZmRiZTAwNzdjNTBj MmNmN2EyOTIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku aApAQCAtMjExLDYgKzIxMSwyMSBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBpbnQgbV9udW1i ZXJPZlRpbWVzU3VkZGVuVGVybWluYXRpb25XYXNEaXNhYmxlZDsKKworI2lmIFBMQVRGT1JNKElP UykKK3B1YmxpYzoKKyAgICBlbnVtIFByb2Nlc3NTdGF0ZSB7CisgICAgICAgIEJhY2tncm91bmQs CisgICAgICAgIEZvcmVncm91bmQKKyAgICB9OworCisgICAgdm9pZCBzZXRQcm9jZXNzU3RhdGUo UHJvY2Vzc1N0YXRlKTsKKworcHJpdmF0ZToKKyAgICB2b2lkIHVwZGF0ZVByb2Nlc3NTdGF0ZSgp OworCisgICAgUHJvY2Vzc1N0YXRlIG1fcHJvY2Vzc1N0YXRlOworI2VuZGlmCiB9OwogICAgIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dlYlByb2Nlc3NQcm94eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV2ViUHJvY2Vzc1Byb3h5SU9TLm1tCmluZGV4IDA3OTQwNzE3NzMwZDVhNGMxY2EwODM3N2Vh MDMxYjcwMzQ5MWQ0NzIuLjk0MDlhNzUzMTNiMjI4N2MxNzZhYzQzNWU3ZDljOWYzY2Q3Mzc4M2Eg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUHJvY2Vzc1Byb3h5 SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUHJvY2Vzc1Byb3h5 SU9TLm1tCkBAIC0yNiw2ICsyNiw3IEBACiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIldl YlByb2Nlc3NQcm94eS5oIgogCisjaW1wb3J0IDxhc3NlcnRpb24vZXh0ZW5zaW9uX3ByaXZhdGUu aD4KICNpbXBvcnQgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KIAogbmFtZXNwYWNlIFdlYktp dCB7CkBAIC02OCw0ICs2OSwyNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6dXBkYXRlUHJvY2Vz c1N1cHByZXNzaW9uU3RhdGUoKQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKK3ZvaWQgV2Vi UHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcm9jZXNzU3RhdGUoKQoreworI2lmIFVTRShYUENfU0VSVklD RVMpCisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CisgICAgeHBjX2Nvbm5lY3Rpb25fdCB4cGNDb25u ZWN0aW9uID0gY29ubmVjdGlvbigpLT54cGNDb25uZWN0aW9uKCk7CisgICAgaWYgKCF4cGNDb25u ZWN0aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBhc3NlcnRpb25fZXh0ZW5zaW9uX3N0YXRl X3QgZXh0ZW5zaW9uU3RhdGUgPSAobV9wcm9jZXNzU3RhdGUgPT0gRm9yZWdyb3VuZCkgPyBBU1NF UlRJT05fRVhURU5TSU9OX1NUQVRFX0ZPUkVHUk9VTkQgOiBBU1NFUlRJT05fRVhURU5TSU9OX1NU QVRFX0JBQ0tHUk9VTkQ7CisgICAgZXJybm9fdCB0YWJTdGF0ZUVycm9yID0gYXNzZXJ0aW9uX2V4 dGVuc2lvbl9zZXRfc3RhdGUoeHBjQ29ubmVjdGlvbiwgZXh0ZW5zaW9uU3RhdGUsIE5VTEwpOwor ICAgIEFTU0VSVF9VTlVTRUQodGFiU3RhdGVFcnJvciwgIXRhYlN0YXRlRXJyb3IpOworI2VuZGlm Cit9CisKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpzZXRQcm9jZXNzU3RhdGUoUHJvY2Vzc1N0YXRl IHN0YXRlKQoreworICAgIG1fcHJvY2Vzc1N0YXRlID0gc3RhdGU7CisgICAgaWYgKCFpc1ZhbGlk KCkpCisgICAgICAgIHJldHVybjsKKworICAgIHVwZGF0ZVByb2Nlc3NTdGF0ZSgpOworfQorCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQK 225165 2014-02-25 11:27:19 -0800 2014-02-26 08:59:28 -0800 Patch bug-129188-20140225112718.patch text/plain 6679 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDI5NDZmZDRiZjI0NWU4 M2EwNjU2NzQzNjYzNWVmMmM2OTY2YjllMi4uODE4Y2M5NzNkYWNhNGMyN2UzMzEwNzc0Mjk4Yjlk MTQzNjkyMzUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAyLTI1ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXVtXZWJLaXQy XSBBZG9wdCBTUEkgZm9yIG1hbmFnaW5nIHRhYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTE4OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU5 Mzk4Mjc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2FsbCBpbnRvIGFzc2VydGlvbnMgU1BJIHRvIG1hcmsgdGFicyBhcyBmb3JlZ3JvdW5kIGFuZCBi YWNrZ3JvdW5kLgorCisgICAgICAgICogQ29uZmlndXJhdGlvbnMvV2ViS2l0Mi54Y2NvbmZpZzoK KyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAoSVBDOjpDb25u ZWN0aW9uOjp4cGNDb25uZWN0aW9uKTogRXhwb3NlIHRoZSB4cGNfY29ubmVjdGlvbl90LgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnZpZXdTdGF0ZURpZENoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkRmlu aXNoTGF1bmNoaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6dXBkYXRlUHJvY2Vzc1N0YXRlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlByb2Nlc3NQcm94eUlPUy5tbToKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcm9jZXNzU3RhdGUpOiBBZGRlZC4gVGhpcyBn b2VzIHRocm91Z2ggdGhlIGxpc3Qgb2YKKyAgICAgICAgV2ViUGFnZVByb3hpZXMgYW5kIHNldHMg dGhlIHByb2Nlc3Mgc3RhdGUgdG8gZm9yZWdyb3VuZCBpZiBvbmUgb2YgdGhlbSBpcyBpbiBhIHdp bmRvdy4KKyAgICAgICAgT3RoZXJ3aXNlLCBpdCBzZXRzIGl0IHRvIGJhY2tncm91bmQuCisKIDIw MTQtMDItMjQgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0 ZSBTZXNzaW9uSUQgdmFsdWUtc3R5bGUgY2xhc3MgZm9yIHNlc3Npb24gSURzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlvbnMvV2ViS2l0Mi54Y2NvbmZpZyBiL1NvdXJj ZS9XZWJLaXQyL0NvbmZpZ3VyYXRpb25zL1dlYktpdDIueGNjb25maWcKaW5kZXggYmVhMTM2MTNj YzE3ZWYwY2JhMWZmMDBlZjRiMzU4Y2UxYWQyNTZkOS4uNGI5ZmZmY2I4ZDg3Mzc5ODFjZDNmNjM5 Y2NmNWY0ZGMyYjc4NGM5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlv bnMvV2ViS2l0Mi54Y2NvbmZpZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9Db25maWd1cmF0aW9ucy9X ZWJLaXQyLnhjY29uZmlnCkBAIC0zMCw3ICszMCw3IEBAIElOU1RBTExfUEFUSF9BQ1RVQUwgPSAk KFdFQktJVDJfRlJBTUVXT1JLU19ESVIpOwogRFlMSUJfSU5TVEFMTF9OQU1FX0JBU0UgPSAkKE5P Uk1BTF9XRUJLSVQyX0ZSQU1FV09SS1NfRElSKTsKIAogRlJBTUVXT1JLX0FORF9MSUJSQVJZX0xE RkxBR1MgPSAkKEZSQU1FV09SS19BTkRfTElCUkFSWV9MREZMQUdTXyQoUExBVEZPUk1fTkFNRSkp OwotRlJBTUVXT1JLX0FORF9MSUJSQVJZX0xERkxBR1NfaXBob25lc2ltdWxhdG9yID0gLWxvYmpj IC1mcmFtZXdvcmsgQ0ZOZXR3b3JrIC1mcmFtZXdvcmsgQ29yZUZvdW5kYXRpb24gLWZyYW1ld29y ayBDb3JlR3JhcGhpY3MgLWZyYW1ld29yayBDb3JlVGV4dCAtZnJhbWV3b3JrIEZvdW5kYXRpb24g LWZyYW1ld29yayBHcmFwaGljc1NlcnZpY2VzIC1mcmFtZXdvcmsgSW1hZ2VJTyAtZnJhbWV3b3Jr IFVJS2l0IC1mcmFtZXdvcmsgV2ViS2l0IC1sTW9iaWxlR2VzdGFsdDsKK0ZSQU1FV09SS19BTkRf TElCUkFSWV9MREZMQUdTX2lwaG9uZXNpbXVsYXRvciA9IC1sb2JqYyAtZnJhbWV3b3JrIENGTmV0 d29yayAtZnJhbWV3b3JrIENvcmVGb3VuZGF0aW9uIC1mcmFtZXdvcmsgQ29yZUdyYXBoaWNzIC1m cmFtZXdvcmsgQ29yZVRleHQgLWZyYW1ld29yayBGb3VuZGF0aW9uIC1mcmFtZXdvcmsgR3JhcGhp Y3NTZXJ2aWNlcyAtZnJhbWV3b3JrIEltYWdlSU8gLWZyYW1ld29yayBVSUtpdCAtZnJhbWV3b3Jr IFdlYktpdCAtbE1vYmlsZUdlc3RhbHQgLWxhc3NlcnRpb25fZXh0ZW5zaW9uOwogRlJBTUVXT1JL X0FORF9MSUJSQVJZX0xERkxBR1NfaXBob25lb3MgPSAkKEZSQU1FV09SS19BTkRfTElCUkFSWV9M REZMQUdTX2lwaG9uZXNpbXVsYXRvcikgLWZyYW1ld29yayBJT1N1cmZhY2U7CiBGUkFNRVdPUktf QU5EX0xJQlJBUllfTERGTEFHU19tYWNvc3ggPSAtZnJhbWV3b3JrIEFwcGxpY2F0aW9uU2Vydmlj ZXMgLWZyYW1ld29yayBDYXJib24gLWZyYW1ld29yayBDb2NvYSAtZnJhbWV3b3JrIENvcmVTZXJ2 aWNlcyAtZnJhbWV3b3JrIElPS2l0IC1mcmFtZXdvcmsgQ29yZUF1ZGlvIC1mcmFtZXdvcmsgSU9T dXJmYWNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVj dGlvbi5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaAppbmRleCAx MGRlNjk0NzgxZDI4ODhjYTE2YjlkZDMzY2IxMWM5OWJjMzFmOTg0Li41N2EwNTEzNTI4ODI3Mjkx MjE1NTQyZWEyNzZhODIzY2NhMWNkZTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9D b25uZWN0aW9uLmgKQEAgLTExMyw2ICsxMTMsOCBAQCBwdWJsaWM6CiAgICAgICAgIHhwY19jb25u ZWN0aW9uX3QgeHBjQ29ubmVjdGlvbjsKICAgICB9OwogICAgIHN0YXRpYyBib29sIGlkZW50aWZp ZXJJc051bGwoSWRlbnRpZmllciBpZGVudGlmaWVyKSB7IHJldHVybiBpZGVudGlmaWVyLnBvcnQg PT0gTUFDSF9QT1JUX05VTEw7IH0KKyAgICB4cGNfY29ubmVjdGlvbl90IHhwY0Nvbm5lY3Rpb24o KSB7IHJldHVybiBtX3hwY0Nvbm5lY3Rpb247IH0KKwogI2VsaWYgVVNFKFVOSVhfRE9NQUlOX1NP Q0tFVFMpCiAgICAgdHlwZWRlZiBpbnQgSWRlbnRpZmllcjsKICAgICBzdGF0aWMgYm9vbCBpZGVu dGlmaWVySXNOdWxsKElkZW50aWZpZXIgaWRlbnRpZmllcikgeyByZXR1cm4gIWlkZW50aWZpZXI7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYzllNGU5 ODcwOTg1OTJhMDc1NDdjY2I4OGJjZmQxYWVjMzczYjkxYy4uZmUwZTMzNjM2NjQxNTkzOTZhZjNm OTcwNzdjODI5MmVhMmRjOGZhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTEwMjUsNiArMTAyNSw5IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3U3Rh dGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpGbGFncyBtYXlIYXZlQ2hhbmdlZCwgV2FudHNSZXBsCiAg ICAgfQogI2VuZGlmCiAKKyAgICBpZiAobWF5SGF2ZUNoYW5nZWQgJiBWaWV3U3RhdGU6OklzSW5X aW5kb3cpCisgICAgICAgIHByb2Nlc3MoKS51cGRhdGVQcm9jZXNzU3RhdGUoKTsKKwogICAgIHVw ZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxlU3RhdGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBkZjEzYWZiMDUyMDkyMjRhODE4 YWNjNjdhMDU2N2IzMWQ2MzFmZjZlLi43MDI5NzdiNGFkNGEzOGU0MjkwMDU5NjgzZDQwZDMzNTUy ODk5MDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cApAQCAtNDUzLDYgKzQ1Myw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVu Y2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hlciwgSVBDOjpDb25uZWN0CiAjaWYgUExBVEZP Uk0oQ09DT0EpCiAgICAgdXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uU3RhdGUoKTsKICNlbmRpZgor ICAgIHVwZGF0ZVByb2Nlc3NTdGF0ZSgpOwogfQogCiBXZWJGcmFtZVByb3h5KiBXZWJQcm9jZXNz UHJveHk6OndlYkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggZDAwNjkyOWQ3Mjc0MDJmY2JmMzFlMzU2 ZjVhYzI1YjRkNWEwMWQxMS4uMDYwNDBhOGE5NDRkOTc3ODI1OGY5ZjU3ZTcwYWU1ZjQ2ZWNmMzQ4 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaApAQCAtMTI3 LDYgKzEyNyw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgd2luZG93U2VydmVyQ29ubmVjdGlvblN0 YXRlQ2hhbmdlZCgpOwogCisgICAgdm9pZCB1cGRhdGVQcm9jZXNzU3RhdGUoKTsKKwogcHJpdmF0 ZToKICAgICBleHBsaWNpdCBXZWJQcm9jZXNzUHJveHkoV2ViQ29udGV4dCYpOwogCkBAIC0yMTIs NyArMjE0LDExIEBAIHByaXZhdGU6CiAKICAgICBpbnQgbV9udW1iZXJPZlRpbWVzU3VkZGVuVGVy bWluYXRpb25XYXNEaXNhYmxlZDsKIH07Ci0gICAgCisKKyNpZiAhUExBVEZPUk0oSU9TKQordm9p ZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZVByb2Nlc3NTdGF0ZSgpIHsgfQorI2VuZGlmCisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gV2ViUHJvY2Vzc1Byb3h5X2gKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUHJvY2Vzc1Byb3h5SU9TLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQcm9jZXNzUHJveHlJT1MubW0KaW5k ZXggMDc5NDA3MTc3MzBkNWE0YzFjYTA4Mzc3ZWEwMzFiNzAzNDkxZDQ3Mi4uMWVlNDg3MWQ2NmVl YjRlMTc5NDFiYTg3NDAwMDE5ZmE5Zjc0M2M0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XZWJQcm9jZXNzUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XZWJQcm9jZXNzUHJveHlJT1MubW0KQEAgLTI2LDYgKzI2LDcgQEAKICNp bXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAKKyNpbXBvcnQg PGFzc2VydGlvbi9leHRlbnNpb25fcHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9Ob3RJbXBs ZW1lbnRlZC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTY4LDQgKzY5LDI5IEBAIHZvaWQg V2ViUHJvY2Vzc1Byb3h5Ojp1cGRhdGVQcm9jZXNzU3VwcHJlc3Npb25TdGF0ZSgpCiAgICAgbm90 SW1wbGVtZW50ZWQoKTsKIH0KIAordm9pZCBXZWJQcm9jZXNzUHJveHk6OnVwZGF0ZVByb2Nlc3NT dGF0ZSgpCit7CisjaWYgVVNFKFhQQ19TRVJWSUNFUykKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgeHBjX2Nvbm5lY3Rpb25fdCB4cGNDb25uZWN0aW9uID0gY29u bmVjdGlvbigpLT54cGNDb25uZWN0aW9uKCk7CisgICAgaWYgKCF4cGNDb25uZWN0aW9uKQorICAg ICAgICByZXR1cm47CisKKyAgICBWZWN0b3I8UmVmUHRyPFdlYlBhZ2VQcm94eT4+IHBhZ2VzOwor ICAgIGNvcHlWYWx1ZXNUb1ZlY3RvcihtX3BhZ2VNYXAsIHBhZ2VzKTsKKyAgICBhc3NlcnRpb25f ZXh0ZW5zaW9uX3N0YXRlX3QgZXh0ZW5zaW9uU3RhdGUgPSBBU1NFUlRJT05fRVhURU5TSU9OX1NU QVRFX0JBQ0tHUk9VTkQ7CisgICAgZm9yIChzaXplX3QgaSA9IDAsIHNpemUgPSBwYWdlcy5zaXpl KCk7IGkgPCBzaXplOyArK2kpIHsKKyAgICAgICAgaWYgKHBhZ2VzW2ldLT5pc0luV2luZG93KCkp IHsKKyAgICAgICAgICAgIGV4dGVuc2lvblN0YXRlID0gQVNTRVJUSU9OX0VYVEVOU0lPTl9TVEFU RV9GT1JFR1JPVU5EOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisKKyAg ICBlcnJub190IHRhYlN0YXRlRXJyb3IgPSBhc3NlcnRpb25fZXh0ZW5zaW9uX3NldF9zdGF0ZSh4 cGNDb25uZWN0aW9uLCBleHRlbnNpb25TdGF0ZSwgTlVMTCk7CisgICAgQVNTRVJUX1VOVVNFRCh0 YWJTdGF0ZUVycm9yLCAhdGFiU3RhdGVFcnJvcik7CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0Cg==