128392 2014-02-07 13:18:39 -0800 Simplify WebPreferences creation inside WebPageGroup 2014-02-07 13:37:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 978002 0 andersca 2014-02-07 13:18:39 -0800 Simplify WebPreferences creation inside WebPageGroup 978004 1 223490 andersca 2014-02-07 13:19:54 -0800 Created attachment 223490 Patch 978014 2 andersca 2014-02-07 13:37:32 -0800 Committed r163644: <http://trac.webkit.org/changeset/163644> 223490 2014-02-07 13:19:54 -0800 2014-02-07 13:34:45 -0800 Patch bug-128392-20140207131953.patch text/plain 4945 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjY1MGRmZjZlZGJlMzcx Y2UxNzE5NmVlN2M3ODg1ODU3NDBhZGY2MC4uNzBjNTQ5MzA1ZTgzZmJjMDlkNjVhMTc3MzE4ZWE3 OTY4ZmM4ZGVlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTAyLTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgV2Vi UHJlZmVyZW5jZXMgY3JlYXRpb24gaW5zaWRlIFdlYlBhZ2VHcm91cAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MzkyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWx3YXlzIGNyZWF0ZSBhIFdlYlByZWZl cmVuY2VzIG9iamVjdCB3aGVuIGNyZWF0aW5nIHRoZSB3ZWIgcGFnZSBncm91cC4KKyAgICAgICAg VGhpcyBpcyBhbm90aGVyIHN0ZXAgdG93YXJkcyBsZXR0aW5nIFdlYlBhZ2VQcm94eSBtYW5hZ2Ug d2ViIHByZWZlcmVuY2VzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OnBhZ2VHcm91cERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlR3JvdXA6OldlYlBhZ2VHcm91cCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6 fldlYlBhZ2VHcm91cCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6c2V0UHJlZmVy ZW5jZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXA6OnByZWZlcmVuY2VzKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmg6CisKKzIwMTQtMDItMDcgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBDb3B5aW5nIGEgV2ViUHJl ZmVyZW5jZXMgb2JqZWN0IHNob3VsZCBiZSBkb25lIHRocm91Z2ggYSBtZW1iZXIgZnVuY3Rpb24K ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODM4NQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwCmluZGV4IDZhZDFjYmIz ZmRhMTQ2MjllYjNlYzBiZGYxMzkzYmE1NTgxNTg0YzYuLjMzYTg1MTM3NmEwODg3NTM0Yjg5ZWUx YWE1NGY5MThjZTM5ODU1ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3Jv dXAuY3BwCkBAIC02NSwyNSArNjUsMzQgQEAgV2ViUGFnZUdyb3VwKiBXZWJQYWdlR3JvdXA6Omdl dCh1aW50NjRfdCBwYWdlR3JvdXBJRCkKICAgICByZXR1cm4gd2ViUGFnZUdyb3VwTWFwKCkuZ2V0 KHBhZ2VHcm91cElEKTsKIH0KIAotV2ViUGFnZUdyb3VwOjpXZWJQYWdlR3JvdXAoY29uc3QgU3Ry aW5nJiBpZGVudGlmaWVyLCBib29sIHZpc2libGVUb0luamVjdGVkQnVuZGxlLCBib29sIHZpc2li bGVUb0hpc3RvcnlDbGllbnQpCitzdGF0aWMgV2ViUGFnZUdyb3VwRGF0YSBwYWdlR3JvdXBEYXRh KGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgYm9vbCB2aXNpYmxlVG9JbmplY3RlZEJ1bmRsZSwg Ym9vbCB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50KQogewotICAgIG1fZGF0YS5wYWdlR3JvdXBJRCA9 IGdlbmVyYXRlUGFnZUdyb3VwSUQoKTsKKyAgICBXZWJQYWdlR3JvdXBEYXRhIGRhdGE7CisKKyAg ICBkYXRhLnBhZ2VHcm91cElEID0gZ2VuZXJhdGVQYWdlR3JvdXBJRCgpOwogCiAgICAgaWYgKCFp ZGVudGlmaWVyLmlzRW1wdHkoKSkKLSAgICAgICAgbV9kYXRhLmlkZW50aWZlciA9IGlkZW50aWZp ZXI7CisgICAgICAgIGRhdGEuaWRlbnRpZmVyID0gaWRlbnRpZmllcjsKICAgICBlbHNlCi0gICAg ICAgIG1fZGF0YS5pZGVudGlmZXIgPSBtX2RhdGEuaWRlbnRpZmVyID0gbWFrZVN0cmluZygiX191 bmlxdWVQYWdlR3JvdXBJRC0iLCBTdHJpbmc6Om51bWJlcihtX2RhdGEucGFnZUdyb3VwSUQpKTsK KyAgICAgICAgZGF0YS5pZGVudGlmZXIgPSBtYWtlU3RyaW5nKCJfX3VuaXF1ZVBhZ2VHcm91cElE LSIsIFN0cmluZzo6bnVtYmVyKGRhdGEucGFnZUdyb3VwSUQpKTsKKworICAgIGRhdGEudmlzaWJs ZVRvSW5qZWN0ZWRCdW5kbGUgPSB2aXNpYmxlVG9JbmplY3RlZEJ1bmRsZTsKKyAgICBkYXRhLnZp c2libGVUb0hpc3RvcnlDbGllbnQgPSB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50OwogCi0gICAgbV9k YXRhLnZpc2libGVUb0luamVjdGVkQnVuZGxlID0gdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGU7Ci0g ICAgbV9kYXRhLnZpc2libGVUb0hpc3RvcnlDbGllbnQgPSB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50 OwotICAgIAorICAgIHJldHVybiBkYXRhOworfQorCitXZWJQYWdlR3JvdXA6OldlYlBhZ2VHcm91 cChjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUs IGJvb2wgdmlzaWJsZVRvSGlzdG9yeUNsaWVudCkKKyAgICA6IG1fZGF0YShwYWdlR3JvdXBEYXRh KGlkZW50aWZpZXIsIHZpc2libGVUb0luamVjdGVkQnVuZGxlLCB2aXNpYmxlVG9IaXN0b3J5Q2xp ZW50KSkKKyAgICAsIG1fcHJlZmVyZW5jZXMoV2ViUHJlZmVyZW5jZXM6OmNyZWF0ZShtX2RhdGEu aWRlbnRpZmVyKSkKK3sKKyAgICBtX3ByZWZlcmVuY2VzLT5hZGRQYWdlR3JvdXAodGhpcyk7CiAg ICAgd2ViUGFnZUdyb3VwTWFwKCkuc2V0KG1fZGF0YS5wYWdlR3JvdXBJRCwgdGhpcyk7CiB9CiAK IFdlYlBhZ2VHcm91cDo6fldlYlBhZ2VHcm91cCgpCiB7Ci0gICAgaWYgKG1fcHJlZmVyZW5jZXMp Ci0gICAgICAgIG1fcHJlZmVyZW5jZXMtPnJlbW92ZVBhZ2VHcm91cCh0aGlzKTsKKyAgICBtX3By ZWZlcmVuY2VzLT5yZW1vdmVQYWdlR3JvdXAodGhpcyk7CiAgICAgd2ViUGFnZUdyb3VwTWFwKCku cmVtb3ZlKHBhZ2VHcm91cElEKCkpOwogfQogCkBAIC0xMDIsMzQgKzExMSwxOCBAQCB2b2lkIFdl YlBhZ2VHcm91cDo6c2V0UHJlZmVyZW5jZXMoV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQog ICAgIGlmIChwcmVmZXJlbmNlcyA9PSBtX3ByZWZlcmVuY2VzKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAoIW1fcHJlZmVyZW5jZXMpIHsKLSAgICAgICAgbV9wcmVmZXJlbmNlcyA9IHByZWZl cmVuY2VzOwotICAgICAgICBtX3ByZWZlcmVuY2VzLT5hZGRQYWdlR3JvdXAodGhpcyk7Ci0KLSAg ICAgICAgZm9yIChhdXRvJiB3ZWJQYWdlUHJveHkgOiBtX3BhZ2VzKQotICAgICAgICAgICAgd2Vi UGFnZVByb3h5LT5zZXRQcmVmZXJlbmNlcygqbV9wcmVmZXJlbmNlcyk7Ci0gICAgfSBlbHNlIHsK LSAgICAgICAgbV9wcmVmZXJlbmNlcy0+cmVtb3ZlUGFnZUdyb3VwKHRoaXMpOwotICAgICAgICBt X3ByZWZlcmVuY2VzID0gcHJlZmVyZW5jZXM7Ci0gICAgICAgIG1fcHJlZmVyZW5jZXMtPmFkZFBh Z2VHcm91cCh0aGlzKTsKKyAgICBtX3ByZWZlcmVuY2VzLT5yZW1vdmVQYWdlR3JvdXAodGhpcyk7 CisgICAgbV9wcmVmZXJlbmNlcyA9IHByZWZlcmVuY2VzOworICAgIG1fcHJlZmVyZW5jZXMtPmFk ZFBhZ2VHcm91cCh0aGlzKTsKIAotICAgICAgICBmb3IgKGF1dG8mIHdlYlBhZ2VQcm94eSA6IG1f cGFnZXMpCi0gICAgICAgICAgICB3ZWJQYWdlUHJveHktPnNldFByZWZlcmVuY2VzKCptX3ByZWZl cmVuY2VzKTsKKyAgICBmb3IgKGF1dG8mIHdlYlBhZ2VQcm94eSA6IG1fcGFnZXMpCisgICAgICAg IHdlYlBhZ2VQcm94eS0+c2V0UHJlZmVyZW5jZXMoKm1fcHJlZmVyZW5jZXMpOwogCi0gICAgICAg IHByZWZlcmVuY2VzRGlkQ2hhbmdlKCk7Ci0gICAgfQorICAgIHByZWZlcmVuY2VzRGlkQ2hhbmdl KCk7CiB9CiAKIFdlYlByZWZlcmVuY2VzJiBXZWJQYWdlR3JvdXA6OnByZWZlcmVuY2VzKCkgY29u c3QKIHsKLSAgICBpZiAoIW1fcHJlZmVyZW5jZXMpIHsKLSAgICAgICAgaWYgKCFtX2RhdGEuaWRl bnRpZmVyLmlzTnVsbCgpKQotICAgICAgICAgICAgbV9wcmVmZXJlbmNlcyA9IFdlYlByZWZlcmVu Y2VzOjpjcmVhdGUobV9kYXRhLmlkZW50aWZlcik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAg IG1fcHJlZmVyZW5jZXMgPSBXZWJQcmVmZXJlbmNlczo6Y3JlYXRlKCk7Ci0gICAgICAgIG1fcHJl ZmVyZW5jZXMtPmFkZFBhZ2VHcm91cChjb25zdF9jYXN0PFdlYlBhZ2VHcm91cCo+KHRoaXMpKTsK LSAgICB9Ci0KICAgICByZXR1cm4gKm1fcHJlZmVyZW5jZXM7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlR3JvdXAuaAppbmRleCBmZTc0MTE4YmNkMzI3YzZjZWViODliYTRlMTMx MWViNjRiZDQ0YjYxLi4wYjUyNDdiNzhmZWZhNTVmM2RkZmZlNjhmMDJkZTAyNWIwMDM3OGZmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCkBAIC02OSw3ICs2OSw3IEBA IHByaXZhdGU6CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gdm9pZCBzZW5kVG9BbGxQcm9jZXNz ZXNJbkdyb3VwKGNvbnN0IFQmLCB1aW50NjRfdCBkZXN0aW5hdGlvbklEKTsKIAogICAgIFdlYlBh Z2VHcm91cERhdGEgbV9kYXRhOwotICAgIG11dGFibGUgUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBt X3ByZWZlcmVuY2VzOworICAgIFJlZlB0cjxXZWJQcmVmZXJlbmNlcz4gbV9wcmVmZXJlbmNlczsK ICAgICBIYXNoU2V0PFdlYlBhZ2VQcm94eSo+IG1fcGFnZXM7CiB9OwogCg==