summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge -s ours from froyo-release so that upgrading to gingerbread is a git ↵Jean-Baptiste Queru2010-08-230-0/+0
|\ | | | | | | | | | | fast-forward Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
| * Cherry-pick WebKit change 61921 to fix exploitable memory corruption in ↵Steve Block2010-08-181-28/+39
| | | | | | | | | | | | | | RenderBoxModelObject Bug: 2895569 Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
| * Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is ↵Steve Block2010-08-181-1/+5
| | | | | | | | | | | | | | changed Bug: 2895569 Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
* | DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-204-220/+1430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Change imported by hand from master, based on https://android-git.corp.google.com/g/#change,53489 ) SelectText now permits incremental extension of the selection using either touch or trackball data. SelectText adds word selection and select all interfaces. SelectText has been rewritten to do a better job of finding space characters and selecting text outside of the visible window. Companion changes in frameworks/base and packages/apps/Browser Change-Id: I28a815375345d842f79464edbf0cb3a2019b7fe8 http://b/2626451
* | am a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory ↵Steve Block2010-08-061-28/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | corruption in RenderBoxModelObject Merge commit 'a42794783dfec7f142845611dc0f20bfe2657c49' into gingerbread * commit 'a42794783dfec7f142845611dc0f20bfe2657c49': Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
| * | Cherry-pick WebKit change 61921 to fix exploitable memory corruption in ↵Steve Block2010-08-051-28/+39
| | | | | | | | | | | | | | | | | | | | | RenderBoxModelObject Bug: 2895569 Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
* | | am 2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash ↵Steve Block2010-08-061-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | when focus is changed Merge commit '2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0' into gingerbread * commit '2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0': Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
| * | Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is ↵Steve Block2010-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | | changed Bug: 2895569 Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
* | | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-20/+20
| | | | | | | | | | | | | | | | | | git cherry-pick --no-commit a2350cae81d07b024de06d0508f8cbd317dad3b7 Change-Id: I52ae486a58ed5bdc79390525179092a5a930c0e7
* | | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | | | | | | | | | | | Change-Id: I1cc3b4d6e2165285a27b5d848c39d3965553382a
* | | Merge "The ICU data is no longer compiled directly into the shared library." ↵Joe Onorato2010-07-151-1/+0
|\ \ \ | | | | | | | | | | | | into gingerbread
| * | | The ICU data is no longer compiled directly into the shared library.Joe Onorato2010-07-131-1/+0
| | | | | | | | | | | | | | | | Change-Id: Iff0a8c1152c9be1ea49f1856f3edc4383a1a5640
* | | | Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-134-79/+107
|/ / / | | | | | | | | | Change-Id: I523d6fab2964cec4610424f6fd7bbe86d38b7306
* | | am 9d4701f9: Push a local reference frame to avoid table overflow.Patrick Scott2010-07-012-8/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread * commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be': Push a local reference frame to avoid table overflow.
| * | Push a local reference frame to avoid table overflow.Patrick Scott2010-06-292-8/+13
| |/ | | | | | | | | | | | | | | | | Similar to jsc's implementation, this is needed to restrict the amount of local references in a given jni frame. Once the frame is popped from the stack, all local references are cleaned. Bug: 2807132 Change-Id: I5f4153509c513bec142472927a1787869a57f530
* | am ec92ec7c: merge from open-source masterThe Android Open Source Project2010-05-180-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Merge commit 'ec92ec7cd8fe4ad6c8137865ec2d6b43c1a56ee5' into kraken * commit 'ec92ec7cd8fe4ad6c8137865ec2d6b43c1a56ee5': Check for the absence of a frame.
| * \ merge from open-source masterThe Android Open Source Project2010-05-180-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I906635459af677aceff46ff10de93d45670481cd
| | * \ Merge "Check for the absence of a frame. This crashes in the situation where ↵Jean-Baptiste Queru2010-05-181-1/+2
| | |\ \ | | | | | | | | | | | | | | | the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028"
| | | * | Check for the absence of a frame.Leon Clarke2010-05-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. http://b/issue?id=2346028
* | | | | am 18e97e57: merge from open-source masterThe Android Open Source Project2010-05-171-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '18e97e57694ae8596ac316af30cb5512fe8ef1bf' into kraken * commit '18e97e57694ae8596ac316af30cb5512fe8ef1bf': Fix focus ring on links with non-latin text
| * | | | merge from open-source masterThe Android Open Source Project2010-05-171-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I0b566897309348d094f93ed7ae5d9af7b0e8a377
| | * | | Merge "Fix focus ring on links with non-latin text"Jean-Baptiste Queru2010-05-171-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix focus ring on links with non-latin textAnders Edenbrandt2010-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a clickable link in a HTML document is focused, a rectangle with rounded corners is drawn around that link. If the link contains Arabic characters (or characters from other non-latin alphabets) the focus ring will be drawn too high up on the page. Change-Id: Ia589236c4e315af76c6e8f746cc99af63e7e53d7
* | | | | am 75238a0c: am 2943c136: Fix the \'wobbling fixed elements\' bug. ↵Nicolas Roard2010-05-111-9/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from master. This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150). Merge commit '75238a0c6749b428ac76d812d1ab08bedaec5ee3' into kraken * commit '75238a0c6749b428ac76d812d1ab08bedaec5ee3': Fix the 'wobbling fixed elements' bug.
| * | | | am 2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from ↵Nicolas Roard2010-05-111-9/+19
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150). Merge commit '2943c136f14cf8d0631249dd8764a0b6ab45fb98' into froyo-plus-aosp * commit '2943c136f14cf8d0631249dd8764a0b6ab45fb98': Fix the 'wobbling fixed elements' bug.
| | * | | Fix the 'wobbling fixed elements' bug.Nicolas Roard2010-05-101-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from master. This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150). Bug:2665696 Change-Id: I408a3e2f089a491c340e0f9eb8633870dae84997
* | | | | am ec366141: am 7f034a17: Fix a ref counting bug in touch event handling. ↵Ben Murdoch2010-05-061-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RefPtr 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 Merge commit 'ec3661418dd6a5edfca19848a0fa12a28959bd06' into kraken * commit 'ec3661418dd6a5edfca19848a0fa12a28959bd06': Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope
| * | | | 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 cc7f2722: am da713c02: Fix a crash caused by navigating away from a page ↵Ben Murdoch2010-05-051-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with your 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 'cc7f27228a13f253de0651478d67245e240a9dc6' into kraken * commit 'cc7f27228a13f253de0651478d67245e240a9dc6': Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have
| * | | | 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 6452300d: am d294ab99: Update plugin\'s dirtyRect to match the dirtyRect ↵Derek Sollenberger2010-05-031-0/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returned when locking a surface. Merge commit '6452300d47d77d78e874862c5f7908746b04c1f8' into kraken * commit '6452300d47d77d78e874862c5f7908746b04c1f8': Update plugin's dirtyRect to match the dirtyRect returned when locking a surface.
| * | | | am d294ab99: Update plugin\'s dirtyRect to match the dirtyRect returned when ↵Derek Sollenberger2010-05-031-0/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locking a surface. Merge commit 'd294ab9957512fd5554d794194d26328840125b4' into froyo-plus-aosp * commit 'd294ab9957512fd5554d794194d26328840125b4': Update plugin's dirtyRect to match the dirtyRect returned when locking a surface.
| | * | | Update plugin's dirtyRect to match the dirtyRect returned when locking a ↵Derek Sollenberger2010-05-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface. Change-Id: I2c3e6daa10eb9eb651be52bf9387008f154b176d http://b/2650954
* | | | | am 6ec27fea: am 5076efcd: don\'t hide transparent nodesCary Clark2010-04-221-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6ec27fea860849da854f5c3bcfd7b4798b08efc0' into kraken * commit '6ec27fea860849da854f5c3bcfd7b4798b08efc0': don't hide transparent nodes
| * | | | am 5076efcd: don\'t hide transparent nodesCary Clark2010-04-221-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5076efcd053da090680d27026645b6a7d26ca79b' into froyo-plus-aosp * commit '5076efcd053da090680d27026645b6a7d26ca79b': don't hide transparent nodes
| | * | | don't hide transparent nodesCary Clark2010-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A node may be transparent if the body of the node is drawn earlier. In this case, the node may not be tested to see if it has been occluded by later drawing, since no drawing inside the scope of the node is actually visible. So, skip the hidden test for transparent nodes. Change-Id: Ib748e9e7b86252f791ee68198d1d794fb4591a88 http://b/2582455
* | | | | am 0f92e845: am 55ab51c0: Merge "nextTextField may walk off the end or try ↵Cary Clark2010-04-225-34/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid frames" into froyo Merge commit '0f92e845ed6499088958acf229f196ad67965f63' into kraken * commit '0f92e845ed6499088958acf229f196ad67965f63': nextTextField may walk off the end or try invalid frames
| * | | | am 55ab51c0: Merge "nextTextField may walk off the end or try invalid ↵Cary Clark2010-04-225-34/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frames" into froyo Merge commit '55ab51c027055eb6f5ab777712cf4aa058ab7891' into froyo-plus-aosp * commit '55ab51c027055eb6f5ab777712cf4aa058ab7891': nextTextField may walk off the end or try invalid frames
| | * | | Merge "nextTextField may walk off the end or try invalid frames" into froyoCary Clark2010-04-225-34/+44
| | |\ \ \
| | | * | | nextTextField may walk off the end or try invalid framesCary Clark2010-04-225-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote nextTextField() to check range and frame, and to more resemble other node walkers. Caller no longer passes uninitialized frame in focused case, and looks at parent frames after the target node. Change-Id: I7ea9dffb75d28bdd9d71d83921058feca6baf928 http://b/2607250
* | | | | | am da70a732: am 42496a8f: Add cleanspec rules after re-enabling V8 snapshots.Andrei Popescu2010-04-211-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'da70a73229ffd53fe61eee809ca96f2cb3853f58' into kraken * commit 'da70a73229ffd53fe61eee809ca96f2cb3853f58': Add cleanspec rules after re-enabling V8 snapshots.
| * | | | | am 42496a8f: Add cleanspec rules after re-enabling V8 snapshots.Andrei Popescu2010-04-211-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '42496a8f108674defe617aac3b7b646ee058d3aa' into froyo-plus-aosp * commit '42496a8f108674defe617aac3b7b646ee058d3aa': Add cleanspec rules after re-enabling V8 snapshots.
| | * | | | Add cleanspec rules after re-enabling V8 snapshots.Andrei Popescu2010-04-211-0/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: 2612919 Change-Id: Id65eae5ed3ad34bf10fafdd35cfae2ea873483ce
* | | | | am 233b1e5a: am 54070f49: Merge "Make sure to layout the view with the final ↵Patrick Scott2010-04-141-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dimensions." into froyo Merge commit '233b1e5ab6e18ef2db20b5179e891d1a73293225' into kraken * commit '233b1e5ab6e18ef2db20b5179e891d1a73293225': Make sure to layout the view with the final dimensions.
| * | | | 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 34a423ba: am 22804c07: Pass scroll mode to Java so that we can handle ↵Grace Kloba2010-04-144-2/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow on html and body correctly. Merge commit '34a423ba5b431f032c09b5a6702b2cd3944bda3b' into kraken * commit '34a423ba5b431f032c09b5a6702b2cd3944bda3b': Pass scroll mode to Java so that we can handle
generated by cgit v1.1 at 2024-10-28 02:29:47 +0000