139564 2014-12-11 15:07:52 -0800 WK2: Need new SPI for Webkit clients to override default immediate action 2014-12-12 00:27:48 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue eric.carlson glenn jer.noble philipj sergio thorton oldest_to_newest 1054636 0 bdakin 2014-12-11 15:07:52 -0800 WK2: Need new SPI for Webkit clients to override default immediate action rdar://problem/19225448 1054639 1 243155 bdakin 2014-12-11 15:15:55 -0800 Created attachment 243155 Patch 1054646 2 243156 bdakin 2014-12-11 15:28:25 -0800 Created attachment 243156 Patch 1054647 3 commit-queue 2014-12-11 15:29:27 -0800 Attachment 243156 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm:200: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1054649 4 243156 thorton 2014-12-11 15:30:20 -0800 Comment on attachment 243156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243156&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h:129 > +// do something custom, return an id that conforms to the NSImmediateActionAnimationController protocol. "an object" instead of "an id", maybe. > Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm:201 > + else if (customClientAnimationController && [customClientAnimationController conformsToProtocol:@protocol(NSImmediateActionAnimationController)]) No need for the else if because of the return. 1054651 5 243156 thorton 2014-12-11 15:31:10 -0800 Comment on attachment 243156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243156&action=review > Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm:197 > + id customClientAnimationController = [_wkView _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult.get()) withType:_type userData:toAPI(_userData.get())]; I wonder if we should do this (and the early return) earlier so we avoid building a defaultAnimationController if we don't need it. 1054675 6 bdakin 2014-12-11 16:19:13 -0800 (In reply to comment #5) > Comment on attachment 243156 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243156&action=review > > > Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm:197 > > + id customClientAnimationController = [_wkView _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult.get()) withType:_type userData:toAPI(_userData.get())]; > > I wonder if we should do this (and the early return) earlier so we avoid > building a defaultAnimationController if we don't need it. Good idea, but then we won't have the _type set yet! 1054777 7 thorton 2014-12-12 00:27:48 -0800 Ah, yes. Nevermind! 243155 2014-12-11 15:15:55 -0800 2014-12-11 15:28:57 -0800 Patch for-review.txt text/plain 8377 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzE4NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTEyLTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXSzI6IE5lZWQgbmV3IFNQSSBmb3Ig V2Via2l0IGNsaWVudHMgdG8gb3ZlcnJpZGUgZGVmYXVsdCBpbW1lZGlhdGUgYWN0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk1NjQKKyAgICAg ICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xOTIyNTQ0OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyBTUEkg X2ltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXJGb3JIaXRUZXN0UmVzdWx0OndpdGhU eXBlOnVzZXJEYXRhOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0 ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1b V0tWaWV3IF9pbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyRm9ySGl0VGVzdFJlc3Vs dDp3aXRoVHlwZTp1c2VyRGF0YTpdKToKKworICAgICAgICBLZWVwIGF0IGl2YXIgZm9yIHRoZSB1 c2VyRGF0YSBzbyB0aGF0IGl0IGNhbiBiZSBwYXNzZWQgdG8gdGhlIG5ldyBTUEkuCisgICAgICAg ICogVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbToKKyAgICAgICAg KC1bV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIF9jbGVhckltbWVkaWF0ZUFjdGlvblN0YXRl XSk6CisgICAgICAgICgtW1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBkaWRQZXJmb3JtQWN0 aW9uTWVudUhpdFRlc3Q6dXNlckRhdGE6XSk6CisKKyAgICAgICAgQWx3YXlzIGdpdmUgdGhlIFNQ SSBhIGNoYW5jZSB0byBvdmVycmlkZSB0aGUgYW5pbWF0aW9uQ29udHJvbGxlci4KKyAgICAgICAg KC1bV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIF91cGRhdGVJbW1lZGlhdGVBY3Rpb25JdGVt XSk6CisKKyAgICAgICAgTmVlZCB0byBtYXJrIFdLSW1tZWRpYXRlQWN0aW9uVHlwZXMuaCBhcyBQ cml2YXRlLgorICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwog MjAxNC0xMi0xMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK ICAgICAgICAgTW92ZSB0aGUgcHJldmlldyBwb3BvdmVyIHRvIFdlYkltbWVkaWF0ZUFjdGlvbkNv bnRyb2xsZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3 UHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tWaWV3UHJpdmF0ZS5oCShyZXZpc2lvbiAxNzcxODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjUs NiArMjUsNyBAQAogCiAjaW1wb3J0IDxXZWJLaXQvV0tBY3Rpb25NZW51VHlwZXMuaD4KICNpbXBv cnQgPFdlYktpdC9XS0Jhc2UuaD4KKyNpbXBvcnQgPFdlYktpdC9XS0ltbWVkaWF0ZUFjdGlvblR5 cGVzLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tWaWV3Lmg+CiAKIEBpbnRlcmZhY2UgV0tWaWV3IChQ cml2YXRlKQpAQCAtMTI0LDYgKzEyNSw4IEBACiAtIChOU0FycmF5ICopX2FjdGlvbk1lbnVJdGVt c0ZvckhpdFRlc3RSZXN1bHQ6KFdLSGl0VGVzdFJlc3VsdFJlZiloaXRUZXN0UmVzdWx0IHdpdGhU eXBlOihfV0tBY3Rpb25NZW51VHlwZSl0eXBlIGRlZmF1bHRBY3Rpb25NZW51SXRlbXM6KE5TQXJy YXkgKilkZWZhdWx0TWVudUl0ZW1zOwogLSAoTlNBcnJheSAqKV9hY3Rpb25NZW51SXRlbXNGb3JI aXRUZXN0UmVzdWx0OihXS0hpdFRlc3RSZXN1bHRSZWYpaGl0VGVzdFJlc3VsdCB3aXRoVHlwZToo X1dLQWN0aW9uTWVudVR5cGUpdHlwZSBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOihOU0FycmF5ICop ZGVmYXVsdE1lbnVJdGVtcyB1c2VyRGF0YTooV0tUeXBlUmVmKXVzZXJEYXRhOwogCistIChpZClf aW1tZWRpYXRlQWN0aW9uQW5pbWF0aW9uQ29udHJvbGxlckZvckhpdFRlc3RSZXN1bHQ6KFdLSGl0 VGVzdFJlc3VsdFJlZiloaXRUZXN0UmVzdWx0IHdpdGhUeXBlOihfV0tJbW1lZGlhdGVBY3Rpb25U eXBlKXR5cGUgdXNlckRhdGE6KFdLVHlwZVJlZil1c2VyRGF0YTsKKwogLSAoTlNWaWV3ICopX3Zp ZXdGb3JQcmV2aWV3aW5nVVJMOihOU1VSTCAqKXVybCBpbml0aWFsRnJhbWVTaXplOihOU1NpemUp aW5pdGlhbEZyYW1lU2l6ZTsKIC0gKE5TU3RyaW5nICopX3RpdGxlRm9yUHJldmlld09mVVJMOihO U1VSTCAqKXVybDsKIC0gKHZvaWQpX3NldFByZXZpZXdUaXRsZTooTlNTdHJpbmcgKilwcmV2aWV3 VGl0bGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1t CShyZXZpc2lvbiAxNzcxODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTQzMTAsNiArNDMxMCwxMSBAQCAtIChOU0FycmF5 ICopX2FjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSCiAgICAgcmV0dXJuIFtzZWxmIF9hY3Rpb25N ZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHQgd2l0aFR5cGU6dHlwZSBkZWZh dWx0QWN0aW9uTWVudUl0ZW1zOmRlZmF1bHRNZW51SXRlbXNdOwogfQogCistIChpZClfaW1tZWRp YXRlQWN0aW9uQW5pbWF0aW9uQ29udHJvbGxlckZvckhpdFRlc3RSZXN1bHQ6KFdLSGl0VGVzdFJl c3VsdFJlZiloaXRUZXN0UmVzdWx0IHdpdGhUeXBlOihfV0tJbW1lZGlhdGVBY3Rpb25UeXBlKXR5 cGUgdXNlckRhdGE6KFdLVHlwZVJlZil1c2VyRGF0YQoreworICAgIHJldHVybiBuaWw7Cit9CisK IC0gKHZvaWQpX2Rpc21pc3NBY3Rpb25NZW51UG9wb3ZlcnMKIHsKICNpZiBfX01BQ19PU19YX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCShy ZXZpc2lvbiAxNzcxODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLSW1tZWRp YXRlQWN0aW9uQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw3IEBAIEBp bnRlcmZhY2UgV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIDoKIAogICAgIFdlYktpdDo6SW1t ZWRpYXRlQWN0aW9uU3RhdGUgX3N0YXRlOwogICAgIFdlYktpdDo6QWN0aW9uTWVudUhpdFRlc3RS ZXN1bHQgX2hpdFRlc3RSZXN1bHQ7CisgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBfdXNlckRhdGE7 CiAgICAgX1dLSW1tZWRpYXRlQWN0aW9uVHlwZSBfdHlwZTsKICAgICBOU0ltbWVkaWF0ZUFjdGlv bkdlc3R1cmVSZWNvZ25pemVyICpfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcjsKIApJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0 ZUFjdGlvbkNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDE3NzE4MykKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1tCSh3b3JraW5nIGNv cHkpCkBAIC04NCw2ICs4NCw3IEBAIC0gKHZvaWQpX2NsZWFySW1tZWRpYXRlQWN0aW9uU3RhdGUK ICAgICBfc3RhdGUgPSBJbW1lZGlhdGVBY3Rpb25TdGF0ZTo6Tm9uZTsKICAgICBfaGl0VGVzdFJl c3VsdCA9IEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0KCk7CiAgICAgX3R5cGUgPSBrV0tJbW1lZGlh dGVBY3Rpb25Ob25lOworICAgIF91c2VyRGF0YSA9IG5pbDsKIH0KIAogLSAodm9pZClkaWRQZXJm b3JtQWN0aW9uTWVudUhpdFRlc3Q6KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0JiloaXRU ZXN0UmVzdWx0IHVzZXJEYXRhOihBUEk6Ok9iamVjdCopdXNlckRhdGEKQEAgLTkxLDYgKzkyLDcg QEAgLSAodm9pZClkaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6KGNvbgogICAgIC8vIEZJWE1F OiBUaGlzIG5lZWRzIHRvIHVzZSB0aGUgV2ViS2l0MiBjYWxsYmFjayBtZWNoYW5pc20gdG8gYXZv aWQgb3V0LW9mLW9yZGVyIHJlcGxpZXMuCiAgICAgX3N0YXRlID0gSW1tZWRpYXRlQWN0aW9uU3Rh dGU6OlJlYWR5OwogICAgIF9oaXRUZXN0UmVzdWx0ID0gaGl0VGVzdFJlc3VsdDsKKyAgICBfdXNl ckRhdGEgPSB1c2VyRGF0YTsKIAogICAgIFtzZWxmIF91cGRhdGVJbW1lZGlhdGVBY3Rpb25JdGVt XTsKIH0KQEAgLTE2NSw2ICsxNjcsNyBAQCAtICh2b2lkKV91cGRhdGVJbW1lZGlhdGVBY3Rpb25J dGVtCiAKICAgICBfdHlwZSA9IGtXS0ltbWVkaWF0ZUFjdGlvbk5vbmU7CiAgICAgX2ltbWVkaWF0 ZUFjdGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IG5pbDsKKyAgICBpZCA8TlNJ bW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyPiBkZWZhdWx0QW5pbWF0aW9uQ29udHJv bGxlciA9IG5pbDsKIAogICAgIGlmICghaGl0VGVzdFJlc3VsdCkKICAgICAgICAgcmV0dXJuOwpA QCAtMTgyLDE2ICsxODUsMjAgQEAgLSAodm9pZClfdXBkYXRlSW1tZWRpYXRlQWN0aW9uSXRlbQog ICAgICAgICAgICAgICAgIFtxbFByZXZpZXdMaW5rSXRlbSBzZXRQcmV2aWV3U3R5bGU6UUxQcmV2 aWV3U3R5bGVQb3BvdmVyXTsKICAgICAgICAgICAgICAgICBbcWxQcmV2aWV3TGlua0l0ZW0gc2V0 RGVsZWdhdGU6c2VsZl07CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBfaW1tZWRpYXRlQWN0 aW9uUmVjb2duaXplci5hbmltYXRpb25Db250cm9sbGVyID0gKGlkPE5TSW1tZWRpYXRlQWN0aW9u QW5pbWF0aW9uQ29udHJvbGxlcj4pcWxQcmV2aWV3TGlua0l0ZW0uZ2V0KCk7CisgICAgICAgICAg ICBkZWZhdWx0QW5pbWF0aW9uQ29udHJvbGxlciA9IChpZDxOU0ltbWVkaWF0ZUFjdGlvbkFuaW1h dGlvbkNvbnRyb2xsZXI+KXFsUHJldmlld0xpbmtJdGVtLmdldCgpOwogICAgICAgICB9IGVsc2Ug ewogI2lmIFdLX0FQSV9FTkFCTEVECiAgICAgICAgICAgICBbc2VsZiBfY3JlYXRlUHJldmlld1Bv cG92ZXJJZk5lZWRlZEZvclVSTDphYnNvbHV0ZUxpbmtVUkxdOwotICAgICAgICAgICAgX2ltbWVk aWF0ZUFjdGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IChpZDxOU0ltbWVkaWF0 ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXI+KV9wcmV2aWV3UG9wb3Zlci5nZXQoKTsKKyAgICAg ICAgICAgIGRlZmF1bHRBbmltYXRpb25Db250cm9sbGVyID0gKGlkPE5TSW1tZWRpYXRlQWN0aW9u QW5pbWF0aW9uQ29udHJvbGxlcj4pX3ByZXZpZXdQb3BvdmVyLmdldCgpOwogI2VuZGlmIC8vIFdL X0FQSV9FTkFCTEVECiAgICAgICAgIH0KLQotICAgICAgICByZXR1cm47CiAgICAgfQorCisgICAg aWQgY3VzdG9tQ2xpZW50QW5pbWF0aW9uQ29udHJvbGxlciA9IFtfd2tWaWV3IF9pbW1lZGlhdGVB Y3Rpb25BbmltYXRpb25Db250cm9sbGVyRm9ySGl0VGVzdFJlc3VsdDp0b0FQSShoaXRUZXN0UmVz dWx0LmdldCgpKSB3aXRoVHlwZTpfdHlwZSB1c2VyRGF0YTp0b0FQSShfdXNlckRhdGEuZ2V0KCkp XTsKKyAgICBpZiAoY3VzdG9tQ2xpZW50QW5pbWF0aW9uQ29udHJvbGxlciAmJiBbY3VzdG9tQ2xp ZW50QW5pbWF0aW9uQ29udHJvbGxlciBjb25mb3Jtc1RvUHJvdG9jb2w6QHByb3RvY29sKE5TSW1t ZWRpYXRlQWN0aW9uQW5pbWF0aW9uQ29udHJvbGxlcildKQorICAgICAgICBfaW1tZWRpYXRlQWN0 aW9uUmVjb2duaXplci5hbmltYXRpb25Db250cm9sbGVyID0gKGlkIDxOU0ltbWVkaWF0ZUFjdGlv bkFuaW1hdGlvbkNvbnRyb2xsZXI+KWN1c3RvbUNsaWVudEFuaW1hdGlvbkNvbnRyb2xsZXI7Cisg ICAgZWxzZQorICAgICAgICBfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplci5hbmltYXRpb25Db250 cm9sbGVyID0gZGVmYXVsdEFuaW1hdGlvbkNvbnRyb2xsZXI7CiB9CiAKICNwcmFnbWEgbWFyayBM aW5rIFByZXZpZXcgYWN0aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxNzcxODMpCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAg LTEwOTYsNyArMTA5Niw3IEBACiAJCTkwOTg1NEVFMTJCQzRFMTgwMDBBRDA4MCAvKiBXZWJNZW1v cnlTYW1wbGVyLm1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDkwNTYyMEU1MTJCQzI0NzYwMDA3OTlCNiAvKiBXZWJNZW1vcnlTYW1wbGVyLm1hYy5t bSAqLzsgfTsKIAkJOTMyMUQ1ODYxQTM4RUUzQzAwODA1MkJFIC8qIFdLSW1tZWRpYXRlQWN0aW9u Q29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gOTMyMUQ1ODUxQTM4RUUzQzAwODA1MkJFIC8qIFdLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxl ci5oICovOyB9OwogCQk5MzIxRDU4ODFBMzhFRTc0MDA4MDUyQkUgLyogV0tJbW1lZGlhdGVBY3Rp b25Db250cm9sbGVyLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gOTMyMUQ1ODcxQTM4RUU3NDAwODA1MkJFIC8qIFdLSW1tZWRpYXRlQWN0aW9uQ29udHJv bGxlci5tbSAqLzsgfTsKLQkJOTMyMUQ1OEExQTM4RjE5NjAwODA1MkJFIC8qIFdLSW1tZWRpYXRl QWN0aW9uVHlwZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDkzMjFENTg5MUEzOEYxOTYwMDgwNTJCRSAvKiBXS0ltbWVkaWF0ZUFjdGlvblR5cGVzLmgg Ki87IH07CisJCTkzMjFENThBMUEzOEYxOTYwMDgwNTJCRSAvKiBXS0ltbWVkaWF0ZUFjdGlvblR5 cGVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzIx RDU4OTFBMzhGMTk2MDA4MDUyQkUgLyogV0tJbW1lZGlhdGVBY3Rpb25UeXBlcy5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTkzNEI3MjQ0MTlGNUI5 QkUwMEFFOTZENiAvKiBXS0FjdGlvbk1lbnVJdGVtVHlwZXMuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEI3MjQzMTlGNUI5QkUwMEFFOTZENiAvKiBX S0FjdGlvbk1lbnVJdGVtVHlwZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2 YXRlLCApOyB9OyB9OwogCQk5MzVFRUI5QjEyNzc2MTdDMDAzMzIyQjggLyogV0tCdW5kbGVCYWNr Rm9yd2FyZExpc3RJdGVtLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA5MzVFRUI5ODEyNzc2MTZEMDAzMzIyQjggLyogV0tCdW5kbGVCYWNrRm9yd2FyZExp c3RJdGVtLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJOTM1RUVCOUUxMjc3NjFBQzAwMzMyMkI4IC8qIFdLQnVuZGxlQmFja0ZvcndhcmRMaXN0LmNw cCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNUVFQjk1 MTI3NzYxNkQwMDMzMjJCOCAvKiBXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdC5jcHAgKi87IH07Cg== 243156 2014-12-11 15:28:25 -0800 2014-12-11 15:30:20 -0800 Patch for-review-2.txt text/plain 8686 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzE4NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTEyLTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXSzI6IE5lZWQgbmV3IFNQSSBmb3Ig V2Via2l0IGNsaWVudHMgdG8gb3ZlcnJpZGUgZGVmYXVsdCBpbW1lZGlhdGUgYWN0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk1NjQKKyAgICAg ICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xOTIyNTQ0OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyBTUEkg X2ltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXJGb3JIaXRUZXN0UmVzdWx0OndpdGhU eXBlOnVzZXJEYXRhOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0 ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1b V0tWaWV3IF9pbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyRm9ySGl0VGVzdFJlc3Vs dDp3aXRoVHlwZTp1c2VyRGF0YTpdKToKKworICAgICAgICBLZWVwIGF0IGl2YXIgZm9yIHRoZSB1 c2VyRGF0YSBzbyB0aGF0IGl0IGNhbiBiZSBwYXNzZWQgdG8gdGhlIG5ldyBTUEkuCisgICAgICAg ICogVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbToKKyAgICAgICAg KC1bV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIF9jbGVhckltbWVkaWF0ZUFjdGlvblN0YXRl XSk6CisgICAgICAgICgtW1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBkaWRQZXJmb3JtQWN0 aW9uTWVudUhpdFRlc3Q6dXNlckRhdGE6XSk6CisKKyAgICAgICAgQWx3YXlzIGdpdmUgdGhlIFNQ SSBhIGNoYW5jZSB0byBvdmVycmlkZSB0aGUgYW5pbWF0aW9uQ29udHJvbGxlci4KKyAgICAgICAg KC1bV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIF91cGRhdGVJbW1lZGlhdGVBY3Rpb25JdGVt XSk6CisKKyAgICAgICAgTmVlZCB0byBtYXJrIFdLSW1tZWRpYXRlQWN0aW9uVHlwZXMuaCBhcyBQ cml2YXRlLgorICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwog MjAxNC0xMi0xMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK ICAgICAgICAgTW92ZSB0aGUgcHJldmlldyBwb3BvdmVyIHRvIFdlYkltbWVkaWF0ZUFjdGlvbkNv bnRyb2xsZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3 UHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tWaWV3UHJpdmF0ZS5oCShyZXZpc2lvbiAxNzcxODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjUs NiArMjUsNyBAQAogCiAjaW1wb3J0IDxXZWJLaXQvV0tBY3Rpb25NZW51VHlwZXMuaD4KICNpbXBv cnQgPFdlYktpdC9XS0Jhc2UuaD4KKyNpbXBvcnQgPFdlYktpdC9XS0ltbWVkaWF0ZUFjdGlvblR5 cGVzLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tWaWV3Lmg+CiAKIEBpbnRlcmZhY2UgV0tWaWV3IChQ cml2YXRlKQpAQCAtMTI0LDYgKzEyNSwxMCBAQAogLSAoTlNBcnJheSAqKV9hY3Rpb25NZW51SXRl bXNGb3JIaXRUZXN0UmVzdWx0OihXS0hpdFRlc3RSZXN1bHRSZWYpaGl0VGVzdFJlc3VsdCB3aXRo VHlwZTooX1dLQWN0aW9uTWVudVR5cGUpdHlwZSBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOihOU0Fy cmF5ICopZGVmYXVsdE1lbnVJdGVtczsKIC0gKE5TQXJyYXkgKilfYWN0aW9uTWVudUl0ZW1zRm9y SGl0VGVzdFJlc3VsdDooV0tIaXRUZXN0UmVzdWx0UmVmKWhpdFRlc3RSZXN1bHQgd2l0aFR5cGU6 KF9XS0FjdGlvbk1lbnVUeXBlKXR5cGUgZGVmYXVsdEFjdGlvbk1lbnVJdGVtczooTlNBcnJheSAq KWRlZmF1bHRNZW51SXRlbXMgdXNlckRhdGE6KFdLVHlwZVJlZil1c2VyRGF0YTsKIAorLy8gQ2xp ZW50cyB0aGF0IHdhbnQgdG8gbWFpbnRhaW4gZGVmYXVsdCBiZWhhdmlvciBjYW4gcmV0dXJuIG5p bC4gVG8gZGlzYWJsZSB0aGUgaW1tZWRpYXRlIGFjdGlvbiBlbnRpcmVseSwgcmV0dXJuIE5TTnVs bC4gQW5kIHRvCisvLyBkbyBzb21ldGhpbmcgY3VzdG9tLCByZXR1cm4gYW4gaWQgdGhhdCBjb25m b3JtcyB0byB0aGUgTlNJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyIHByb3RvY29s LgorLSAoaWQpX2ltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXJGb3JIaXRUZXN0UmVz dWx0OihXS0hpdFRlc3RSZXN1bHRSZWYpaGl0VGVzdFJlc3VsdCB3aXRoVHlwZTooX1dLSW1tZWRp YXRlQWN0aW9uVHlwZSl0eXBlIHVzZXJEYXRhOihXS1R5cGVSZWYpdXNlckRhdGE7CisKIC0gKE5T VmlldyAqKV92aWV3Rm9yUHJldmlld2luZ1VSTDooTlNVUkwgKil1cmwgaW5pdGlhbEZyYW1lU2l6 ZTooTlNTaXplKWluaXRpYWxGcmFtZVNpemU7CiAtIChOU1N0cmluZyAqKV90aXRsZUZvclByZXZp ZXdPZlVSTDooTlNVUkwgKil1cmw7CiAtICh2b2lkKV9zZXRQcmV2aWV3VGl0bGU6KE5TU3RyaW5n ICopcHJldmlld1RpdGxlOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv V0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbQkocmV2aXNpb24gMTc3MTgzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MzEwLDYgKzQzMTAsMTEgQEAg LSAoTlNBcnJheSAqKV9hY3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UgogICAgIHJldHVybiBbc2Vs ZiBfYWN0aW9uTWVudUl0ZW1zRm9ySGl0VGVzdFJlc3VsdDpoaXRUZXN0UmVzdWx0IHdpdGhUeXBl OnR5cGUgZGVmYXVsdEFjdGlvbk1lbnVJdGVtczpkZWZhdWx0TWVudUl0ZW1zXTsKIH0KIAorLSAo aWQpX2ltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXJGb3JIaXRUZXN0UmVzdWx0OihX S0hpdFRlc3RSZXN1bHRSZWYpaGl0VGVzdFJlc3VsdCB3aXRoVHlwZTooX1dLSW1tZWRpYXRlQWN0 aW9uVHlwZSl0eXBlIHVzZXJEYXRhOihXS1R5cGVSZWYpdXNlckRhdGEKK3sKKyAgICByZXR1cm4g bmlsOworfQorCiAtICh2b2lkKV9kaXNtaXNzQWN0aW9uTWVudVBvcG92ZXJzCiB7CiAjaWYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRy b2xsZXIuaAkocmV2aXNpb24gMTc3MTgzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNiAr NTUsNyBAQCBAaW50ZXJmYWNlIFdLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA6CiAKICAgICBX ZWJLaXQ6OkltbWVkaWF0ZUFjdGlvblN0YXRlIF9zdGF0ZTsKICAgICBXZWJLaXQ6OkFjdGlvbk1l bnVIaXRUZXN0UmVzdWx0IF9oaXRUZXN0UmVzdWx0OworICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4g X3VzZXJEYXRhOwogICAgIF9XS0ltbWVkaWF0ZUFjdGlvblR5cGUgX3R5cGU7CiAgICAgTlNJbW1l ZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqX2ltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXI7 CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25D b250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv V0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1tCShyZXZpc2lvbiAxNzcxODMpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQko d29ya2luZyBjb3B5KQpAQCAtODQsNiArODQsNyBAQCAtICh2b2lkKV9jbGVhckltbWVkaWF0ZUFj dGlvblN0YXRlCiAgICAgX3N0YXRlID0gSW1tZWRpYXRlQWN0aW9uU3RhdGU6Ok5vbmU7CiAgICAg X2hpdFRlc3RSZXN1bHQgPSBBY3Rpb25NZW51SGl0VGVzdFJlc3VsdCgpOwogICAgIF90eXBlID0g a1dLSW1tZWRpYXRlQWN0aW9uTm9uZTsKKyAgICBfdXNlckRhdGEgPSBuaWw7CiB9CiAKIC0gKHZv aWQpZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0Oihjb25zdCBBY3Rpb25NZW51SGl0VGVzdFJl c3VsdCYpaGl0VGVzdFJlc3VsdCB1c2VyRGF0YTooQVBJOjpPYmplY3QqKXVzZXJEYXRhCkBAIC05 MSw2ICs5Miw3IEBAIC0gKHZvaWQpZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0Oihjb24KICAg ICAvLyBGSVhNRTogVGhpcyBuZWVkcyB0byB1c2UgdGhlIFdlYktpdDIgY2FsbGJhY2sgbWVjaGFu aXNtIHRvIGF2b2lkIG91dC1vZi1vcmRlciByZXBsaWVzLgogICAgIF9zdGF0ZSA9IEltbWVkaWF0 ZUFjdGlvblN0YXRlOjpSZWFkeTsKICAgICBfaGl0VGVzdFJlc3VsdCA9IGhpdFRlc3RSZXN1bHQ7 CisgICAgX3VzZXJEYXRhID0gdXNlckRhdGE7CiAKICAgICBbc2VsZiBfdXBkYXRlSW1tZWRpYXRl QWN0aW9uSXRlbV07CiB9CkBAIC0xNjUsNiArMTY3LDcgQEAgLSAodm9pZClfdXBkYXRlSW1tZWRp YXRlQWN0aW9uSXRlbQogCiAgICAgX3R5cGUgPSBrV0tJbW1lZGlhdGVBY3Rpb25Ob25lOwogICAg IF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyLmFuaW1hdGlvbkNvbnRyb2xsZXIgPSBuaWw7Cisg ICAgaWQgPE5TSW1tZWRpYXRlQWN0aW9uQW5pbWF0aW9uQ29udHJvbGxlcj4gZGVmYXVsdEFuaW1h dGlvbkNvbnRyb2xsZXIgPSBuaWw7CiAKICAgICBpZiAoIWhpdFRlc3RSZXN1bHQpCiAgICAgICAg IHJldHVybjsKQEAgLTE4MiwxNiArMTg1LDIzIEBAIC0gKHZvaWQpX3VwZGF0ZUltbWVkaWF0ZUFj dGlvbkl0ZW0KICAgICAgICAgICAgICAgICBbcWxQcmV2aWV3TGlua0l0ZW0gc2V0UHJldmlld1N0 eWxlOlFMUHJldmlld1N0eWxlUG9wb3Zlcl07CiAgICAgICAgICAgICAgICAgW3FsUHJldmlld0xp bmtJdGVtIHNldERlbGVnYXRlOnNlbGZdOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgX2lt bWVkaWF0ZUFjdGlvblJlY29nbml6ZXIuYW5pbWF0aW9uQ29udHJvbGxlciA9IChpZDxOU0ltbWVk aWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXI+KXFsUHJldmlld0xpbmtJdGVtLmdldCgpOwor ICAgICAgICAgICAgZGVmYXVsdEFuaW1hdGlvbkNvbnRyb2xsZXIgPSAoaWQ8TlNJbW1lZGlhdGVB Y3Rpb25BbmltYXRpb25Db250cm9sbGVyPilxbFByZXZpZXdMaW5rSXRlbS5nZXQoKTsKICAgICAg ICAgfSBlbHNlIHsKICNpZiBXS19BUElfRU5BQkxFRAogICAgICAgICAgICAgW3NlbGYgX2NyZWF0 ZVByZXZpZXdQb3BvdmVySWZOZWVkZWRGb3JVUkw6YWJzb2x1dGVMaW5rVVJMXTsKLSAgICAgICAg ICAgIF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyLmFuaW1hdGlvbkNvbnRyb2xsZXIgPSAoaWQ8 TlNJbW1lZGlhdGVBY3Rpb25BbmltYXRpb25Db250cm9sbGVyPilfcHJldmlld1BvcG92ZXIuZ2V0 KCk7CisgICAgICAgICAgICBkZWZhdWx0QW5pbWF0aW9uQ29udHJvbGxlciA9IChpZDxOU0ltbWVk aWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXI+KV9wcmV2aWV3UG9wb3Zlci5nZXQoKTsKICNl bmRpZiAvLyBXS19BUElfRU5BQkxFRAogICAgICAgICB9CisgICAgfQorCisgICAgaWQgY3VzdG9t Q2xpZW50QW5pbWF0aW9uQ29udHJvbGxlciA9IFtfd2tWaWV3IF9pbW1lZGlhdGVBY3Rpb25Bbmlt YXRpb25Db250cm9sbGVyRm9ySGl0VGVzdFJlc3VsdDp0b0FQSShoaXRUZXN0UmVzdWx0LmdldCgp KSB3aXRoVHlwZTpfdHlwZSB1c2VyRGF0YTp0b0FQSShfdXNlckRhdGEuZ2V0KCkpXTsKIAorICAg IGlmIChjdXN0b21DbGllbnRBbmltYXRpb25Db250cm9sbGVyID09IFtOU051bGwgbnVsbF0pCiAg ICAgICAgIHJldHVybjsKLSAgICB9CisgICAgZWxzZSBpZiAoY3VzdG9tQ2xpZW50QW5pbWF0aW9u Q29udHJvbGxlciAmJiBbY3VzdG9tQ2xpZW50QW5pbWF0aW9uQ29udHJvbGxlciBjb25mb3Jtc1Rv UHJvdG9jb2w6QHByb3RvY29sKE5TSW1tZWRpYXRlQWN0aW9uQW5pbWF0aW9uQ29udHJvbGxlcild KQorICAgICAgICBfaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplci5hbmltYXRpb25Db250cm9sbGVy ID0gKGlkIDxOU0ltbWVkaWF0ZUFjdGlvbkFuaW1hdGlvbkNvbnRyb2xsZXI+KWN1c3RvbUNsaWVu dEFuaW1hdGlvbkNvbnRyb2xsZXI7CisgICAgZWxzZQorICAgICAgICBfaW1tZWRpYXRlQWN0aW9u UmVjb2duaXplci5hbmltYXRpb25Db250cm9sbGVyID0gZGVmYXVsdEFuaW1hdGlvbkNvbnRyb2xs ZXI7CiB9CiAKICNwcmFnbWEgbWFyayBMaW5rIFByZXZpZXcgYWN0aW9uCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lv biAxNzcxODMpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTEwOTYsNyArMTA5Niw3IEBACiAJCTkwOTg1NEVFMTJC QzRFMTgwMDBBRDA4MCAvKiBXZWJNZW1vcnlTYW1wbGVyLm1hYy5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkwNTYyMEU1MTJCQzI0NzYwMDA3OTlCNiAv KiBXZWJNZW1vcnlTYW1wbGVyLm1hYy5tbSAqLzsgfTsKIAkJOTMyMUQ1ODYxQTM4RUUzQzAwODA1 MkJFIC8qIFdLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTMyMUQ1ODUxQTM4RUUzQzAwODA1MkJFIC8qIFdL SW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oICovOyB9OwogCQk5MzIxRDU4ODFBMzhFRTc0MDA4 MDUyQkUgLyogV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1tIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTMyMUQ1ODcxQTM4RUU3NDAwODA1MkJFIC8q IFdLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbSAqLzsgfTsKLQkJOTMyMUQ1OEExQTM4RjE5 NjAwODA1MkJFIC8qIFdLSW1tZWRpYXRlQWN0aW9uVHlwZXMuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzMjFENTg5MUEzOEYxOTYwMDgwNTJCRSAvKiBX S0ltbWVkaWF0ZUFjdGlvblR5cGVzLmggKi87IH07CisJCTkzMjFENThBMUEzOEYxOTYwMDgwNTJC RSAvKiBXS0ltbWVkaWF0ZUFjdGlvblR5cGVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA5MzIxRDU4OTFBMzhGMTk2MDA4MDUyQkUgLyogV0tJbW1lZGlh dGVBY3Rpb25UeXBlcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7 IH07IH07CiAJCTkzNEI3MjQ0MTlGNUI5QkUwMEFFOTZENiAvKiBXS0FjdGlvbk1lbnVJdGVtVHlw ZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEI3 MjQzMTlGNUI5QkUwMEFFOTZENiAvKiBXS0FjdGlvbk1lbnVJdGVtVHlwZXMuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk5MzVFRUI5QjEyNzc2MTdD MDAzMzIyQjggLyogV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzVFRUI5ODEyNzc2MTZEMDAzMzIyQjgg LyogV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJOTM1RUVCOUUxMjc3NjFBQzAwMzMyMkI4IC8qIFdL QnVuZGxlQmFja0ZvcndhcmRMaXN0LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDkzNUVFQjk1MTI3NzYxNkQwMDMzMjJCOCAvKiBXS0J1bmRsZUJhY2tG b3J3YXJkTGlzdC5jcHAgKi87IH07Cg==