154012 2016-02-08 15:28:00 -0800 WKAutomationDelegate's requestAutomationSession should take a suggested session identifier 2016-02-15 14:27:03 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 154260 1 bburg bburg bburg commit-queue graouts joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1163038 0 bburg 2016-02-08 15:28:00 -0800 Patch coming. 1163040 1 webkit-bug-importer 2016-02-08 15:29:08 -0800 <rdar://problem/24557697> 1163047 2 270889 bburg 2016-02-08 15:55:57 -0800 Created attachment 270889 Proposed Fix 1163181 3 270889 darin 2016-02-09 07:24:56 -0800 Comment on attachment 270889 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=270889&action=review > Source/WebKit2/UIProcess/API/APIAutomationClient.h:42 > + virtual void didRequestAutomationSession(WebKit::WebProcessPool*, const WTF::String&) { } Should be able to just say "const String&" without the namespace. > Source/WebKit2/UIProcess/Cocoa/AutomationClient.h:53 > + virtual void didRequestAutomationSession(WebKit::WebProcessPool*, const String& sessionIdentifier) override > + { > + requestAutomationSession(sessionIdentifier); > + } Please put this function body in the .mm file, not the header. Keeps the class definition easier to read when the bodies are bigger than a single line. 1163217 4 bburg 2016-02-09 09:47:11 -0800 (In reply to comment #3) > Comment on attachment 270889 [details] > Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=270889&action=review > > > Source/WebKit2/UIProcess/API/APIAutomationClient.h:42 > > + virtual void didRequestAutomationSession(WebKit::WebProcessPool*, const WTF::String&) { } > > Should be able to just say "const String&" without the namespace. I thought that too, but Xcode was insistent that it was ambiguous with API::String. I didn't even know about that class! > > Source/WebKit2/UIProcess/Cocoa/AutomationClient.h:53 > > + virtual void didRequestAutomationSession(WebKit::WebProcessPool*, const String& sessionIdentifier) override > > + { > > + requestAutomationSession(sessionIdentifier); > > + } > > Please put this function body in the .mm file, not the header. Keeps the > class definition easier to read when the bodies are bigger than a single > line. OK 1163279 5 270950 bburg 2016-02-09 14:03:22 -0800 Created attachment 270950 For Landing 1164646 6 bburg 2016-02-14 17:42:31 -0800 Committed r196562: <http://trac.webkit.org/changeset/196562> 270889 2016-02-08 15:55:57 -0800 2016-02-09 14:03:19 -0800 Proposed Fix bug-154012-20160208155534.patch text/plain 7096 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx YWM2ZmNhNDlkZjJhMjU1OTM5ODkwZWM0OWE2ZWJhOGYwMTQ3MzlkLi41YWE4OWI1MGE5YWM4MTEw NTVhMjA1NzIyNTlmMGY1ZDljOTI3NzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNi0wMi0wOCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXS0F1dG9tYXRpb25EZWxlZ2F0ZSdzIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiBz aG91bGQgdGFrZSBhIHN1Z2dlc3RlZCBzZXNzaW9uIGlkZW50aWZpZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDAxMgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMjQ1NTc2OTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGEgc3RyaW5nIHBhcmFtZXRlciB0byB0aGUgY2xpZW50IG1ldGhvZCBm b3IgcmVxdWVzdGluZyBhIG5ldyBzZXNzaW9uLgorCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90 ZS9SZW1vdGVJbnNwZWN0b3IuaDoKKwogMjAxNi0wMi0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoKSBk b2VzIG5vdCB3b3JrIG9uIHN1Yi1mcmFtZSdzIHdpbmRvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGMxNGVmZTc3 MWU5YmMwOWUyMTMzNjBiNmM5ZWY4YTQzZjQ5MjlhNGIuLjM2OWNkODQ3ZjEzZTkyYjU5MmYyNGU0 ZmRiMDBjMGQ0YTA3YWZlZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNi0wMi0w OCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKworICAgICAgICBXS0F1dG9tYXRpb25E ZWxlZ2F0ZSdzIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiBzaG91bGQgdGFrZSBhIHN1Z2dlc3Rl ZCBzZXNzaW9uIGlkZW50aWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NDAxMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQ1NTc2OTc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgc3Ry aW5nIHBhcmFtZXRlciB0byB0aGUgZGVsZWdhdGUgbWV0aG9kIGZvciByZXF1ZXN0aW5nIGEgbmV3 IHNlc3Npb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRpb25DbGllbnQu aDoKKyAgICAgICAgKEFQSTo6QXV0b21hdGlvbkNsaWVudDo6ZGlkUmVxdWVzdEF1dG9tYXRpb25T ZXNzaW9uKToKKyAgICAgICAgKEFQSTo6QXV0b21hdGlvbkNsaWVudDo6cmVxdWVzdEF1dG9tYXRp b25TZXNzaW9uKTogRGVsZXRlZC4KKyAgICAgICAgUmVuYW1lIHRoZSBjbGllbnQgbWV0aG9kIHRv IGJldHRlciBtYXRjaCB0aGUgZGVsZWdhdGUgbWV0aG9kJ3MgbmFtZS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvbkRlbGVnYXRlLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29j b2EvQXV0b21hdGlvbkNsaWVudC5tbToKKyAgICAgICAgKFdlYktpdDo6QXV0b21hdGlvbkNsaWVu dDo6QXV0b21hdGlvbkNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9tYXRpb25DbGllbnQ6 OnJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbik6CisKIDIwMTYtMDItMDYgIEJyaWFuIEJ1cmcgIDxi YnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgV2ViS2l0IFNQSSBmb3IgY3JlYXRpbmcg YW4gYXV0b21hdGlvbiBzZXNzaW9uIGFuZCBhZHZlcnRpc2UgdGhlIGFjdGl2ZSBzZXNzaW9uIHZp YSBSZW1vdGVJbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKaW5kZXggNzkzMzQyYzYyNmE1ODNiNjVk ZWU3MzFkYzQzYzA0ZTg4NjlkODJhNi4uNWMwODk4OWRmMDBjMDM4MjgyYjY3M2Y5Nzk0NGU4ZTg2 ZTFlNzEyZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1v dGUvUmVtb3RlSW5zcGVjdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKQEAgLTUyLDcgKzUyLDcgQEAgcHVibGljOgogICAg IHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB+Q2xpZW50KCkgeyB9CiAgICAgICAgIHZpcnR1YWwg Ym9vbCByZW1vdGVBdXRvbWF0aW9uQWxsb3dlZCgpIGNvbnN0ID0gMDsKLSAgICAgICAgdmlydHVh bCB2b2lkIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbigpID0gMDsKKyAgICAgICAgdmlydHVhbCB2 b2lkIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNlc3Npb25JZGVudGlm aWVyKSA9IDA7CiAgICAgfTsKIAogICAgIHN0YXRpYyB2b2lkIHN0YXJ0RGlzYWJsZWQoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJQXV0b21hdGlvbkNsaWVu dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElBdXRvbWF0aW9uQ2xpZW50LmgK aW5kZXggNWRjNDYyOGMwMjY5NjQ4MzNmMGY2MjMzZDlmZTY1NzUxZDNhMjc4NC4uMjk5NTgxMDk1 ZGQxZDFiMTVhZmVhYmI0ZGFjYmVkMDVkMmJkZDExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9BUElBdXRvbWF0aW9uQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9BUElBdXRvbWF0aW9uQ2xpZW50LmgKQEAgLTI2LDYgKzI2LDggQEAK ICNpZm5kZWYgQVBJQXV0b21hdGlvbkNsaWVudF9oCiAjZGVmaW5lIEFQSUF1dG9tYXRpb25DbGll bnRfaAogCisjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KKwogbmFtZXNwYWNlIFdlYktpdCB7CiBj bGFzcyBXZWJQcm9jZXNzUG9vbDsKIH0KQEAgLTM3LDcgKzM5LDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgfkF1dG9tYXRpb25DbGllbnQoKSB7IH0KIAogICAgIHZpcnR1YWwgYm9vbCBhbGxvd3NS ZW1vdGVBdXRvbWF0aW9uKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2wqKSB7IHJldHVybiBmYWxzZTsg fQotICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oV2ViS2l0OjpXZWJQ cm9jZXNzUG9vbCopIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRSZXF1ZXN0QXV0b21hdGlvblNl c3Npb24oV2ViS2l0OjpXZWJQcm9jZXNzUG9vbCosIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvbkRlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxlZ2F0ZS5oCmluZGV4IDhkMTNhNjZm NGMwODM3ZjQ0ZTM2MTI5YmQ3NzUxMWI1N2RhOWQ2MDcuLjdjN2NlOTFjMzU2ZWUwNTA3ZTExMjFj MzQ3MmM5ZjAzYmM1ZTAyZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLQXV0b21hdGlvbkRlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdhdGUuaApAQCAtMzIsNyArMzIsNyBA QAogQHByb3RvY29sIF9XS0F1dG9tYXRpb25EZWxlZ2F0ZSA8TlNPYmplY3Q+CiBAb3B0aW9uYWwK IC0gKEJPT0wpX3Byb2Nlc3NQb29sQWxsb3dzUmVtb3RlQXV0b21hdGlvbjooV0tQcm9jZXNzUG9v bCAqKXByb2Nlc3NQb29sOwotLSAodm9pZClfcHJvY2Vzc1Bvb2xEaWRSZXF1ZXN0QXV0b21hdGlv blNlc3Npb246KFdLUHJvY2Vzc1Bvb2wgKilwcm9jZXNzUG9vbDsKKy0gKHZvaWQpX3Byb2Nlc3NQ b29sOihXS1Byb2Nlc3NQb29sICopcHJvY2Vzc1Bvb2wgZGlkUmVxdWVzdEF1dG9tYXRpb25TZXNz aW9uV2l0aElkZW50aWZpZXI6KE5TU3RyaW5nICopaWRlbnRpZmllcjsKIEBlbmQKIAogI2VuZGlm IC8vIFdLX0FQSV9FTkFCTEVECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29jb2EvQXV0b21hdGlvbkNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L0F1dG9tYXRpb25DbGllbnQuaAppbmRleCBkNjRiMzdhMzk4OGNlNzJiZGM0YTcwMjY4Mzc3NGM0 MDViMWE0NzQ0Li40Y2RjMzBkNmUyYTcwZDQ4Njk1YmFlMzk0NDUwNmEwZjYzNDQ5NDQ3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50LmgK QEAgLTQ3LDExICs0NywxNCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIC8vIEFQSTo6QXV0b21h dGlvbkNsaWVudAogICAgIHZpcnR1YWwgYm9vbCBhbGxvd3NSZW1vdGVBdXRvbWF0aW9uKFdlYlBy b2Nlc3NQb29sKikgb3ZlcnJpZGUgeyByZXR1cm4gcmVtb3RlQXV0b21hdGlvbkFsbG93ZWQoKTsg fQotICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oV2ViUHJvY2Vzc1Bv b2wqKSBvdmVycmlkZSB7IHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbigpOyB9CisgICAgdmlydHVh bCB2b2lkIGRpZFJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbihXZWJLaXQ6OldlYlByb2Nlc3NQb29s KiwgY29uc3QgU3RyaW5nJiBzZXNzaW9uSWRlbnRpZmllcikgb3ZlcnJpZGUKKyAgICB7CisgICAg ICAgIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbihzZXNzaW9uSWRlbnRpZmllcik7CisgICAgfQog CiAgICAgLy8gUmVtb3RlSW5zcGVjdG9yOjpDbGllbnQKICAgICB2aXJ0dWFsIGJvb2wgcmVtb3Rl QXV0b21hdGlvbkFsbG93ZWQoKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgcmVx dWVzdEF1dG9tYXRpb25TZXNzaW9uKCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHJlcXVl c3RBdXRvbWF0aW9uU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNlc3Npb25JZGVudGlmaWVyKSBvdmVy cmlkZTsKIAogICAgIFdLUHJvY2Vzc1Bvb2wgKm1fcHJvY2Vzc1Bvb2w7CiAgICAgV2Vha09iakNQ dHI8aWQgPF9XS0F1dG9tYXRpb25EZWxlZ2F0ZT4+IG1fZGVsZWdhdGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tCmluZGV4IDY1MTBh NDdjZGMxMTczMTUyZDk0MmVjOTcwZjkxMDU5ZjFkNGVkNjMuLjEyNzkyODkzYTVkM2YyNDIwNTAy OWNmODcxNWNhNzg0YzczNWIzMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tCkBAIC0zMyw2ICszMyw3IEBACiAjaW1wb3J0ICJX S1Byb2Nlc3NQb29sLmgiCiAjaW1wb3J0ICJfV0tBdXRvbWF0aW9uRGVsZWdhdGUuaCIKICNpbXBv cnQgPEphdmFTY3JpcHRDb3JlL1JlbW90ZUluc3BlY3Rvci5oPgorI2ltcG9ydCA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBJbnNwZWN0b3I7CiAKQEAgLTQzLDcgKzQ0 LDcgQEAgQXV0b21hdGlvbkNsaWVudDo6QXV0b21hdGlvbkNsaWVudChXS1Byb2Nlc3NQb29sICpw cm9jZXNzUG9vbCwgaWQgPF9XS0F1dG9tYXRpb24KICAgICAsIG1fZGVsZWdhdGUoZGVsZWdhdGUp CiB7CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuYWxsb3dzUmVtb3RlQXV0b21hdGlvbiA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcm9jZXNzUG9vbEFsbG93c1JlbW90 ZUF1dG9tYXRpb246KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdEF1dG9tYXRpb25T ZXNzaW9uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQ b29sRGlkUmVxdWVzdEF1dG9tYXRpb25TZXNzaW9uOildOworICAgIG1fZGVsZWdhdGVNZXRob2Rz LnJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9wcm9jZXNzUG9vbDpkaWRSZXF1ZXN0QXV0b21hdGlvblNlc3Npb25XaXRoSWRl bnRpZmllcjopXTsKIAogICAgIFJlbW90ZUluc3BlY3Rvcjo6c2luZ2xldG9uKCkuc2V0UmVtb3Rl SW5zcGVjdG9yQ2xpZW50KHRoaXMpOwogfQpAQCAtNjEsMTAgKzYyLDEwIEBAIGJvb2wgQXV0b21h dGlvbkNsaWVudDo6cmVtb3RlQXV0b21hdGlvbkFsbG93ZWQoKSBjb25zdAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotdm9pZCBBdXRvbWF0aW9uQ2xpZW50OjpyZXF1ZXN0QXV0b21hdGlvblNlc3Np b24oKQordm9pZCBBdXRvbWF0aW9uQ2xpZW50OjpyZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oY29u c3QgU3RyaW5nJiBzZXNzaW9uSWRlbnRpZmllcikKIHsKICAgICBpZiAobV9kZWxlZ2F0ZU1ldGhv ZHMucmVxdWVzdEF1dG9tYXRpb25TZXNzaW9uKQotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBf cHJvY2Vzc1Bvb2xEaWRSZXF1ZXN0QXV0b21hdGlvblNlc3Npb246bV9wcm9jZXNzUG9vbF07Cisg ICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9wcm9jZXNzUG9vbDptX3Byb2Nlc3NQb29sIGRpZFJl cXVlc3RBdXRvbWF0aW9uU2Vzc2lvbldpdGhJZGVudGlmaWVyOnNlc3Npb25JZGVudGlmaWVyXTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 270950 2016-02-09 14:03:22 -0800 2016-02-09 14:03:22 -0800 For Landing bug-154012-20160209140259.patch text/plain 7353 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZGMyYmU3N2ZiZmQ4YjhlNmYyMjM5OGMxNDBlMDI4M2Q3NjI3MmJmLi5kZDE2ZjYzZWMxMWY4OGEz ZDEwNmJmNjA0ZmMxMWIxN2Y4YWRmMDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNi0wMi0wOSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXS0F1dG9tYXRpb25EZWxlZ2F0ZSdzIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiBz aG91bGQgdGFrZSBhIHN1Z2dlc3RlZCBzZXNzaW9uIGlkZW50aWZpZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDAxMgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMjQ1NTc2OTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisK KyAgICAgICAgQWRkIGEgc3RyaW5nIHBhcmFtZXRlciB0byB0aGUgY2xpZW50IG1ldGhvZCBmb3Ig cmVxdWVzdGluZyBhIG5ldyBzZXNzaW9uLgorCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3IuaDoKKwogMjAxNi0wMi0wOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1 ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE5NjI4 Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCAxZWEwNjY4NDE0YTIwZTEwOGQxOGI2ZmI4Y2Y5ODAzMGU5NzUwZTZj Li4wMWMyZDZmZGRlMjQzYzkxMWY3NjRlZmEyNjNlNWUwZjMwNWNkZTIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTYtMDItMDkgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+ CisKKyAgICAgICAgV0tBdXRvbWF0aW9uRGVsZWdhdGUncyByZXF1ZXN0QXV0b21hdGlvblNlc3Np b24gc2hvdWxkIHRha2UgYSBzdWdnZXN0ZWQgc2Vzc2lvbiBpZGVudGlmaWVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQwMTIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzI0NTU3Njk3PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgIEFkZCBhIHN0cmluZyBwYXJhbWV0ZXIgdG8gdGhlIGRlbGVnYXRlIG1ldGhv ZCBmb3IgcmVxdWVzdGluZyBhIG5ldyBzZXNzaW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9BUElBdXRvbWF0aW9uQ2xpZW50Lmg6CisgICAgICAgIChBUEk6OkF1dG9tYXRpb25DbGllbnQ6 OmRpZFJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbik6CisgICAgICAgIChBUEk6OkF1dG9tYXRpb25D bGllbnQ6OnJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbik6IERlbGV0ZWQuCisgICAgICAgIFJlbmFt ZSB0aGUgY2xpZW50IG1ldGhvZCB0byBiZXR0ZXIgbWF0Y2ggdGhlIGRlbGVnYXRlIG1ldGhvZCdz IG5hbWUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxl Z2F0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQubW06CisgICAgICAgIChX ZWJLaXQ6OkF1dG9tYXRpb25DbGllbnQ6OkF1dG9tYXRpb25DbGllbnQpOgorICAgICAgICAoV2Vi S2l0OjpBdXRvbWF0aW9uQ2xpZW50OjpyZXF1ZXN0QXV0b21hdGlvblNlc3Npb24pOgorCiAyMDE2 LTAyLTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg QWxsIDMyLWJpdCBwbHVnLWlucyBzaG91bGQgdXNlIHRoZSBYUEMgc2VydmljZQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3IuaAppbmRleCA3OTMzNDJjNjI2YTU4M2I2NWRlZTczMWRjNDNjMDRlODg2OWQ4MmE2Li41YzA4 OTg5ZGYwMGMwMzgyODJiNjczZjk3OTQ0ZThlODZlMWU3MTJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IuaApA QCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgcHVibGljOgogICAgICAgICB2aXJ0dWFsIH5D bGllbnQoKSB7IH0KICAgICAgICAgdmlydHVhbCBib29sIHJlbW90ZUF1dG9tYXRpb25BbGxvd2Vk KCkgY29uc3QgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdEF1dG9tYXRpb25TZXNz aW9uKCkgPSAwOworICAgICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdEF1dG9tYXRpb25TZXNzaW9u KGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkZW50aWZpZXIpID0gMDsKICAgICB9OwogCiAgICAgc3Rh dGljIHZvaWQgc3RhcnREaXNhYmxlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9BUElBdXRvbWF0aW9uQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0FQSUF1dG9tYXRpb25DbGllbnQuaAppbmRleCA1ZGM0NjI4YzAyNjk2NDgzM2YwZjYy MzNkOWZlNjU3NTFkM2EyNzg0Li4yOTk1ODEwOTVkZDFkMWIxNWFmZWFiYjRkYWNiZWQwNWQyYmRk MTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRp b25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRp b25DbGllbnQuaApAQCAtMjYsNiArMjYsOCBAQAogI2lmbmRlZiBBUElBdXRvbWF0aW9uQ2xpZW50 X2gKICNkZWZpbmUgQVBJQXV0b21hdGlvbkNsaWVudF9oCiAKKyNpbmNsdWRlIDx3dGYvRm9yd2Fy ZC5oPgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdlYlByb2Nlc3NQb29sOwogfQpAQCAt MzcsNyArMzksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+QXV0b21hdGlvbkNsaWVudCgpIHsg fQogCiAgICAgdmlydHVhbCBib29sIGFsbG93c1JlbW90ZUF1dG9tYXRpb24oV2ViS2l0OjpXZWJQ cm9jZXNzUG9vbCopIHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCB2b2lkIHJlcXVlc3RB dXRvbWF0aW9uU2Vzc2lvbihXZWJLaXQ6OldlYlByb2Nlc3NQb29sKikgeyB9CisgICAgdmlydHVh bCB2b2lkIGRpZFJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbihXZWJLaXQ6OldlYlByb2Nlc3NQb29s KiwgY29uc3QgV1RGOjpTdHJpbmcmKSB7IH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIEFQSQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9u RGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21h dGlvbkRlbGVnYXRlLmgKaW5kZXggOGQxM2E2NmY0YzA4MzdmNDRlMzYxMjliZDc3NTExYjU3ZGE5 ZDYwNy4uN2M3Y2U5MWMzNTZlZTA1MDdlMTEyMWMzNDcyYzlmMDNiYzVlMDJmMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdh dGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRp b25EZWxlZ2F0ZS5oCkBAIC0zMiw3ICszMiw3IEBACiBAcHJvdG9jb2wgX1dLQXV0b21hdGlvbkRl bGVnYXRlIDxOU09iamVjdD4KIEBvcHRpb25hbAogLSAoQk9PTClfcHJvY2Vzc1Bvb2xBbGxvd3NS ZW1vdGVBdXRvbWF0aW9uOihXS1Byb2Nlc3NQb29sICopcHJvY2Vzc1Bvb2w7Ci0tICh2b2lkKV9w cm9jZXNzUG9vbERpZFJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbjooV0tQcm9jZXNzUG9vbCAqKXBy b2Nlc3NQb29sOworLSAodm9pZClfcHJvY2Vzc1Bvb2w6KFdLUHJvY2Vzc1Bvb2wgKilwcm9jZXNz UG9vbCBkaWRSZXF1ZXN0QXV0b21hdGlvblNlc3Npb25XaXRoSWRlbnRpZmllcjooTlNTdHJpbmcg KilpZGVudGlmaWVyOwogQGVuZAogCiAjZW5kaWYgLy8gV0tfQVBJX0VOQUJMRUQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5oCmluZGV4IGQ2 NGIzN2EzOTg4Y2U3MmJkYzRhNzAyNjgzNzc0YzQwNWIxYTQ3NDQuLjM3ZjBlNGQzMGM3YjY0YjU0 YzQxM2JjMGQ2ZWE1NTBiNWNiOTcwMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQuaApAQCAtNDcsMTEgKzQ3LDExIEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgLy8gQVBJOjpBdXRvbWF0aW9uQ2xpZW50CiAgICAgdmlydHVhbCBib29s IGFsbG93c1JlbW90ZUF1dG9tYXRpb24oV2ViUHJvY2Vzc1Bvb2wqKSBvdmVycmlkZSB7IHJldHVy biByZW1vdGVBdXRvbWF0aW9uQWxsb3dlZCgpOyB9Ci0gICAgdmlydHVhbCB2b2lkIHJlcXVlc3RB dXRvbWF0aW9uU2Vzc2lvbihXZWJQcm9jZXNzUG9vbCopIG92ZXJyaWRlIHsgcmVxdWVzdEF1dG9t YXRpb25TZXNzaW9uKCk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlkUmVxdWVzdEF1dG9tYXRpb25T ZXNzaW9uKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2wqLCBjb25zdCBTdHJpbmcmIHNlc3Npb25JZGVu dGlmaWVyKSBvdmVycmlkZTsKIAogICAgIC8vIFJlbW90ZUluc3BlY3Rvcjo6Q2xpZW50CiAgICAg dmlydHVhbCBib29sIHJlbW90ZUF1dG9tYXRpb25BbGxvd2VkKCkgY29uc3Qgb3ZlcnJpZGU7Ci0g ICAgdmlydHVhbCB2b2lkIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbigpIG92ZXJyaWRlOworICAg IHZpcnR1YWwgdm9pZCByZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oY29uc3QgU3RyaW5nJiBzZXNz aW9uSWRlbnRpZmllcikgb3ZlcnJpZGU7CiAKICAgICBXS1Byb2Nlc3NQb29sICptX3Byb2Nlc3NQ b29sOwogICAgIFdlYWtPYmpDUHRyPGlkIDxfV0tBdXRvbWF0aW9uRGVsZWdhdGU+PiBtX2RlbGVn YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRp b25DbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNs aWVudC5tbQppbmRleCA2NTEwYTQ3Y2RjMTE3MzE1MmQ5NDJlYzk3MGY5MTA1OWYxZDRlZDYzLi43 MGMzZTI2MjNhODY2YTkxNDU1ODVlZjAxMmE5OTZlOTQwMGEzOGU2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5tbQpAQCAtMzMsNiAr MzMsNyBAQAogI2ltcG9ydCAiV0tQcm9jZXNzUG9vbC5oIgogI2ltcG9ydCAiX1dLQXV0b21hdGlv bkRlbGVnYXRlLmgiCiAjaW1wb3J0IDxKYXZhU2NyaXB0Q29yZS9SZW1vdGVJbnNwZWN0b3IuaD4K KyNpbXBvcnQgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiB1c2luZyBuYW1lc3BhY2UgSW5zcGVj dG9yOwogCkBAIC00Myw3ICs0NCw3IEBAIEF1dG9tYXRpb25DbGllbnQ6OkF1dG9tYXRpb25DbGll bnQoV0tQcm9jZXNzUG9vbCAqcHJvY2Vzc1Bvb2wsIGlkIDxfV0tBdXRvbWF0aW9uCiAgICAgLCBt X2RlbGVnYXRlKGRlbGVnYXRlKQogewogICAgIG1fZGVsZWdhdGVNZXRob2RzLmFsbG93c1JlbW90 ZUF1dG9tYXRpb24gPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfcHJv Y2Vzc1Bvb2xBbGxvd3NSZW1vdGVBdXRvbWF0aW9uOildOwotICAgIG1fZGVsZWdhdGVNZXRob2Rz LnJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9wcm9jZXNzUG9vbERpZFJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbjopXTsKKyAg ICBtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0QXV0b21hdGlvblNlc3Npb24gPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfcHJvY2Vzc1Bvb2w6ZGlkUmVxdWVzdEF1dG9t YXRpb25TZXNzaW9uV2l0aElkZW50aWZpZXI6KV07CiAKICAgICBSZW1vdGVJbnNwZWN0b3I6OnNp bmdsZXRvbigpLnNldFJlbW90ZUluc3BlY3RvckNsaWVudCh0aGlzKTsKIH0KQEAgLTUzLDYgKzU0 LDExIEBAIEF1dG9tYXRpb25DbGllbnQ6On5BdXRvbWF0aW9uQ2xpZW50KCkKICAgICBSZW1vdGVJ bnNwZWN0b3I6OnNpbmdsZXRvbigpLnNldFJlbW90ZUluc3BlY3RvckNsaWVudChudWxscHRyKTsK IH0KIAordm9pZCBBdXRvbWF0aW9uQ2xpZW50OjpkaWRSZXF1ZXN0QXV0b21hdGlvblNlc3Npb24o V2ViS2l0OjpXZWJQcm9jZXNzUG9vbCosIGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkZW50aWZpZXIp Cit7CisgICAgcmVxdWVzdEF1dG9tYXRpb25TZXNzaW9uKHNlc3Npb25JZGVudGlmaWVyKTsKK30K KwogYm9vbCBBdXRvbWF0aW9uQ2xpZW50OjpyZW1vdGVBdXRvbWF0aW9uQWxsb3dlZCgpIGNvbnN0 CiB7CiAgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmFsbG93c1JlbW90ZUF1dG9tYXRpb24pCkBA IC02MSwxMCArNjcsMTAgQEAgYm9vbCBBdXRvbWF0aW9uQ2xpZW50OjpyZW1vdGVBdXRvbWF0aW9u QWxsb3dlZCgpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEF1dG9tYXRpb25D bGllbnQ6OnJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbigpCit2b2lkIEF1dG9tYXRpb25DbGllbnQ6 OnJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNlc3Npb25JZGVudGlmaWVy KQogewogICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0QXV0b21hdGlvblNlc3Npb24p Ci0gICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9wcm9jZXNzUG9vbERpZFJlcXVlc3RBdXRvbWF0 aW9uU2Vzc2lvbjptX3Byb2Nlc3NQb29sXTsKKyAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX3By b2Nlc3NQb29sOm1fcHJvY2Vzc1Bvb2wgZGlkUmVxdWVzdEF1dG9tYXRpb25TZXNzaW9uV2l0aElk ZW50aWZpZXI6c2Vzc2lvbklkZW50aWZpZXJdOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK