summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Do not mergePatrick Scott2009-07-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull down http://trac.webkit.org/changeset/42163 to fix the icon database crash. I believe the issue was that m_syncThreadRunning could have been initialized to false if the moons aligned. When the Browser quits, it closes the icon db. If m_syncThreadRunning happened to be false, the close method would not wait for the sync thread to complete before cleaning up (and closing) the sqlite database. I think that caused the underlying db to be null within sqlite.
| | * | Do not mergePatrick Scott2009-06-301-1/+1
| | | | | | | | | | | | | | | | Use 2 * aLength as Grace pointed out characters() returns UChar*.
| | * | Do not mergePatrick Scott2009-06-301-0/+4
| | | | | | | | | | | | | | | | | | | | Fix the alignment bug in donut. Only check for ARM since SH4 is in the newer webkit.
* | | | am 7f034a17: Fix a ref counting bug in touch event handling. The RefPtr ↵Ben Murdoch2010-05-061-5/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | returned from m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ended, the RefPtr destroyed it Merge commit '7f034a1734d634dd1fdb3b64817d5828b5e46922' into froyo-plus-aosp * commit '7f034a1734d634dd1fdb3b64817d5828b5e46922': Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope
| * | | Fix a ref counting bug in touch event handling. The RefPtr returned from ↵Ben Murdoch2010-05-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ended, the RefPtr destroyed itself, also deleting it's enclosed pointer if it held the final ref. But we had a saved copy of this raw pointer and then went on to use it later. Fix bug 2543728. Change-Id: I90e17693e15bff0969f103b5947d004837189c44
* | | | am da713c02: Fix a crash caused by navigating away from a page with your ↵Ben Murdoch2010-05-051-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | finger still down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage collection. Merge commit 'da713c0266664dc15b021e99cca31cadc5bd2bdc' into froyo-plus-aosp * commit 'da713c0266664dc15b021e99cca31cadc5bd2bdc': Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have
| * | | Fix a crash caused by navigating away from a page with your finger still ↵Ben Murdoch2010-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage collection. Cherry pick of webkit.org revision 58760. Bug=2543728 Change-Id: I4c9a896ff81881211746451f49158b7e99eb9166
* | | | am 54070f49: Merge "Make sure to layout the view with the final dimensions." ↵Patrick Scott2010-04-141-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '54070f490711d3ec763c006c9b84adf55d32f0a2' into froyo-plus-aosp * commit '54070f490711d3ec763c006c9b84adf55d32f0a2': Make sure to layout the view with the final dimensions.
| * | | Merge "Make sure to layout the view with the final dimensions." into froyoPatrick Scott2010-04-141-0/+4
| |\ \ \
| | * | | Make sure to layout the view with the final dimensions.Patrick Scott2010-04-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2532684 Change-Id: I6500fc08760f8dbc99d1d279e6beca7bdb3345c9
* | | | | am 22804c07: Pass scroll mode to Java so that we can handle overflow on html ↵Grace Kloba2010-04-142-2/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and body correctly. Merge commit '22804c073ffc06fd1fc520d1afbad71e353e488d' into froyo-plus-aosp * commit '22804c073ffc06fd1fc520d1afbad71e353e488d': Pass scroll mode to Java so that we can handle
| * | | | Pass scroll mode to Java so that we can handleGrace Kloba2010-04-132-2/+11
| |/ / / | | | | | | | | | | | | | | | | overflow on html and body correctly. Fix http://b/issue?id=2512549
* | | | am ac90fdd7: Merge "Cherry pick http://codereview.chromium.org/1560007" into ↵Andrei Popescu2010-04-121-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit 'ac90fdd70d8a2f6051fdc959dac8edf5819f38bd' into froyo-plus-aosp * commit 'ac90fdd70d8a2f6051fdc959dac8edf5819f38bd': Cherry pick http://codereview.chromium.org/1560007
| * | | Merge "Cherry pick http://codereview.chromium.org/1560007" into froyoAndrei Popescu2010-04-121-1/+1
| |\ \ \
| | * | | Cherry pick http://codereview.chromium.org/1560007Andrei Popescu2010-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: 2588946 Change-Id: I80d144dd735e367bde8ba91ef0ab4ba3090da9d6
* | | | | am d71ec47f: Merge "Cherry pick http://codereview.chromium.org/1549001" into ↵Andrei Popescu2010-04-121-7/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit 'd71ec47fc759286ee28567b4ff2a6dd67fc89dcd' into froyo-plus-aosp * commit 'd71ec47fc759286ee28567b4ff2a6dd67fc89dcd': Cherry pick http://codereview.chromium.org/1549001
| * | | | Merge "Cherry pick http://codereview.chromium.org/1549001" into froyoAndrei Popescu2010-04-121-7/+4
| |\ \ \ \
| | * | | | Cherry pick http://codereview.chromium.org/1549001Andrei Popescu2010-04-121-7/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: 2588926 Change-Id: I4d077f109c3b415e1a0fa4765e939bea3b56f7fc
* | | | | am 30f14070: Merge "Cherry-pick http://codereview.chromium.org/1594015" into ↵Andrei Popescu2010-04-121-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit '30f1407065eeef96453ba46aa338ee7ff6dd2165' into froyo-plus-aosp * commit '30f1407065eeef96453ba46aa338ee7ff6dd2165': Cherry-pick http://codereview.chromium.org/1594015
| * | | | Merge "Cherry-pick http://codereview.chromium.org/1594015" into froyoAndrei Popescu2010-04-121-0/+1
| |\ \ \ \
| | * | | | Cherry-pick http://codereview.chromium.org/1594015Andrei Popescu2010-04-121-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: 2588909 Change-Id: I4102e4aebb9edb8219e6b9f3bb57f0cb969f1d15
* | | | | am 61c1b0ac: Merge "Cherry pick ↵Andrei Popescu2010-04-121-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://src.chromium.org/viewvc/chrome?view=rev&revision=43874" into froyo Merge commit '61c1b0ac380b1947aae2bd2394cc255e0c35ebf9' into froyo-plus-aosp * commit '61c1b0ac380b1947aae2bd2394cc255e0c35ebf9': Cherry pick http://src.chromium.org/viewvc/chrome?view=rev&revision=43874
| * | | | Cherry pick http://src.chromium.org/viewvc/chrome?view=rev&revision=43874Andrei Popescu2010-04-121-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Fix bug: 2588887 Change-Id: I06d64e58a95d9dd8d7e4308e1601c55d6d33663f
* | | | am 0c736339: Only allow animations computed on the UI if we have two steps ↵Nicolas Roard2010-04-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- otherwise let webkit do it. Merge commit '0c7363393334265c29401d7f6967347ce7e7f1ae' into froyo-plus-aosp * commit '0c7363393334265c29401d7f6967347ce7e7f1ae': Only allow animations computed on the UI if we have two steps -- otherwise let webkit do it.
| * | | Only allow animations computed on the UI if we have two steps -- otherwise ↵Nicolas Roard2010-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | let webkit do it. Bug:2576137 Change-Id: Ib86814f5edaff518df9d30839098ac3e8633341e
* | | | am 72d9dfdf: Merge "Document can be detached when CachedFrame is destroyed. ↵Grace Kloba2010-04-071-11/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can\'t use it to reset the needTouch flag. Move the logic to removeAllEventListeners(). This is based on the current code where removeAllEventListeners() is called in CachedFrame::destroy Merge commit '72d9dfdf789b6b5f6d7d692fe1a468f7ecca703e' into froyo-plus-aosp * commit '72d9dfdf789b6b5f6d7d692fe1a468f7ecca703e': Document can be detached when CachedFrame is destroyed.
| * | | Merge "Document can be detached when CachedFrame is destroyed. So we can't ↵Grace Kloba2010-04-071-11/+9
| |\ \ \ | | | | | | | | | | | | | | | use it to reset the needTouch flag. Move the logic to removeAllEventListeners(). This is based on the current code where removeAllEventListeners() is called in CachedFrame::destroy() before it sets pageCache to be false." into froyo
| | * | | Document can be detached when CachedFrame is destroyed.Grace Kloba2010-04-061-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can't use it to reset the needTouch flag. Move the logic to removeAllEventListeners(). This is based on the current code where removeAllEventListeners() is called in CachedFrame::destroy() before it sets pageCache to be false. Fix http://b/issue?id=2576132
* | | | | am 5c13f89a: Merge "Revert "Mark positioned elements as needing a relayout ↵Nicolas Roard2010-04-062-13/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when checking for hit test."" into froyo Merge commit '5c13f89a26cb5e3f779c51c13fb0b11967581225' into froyo-plus-aosp * commit '5c13f89a26cb5e3f779c51c13fb0b11967581225': Revert "Mark positioned elements as needing a relayout when checking for hit test."
| * | | | Merge "Revert "Mark positioned elements as needing a relayout when checking ↵Nicolas Roard2010-04-062-13/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | for hit test."" into froyo
| | * | | Revert "Mark positioned elements as needing a relayout when checking for hit ↵Nicolas Roard2010-04-062-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test." Not needed anymore. This reverts commit 84b2cee4185865d37e64bb3cc7a9e1bd6051eb7c. Bug:2457215 Change-Id: I945e6ebe520b1490f4bf62809b4f375750f5c597
* | | | | am 213f1345: Merge "suppress compiler warnings in plugin code" into froyoCary Clark2010-04-061-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '213f1345619560709150e9510a9a22c3cb36eb23' into froyo-plus-aosp * commit '213f1345619560709150e9510a9a22c3cb36eb23': suppress compiler warnings in plugin code
| * | | | Merge "suppress compiler warnings in plugin code" into froyoCary Clark2010-04-061-0/+3
| |\ \ \ \
| | * | | | suppress compiler warnings in plugin codeCary Clark2010-04-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0cadbf8946193ed7a4a7fe0cdeff82a2495d9ef9
* | | | | | am 5e9b4f88: Merge "When handling Fixed position, always relative to the top ↵Grace Kloba2010-04-062-0/+30
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document." into froyo Merge commit '5e9b4f88ec0abb578823e8225ad9614c1ba58c6b' into froyo-plus-aosp * commit '5e9b4f88ec0abb578823e8225ad9614c1ba58c6b': When handling Fixed position, always relative to
| * | | | | Merge "When handling Fixed position, always relative to the top document." ↵Grace Kloba2010-04-062-0/+30
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | into froyo
| | * | | | When handling Fixed position, always relative toGrace Kloba2010-04-062-0/+30
| | |/ / / | | | | | | | | | | | | | | | | | | | | the top document. Fix http://b/issue?id=2281574
* | | | | am 3dc27326: Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150Andrei Popescu2010-04-061-1/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0' into froyo-plus-aosp * commit '3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0': Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
| * | | | Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150Andrei Popescu2010-04-061-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the frame's context at PageCache save and restore time to avoid crashing when it's null. Fix bug: 2564844 Change-Id: Ifef3fcf271b1366d4f63c42da1a9ac08bb8b78ed
* | | | am b721be96: Merge "When we stopUpdating(), we should cancel the outstanding ↵Grace Kloba2010-04-021-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | timer." into froyo Merge commit 'b721be96061253a7a8e35313bb5ee794d03d9af8' into froyo-plus-aosp * commit 'b721be96061253a7a8e35313bb5ee794d03d9af8': When we stopUpdating(), we should cancel the outstanding
| * | | Merge "When we stopUpdating(), we should cancel the outstanding timer." into ↵Grace Kloba2010-04-021-1/+4
| |\ \ \ | | | | | | | | | | | | | | | froyo
| | * | | When we stopUpdating(), we should cancel the outstandingGrace Kloba2010-04-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timer. When timer fired, we should check m_lastError before calling errorOccurred(). Fix http://b/issue?id=2560897
* | | | | am 726a2501: Fix pluginstream delay timer as it is expecting seconds instead ↵Grace Kloba2010-04-021-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of milliseconds. Merge commit '726a250195dce8f58044e80342e99ec8c0fa98df' into froyo-plus-aosp * commit '726a250195dce8f58044e80342e99ec8c0fa98df': Fix pluginstream delay timer as it is expecting seconds
| * | | | Fix pluginstream delay timer as it is expecting secondsGrace Kloba2010-04-021-1/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | instead of milliseconds. While the timer is active, don't deliverData. Fix http://b/issue?id=2567300
* | | | merge from open-source masterThe Android Open Source Project2010-04-022-12/+0
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I87473a9657b8906b4933a7e22bf1125a65e44502
| * | Merge "Remove some oboslete code."Jean-Baptiste Queru2010-04-021-8/+0
| |\ \
| | * | Remove some oboslete code.Julien Chaffraix2010-03-041-8/+0
| | | | | | | | | | | | | | | | | | | | traverseNextItem was renamed itemAfter and it can now deal with a NULL previous node.
| * | | Remove old code that was fixed in WebKit r35902Julien Chaffraix2010-03-301-4/+0
| |/ / | | | | | | | | | | | | | | | | | | This code was based on WebKit r30711 which has now been integrated into Android (this fix was introduced in october 2008). Change-Id: I1faf6e611dfe226771ca8f28ee6a9e0cd80535ae
| * | Revert https://android-git.corp.google.com/g/37444Grace Kloba2010-01-141-5/+2
| | | | | | | | | | | | as https://android-git.corp.google.com/g/37486 is a better fix for http://b/issue?id=2375232
| * | For mobile site, allow text wrap to screen if scaleGrace Kloba2010-01-141-2/+5
| | | | | | | | | | | | | | | is not same as screen width scale. Fix http://b/issue?id=2375232