76212 2012-01-12 14:05:29 -0800 Refactor feature detection logic into helper functions 2012-01-12 15:57:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76198 76214 1 eric eric abarth webkit.review.bot oldest_to_newest 535140 0 eric 2012-01-12 14:05:29 -0800 Refactor feature detection logic into helper functions 535142 1 122307 eric 2012-01-12 14:07:40 -0800 Created attachment 122307 Patch 535248 2 122307 webkit.review.bot 2012-01-12 15:57:46 -0800 Comment on attachment 122307 Patch Clearing flags on attachment: 122307 Committed r104872: <http://trac.webkit.org/changeset/104872> 535249 3 webkit.review.bot 2012-01-12 15:57:50 -0800 All reviewed patches have been landed. Closing bug. 122307 2012-01-12 14:07:40 -0800 2012-01-12 15:57:46 -0800 Patch bug-76212-20120112140738.patch text/plain 6515 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzcxOWE5ZDNkMjFiOGU0 NTRmNjJlZTZiNTBlY2RjOWY2NjAwZDhlZC4uYTNhZDY1Yjc0NjIyYTI3MTkxZjdlNmM4YjFjNmEw ZjEyZjdlYWYxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAxLTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZWZhY3RvciBET01JbXBsZW1l bnRhdGlvbi5oYXNGZWF0dXJlIGxvZ2ljIGludG8gaGVscGVyIGZ1bmN0aW9ucy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MjEyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBzaG91bGQg bm90IGhhdmUgYW55IGJlaGF2aW9yIGNoYW5nZS4gIFRoZSBnb2FsIHdhcworICAgICAgICB0byBt b3ZlIG91ciBmZWF0dXJlIGRldGVjdGlvbiB0b3dhcmRzIGEgbW9yZSBtb2R1bGFyIGFyY2hpdGVj dHVyZQorICAgICAgICAoYXMgdGhhdCBzZWVtcyB0byBiZSB0aGUgY3VycmVudCB0cmVuZCBpbiB3 ZWJraXQpLiAgSW4gYSBmdXR1cmUKKyAgICAgICAgcGF0Y2ggd2UgY291bGQgZWFzaWx5IG1vdmUg dGhlIFNWRyBmZWF0dXJlIGRldGVjdGlvbiBpbnRvIHRoZQorICAgICAgICBTVkcgZGlyZWN0b3J5 LCBmb3IgZXhhbXBsZS4gIEkndmUgYWxzbyBhZGRlZCBhIGxpc3Qgb2YgYWxsIHRoZQorICAgICAg ICBFdmVudDMgZmVhdHVyZXMgKGN1cnJlbnRseSBjb21tZW50ZWQgb3V0KSB3aGljaCBtYWtlcyBp dCBvYnZpb3VzCisgICAgICAgIGhvdyBtYW55IHdlJ3JlIG1pc3NpbmcuCisKKyAgICAgICAgKiBk b20vRE9NSW1wbGVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNTVkcxMEZlYXR1 cmUpOgorICAgICAgICAoV2ViQ29yZTo6aXNTVkcxMUZlYXR1cmUpOgorICAgICAgICAoV2ViQ29y ZTo6aXNFdmVudHMyRmVhdHVyZSk6CisgICAgICAgIChXZWJDb3JlOjppc0V2ZW50czNGZWF0dXJl KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTUltcGxlbWVudGF0aW9uOjpoYXNGZWF0dXJlKToKKwog MjAxMi0wMS0xMSAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgogCiAgICAg ICAgIFF1ZXJ5U2VsZWN0b3Igc2hvdWxkIG5vdCBoYXZlIHNpZGUgZWZmZWN0LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAKaW5kZXggNjQwNjVkMTJmNDg5ZTYxMGQyMTc4 YjFkNzRhMjFmMTI3NWU5OTFkZS4uMzMxMDQwOTdlNDQ4YjhhYTU3ZDE1MDg4YjY5YTZjOTQ1N2Ux ZWVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCkBAIC02MCw4 ICs2MCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIEVOQUJMRShTVkcpCi0KIHR5 cGVkZWYgSGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gRmVhdHVyZVNldDsKIAogc3Rh dGljIHZvaWQgYWRkU3RyaW5nKEZlYXR1cmVTZXQmIHNldCwgY29uc3QgY2hhciogc3RyaW5nKQpA QCAtNjksOCArNjcsMTMgQEAgc3RhdGljIHZvaWQgYWRkU3RyaW5nKEZlYXR1cmVTZXQmIHNldCwg Y29uc3QgY2hhciogc3RyaW5nKQogICAgIHNldC5hZGQoc3RyaW5nKTsKIH0KIAotc3RhdGljIGJv b2wgaXNTVkcxMEZlYXR1cmUoY29uc3QgU3RyaW5nICZmZWF0dXJlKQorI2lmIEVOQUJMRShTVkcp CisKK3N0YXRpYyBib29sIGlzU1ZHMTBGZWF0dXJlKGNvbnN0IFN0cmluZyAmZmVhdHVyZSwgY29u c3QgU3RyaW5nICZ2ZXJzaW9uKQogeworICAgIGlmICghdmVyc2lvbi5pc0VtcHR5KCkgJiYgdmVy c2lvbiAhPSAiMS4wIikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgc3RhdGljIGJvb2wg aW5pdGlhbGl6ZWQgPSBmYWxzZTsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEZlYXR1cmVTZXQs IHN2Z0ZlYXR1cmVzLCAoKSk7CiAgICAgaWYgKCFpbml0aWFsaXplZCkgewpAQCAtOTEsMTEgKzk0 LDE1IEBAIHN0YXRpYyBib29sIGlzU1ZHMTBGZWF0dXJlKGNvbnN0IFN0cmluZyAmZmVhdHVyZSkK IC8vICAgICAgYWRkU3RyaW5nKHN2Z0ZlYXR1cmVzLCAiZG9tLnN2Zy5hbGwiKTsKICAgICAgICAg aW5pdGlhbGl6ZWQgPSB0cnVlOwogICAgIH0KLSAgICByZXR1cm4gc3ZnRmVhdHVyZXMuY29udGFp bnMoZmVhdHVyZSk7CisgICAgcmV0dXJuIGZlYXR1cmUuc3RhcnRzV2l0aCgib3JnLnczYy4iLCBm YWxzZSkKKyAgICAgICAgJiYgc3ZnRmVhdHVyZXMuY29udGFpbnMoZmVhdHVyZS5yaWdodChmZWF0 dXJlLmxlbmd0aCgpIC0gOCkpOwogfQogCi1zdGF0aWMgYm9vbCBpc1NWRzExRmVhdHVyZShjb25z dCBTdHJpbmcgJmZlYXR1cmUpCitzdGF0aWMgYm9vbCBpc1NWRzExRmVhdHVyZShjb25zdCBTdHJp bmcgJmZlYXR1cmUsIGNvbnN0IFN0cmluZyAmdmVyc2lvbikKIHsKKyAgICBpZiAoIXZlcnNpb24u aXNFbXB0eSgpICYmIHZlcnNpb24gIT0gIjEuMSIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwog ICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgREVGSU5FX1NUQVRJQ19M T0NBTChGZWF0dXJlU2V0LCBzdmdGZWF0dXJlcywgKCkpOwogICAgIGlmICghaW5pdGlhbGl6ZWQp IHsKQEAgLTE1NiwxMCArMTYzLDU1IEBAIHN0YXRpYyBib29sIGlzU1ZHMTFGZWF0dXJlKGNvbnN0 IFN0cmluZyAmZmVhdHVyZSkKICAgICAgICAgYWRkU3RyaW5nKHN2Z0ZlYXR1cmVzLCAiRXh0ZW5z aWJpbGl0eSIpOwogICAgICAgICBpbml0aWFsaXplZCA9IHRydWU7CiAgICAgfQotICAgIHJldHVy biBzdmdGZWF0dXJlcy5jb250YWlucyhmZWF0dXJlKTsKKyAgICByZXR1cm4gZmVhdHVyZS5zdGFy dHNXaXRoKCJodHRwOi8vd3d3LnczLm9yZy90ci9zdmcxMS9mZWF0dXJlIyIsIGZhbHNlKQorICAg ICAgICAmJiBzdmdGZWF0dXJlcy5jb250YWlucyhmZWF0dXJlLnJpZ2h0KGZlYXR1cmUubGVuZ3Ro KCkgLSAzNSkpOwogfQogI2VuZGlmCiAKK3N0YXRpYyBib29sIGlzRXZlbnRzMkZlYXR1cmUoY29u c3QgU3RyaW5nICZmZWF0dXJlLCBjb25zdCBTdHJpbmcgJnZlcnNpb24pCit7CisgICAgaWYgKCF2 ZXJzaW9uLmlzRW1wdHkoKSAmJiB2ZXJzaW9uICE9ICIyLjAiKQorICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOworICAgIERFRklORV9T VEFUSUNfTE9DQUwoRmVhdHVyZVNldCwgZXZlbnRzMkZlYXR1cmVzLCAoKSk7CisgICAgaWYgKCFp bml0aWFsaXplZCkgeworICAgICAgICBhZGRTdHJpbmcoZXZlbnRzMkZlYXR1cmVzLCAiRXZlbnRz Iik7CisgICAgICAgIGFkZFN0cmluZyhldmVudHMyRmVhdHVyZXMsICJIVE1MRXZlbnRzIik7Cisg ICAgICAgIGFkZFN0cmluZyhldmVudHMyRmVhdHVyZXMsICJNb3VzZUV2ZW50cyIpOworICAgICAg ICBhZGRTdHJpbmcoZXZlbnRzMkZlYXR1cmVzLCAiTXV0YXRpb25FdmVudHMiKTsKKyAgICAgICAg YWRkU3RyaW5nKGV2ZW50czJGZWF0dXJlcywgIlVJRXZlbnRzIik7CisgICAgICAgIGluaXRpYWxp emVkID0gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGV2ZW50czJGZWF0dXJlcy5jb250YWlucyhm ZWF0dXJlKTsKK30KKworc3RhdGljIGJvb2wgaXNFdmVudHMzRmVhdHVyZShjb25zdCBTdHJpbmcg JmZlYXR1cmUsIGNvbnN0IFN0cmluZyAmdmVyc2lvbikKK3sKKyAgICBpZiAoIXZlcnNpb24uaXNF bXB0eSgpICYmIHZlcnNpb24gIT0gIjMuMCIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IHN0YXRpYyBib29sIGluaXRpYWxpemVkID0gZmFsc2U7CisgICAgREVGSU5FX1NUQVRJQ19MT0NB TChGZWF0dXJlU2V0LCBldmVudHMzRmVhdHVyZXMsICgpKTsKKyAgICBpZiAoIWluaXRpYWxpemVk KSB7CisgICAgICAgIC8vIEZJWE1FOiBXZSBwcm9iYWJseSBzdXBwb3J0IG1hbnkgb2YgdGhlc2Ug ZmVhdHVyZXMuCisvLyAgICAgICAgYWRkU3RyaW5nKGV2ZW50czNGZWF0dXJlcywgIkNvbXBvc2l0 aW9uRXZlbnRzIik7CisvLyAgICAgICAgYWRkU3RyaW5nKGV2ZW50czNGZWF0dXJlcywgIkV2ZW50 cyIpOworLy8gICAgICAgIGFkZFN0cmluZyhldmVudHMzRmVhdHVyZXMsICJGb2N1c0V2ZW50cyIp OworLy8gICAgICAgIGFkZFN0cmluZyhldmVudHMzRmVhdHVyZXMsICJIVE1MRXZlbnRzIik7Cisv LyAgICAgICAgYWRkU3RyaW5nKGV2ZW50czNGZWF0dXJlcywgIktleWJvYXJkRXZlbnRzIik7Cisv LyAgICAgICAgYWRkU3RyaW5nKGV2ZW50czNGZWF0dXJlcywgIk1vdXNlRXZlbnRzIik7CisvLyAg ICAgICAgYWRkU3RyaW5nKGV2ZW50czNGZWF0dXJlcywgIk11dGF0aW9uRXZlbnRzIik7CisvLyAg ICAgICAgYWRkU3RyaW5nKGV2ZW50czNGZWF0dXJlcywgIk11dGF0aW9uTmFtZUV2ZW50cyIpOwor ICAgICAgICBhZGRTdHJpbmcoZXZlbnRzM0ZlYXR1cmVzLCAiVGV4dEV2ZW50cyIpOworLy8gICAg ICAgIGFkZFN0cmluZyhldmVudHMzRmVhdHVyZXMsICJVSUV2ZW50cyIpOworLy8gICAgICAgIGFk ZFN0cmluZyhldmVudHMzRmVhdHVyZXMsICJXaGVlbEV2ZW50cyIpOworICAgICAgICBpbml0aWFs aXplZCA9IHRydWU7CisgICAgfQorICAgIC8vIEZJWE1FOiBXZSBkbyBub3QgeWV0IHN1cHBvcnQg RXZlbnRzIDMgImV4dGVuZGVkIGZlYXR1cmUgc3RyaW5ncyIuCisgICAgcmV0dXJuIGV2ZW50czNG ZWF0dXJlcy5jb250YWlucyhmZWF0dXJlKTsKK30KKwogRE9NSW1wbGVtZW50YXRpb246OkRPTUlt cGxlbWVudGF0aW9uKERvY3VtZW50KiBkb2N1bWVudCkKICAgICA6IG1fZG9jdW1lbnQoZG9jdW1l bnQpCiB7CkBAIC0xNzIsMzEgKzIyNCwyNSBAQCBib29sIERPTUltcGxlbWVudGF0aW9uOjpoYXNG ZWF0dXJlKGNvbnN0IFN0cmluZyYgZmVhdHVyZSwgY29uc3QgU3RyaW5nJiB2ZXJzaW9uKQogICAg ICAgICByZXR1cm4gdmVyc2lvbi5pc0VtcHR5KCkgfHwgdmVyc2lvbiA9PSAiMS4wIiB8fCB2ZXJz aW9uID09ICIyLjAiOwogICAgIGlmIChsb3dlciA9PSAiY3NzIgogICAgICAgICAgICAgfHwgbG93 ZXIgPT0gImNzczIiCi0gICAgICAgICAgICB8fCBsb3dlciA9PSAiZXZlbnRzIgotICAgICAgICAg ICAgfHwgbG93ZXIgPT0gImh0bWxldmVudHMiCi0gICAgICAgICAgICB8fCBsb3dlciA9PSAibW91 c2VldmVudHMiCi0gICAgICAgICAgICB8fCBsb3dlciA9PSAibXV0YXRpb25ldmVudHMiCiAgICAg ICAgICAgICB8fCBsb3dlciA9PSAicmFuZ2UiCiAgICAgICAgICAgICB8fCBsb3dlciA9PSAic3R5 bGVzaGVldHMiCiAgICAgICAgICAgICB8fCBsb3dlciA9PSAidHJhdmVyc2FsIgotICAgICAgICAg ICAgfHwgbG93ZXIgPT0gInVpZXZlbnRzIgogICAgICAgICAgICAgfHwgbG93ZXIgPT0gInZpZXdz IikKICAgICAgICAgcmV0dXJuIHZlcnNpb24uaXNFbXB0eSgpIHx8IHZlcnNpb24gPT0gIjIuMCI7 Ci0gICAgaWYgKGxvd2VyID09ICJ4cGF0aCIgfHwgbG93ZXIgPT0gInRleHRldmVudHMiKQorICAg IGlmIChpc0V2ZW50czJGZWF0dXJlKGZlYXR1cmUsIHZlcnNpb24pKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICBpZiAobG93ZXIgPT0gInhwYXRoIikKICAgICAgICAgcmV0dXJuIHZlcnNpb24u aXNFbXB0eSgpIHx8IHZlcnNpb24gPT0gIjMuMCI7CisgICAgaWYgKGlzRXZlbnRzM0ZlYXR1cmUo ZmVhdHVyZSwgdmVyc2lvbikpCisgICAgICAgIHJldHVybiB0cnVlOwogCiAjaWYgRU5BQkxFKFNW RykKLSAgICBpZiAoKHZlcnNpb24uaXNFbXB0eSgpIHx8IHZlcnNpb24gPT0gIjEuMSIpICYmIGZl YXR1cmUuc3RhcnRzV2l0aCgiaHR0cDovL3d3dy53My5vcmcvdHIvc3ZnMTEvZmVhdHVyZSMiLCBm YWxzZSkpIHsKLSAgICAgICAgaWYgKGlzU1ZHMTFGZWF0dXJlKGZlYXR1cmUucmlnaHQoZmVhdHVy ZS5sZW5ndGgoKSAtIDM1KSkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KLSAg ICBpZiAoKHZlcnNpb24uaXNFbXB0eSgpIHx8IHZlcnNpb24gPT0gIjEuMCIpICYmIGZlYXR1cmUu c3RhcnRzV2l0aCgib3JnLnczYy4iLCBmYWxzZSkpIHsKLSAgICAgICAgaWYgKGlzU1ZHMTBGZWF0 dXJlKGZlYXR1cmUucmlnaHQoZmVhdHVyZS5sZW5ndGgoKSAtIDgpKSkKLSAgICAgICAgICAgIHJl dHVybiB0cnVlOwotICAgIH0KKyAgICBpZiAoaXNTVkcxMUZlYXR1cmUoZmVhdHVyZSwgdmVyc2lv bikpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGlmIChpc1NWRzEwRmVhdHVyZShmZWF0dXJl LCB2ZXJzaW9uKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKLSAgICAKKwogICAgIHJl dHVybiBmYWxzZTsKIH0KIAo=