summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
Commit message (Collapse)AuthorAgeFilesLines
* WebKit merge 40474:40500 [chromium-side].ericroman@google.com2009-02-041-1/+1
| | | | | | Review URL: http://codereview.chromium.org/21029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9121 0039d316-1c4b-4281-b951-d872f2087c98
* WebKitMerge 40409:40464 (chromium-side).ericroman@google.com2009-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The death of FrameLoaderClient.cpp correspond with <http://trac.webkit.org/changeset/40435> * The custom V8 binding for V8HTMLFormElement::submit() corresponds with <http://trac.webkit.org/changeset/40424> * Changes to FrameLoader::loadFrameRequestWithFormAndValues() and FrameLoadTypeRedirectWithLockedHistory correspond with <http://trac.webkit.org/changeset/40432> * No action was taken for the disable-web-security change <http://trac.webkit.org/changeset/40449>, defaults to enabled. * Frame::isFrameSet() moving to Document::isFrameSet corresponds with <http://trac.webkit.org/changeset/40443> * Frame::sendResizeEvent() moved to EventHandler::sendResizeEvent() <http://trac.webkit.org/changeset/40444> * Not sure which webkit change added RenderObjectChildList.cpp. ======================= Rebaselined the following layout tests to reflect upstream changes: ======================= * LayoutTests/fast/table/form-with-table-style.html http://trac.webkit.org/browser/trunk/LayoutTests/platform/mac/fast/table/form-with-table-style-expected.png?rev=40457 * LayoutTests/fast/table/insert-row-before-form.html http://trac.webkit.org/changeset/40456/trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt * LayoutTests/tables/mozilla/bugs/bug4527.html http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt * LayoutTests/tables/mozilla/bugs/bug96343.html http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt * LayoutTests/tables/mozilla_expected_failures/bugs/bug1725.html http://trac.webkit.org/changeset/40459/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt * LayoutTests/tables/mozilla_expected_failures/other/test4.html http://trac.webkit.org/changeset/40460/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt?old=34683&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt * LayoutTests/editing/deleting/deletionUI-single-instance-actual.png http://trac.webkit.org/changeset/40454/trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt?old=32226&old_path=trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt Review URL: http://codereview.chromium.org/21007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9077 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 40364:40409, Chromium partdimich@google.com2009-01-311-1/+1
| | | | | | Review URL: http://codereview.chromium.org/19736 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9007 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium side of merge 40314:40364.ojan@google.com2009-01-301-1/+1
| | | | | | Review URL: http://codereview.chromium.org/19485 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8946 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome part of WebKit merge 40297:40314dimich@google.com2009-01-291-1/+1
| | | | | | Review URL: http://codereview.chromium.org/19445 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8838 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome side of WebKit Merge 40165:40297playmobil@google.com2009-01-281-1/+1
| | | | | | Review URL: http://codereview.chromium.org/19603 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8776 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome side of webkit merge to r40164.tc@google.com2009-01-241-1/+1
| | | | | | | | One file added between r40124 and r40164, however, all the worker files didn't seem to be in the xcode project so I added all of them. Review URL: http://codereview.chromium.org/18733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8601 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome side of webkit merge to 40124.tc@google.com2009-01-221-1/+1
| | | | | | | | | | | | Not much here other than CanvasPixelArray being re-added in webkit@r40089. Changes: http://trac.webkit.org/changeset?new=40124@trunk&old=40086@trunk Review URL: http://codereview.chromium.org/16617 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8520 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit Merge 40059:40086playmobil@google.com2009-01-211-1/+1
| | | | | | Review URL: http://codereview.chromium.org/18632 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8402 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Merge 39972:40057, Chromium side.dglazkov@google.com2009-01-211-1/+1
| | | | | | | | R=jeremy Review URL: http://codereview.chromium.org/18608 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8370 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Merge 39953:39972, Chromium Side.dglazkov@google.com2009-01-161-1/+1
| | | | | | Review URL: http://codereview.chromium.org/18325 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8215 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome side of WebKit merge 39933:39953brettw@chromium.org2009-01-161-1/+1
| | | | | | Review URL: http://codereview.chromium.org/18301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8154 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome-side of WebKit merge 39913:39933brettw@chromium.org2009-01-151-1/+1
| | | | | | Review URL: http://codereview.chromium.org/18283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8131 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium side of WebKit merge 39894:39913 plus a one-line fix from a morebrettw@chromium.org2009-01-151-1/+1
| | | | | | | recent WebKit revision in XMLTokenizerLibxml2.cpp to make it compile. Review URL: http://codereview.chromium.org/18075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8068 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium part of WebKit merge 39880:39894brettw@chromium.org2009-01-141-1/+1
| | | | | | | This also adds a batch file for running the merge script since I don't have sh. Review URL: http://codereview.chromium.org/18061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8044 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit merge 39829:39880, chromium portionlevin@chromium.org2009-01-141-1/+1
| | | | | | Review URL: http://codereview.chromium.org/18048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8018 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit merge 39829:39744, Chromium portion.levin@chromium.org2009-01-141-1/+1
| | | | | | Review URL: http://codereview.chromium.org/18204 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7995 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 39711:39744. This CL includes changes to webkit/glue code.darin@chromium.org2009-01-091-1/+1
| | | | | | | | R=levin Review URL: http://codereview.chromium.org/17319 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7809 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 39660:39711, part 2. Covers webkit/ changes.darin@chromium.org2009-01-081-1/+1
| | | | | | | | R=ojan Review URL: http://codereview.chromium.org/17284 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7767 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 39606:39660dimich@google.com2009-01-071-1/+1
| | | | | | Review URL: http://codereview.chromium.org/17239 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7684 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Merge 39520:39606, Chromium sidedglazkov@google.com2009-01-051-1/+1
| | | | | | | | No Mac/SCons project changes needed. No regressions, a few new tests. Review URL: http://codereview.chromium.org/17060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7569 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium piece of merge 39501:39520.pamg@google.com2008-12-311-1/+1
| | | | | | | | BUG=none TEST=covered by layout tests Review URL: http://codereview.chromium.org/17035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7523 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium side of merge 39453:39501.pamg@google.com2008-12-301-1/+1
| | | | | | | | | | | | Includes new baselines for fast/transforms/identity-matrix-expected.html, which was edited slightly, and fast/backgrounds/opacity-on-document-element.html, which is new and looks correct. BUG=none TEST=none Review URL: http://codereview.chromium.org/17010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7513 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit merge 39438:39453 (CL 2 of 2).ericroman@google.com2008-12-231-1/+1
| | | | | | Review URL: http://codereview.chromium.org/16249 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7439 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit merge 39410:39438 (CL 4 of 4).ericroman@google.com2008-12-231-1/+1
| | | | | | Review URL: http://codereview.chromium.org/16444 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7416 0039d316-1c4b-4281-b951-d872f2087c98
* cChrome side of WebKit merge 39369:39410.pamg@google.com2008-12-221-1/+1
| | | | | | | | | | | | * Move files from platform/graphics into platform/animation and platform/graphics/transforms and update include path * Add stubs for two new methods in FrameLoaderClient * Re-baseline one new layout test for Windows and add two to tests_fixable. Review URL: http://codereview.chromium.org/14917 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7352 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium half of the WebKit merge from 39335 to 39369.pamg@google.com2008-12-191-1/+1
| | | | | | Review URL: http://codereview.chromium.org/15404 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7279 0039d316-1c4b-4281-b951-d872f2087c98
* webkit merge 39309:39335 part 2.ojan@google.com2008-12-161-1/+1
| | | | | | Review URL: http://codereview.chromium.org/14476 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7096 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Merge 39143:39309, Part 8 (port side)dglazkov@google.com2008-12-161-1/+1
| | | | | | Review URL: http://codereview.chromium.org/14140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7040 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 39141:39143: The ScriptCallStack (2/2)dglazkov@google.com2008-12-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/14092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6956 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 39100:39141 (CL 2 of 2).ericroman@google.com2008-12-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/14040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6881 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit merge 39050:39100 (CL 5 of 5).ericroman@google.com2008-12-111-1/+1
| | | | | | Review URL: http://codereview.chromium.org/13740 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6810 0039d316-1c4b-4281-b951-d872f2087c98
* webkit merge 39000:39050, srcdimich@google.com2008-12-101-1/+1
| | | | | | | review: http://codereview.chromium.org/13697 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6698 0039d316-1c4b-4281-b951-d872f2087c98
* Merge WebKit from r38950 -> r39000brettw@google.com2008-12-091-1/+1
| | | | | | Review URL: http://codereview.chromium.org/11017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6563 0039d316-1c4b-4281-b951-d872f2087c98
* Pull new WebKit 38900:38950.brettw@google.com2008-12-061-1/+1
| | | | | | Review URL: http://codereview.chromium.org/13228 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6487 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Merge 38850:38900, Part 3dglazkov@google.com2008-12-051-1/+1
| | | | | | Review URL: http://codereview.chromium.org/10425 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6435 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit Merge 38800:38850, Part 3dglazkov@google.com2008-12-041-1/+1
| | | | | | Review URL: http://codereview.chromium.org/13118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6361 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of webkit merge 38760:38800ojan@google.com2008-12-031-1/+1
| | | | | | Review URL: http://codereview.chromium.org/13034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6325 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of webkit merge 38729:38760ojan@google.com2008-12-011-1/+1
| | | | | | Review URL: http://codereview.chromium.org/13028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6183 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of webKit merge 38653:38729ojan@google.com2008-11-271-1/+1
| | | | | | Review URL: http://codereview.chromium.org/12708 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6081 0039d316-1c4b-4281-b951-d872f2087c98
* This got lost in the merge. ojan@google.com2008-11-261-1/+1
| | | | | | Review URL: http://codereview.chromium.org/12492 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6056 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of webKit merge 38600:38625.ojan@google.com2008-11-261-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6023 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of webkit merge 38575:38600ojan@google.com2008-11-251-1/+1
| | | | | | Review URL: http://codereview.chromium.org/12414 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5951 0039d316-1c4b-4281-b951-d872f2087c98
* non third_party/WEbKit side of WebKit merge 38550:38575.ojan@google.com2008-11-211-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5867 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of merge 38500:38550.ojan@google.com2008-11-211-1/+1
| | | | | | Review URL: http://codereview.chromium.org/11551 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5803 0039d316-1c4b-4281-b951-d872f2087c98
* src/webkit side of 38450:38500 merge.ojan@google.com2008-11-201-1/+1
| | | | | | Review URL: http://codereview.chromium.org/11537 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5781 0039d316-1c4b-4281-b951-d872f2087c98
* non-third_party side of merge 38389:38450.ojan@google.com2008-11-201-1/+1
| | | | | | Review URL: http://codereview.chromium.org/11301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5753 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 38377:38389.ojan@google.com2008-11-151-1/+1
| | | | | | Review URL: http://codereview.chromium.org/10757 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5522 0039d316-1c4b-4281-b951-d872f2087c98
* UPdate DEPS to pull in the new webkit.ojan@google.com2008-11-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/10911 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5405 0039d316-1c4b-4281-b951-d872f2087c98
* Do another merge using nifty new merge script (CL for that coming soon).ojan@google.com2008-11-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/10670 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5360 0039d316-1c4b-4281-b951-d872f2087c98