Feature branch has been rebased to ToT
Hi All! As Maciej stated earlier today I have been working on rebasing the feature branch to ToT. I am pleased to say this has now been completed, and the feature branched is now based on r25816 Given the age of the feature branch prior to this the merge was non- trivial and a number of more substantial and/or convoluted patches have been skipped and will need to be remerged. Where possible the appropriate bugs have been reopened. The most complex are the media element patches: r23870, r23871, r23872, r23873 In addition a few more recent patches did not apply cleanly enough to make it worth attempting to merge and will need to be redone (I've reopened the bugs): r25733 -- http://bugs.webkit.org/show_bug.cgi?id=15281 r25805 -- http://bugs.webkit.org/show_bug.cgi?id=15320 r25809 -- http://bugs.webkit.org/show_bug.cgi?id=15280 In addition to these missed revisions there a reasonable amount of fallout from the rebase, and we should focus on correcting any layout test failures that have been introduced by the merge. These can either be the result of incorrect merging in layout test results, or bug fixes that were applied to files that have been deleted and/or moved. Finally, to deal with the difference in float and double usage between trunk and feature branch it was necessary to disable the warnings for implicit double to float conversion. To match trunk we will need to re-enable this warning as soon as possible. Cheers, Oliver
participants (1)
-
Oliver Hunt