128942 2014-02-17 16:43:07 -0800 Move iOS only Settings into Settings.in and make them not-iOS only 2014-02-17 16:48:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 981709 0 sam 2014-02-17 16:43:07 -0800 Move iOS only Settings into Settings.in and make them not-iOS only 981711 1 224446 sam 2014-02-17 16:43:42 -0800 Created attachment 224446 Patch 981714 2 sam 2014-02-17 16:48:23 -0800 Committed r164259: <http://trac.webkit.org/changeset/164259> 224446 2014-02-17 16:43:42 -0800 2014-02-17 16:45:48 -0800 Patch bug-128942-20140217164341.patch text/plain 6088 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDI1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE0LTAyLTE3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBpT1Mgb25seSBTZXR0aW5ncyBp bnRvIFNldHRpbmdzLmluIGFuZCBtYWtlIHRoZW0gbm90LWlPUyBvbmx5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5NDIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgor ICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmluOgor CiAyMDE0LTAyLTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIHZpZXcgc291cmNlIGNvZGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu Y3BwCShyZXZpc2lvbiAxNjQyNTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTU2LDkgKzE1Niw2IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQ YWdlKiBwYWdlKQogICAgICwgbV9mb250R2VuZXJpY0ZhbWlsaWVzKHN0ZDo6bWFrZV91bmlxdWU8 Rm9udEdlbmVyaWNGYW1pbGllcz4oKSkKICAgICAsIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5KFNl Y3VyaXR5T3JpZ2luOjpBbGxvd0FsbFN0b3JhZ2UpCiAgICAgLCBtX2xheW91dEludGVydmFsKGxh eW91dFNjaGVkdWxlVGhyZXNob2xkKQotI2lmIFBMQVRGT1JNKElPUykKLSAgICAsIG1fbWF4UGFy c2VEdXJhdGlvbigtMSkKLSNlbmRpZgogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAg LCBtX3RleHRBdXRvc2l6aW5nRm9udFNjYWxlRmFjdG9yKDEpCiAjaWYgSEFDS19GT1JDRV9URVhU X0FVVE9TSVpJTkdfT05fREVTS1RPUApAQCAtMTgwLDE1ICsxNzcsNiBAQCBTZXR0aW5nczo6U2V0 dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fbmVlZHNBZG9iZUZyYW1lUmVsb2FkaW5nUXVpcmso ZmFsc2UpCiAgICAgLCBtX3VzZXNQYWdlQ2FjaGUoZmFsc2UpCiAgICAgLCBtX2ZvbnRSZW5kZXJp bmdNb2RlKDApCi0jaWYgUExBVEZPUk0oSU9TKQotICAgICwgbV9zdGFuZGFsb25lKGZhbHNlKQot ICAgICwgbV90ZWxlcGhvbmVOdW1iZXJQYXJzaW5nRW5hYmxlZChmYWxzZSkKLSAgICAsIG1fbWVk aWFEYXRhTG9hZHNBdXRvbWF0aWNhbGx5KGZhbHNlKQotICAgICwgbV9zaG91bGRUcmFuc2Zvcm1z QWZmZWN0T3ZlcmZsb3codHJ1ZSkKLSAgICAsIG1fc2hvdWxkRGlzcGF0Y2hKYXZhU2NyaXB0V2lu ZG93T25FcnJvckV2ZW50cyhmYWxzZSkKLSAgICAsIG1fYWx3YXlzVXNlQmFzZWxpbmVPZlByaW1h cnlGb250KGZhbHNlKQotICAgICwgbV9hbHdheXNVc2VBY2NlbGVyYXRlZE92ZXJmbG93U2Nyb2xs KGZhbHNlKQotI2VuZGlmCiAgICAgLCBtX3Nob3dUaWxlZFNjcm9sbGluZ0luZGljYXRvcihmYWxz ZSkKICAgICAsIG1fdGlsZWRCYWNraW5nU3RvcmVFbmFibGVkKGZhbHNlKQogICAgICwgbV9iYWNr Z3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShmYWxzZSkKQEAgLTcxNCwxMSArNzAyLDYgQEAg dm9pZCBTZXR0aW5nczo6c2V0TG93UG93ZXJWaWRlb0F1ZGlvQnVmZgogfQogCiAjaWYgUExBVEZP Uk0oSU9TKQotdm9pZCBTZXR0aW5nczo6c2V0U3RhbmRhbG9uZShib29sIHN0YW5kYWxvbmUpCi17 Ci0gICAgbV9zdGFuZGFsb25lID0gc3RhbmRhbG9uZTsKLX0KLQogdm9pZCBTZXR0aW5nczo6c2V0 QXVkaW9TZXNzaW9uQ2F0ZWdvcnlPdmVycmlkZSh1bnNpZ25lZCBzZXNzaW9uQ2F0ZWdvcnkpCiB7 CiAgICAgQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9uKCkuc2V0Q2F0ZWdvcnlPdmVycmlkZShz dGF0aWNfY2FzdDxBdWRpb1Nlc3Npb246OkNhdGVnb3J5VHlwZT4oc2Vzc2lvbkNhdGVnb3J5KSk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCShyZXZpc2lvbiAxNjQyNTEpCisrKyBTb3VyY2Uv V2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3OSwzMyArMTc5LDYg QEAgcHVibGljOgogICAgIHZvaWQgc2V0SGlkZGVuUGFnZURPTVRpbWVyVGhyb3R0bGluZ0VuYWJs ZWQoYm9vbCk7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKElPUykKLSAgICAvLyBGSVhNRTogVGhp cyBzZXR0aW5nIGlzbid0IHNwZWNpZmljIHRvIGlPUy4KLSAgICB2b2lkIHNldE1heFBhcnNlRHVy YXRpb24oZG91YmxlIG1heFBhcnNlRHVyYXRpb24pIHsgbV9tYXhQYXJzZUR1cmF0aW9uID0gbWF4 UGFyc2VEdXJhdGlvbjsgfQotICAgIGRvdWJsZSBtYXhQYXJzZUR1cmF0aW9uKCkgY29uc3QgeyBy ZXR1cm4gbV9tYXhQYXJzZUR1cmF0aW9uOyB9Ci0KLSAgICB2b2lkIHNldFN0YW5kYWxvbmUoYm9v bCk7Ci0gICAgYm9vbCBzdGFuZGFsb25lKCkgY29uc3QgeyByZXR1cm4gbV9zdGFuZGFsb25lOyB9 Ci0KLSAgICB2b2lkIHNldFRlbGVwaG9uZU51bWJlclBhcnNpbmdFbmFibGVkKGJvb2wgZmxhZykg eyBtX3RlbGVwaG9uZU51bWJlclBhcnNpbmdFbmFibGVkID0gZmxhZzsgfQotICAgIGJvb2wgdGVs ZXBob25lTnVtYmVyUGFyc2luZ0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3RlbGVwaG9uZU51 bWJlclBhcnNpbmdFbmFibGVkOyB9Ci0KLSAgICB2b2lkIHNldE1lZGlhRGF0YUxvYWRzQXV0b21h dGljYWxseShib29sIGZsYWcpIHsgbV9tZWRpYURhdGFMb2Fkc0F1dG9tYXRpY2FsbHkgPSBmbGFn OyB9Ci0gICAgYm9vbCBtZWRpYURhdGFMb2Fkc0F1dG9tYXRpY2FsbHkoKSBjb25zdCB7IHJldHVy biBtX21lZGlhRGF0YUxvYWRzQXV0b21hdGljYWxseTsgfQotCi0gICAgdm9pZCBzZXRTaG91bGRU cmFuc2Zvcm1zQWZmZWN0T3ZlcmZsb3coYm9vbCBmbGFnKSB7IG1fc2hvdWxkVHJhbnNmb3Jtc0Fm ZmVjdE92ZXJmbG93ID0gZmxhZzsgfQotICAgIGJvb2wgc2hvdWxkVHJhbnNmb3Jtc0FmZmVjdE92 ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRUcmFuc2Zvcm1zQWZmZWN0T3ZlcmZsb3c7 IH0KLQotICAgIHZvaWQgc2V0U2hvdWxkRGlzcGF0Y2hKYXZhU2NyaXB0V2luZG93T25FcnJvckV2 ZW50cyhib29sIGZsYWcpIHsgbV9zaG91bGREaXNwYXRjaEphdmFTY3JpcHRXaW5kb3dPbkVycm9y RXZlbnRzID0gZmxhZzsgfQotICAgIGJvb2wgc2hvdWxkRGlzcGF0Y2hKYXZhU2NyaXB0V2luZG93 T25FcnJvckV2ZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkRGlzcGF0Y2hKYXZhU2NyaXB0 V2luZG93T25FcnJvckV2ZW50czsgfQotCi0gICAgdm9pZCBzZXRBbHdheXNVc2VCYXNlbGluZU9m UHJpbWFyeUZvbnQoYm9vbCBmbGFnKSB7IG1fYWx3YXlzVXNlQmFzZWxpbmVPZlByaW1hcnlGb250 ID0gZmxhZzsgfQotICAgIGJvb2wgYWx3YXlzVXNlQmFzZWxpbmVPZlByaW1hcnlGb250KCkgY29u c3QgeyByZXR1cm4gbV9hbHdheXNVc2VCYXNlbGluZU9mUHJpbWFyeUZvbnQ7IH0KLQotICAgIHZv aWQgc2V0QWx3YXlzVXNlQWNjZWxlcmF0ZWRPdmVyZmxvd1Njcm9sbChib29sIGZsYWcpIHsgbV9h bHdheXNVc2VBY2NlbGVyYXRlZE92ZXJmbG93U2Nyb2xsID0gZmxhZzsgfQotICAgIGJvb2wgYWx3 YXlzVXNlQWNjZWxlcmF0ZWRPdmVyZmxvd1Njcm9sbCgpIGNvbnN0IHsgcmV0dXJuIG1fYWx3YXlz VXNlQWNjZWxlcmF0ZWRPdmVyZmxvd1Njcm9sbDsgfQotI2VuZGlmCi0KICAgICB2b2lkIHNldFVz ZXNQYWdlQ2FjaGUoYm9vbCk7CiAgICAgYm9vbCB1c2VzUGFnZUNhY2hlKCkgY29uc3QgeyByZXR1 cm4gbV91c2VzUGFnZUNhY2hlOyB9CiAgICAgICAgIApAQCAtMzEzLDkgKzI4Niw2IEBAIHByaXZh dGU6CiAgICAgY29uc3Qgc3RkOjp1bmlxdWVfcHRyPEZvbnRHZW5lcmljRmFtaWxpZXM+IG1fZm9u dEdlbmVyaWNGYW1pbGllczsKICAgICBTZWN1cml0eU9yaWdpbjo6U3RvcmFnZUJsb2NraW5nUG9s aWN5IG1fc3RvcmFnZUJsb2NraW5nUG9saWN5OwogICAgIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29u ZHMgbV9sYXlvdXRJbnRlcnZhbDsKLSNpZiBQTEFURk9STShJT1MpCi0gICAgZG91YmxlIG1fbWF4 UGFyc2VEdXJhdGlvbjsKLSNlbmRpZgogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAg ZmxvYXQgbV90ZXh0QXV0b3NpemluZ0ZvbnRTY2FsZUZhY3RvcjsKICAgICBJbnRTaXplIG1fdGV4 dEF1dG9zaXppbmdXaW5kb3dTaXplT3ZlcnJpZGU7CkBAIC0zMzUsMTYgKzMwNSw2IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX25lZWRzQWRvYmVGcmFtZVJlbG9hZGluZ1F1aXJrIDogMTsKICAgICBi b29sIG1fdXNlc1BhZ2VDYWNoZSA6IDE7CiAgICAgdW5zaWduZWQgbV9mb250UmVuZGVyaW5nTW9k ZSA6IDE7Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIGJvb2wgbV9zdGFuZGFsb25lIDogMTsKLSAg ICBib29sIG1fdGVsZXBob25lTnVtYmVyUGFyc2luZ0VuYWJsZWQgOiAxOwotICAgIGJvb2wgbV9t ZWRpYURhdGFMb2Fkc0F1dG9tYXRpY2FsbHkgOiAxOwotICAgIGJvb2wgbV9zaG91bGRUcmFuc2Zv cm1zQWZmZWN0T3ZlcmZsb3cgOiAxOwotICAgIGJvb2wgbV9zaG91bGREaXNwYXRjaEphdmFTY3Jp cHRXaW5kb3dPbkVycm9yRXZlbnRzIDogMTsKLSAgICBib29sIG1fYWx3YXlzVXNlQmFzZWxpbmVP ZlByaW1hcnlGb250IDogMTsKLSAgICBib29sIG1fYWxsb3dNdWx0aUVsZW1lbnRJbXBsaWNpdEZv cm1TdWJtaXNzaW9uIDogMTsKLSAgICBib29sIG1fYWx3YXlzVXNlQWNjZWxlcmF0ZWRPdmVyZmxv d1Njcm9sbCA6IDE7Ci0jZW5kaWYKICAgICBib29sIG1fc2hvd1RpbGVkU2Nyb2xsaW5nSW5kaWNh dG9yIDogMTsKICAgICBib29sIG1fdGlsZWRCYWNraW5nU3RvcmVFbmFibGVkIDogMTsKICAgICBi b29sIG1fYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UgOiAxOwpJbmRleDogU291cmNl L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLmluCShyZXZpc2lvbiAxNjQyNTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0yMDYsMyArMjA2LDE0IEBAIGFsbG93TXVs dGlFbGVtZW50SW1wbGljaXRTdWJtaXNzaW9uIGluaXQKIG1lZGlhUGxheWJhY2tBbGxvd3NBaXJQ bGF5IGluaXRpYWw9dHJ1ZSwgY29uZGl0aW9uYWw9SU9TX0FJUlBMQVkKIAogc2hvdWxkQ29udmVy dFBvc2l0aW9uU3R5bGVPbkNvcHkgaW5pdGlhbD1mYWxzZQorCittYXhQYXJzZUR1cmF0aW9uIHR5 cGU9ZG91YmxlLCBpbml0aWFsPS0xCitzdGFuZGFsb25lIGluaXRpYWw9ZmFsc2UKK3RlbGVwaG9u ZU51bWJlclBhcnNpbmdFbmFibGVkIGluaXRpYWw9ZmFsc2UKK21lZGlhRGF0YUxvYWRzQXV0b21h dGljYWxseSBpbml0aWFsPWZhbHNlCitzaG91bGRUcmFuc2Zvcm1zQWZmZWN0T3ZlcmZsb3cgaW5p dGlhbD10cnVlCitzaG91bGREaXNwYXRjaEphdmFTY3JpcHRXaW5kb3dPbkVycm9yRXZlbnRzIGlu aXRpYWw9ZmFsc2UKK2Fsd2F5c1VzZUFjY2VsZXJhdGVkT3ZlcmZsb3dTY3JvbGwgaW5pdGlhbD1m YWxzZQorCisjIEZJWE1FOiBUaGlzIGlzIHVubmVlZGVkIGFuZCBzaG91bGQgYmUgcmVtb3ZlZC4K K2Fsd2F5c1VzZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udCBpbml0aWFsPWZhbHNlCg==