137153 2014-09-26 11:56:32 -0700 Add API for loading local files 2015-08-18 02:02:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca marcin.ignac mitz oldest_to_newest 1037524 0 andersca 2014-09-26 11:56:32 -0700 Add API for loading local files 1037527 1 238727 andersca 2014-09-26 12:08:19 -0700 Created attachment 238727 Patch 1037531 2 238727 mitz 2014-09-26 12:58:25 -0700 Comment on attachment 238727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238727&action=review This new API could use a couple of API tests. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:99 > +- (WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(NA, WK_IOS_TBA); The Modern WebKit API has been described as “Class for class […] exactly the same on iOS and OS X”. Why is this method not available on OS X? 1037533 3 238727 andersca 2014-09-26 13:07:50 -0700 Comment on attachment 238727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238727&action=review >> Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:99 >> +- (WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(NA, WK_IOS_TBA); > > The Modern WebKit API has been described as “Class for class […] exactly the same on iOS and OS X”. Why is this method not available on OS X? No reason, I'll fix that! 1037583 4 238745 andersca 2014-09-26 16:29:37 -0700 Created attachment 238745 Patch 1037587 5 andersca 2014-09-26 16:38:41 -0700 Committed r174029: <http://trac.webkit.org/changeset/174029> 1037811 6 238745 darin 2014-09-28 16:25:18 -0700 Comment on attachment 238745 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238745&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:96 > + If readAccessURL references a directory, files inside that file may be loaded by WebKit. file inside that *directory* > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:99 > +- (WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA); Why is a single URL good enough for read-access? Should this be an array of NSURL instead? > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:423 > + auto navigation = _navigationState->createLoadRequestNavigation(navigationID, [NSURLRequest requestWithURL:URL]); > + > + return navigation.autorelease(); Wouldn’t this read better without a local variable? 1118496 7 marcin.ignac 2015-08-18 02:02:21 -0700 Looks like images loaded from a local path on iOS even with allowingReadAccessToURL are tainted and trying to use them for WebGL textures throws DOM Exception 18. Is there any solution for that? 238727 2014-09-26 12:08:19 -0700 2014-09-26 16:29:35 -0700 Patch bug-137153-20140926120819.patch text/plain 6916 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmJhMGE3ODA5N2FkNGIx MjRmNmViYjE1MDU0MTZiODYwNDRhNTcxMi4uOTJlYzRkNGFiYjhlNDM4NjQ2NzBjYWNiOTNjYWQ4 ZjJjNjc2ZmUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA5LTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEFQSSBmb3Ig bG9hZGluZyBsb2NhbCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM3MTUzCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE3NzYxNDU5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgbG9hZEZpbGVVUkw6YWxsb3dpbmdSZWFk QWNjZXNzVG9VUkw6XSk6CisgICAgICAgIExvYWQgdGhlIGZpbGUsIHdyYXBwaW5nIHRoZSBuYXZp Z2F0aW9uIElEIGluIGEgV0tOYXZpZ2F0aW9uIHVzaW5nIGNyZWF0ZUxvYWRSZXF1ZXN0TmF2aWdh dGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRGaWxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgIFJldHVybiB0aGUgbmF2aWdhdGlvbiBJRCAob3IgMCBpZiB0 aGUgbmF2aWdhdGlvbiBmYWlsZWQpLgorCiAyMDE0LTA5LTI2ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV0tJbnNwZWN0b3IgYmFjayBmdW5jdGlv biBzdHVicyB0aGF0IHdlbnQgbWlzc2luZyBmcm9tIHIxNzM5MjkuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaAppbmRleCBjMzUzMTQ4ZWI4YmU3ZDdj MzdmYjM2OTcwZjliNjhlYzhmYTU3YWI0Li5mNWU5NzhhZGM2YTRkMWVhOWM2ZTA2YjU5ZmQ3YTgx NDI4ODU3NGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3LmgKQEAgLTg5LDYgKzg5LDE1IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSgxMF8xMCwgOF8w KQogICovCiAtIChXS05hdmlnYXRpb24gKilsb2FkUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVx dWVzdDsKIAorLyohIEBhYnN0cmFjdCBOYXZpZ2F0ZXMgdG8gdGhlIHJlcXVlc3RlZCBmaWxlIFVS TCBvbiB0aGUgZmlsZXN5c3RlbS4KKyBAcGFyYW0gVVJMIFRoZSBmaWxlIFVSTCB0byB3aGljaCB0 byBuYXZpZ2F0ZS4KKyBAcGFyYW0gcmVhZEFjY2Vzc1VSTCBUaGUgVVJMIHRvIGFsbG93IHJlYWQg YWNjZXNzIHRvLgorIEBkaXNjdXNzaW9uIElmIHJlYWRBY2Nlc3NVUkwgcmVmZXJlbmNlcyBhIHNp bmdsZSBmaWxlLCBvbmx5IHRoYXQgZmlsZSBtYXkgYmUgbG9hZGVkIGJ5IFdlYktpdC4KKyBJZiBy ZWFkQWNjZXNzVVJMIHJlZmVyZW5jZXMgYSBkaXJlY3RvcnksIGZpbGVzIGluc2lkZSB0aGF0IGZp bGUgbWF5IGJlIGxvYWRlZCBieSBXZWJLaXQuCisgQHJlc3VsdCBBIG5ldyBuYXZpZ2F0aW9uIGZv ciB0aGUgZ2l2ZW4gZmlsZSBVUkwuCisgKi8KKy0gKFdLTmF2aWdhdGlvbiAqKWxvYWRGaWxlVVJM OihOU1VSTCAqKVVSTCBhbGxvd2luZ1JlYWRBY2Nlc3NUb1VSTDooTlNVUkwgKilyZWFkQWNjZXNz VVJMIFdLX0FWQUlMQUJMRShOQSwgV0tfSU9TX1RCQSk7CisKIC8qISBAYWJzdHJhY3QgU2V0cyB0 aGUgd2VicGFnZSBjb250ZW50cyBhbmQgYmFzZSBVUkwuCiAgQHBhcmFtIHN0cmluZyBUaGUgc3Ry aW5nIHRvIHVzZSBhcyB0aGUgY29udGVudHMgb2YgdGhlIHdlYnBhZ2UuCiAgQHBhcmFtIGJhc2VV UkwgQSBVUkwgdGhhdCBpcyB1c2VkIHRvIHJlc29sdmUgcmVsYXRpdmUgVVJMcyB3aXRoaW4gdGhl IGRvY3VtZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQppbmRleCBjZGQ5YzE2NWMwMTUzZDgxZjYzNjI0NWYzNjViNmI2MTk4MGJlYjI2Li40 MmQzZjg5NDBmM2ZiYWNiMDFiMDdjNGE3Y2JiOTBjOWJkNDg3NjE1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNDA2LDYgKzQwNiwy MyBAQCBzdGF0aWMgaW50MzJfdCBkZXZpY2VPcmllbnRhdGlvbigpCiAgICAgcmV0dXJuIG5hdmln YXRpb24uYXV0b3JlbGVhc2UoKTsKIH0KIAorLSAoV0tOYXZpZ2F0aW9uICopbG9hZEZpbGVVUkw6 KE5TVVJMICopVVJMIGFsbG93aW5nUmVhZEFjY2Vzc1RvVVJMOihOU1VSTCAqKXJlYWRBY2Nlc3NV UkwKK3sKKyAgICBpZiAoIVtVUkwgaXNGaWxlVVJMXSkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJh aXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIiVAIGlzIG5vdCBhIGZpbGUg VVJMIiwgVVJMXTsKKworICAgIGlmICghW3JlYWRBY2Nlc3NVUkwgaXNGaWxlVVJMXSkKKyAgICAg ICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpA IiVAIGlzIG5vdCBhIGZpbGUgVVJMIiwgcmVhZEFjY2Vzc1VSTF07CisKKyAgICB1aW50NjRfdCBu YXZpZ2F0aW9uSUQgPSBfcGFnZS0+bG9hZEZpbGUoW1VSTCBfd2ViX29yaWdpbmFsRGF0YUFzV1RG U3RyaW5nXSwgW3JlYWRBY2Nlc3NVUkwgX3dlYl9vcmlnaW5hbERhdGFBc1dURlN0cmluZ10pOwor ICAgIGlmICghbmF2aWdhdGlvbklEKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0byBu YXZpZ2F0aW9uID0gX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlTG9hZFJlcXVlc3ROYXZpZ2F0aW9u KG5hdmlnYXRpb25JRCwgW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpVUkxdKTsKKworICAg IHJldHVybiBuYXZpZ2F0aW9uLmF1dG9yZWxlYXNlKCk7Cit9CisKIC0gKFdLTmF2aWdhdGlvbiAq KWxvYWRIVE1MU3RyaW5nOihOU1N0cmluZyAqKXN0cmluZyBiYXNlVVJMOihOU1VSTCAqKWJhc2VV UkwKIHsKICAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQgPSBfcGFnZS0+bG9hZEhUTUxTdHJpbmco c3RyaW5nLCBiYXNlVVJMLmFic29sdXRlU3RyaW5nKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNDQ4MDE3MzE3MTYwYjZmMDQ5OWJkOTVkMDFmZWI1OGFl YTE4YjMwMC4uMWNhZjQ5MDlkN2FiMzM1Yzk3Y2JkNzY5ZDMyNjg2ZjBmYjdkMTRjMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc0MCwxNyArNzQwLDE3 IEBAIHVpbnQ2NF90IFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0LCBBUEk6Ok9iamVjdCoKICAgICByZXR1cm4gbmF2aWdhdGlvbklEOwogfQog Ci12b2lkIFdlYlBhZ2VQcm94eTo6bG9hZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlVVJMU3RyaW5n LCBjb25zdCBTdHJpbmcmIHJlc291cmNlRGlyZWN0b3J5VVJMU3RyaW5nLCBBUEk6Ok9iamVjdCog dXNlckRhdGEpCit1aW50NjRfdCBXZWJQYWdlUHJveHk6OmxvYWRGaWxlKGNvbnN0IFN0cmluZyYg ZmlsZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiByZXNvdXJjZURpcmVjdG9yeVVSTFN0cmluZywg QVBJOjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmIChtX2lzQ2xvc2VkKQotICAgICAgICBy ZXR1cm47CisgICAgICAgIHJldHVybiAwOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAg IHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAKICAgICBVUkwgZmlsZVVSTCA9IFVSTChVUkwoKSwg ZmlsZVVSTFN0cmluZyk7CiAgICAgaWYgKCFmaWxlVVJMLmlzTG9jYWxGaWxlKCkpCi0gICAgICAg IHJldHVybjsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBVUkwgcmVzb3VyY2VEaXJlY3RvcnlV Ukw7CiAgICAgaWYgKHJlc291cmNlRGlyZWN0b3J5VVJMU3RyaW5nLmlzTnVsbCgpKQpAQCAtNzU4 LDE2ICs3NTgsMjQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRGaWxlKGNvbnN0IFN0cmluZyYg ZmlsZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiByZXNvdXJjZUQKICAgICBlbHNlIHsKICAgICAg ICAgcmVzb3VyY2VEaXJlY3RvcnlVUkwgPSBVUkwoVVJMKCksIHJlc291cmNlRGlyZWN0b3J5VVJM U3RyaW5nKTsKICAgICAgICAgaWYgKCFyZXNvdXJjZURpcmVjdG9yeVVSTC5pc0xvY2FsRmlsZSgp KQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCisg ICAgdWludDY0X3QgbmF2aWdhdGlvbklEID0gZ2VuZXJhdGVOYXZpZ2F0aW9uSUQoKTsKKworICAg IGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKKworICAg IG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbiwgZmls ZVVSTFN0cmluZyk7CisKICAgICBTdHJpbmcgcmVzb3VyY2VEaXJlY3RvcnlQYXRoID0gcmVzb3Vy Y2VEaXJlY3RvcnlVUkwuZmlsZVN5c3RlbVBhdGgoKTsKIAogICAgIFNhbmRib3hFeHRlbnNpb246 OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOwogICAgIFNhbmRib3hFeHRlbnNpb246OmNy ZWF0ZUhhbmRsZShyZXNvdXJjZURpcmVjdG9yeVBhdGgsIFNhbmRib3hFeHRlbnNpb246OlJlYWRP bmx5LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRB Y2Nlc3NUb0Jhc2VVUkwocmVzb3VyY2VEaXJlY3RvcnlVUkwpOwotICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFJlcXVlc3QoZ2VuZXJhdGVOYXZpZ2F0aW9uSUQoKSwg ZmlsZVVSTCwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5j b2Rlcih1c2VyRGF0YSwgcHJvY2VzcygpKSksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRSZXF1ZXN0KG5hdmlnYXRpb25JRCwgZmlsZVVSTCwg c2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2Rlcih1c2Vy RGF0YSwgcHJvY2VzcygpKSksIG1fcGFnZUlEKTsKICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVu ZXNzVGltZXIoKS0+c3RhcnQoKTsKKworICAgIHJldHVybiBuYXZpZ2F0aW9uSUQ7CiB9CiAKIHZv aWQgV2ViUGFnZVByb3h5Ojpsb2FkRGF0YShBUEk6OkRhdGEqIGRhdGEsIGNvbnN0IFN0cmluZyYg TUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg QVBJOjpPYmplY3QqIHVzZXJEYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCmluZGV4IGZiZmYyM2ZhY2VmYjNhZjQ1YWZlZTQxYjJjMjk2YzZhNjkwODAzYzkuLjEwNTYx ZGYzZWZiMThjM2QxYzUzNDFmZGRjYzcyNThiOTMxYmQ4ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTMwMiw3ICszMDIsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCBpc0Nsb3NlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNDbG9zZWQ7IH0KIAogICAgIHVpbnQ2NF90 IGxvYWRSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSA9IG51bGxwdHIpOwotICAgIHZvaWQgbG9hZEZpbGUoY29uc3QgU3RyaW5nJiBm aWxlVVJMLCBjb25zdCBTdHJpbmcmIHJlc291cmNlRGlyZWN0b3J5VVJMLCBBUEk6Ok9iamVjdCog dXNlckRhdGEgPSBudWxscHRyKTsKKyAgICB1aW50NjRfdCBsb2FkRmlsZShjb25zdCBTdHJpbmcm IGZpbGVVUkwsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEaXJlY3RvcnlVUkwsIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAgIHZvaWQgbG9hZERhdGEoQVBJOjpEYXRhKiwgY29u c3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5n JiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKICAgICB1aW50NjRf dCBsb2FkSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7CiAgICAgdm9pZCBsb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCwgQVBJOjpPYmplY3QqIHVz ZXJEYXRhID0gbnVsbHB0cik7Cg== 238745 2014-09-26 16:29:37 -0700 2014-09-28 16:25:18 -0700 Patch bug-137153-20140926162937.patch text/plain 6924 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmJhMGE3ODA5N2FkNGIx MjRmNmViYjE1MDU0MTZiODYwNDRhNTcxMi4uOTJlYzRkNGFiYjhlNDM4NjQ2NzBjYWNiOTNjYWQ4 ZjJjNjc2ZmUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA5LTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEFQSSBmb3Ig bG9hZGluZyBsb2NhbCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM3MTUzCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE3NzYxNDU5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgbG9hZEZpbGVVUkw6YWxsb3dpbmdSZWFk QWNjZXNzVG9VUkw6XSk6CisgICAgICAgIExvYWQgdGhlIGZpbGUsIHdyYXBwaW5nIHRoZSBuYXZp Z2F0aW9uIElEIGluIGEgV0tOYXZpZ2F0aW9uIHVzaW5nIGNyZWF0ZUxvYWRSZXF1ZXN0TmF2aWdh dGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRGaWxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgIFJldHVybiB0aGUgbmF2aWdhdGlvbiBJRCAob3IgMCBpZiB0 aGUgbmF2aWdhdGlvbiBmYWlsZWQpLgorCiAyMDE0LTA5LTI2ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV0tJbnNwZWN0b3IgYmFjayBmdW5jdGlv biBzdHVicyB0aGF0IHdlbnQgbWlzc2luZyBmcm9tIHIxNzM5MjkuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaAppbmRleCBjMzUzMTQ4ZWI4YmU3ZDdj MzdmYjM2OTcwZjliNjhlYzhmYTU3YWI0Li40YjgwZjhlNmZlMDY0N2FmY2Q1YTJlNmQ3Y2EwYWVl YTQ3NDdmYTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3LmgKQEAgLTg5LDYgKzg5LDE1IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSgxMF8xMCwgOF8w KQogICovCiAtIChXS05hdmlnYXRpb24gKilsb2FkUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVx dWVzdDsKIAorLyohIEBhYnN0cmFjdCBOYXZpZ2F0ZXMgdG8gdGhlIHJlcXVlc3RlZCBmaWxlIFVS TCBvbiB0aGUgZmlsZXN5c3RlbS4KKyBAcGFyYW0gVVJMIFRoZSBmaWxlIFVSTCB0byB3aGljaCB0 byBuYXZpZ2F0ZS4KKyBAcGFyYW0gcmVhZEFjY2Vzc1VSTCBUaGUgVVJMIHRvIGFsbG93IHJlYWQg YWNjZXNzIHRvLgorIEBkaXNjdXNzaW9uIElmIHJlYWRBY2Nlc3NVUkwgcmVmZXJlbmNlcyBhIHNp bmdsZSBmaWxlLCBvbmx5IHRoYXQgZmlsZSBtYXkgYmUgbG9hZGVkIGJ5IFdlYktpdC4KKyBJZiBy ZWFkQWNjZXNzVVJMIHJlZmVyZW5jZXMgYSBkaXJlY3RvcnksIGZpbGVzIGluc2lkZSB0aGF0IGZp bGUgbWF5IGJlIGxvYWRlZCBieSBXZWJLaXQuCisgQHJlc3VsdCBBIG5ldyBuYXZpZ2F0aW9uIGZv ciB0aGUgZ2l2ZW4gZmlsZSBVUkwuCisgKi8KKy0gKFdLTmF2aWdhdGlvbiAqKWxvYWRGaWxlVVJM OihOU1VSTCAqKVVSTCBhbGxvd2luZ1JlYWRBY2Nlc3NUb1VSTDooTlNVUkwgKilyZWFkQWNjZXNz VVJMIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJBKTsKKwogLyohIEBhYnN0cmFj dCBTZXRzIHRoZSB3ZWJwYWdlIGNvbnRlbnRzIGFuZCBiYXNlIFVSTC4KICBAcGFyYW0gc3RyaW5n IFRoZSBzdHJpbmcgdG8gdXNlIGFzIHRoZSBjb250ZW50cyBvZiB0aGUgd2VicGFnZS4KICBAcGFy YW0gYmFzZVVSTCBBIFVSTCB0aGF0IGlzIHVzZWQgdG8gcmVzb2x2ZSByZWxhdGl2ZSBVUkxzIHdp dGhpbiB0aGUgZG9jdW1lbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCmluZGV4IGNkZDljMTY1YzAxNTNkODFmNjM2MjQ1ZjM2NWI2YjYxOTgw YmViMjYuLjQyZDNmODk0MGYzZmJhY2IwMWIwN2M0YTdjYmI5MGM5YmQ0ODc2MTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00MDYs NiArNDA2LDIzIEBAIHN0YXRpYyBpbnQzMl90IGRldmljZU9yaWVudGF0aW9uKCkKICAgICByZXR1 cm4gbmF2aWdhdGlvbi5hdXRvcmVsZWFzZSgpOwogfQogCistIChXS05hdmlnYXRpb24gKilsb2Fk RmlsZVVSTDooTlNVUkwgKilVUkwgYWxsb3dpbmdSZWFkQWNjZXNzVG9VUkw6KE5TVVJMICopcmVh ZEFjY2Vzc1VSTAoreworICAgIGlmICghW1VSTCBpc0ZpbGVVUkxdKQorICAgICAgICBbTlNFeGNl cHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiJUAgaXMgbm90 IGEgZmlsZSBVUkwiLCBVUkxdOworCisgICAgaWYgKCFbcmVhZEFjY2Vzc1VSTCBpc0ZpbGVVUkxd KQorICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24g Zm9ybWF0OkAiJUAgaXMgbm90IGEgZmlsZSBVUkwiLCByZWFkQWNjZXNzVVJMXTsKKworICAgIHVp bnQ2NF90IG5hdmlnYXRpb25JRCA9IF9wYWdlLT5sb2FkRmlsZShbVVJMIF93ZWJfb3JpZ2luYWxE YXRhQXNXVEZTdHJpbmddLCBbcmVhZEFjY2Vzc1VSTCBfd2ViX29yaWdpbmFsRGF0YUFzV1RGU3Ry aW5nXSk7CisgICAgaWYgKCFuYXZpZ2F0aW9uSUQpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAg ICBhdXRvIG5hdmlnYXRpb24gPSBfbmF2aWdhdGlvblN0YXRlLT5jcmVhdGVMb2FkUmVxdWVzdE5h dmlnYXRpb24obmF2aWdhdGlvbklELCBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOlVSTF0p OworCisgICAgcmV0dXJuIG5hdmlnYXRpb24uYXV0b3JlbGVhc2UoKTsKK30KKwogLSAoV0tOYXZp Z2F0aW9uICopbG9hZEhUTUxTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIGJhc2VVUkw6KE5TVVJM ICopYmFzZVVSTAogewogICAgIHVpbnQ2NF90IG5hdmlnYXRpb25JRCA9IF9wYWdlLT5sb2FkSFRN TFN0cmluZyhzdHJpbmcsIGJhc2VVUkwuYWJzb2x1dGVTdHJpbmcpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA0NDgwMTczMTcxNjBiNmYwNDk5YmQ5NWQw MWZlYjU4YWVhMThiMzAwLi4xY2FmNDkwOWQ3YWIzMzVjOTdjYmQ3NjlkMzI2ODZmMGZiN2QxNGMy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzQwLDE3 ICs3NDAsMTcgQEAgdWludDY0X3QgV2ViUGFnZVByb3h5Ojpsb2FkUmVxdWVzdChjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIEFQSTo6T2JqZWN0KgogICAgIHJldHVybiBuYXZpZ2F0aW9u SUQ7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVV UkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEaXJlY3RvcnlVUkxTdHJpbmcsIEFQSTo6 T2JqZWN0KiB1c2VyRGF0YSkKK3VpbnQ2NF90IFdlYlBhZ2VQcm94eTo6bG9hZEZpbGUoY29uc3Qg U3RyaW5nJiBmaWxlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHJlc291cmNlRGlyZWN0b3J5VVJM U3RyaW5nLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCiB7CiAgICAgaWYgKG1faXNDbG9zZWQpCi0g ICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkK ICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKIAogICAgIFVSTCBmaWxlVVJMID0gVVJM KFVSTCgpLCBmaWxlVVJMU3RyaW5nKTsKICAgICBpZiAoIWZpbGVVUkwuaXNMb2NhbEZpbGUoKSkK LSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gMDsKIAogICAgIFVSTCByZXNvdXJjZURp cmVjdG9yeVVSTDsKICAgICBpZiAocmVzb3VyY2VEaXJlY3RvcnlVUkxTdHJpbmcuaXNOdWxsKCkp CkBAIC03NTgsMTYgKzc1OCwyNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZEZpbGUoY29uc3Qg U3RyaW5nJiBmaWxlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHJlc291cmNlRAogICAgIGVsc2Ug ewogICAgICAgICByZXNvdXJjZURpcmVjdG9yeVVSTCA9IFVSTChVUkwoKSwgcmVzb3VyY2VEaXJl Y3RvcnlVUkxTdHJpbmcpOwogICAgICAgICBpZiAoIXJlc291cmNlRGlyZWN0b3J5VVJMLmlzTG9j YWxGaWxlKCkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gMDsKICAg ICB9CiAKKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQgPSBnZW5lcmF0ZU5hdmlnYXRpb25JRCgp OworCisgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigp OworCisgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0 aW9uLCBmaWxlVVJMU3RyaW5nKTsKKwogICAgIFN0cmluZyByZXNvdXJjZURpcmVjdG9yeVBhdGgg PSByZXNvdXJjZURpcmVjdG9yeVVSTC5maWxlU3lzdGVtUGF0aCgpOwogCiAgICAgU2FuZGJveEV4 dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hFeHRlbnNpb25IYW5kbGU7CiAgICAgU2FuZGJveEV4dGVu c2lvbjo6Y3JlYXRlSGFuZGxlKHJlc291cmNlRGlyZWN0b3J5UGF0aCwgU2FuZGJveEV4dGVuc2lv bjo6UmVhZE9ubHksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogICAgIG1fcHJvY2Vzcy0+YXNz dW1lUmVhZEFjY2Vzc1RvQmFzZVVSTChyZXNvdXJjZURpcmVjdG9yeVVSTCk7Ci0gICAgbV9wcm9j ZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkUmVxdWVzdChnZW5lcmF0ZU5hdmlnYXRp b25JRCgpLCBmaWxlVVJMLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJDb250ZXh0VXNlck1l c3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9wYWdlSUQpOworICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFJlcXVlc3QobmF2aWdhdGlvbklELCBm aWxlVVJMLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNv ZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVz cG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOworCisgICAgcmV0dXJuIG5hdmlnYXRpb25JRDsK IH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhKEFQSTo6RGF0YSogZGF0YSwgY29uc3Qg U3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKaW5kZXggZmJmZjIzZmFjZWZiM2FmNDVhZmVlNDFiMmMyOTZjNmE2OTA4MDNj OS4uMTA1NjFkZjNlZmIxOGMzZDFjNTM0MWZkZGNjNzI1OGI5MzFiZDhkZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzAyLDcgKzMwMiw3IEBAIHB1YmxpYzoK ICAgICBib29sIGlzQ2xvc2VkKCkgY29uc3QgeyByZXR1cm4gbV9pc0Nsb3NlZDsgfQogCiAgICAg dWludDY0X3QgbG9hZFJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7Ci0gICAgdm9pZCBsb2FkRmlsZShjb25zdCBT dHJpbmcmIGZpbGVVUkwsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEaXJlY3RvcnlVUkwsIEFQSTo6 T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOworICAgIHVpbnQ2NF90IGxvYWRGaWxlKGNvbnN0 IFN0cmluZyYgZmlsZVVSTCwgY29uc3QgU3RyaW5nJiByZXNvdXJjZURpcmVjdG9yeVVSTCwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7CiAgICAgdm9pZCBsb2FkRGF0YShBUEk6OkRh dGEqLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25z dCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAg IHVpbnQ2NF90IGxvYWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3Qg U3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKICAgICB2 b2lkIGxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29u c3QgU3RyaW5nJiBiYXNlVVJMLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMLCBBUEk6Ok9i amVjdCogdXNlckRhdGEgPSBudWxscHRyKTsK