83319 2012-04-05 15:00:34 -0700 [chromium] merge redundant conditions in WebCore.gyp 2012-04-06 15:57:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony abarth jamesr webkit.review.bot oldest_to_newest 596938 0 tony 2012-04-05 15:00:34 -0700 [chromium] merge redundant conditions in WebCore.gyp 596942 1 135913 tony 2012-04-05 15:02:38 -0700 Created attachment 135913 Patch 596945 2 135913 tony 2012-04-05 15:03:49 -0700 Comment on attachment 135913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135913&action=review > Source/WebCore/WebCore.gyp/WebCore.gyp:-1626 > - ['include', '/chrome/junk\\.txt$'], I'm not sure what this was for. 597773 3 135913 webkit.review.bot 2012-04-06 15:57:44 -0700 Comment on attachment 135913 Patch Clearing flags on attachment: 135913 Committed r113515: <http://trac.webkit.org/changeset/113515> 597774 4 webkit.review.bot 2012-04-06 15:57:48 -0700 All reviewed patches have been landed. Closing bug. 135913 2012-04-05 15:02:38 -0700 2012-04-06 15:57:43 -0700 Patch bug-83319-20120405150300.patch text/plain 6075 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJlZjRhNzZjYTM3ZDk5 YjI3ZDk4NTNjMDZmZjBhYjUwMTg2YTMxMC4uZjMwMGZiMzM3OWZkMGM3ZjlhNGU2NmVhMWI0NzNk ZDI2YjlkMDFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTA1ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBtZXJnZSBy ZWR1bmRhbnQgY29uZGl0aW9ucyBpbiBXZWJDb3JlLmd5cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODMzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSB3ZXJlIGR1cGxpY2F0ZSBjb25kaXRpb25z IGluIHNvbWUgb2YgdGhlIHRhcmdldHMgKGUuZy4sIDIKKyAgICAgICAgT1M9PSJ3aW4iIHNlY3Rp b25zKSBzbyBJIG1lcmdlZCB0aGVtIGFuZCBpZiBwb3NzaWJsZSwgdXNlZCBhbiBlbHNlCisgICAg ICAgIGJsb2NrIG9mIGFuIGV4aXN0aW5nIGNvbmRpdGlvbi4KKworICAgICAgICBObyBuZXcgdGVz dHMsIGp1c3QgcmVmYWN0b3JpbmcgdGhlIGJ1aWxkIGZpbGUuCisKKyAgICAgICAgKiBXZWJDb3Jl Lmd5cC9XZWJDb3JlLmd5cDoKKwogMjAxMi0wNC0wNSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBs ZS5jb20+CiAKICAgICAgICAgW21hY10gcmVxdWVzdEFuaW1hdGlvbkZyYW1lIHNvbWV0aW1lcyBz dHVjayB3aGVuIHBhZ2UgbG9hZHMgaW4gYSBiYWNrZ3JvdW5kIHRhYgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCAwNjU3OTBhMzljOWFhNTNiN2Y1YjQ1MzVkNWFiY2Rj ODk4NzgyOTY0Li45ODU2MmJhMTVhOWFhMmQxOTE4OWU1ZTg3ZjhmZDg4Zjc0NDcwZTE4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMTUzMSwxMSArMTUzMSw2IEBA CiAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9oYXJmYnV6ei9o YXJmYnV6ei5neXA6aGFyZmJ1enonLAogICAgICAgICAgIF0sCiAgICAgICAgIH1dLAotICAgICAg ICBbJ09TIT0id2luIicsIHsKLSAgICAgICAgICAnc291cmNlcy8nOiBbCi0gICAgICAgICAgICBb J2luY2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVTYW5pdGl6ZXJc XC5jcHAkJ10sCi0gICAgICAgICAgXSwKLSAgICAgICAgfV0sCiAgICAgICAgIFsnT1M9PSJtYWMi JywgewogICAgICAgICAgICMgTmVjZXNzYXJ5IGZvciBNYWMgLm1tIHN0dWZmLgogICAgICAgICAg ICdpbmNsdWRlX2RpcnMnOiBbCkBAIC0xNjIzLDE3ICsxNjE4LDYgQEAKICAgICAgICAgICAgIFsn ZXhjbHVkZScsICdwbGF0Zm9ybS9TY3JvbGxBbmltYXRvck5vbmVcXC5jcHAkJ10sCiAgICAgICAg ICAgICBbJ2V4Y2x1ZGUnLCAncGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3JOb25lXFwuaCQnXSwKIAot ICAgICAgICAgICAgWydpbmNsdWRlJywgJy9jaHJvbWUvanVua1xcLnR4dCQnXSwKLSAgICAgICAg ICBdLAotICAgICAgICB9LHsgIyBPUyE9Im1hYyIKLSAgICAgICAgICAnc291cmNlcy8nOiBbCi0g ICAgICAgICAgICAjIEZJWE1FOiBXZSB3aWxsIGV2ZW50dWFsbHkgY29tcGlsZSB0aGlzIHRvbywg YnV0IGZvciBub3cgaXQncwotICAgICAgICAgICAgIyBvbmx5IHVzZWQgb24gbWFjLgotICAgICAg ICAgICAgWydleGNsdWRlJywgJ3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGFcXC5j cHAkJ10sCi0gICAgICAgICAgXSwKLSAgICAgICAgfV0sCi0gICAgICAgIFsnT1M9PSJtYWMiJywg ewotICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgIFsnaW5jbHVkZScsICdwbGF0 Zm9ybS9ncmFwaGljcy9jZy9GbG9hdFBvaW50Q0dcXC5jcHAkJ10sCiAgICAgICAgICAgICBbJ2lu Y2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3MvY2cvRmxvYXRSZWN0Q0dcXC5jcHAkJ10sCiAgICAg ICAgICAgICBbJ2luY2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3MvY2cvRmxvYXRTaXplQ0dcXC5j cHAkJ10sCkBAIC0xNjQ3LDI1ICsxNjMxLDIyIEBACiAgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAn cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9TaW1wbGVGb250RGF0YVNraWFcXC5jcHAkJ10sCiAgICAg ICAgICAgICBbJ2V4Y2x1ZGUnLCAncGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlQ2hyb21pdW1N YWNcXC5jcHAkJ10sCiAgICAgICAgICAgXSwKLSAgICAgICAgfV0sCi0gICAgICAgIFsndXNlX3gx MSA9PSAwIGFuZCBPUyAhPSAibWFjIicsIHsKLSAgICAgICAgICAnc291cmNlcy8nOiBbCi0gICAg ICAgICAgICBbJ2V4Y2x1ZGUnLCAnVkRNWFteL10rXFwuKGNwcHxoKSQnXSwKLSAgICAgICAgICBd LAotICAgICAgICB9XSwKLSAgICAgICAgWydPUyE9Im1hYyInLCB7CisgICAgICAgIH0seyAjIE9T IT0ibWFjIgogICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgIFsnZXhjbHVkZScs ICdNYWNcXC4oY3BwfG1tPykkJ10sCiAKICAgICAgICAgICAgICMgTGludXggdXNlcyBGb250TGlu dXg7IFdpbmRvd3MgdXNlcyBGb250V2luLiBBZGRpdGlvbmFsbHksIEZvbnRTa2lhCiAgICAgICAg ICAgICAjIGlzIGV4Y2x1ZGVkIGJ5IGEgcnVsZSBhYm92ZSBpZiBXZWJLaXQgdXNlcyBDRyBpbnN0 ZWFkIG9mIFNraWEuCiAgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAncGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Gb250U2tpYVxcLmNwcCQnXSwKKworICAgICAgICAgICAgIyBGSVhNRTogV2Ugd2lsbCBl dmVudHVhbGx5IGNvbXBpbGUgdGhpcyB0b28sIGJ1dCBmb3Igbm93IGl0J3MKKyAgICAgICAgICAg ICMgb25seSB1c2VkIG9uIG1hYy4KKyAgICAgICAgICAgIFsnZXhjbHVkZScsICdwbGF0Zm9ybS9n cmFwaGljcy9Gb250UGxhdGZvcm1EYXRhXFwuY3BwJCddLAogICAgICAgICAgIF0sCiAgICAgICAg IH1dLAotICAgICAgICBbJ09TIT0id2luIicsIHsKKyAgICAgICAgWyd1c2VfeDExID09IDAgYW5k IE9TICE9ICJtYWMiJywgewogICAgICAgICAgICdzb3VyY2VzLyc6IFsKLSAgICAgICAgICAgIFsn ZXhjbHVkZScsICdXaW5cXC5jcHAkJ10sCi0gICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAnLyhXaW5k b3dzfFVuaXNjcmliZSlbXi9dKlxcLmNwcCQnXQorICAgICAgICAgICAgWydleGNsdWRlJywgJ1ZE TVhbXi9dK1xcLihjcHB8aCkkJ10sCiAgICAgICAgICAgXSwKICAgICAgICAgfV0sCiAgICAgICAg IFsnT1M9PSJ3aW4iJywgewpAQCAtMTY4MSw2ICsxNjYyLDEyIEBACiAgICAgICAgICAgICAjIFN5 c3RlbUluZm8uY3BwIGlzIHVzZWZ1bCBhbmQgd2UgZG9uJ3Qgd2FudCB0byBjb3B5IGl0LgogICAg ICAgICAgICAgWydpbmNsdWRlJywgJ3BsYXRmb3JtL3dpbi9TeXN0ZW1JbmZvXFwuY3BwJCddLAog ICAgICAgICAgIF0sCisgICAgICAgIH0seyAjIE9TIT0id2luIgorICAgICAgICAgICdzb3VyY2Vz Lyc6IFsKKyAgICAgICAgICAgIFsnZXhjbHVkZScsICdXaW5cXC5jcHAkJ10sCisgICAgICAgICAg ICBbJ2V4Y2x1ZGUnLCAnLyhXaW5kb3dzfFVuaXNjcmliZSlbXi9dKlxcLmNwcCQnXSwKKyAgICAg ICAgICAgIFsnaW5jbHVkZScsICdwbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9PcGVuVHlwZVNh bml0aXplclxcLmNwcCQnXSwKKyAgICAgICAgICBdLAogICAgICAgICB9XSwKICAgICAgICAgWydP Uz09ImFuZHJvaWQiJywgewogICAgICAgICAgICdzb3VyY2VzLyc6IFsKQEAgLTE3NTgsNiArMTc0 NSwxMCBAQAogICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgIFsnZXhjbHVkZScs ICdQb3NpeFxcLmNwcCQnXSwKICAgICAgICAgICBdLAorICAgICAgICB9LHsgIyBPUyE9IndpbiIK KyAgICAgICAgICAnc291cmNlcy8nOiBbCisgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAnV2luXFwu Y3BwJCddLAorICAgICAgICAgIF0sCiAgICAgICAgIH1dLAogICAgICAgICBbJ09TPT0ibWFjIics IHsKICAgICAgICAgICAnc291cmNlcy8nOiBbCkBAIC0xNzY1LDYgKzE3NTYsOCBAQAogICAgICAg ICAgICAgIyBkb2VzIG5vdCByZWZlcmVuY2UgdGhlIFNraWEgY29kZSB0aGF0IGlzIHVzZWQgYnkg V2luZG93cywgTGludXggYW5kIEFuZHJvaWQuCiAgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAncmVu ZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lhXFwuY3BwJCddLAogICAgICAgICAgIF0sCisg ICAgICAgIH0seyAjIE9TIT0ibWFjIgorICAgICAgICAgICdzb3VyY2VzLyc6IFtbJ2V4Y2x1ZGUn LCAnTWFjXFwuKGNwcHxtbT8pJCddXQogICAgICAgICB9XSwKICAgICAgICAgWydvc19wb3NpeCA9 PSAxIGFuZCBPUyAhPSAibWFjIiBhbmQgT1MgIT0gImFuZHJvaWQiIGFuZCBnY2NfdmVyc2lvbiA9 PSA0MicsIHsKICAgICAgICAgICAjIER1ZSB0byBhIGJ1ZyBpbiBnY2MgNC4yLjEgKHRoZSBjdXJy ZW50IHZlcnNpb24gb24gaGFyZHkpLCB3ZSBnZXQKQEAgLTE3ODEsMTkgKzE3NzQsMTEgQEAKICAg ICAgICAgICAgIFsnZXhjbHVkZScsICdHdGtcXC5jcHAkJ10sCiAgICAgICAgICAgXSwKICAgICAg ICAgfV0sCi0gICAgICAgIFsnT1MhPSJtYWMiJywgewotICAgICAgICAgICdzb3VyY2VzLyc6IFtb J2V4Y2x1ZGUnLCAnTWFjXFwuKGNwcHxtbT8pJCddXQotICAgICAgICB9XSwKLSAgICAgICAgWydP UyE9IndpbiInLCB7Ci0gICAgICAgICAgJ3NvdXJjZXMvJzogWwotICAgICAgICAgICAgWydleGNs dWRlJywgJ1dpblxcLmNwcCQnXSwKLSAgICAgICAgICBdLAotICAgICAgICB9XSwKICAgICAgICAg WydPUz09ImFuZHJvaWQiJywgewogICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAg IFsnaW5jbHVkZScsICdyZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUxpbnV4XFwuY3BwJCdd LAogICAgICAgICAgIF0sCi0gICAgICAgIH0sIHsKKyAgICAgICAgfSx7ICMgT1MhPSJhbmRyb2lk IgogICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgIFsnZXhjbHVkZScsICdBbmRy b2lkXFwuY3BwJCddLAogICAgICAgICAgIF0sCkBAIC0xOTEwLDYgKzE4OTUsMTEgQEAKICAgICAg ICAgICAgIFsnaW5jbHVkZScsICcvU2tpYUZvbnRXaW5cXC5jcHAkJ10sCiAgICAgICAgICAgICBb J2luY2x1ZGUnLCAnL1RyYW5zcGFyZW5jeVdpblxcLmNwcCQnXSwKICAgICAgICAgICBdLAorICAg ICAgICB9LHsgIyBPUyE9IndpbiIKKyAgICAgICAgICAnc291cmNlcy8nOiBbCisgICAgICAgICAg ICBbJ2V4Y2x1ZGUnLCAnV2luXFwuY3BwJCddLAorICAgICAgICAgICAgWydleGNsdWRlJywgJy8o V2luZG93c3xVbmlzY3JpYmUpW14vXSpcXC5jcHAkJ10KKyAgICAgICAgICBdLAogICAgICAgICB9 XSwKICAgICAgICAgWydvc19wb3NpeCA9PSAxIGFuZCBPUyAhPSAibWFjIiBhbmQgT1MgIT0gImFu ZHJvaWQiIGFuZCBnY2NfdmVyc2lvbiA9PSA0MicsIHsKICAgICAgICAgICAjIER1ZSB0byBhIGJ1 ZyBpbiBnY2MgNC4yLjEgKHRoZSBjdXJyZW50IHZlcnNpb24gb24gaGFyZHkpLCB3ZSBnZXQKQEAg LTE5MjksMTIgKzE5MTksNiBAQAogICAgICAgICBbJ09TIT0ibWFjIicsIHsKICAgICAgICAgICAn c291cmNlcy8nOiBbWydleGNsdWRlJywgJ01hY1xcLihjcHB8bW0/KSQnXV0KICAgICAgICAgfV0s Ci0gICAgICAgIFsnT1MhPSJ3aW4iJywgewotICAgICAgICAgICdzb3VyY2VzLyc6IFsKLSAgICAg ICAgICAgIFsnZXhjbHVkZScsICdXaW5cXC5jcHAkJ10sCi0gICAgICAgICAgICBbJ2V4Y2x1ZGUn LCAnLyhXaW5kb3dzfFVuaXNjcmliZSlbXi9dKlxcLmNwcCQnXQotICAgICAgICAgIF0sCi0gICAg ICAgIH1dLAogICAgICAgXSwKICAgICB9LAogICAgIHsK