OSDN Git Service
Melanie Clements [Tue, 31 Aug 2010 16:10:30 +0000 (09:10 -0700)]
am
ff93a851: Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Merge commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp
* commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c':
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Melanie Clements [Fri, 20 Aug 2010 18:19:20 +0000 (14:19 -0400)]
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
The Android browser inserts "/." at the beginning of the URL path
when processing an <img> in an HTML document with a <base> tag.
This does not cause any errors but should be fixed to comply with
RFC 3986 section 5.4.
This only happens at the first pass of the URL parsing, at the second
pass where the base and path are parsed together this is dealt with
correctly. I am therefore fixing it by modifying the parse() method
in KURL to check for a trailing '.' at the end of the base segment.
Change-Id: I0d641c8619e00aa2b08a33e271ef863cee5ed7ad
Cary Clark [Fri, 27 Aug 2010 15:19:11 +0000 (08:19 -0700)]
am
90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp
* commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da':
DO NOT MERGE make the text selection easier to hit
Cary Clark [Thu, 26 Aug 2010 21:47:21 +0000 (17:47 -0400)]
DO NOT MERGE make the text selection easier to hit
Change-Id: I47b7aa04ebc2a8f0bf2c6b4399ef65e5f4c58d4e
http://b/
2626451
Cary Clark [Tue, 24 Aug 2010 13:46:50 +0000 (06:46 -0700)]
am
21ed5a45: Merge "check for null pictures when selecting text" into gingerbread
Merge commit '
21ed5a4502b3ce76875505aa220f187d165f47b1' into gingerbread-plus-aosp
* commit '
21ed5a4502b3ce76875505aa220f187d165f47b1':
check for null pictures when selecting text
Cary Clark [Tue, 24 Aug 2010 13:44:55 +0000 (06:44 -0700)]
Merge "check for null pictures when selecting text" into gingerbread
Cary Clark [Mon, 23 Aug 2010 21:06:50 +0000 (17:06 -0400)]
check for null pictures when selecting text
The LayerAndroid supplied to SelectText may have no picture
associated with it. If that's the case, ignore it.
This change was original uploaded as
https://android-git.corp.google.com/g/#change,62627
in master, but then I realized it should go into
gingerbread as well, and get merged into master automagically.
http://b/
2930142
Change-Id: If6332d81f1f9baba804131caae124dd18e0b0799
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:37:10 +0000 (23:37 -0700)]
am
828ef22d: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
828ef22db863664b8e992adf15ddf92ef570f4f8' into gingerbread-plus-aosp
* commit '
828ef22db863664b8e992adf15ddf92ef570f4f8':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:08:20 +0000 (19:08 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
Cary Clark [Fri, 20 Aug 2010 16:28:25 +0000 (09:28 -0700)]
am
e4be1fd5: DO NOT MERGE Refactor find and select dialogs
Merge commit '
e4be1fd5f14137de249ee66c000f9dadfb2862d7' into gingerbread-plus-aosp
* commit '
e4be1fd5f14137de249ee66c000f9dadfb2862d7':
DO NOT MERGE Refactor find and select dialogs
Cary Clark [Thu, 19 Aug 2010 22:31:48 +0000 (18:31 -0400)]
DO NOT MERGE Refactor find and select dialogs
(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
Steve Block [Thu, 5 Aug 2010 11:12:56 +0000 (12:12 +0100)]
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Bug:
2895569
Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
Steve Block [Thu, 5 Aug 2010 11:10:12 +0000 (12:10 +0100)]
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Bug:
2895569
Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
Henrik Baard [Tue, 17 Aug 2010 14:51:05 +0000 (07:51 -0700)]
am
5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Merge commit '
5dc34a8555dde1ae4a2c174870c4296cc44f8a22' into gingerbread-plus-aosp
* commit '
5dc34a8555dde1ae4a2c174870c4296cc44f8a22':
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Henrik Baard [Fri, 13 Aug 2010 15:02:46 +0000 (17:02 +0200)]
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
This is a fix for a crash found in real phones, there is cases when
activeDocumentLoader() can return null, probably related to closing of a
frame or canceling of a request.
Change-Id: Id340ab006b6e40e396645a4e668dcb58824a63e7
Steve Block [Sat, 7 Aug 2010 01:59:56 +0000 (18:59 -0700)]
am
e9ee2d86: am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3' into gingerbread-plus-aosp
* commit '
e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 01:59:53 +0000 (18:59 -0700)]
am
7162fe0e: am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Merge commit '
7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf' into gingerbread-plus-aosp
* commit '
7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf':
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Steve Block [Sat, 7 Aug 2010 01:55:12 +0000 (18:55 -0700)]
am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
a42794783dfec7f142845611dc0f20bfe2657c49' into gingerbread
* commit '
a42794783dfec7f142845611dc0f20bfe2657c49':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 01:55:10 +0000 (18:55 -0700)]
am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash 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
Brian Carlstrom [Thu, 5 Aug 2010 17:41:06 +0000 (10:41 -0700)]
am
71b088a0: Tracking merge of dalvik-dev to gingerbread
Merge commit '
71b088a040027130a502f60e6f953c08a194b11e' into gingerbread-plus-aosp
* commit '
71b088a040027130a502f60e6f953c08a194b11e':
Tracking merge of dalvik-dev to gingerbread
Steve Block [Thu, 5 Aug 2010 11:12:56 +0000 (12:12 +0100)]
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Bug:
2895569
Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
Steve Block [Thu, 5 Aug 2010 11:10:12 +0000 (12:10 +0100)]
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Bug:
2895569
Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
Brian Carlstrom [Thu, 5 Aug 2010 06:24:52 +0000 (23:24 -0700)]
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit
a2350cae81d07b024de06d0508f8cbd317dad3b7
Change-Id: I52ae486a58ed5bdc79390525179092a5a930c0e7
The Android Open Source Project [Fri, 16 Jul 2010 18:52:51 +0000 (11:52 -0700)]
am
ae583467: add meta-files about 3rd party projects
Merge commit '
ae583467c6ceda8b918b6d3e38cceca26d0715eb' into gingerbread-plus-aosp
* commit '
ae583467c6ceda8b918b6d3e38cceca26d0715eb':
add meta-files about 3rd party projects
The Android Open Source Project [Fri, 16 Jul 2010 18:41:36 +0000 (11:41 -0700)]
add meta-files about 3rd party projects
Change-Id: I1cc3b4d6e2165285a27b5d848c39d3965553382a
Joe Onorato [Thu, 15 Jul 2010 18:13:02 +0000 (11:13 -0700)]
am
4da2dabd: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '
4da2dabd9828e43b05c234be082905c7825a22ec' into gingerbread-plus-aosp
* commit '
4da2dabd9828e43b05c234be082905c7825a22ec':
The ICU data is no longer compiled directly into the shared library.
Joe Onorato [Thu, 15 Jul 2010 18:08:20 +0000 (11:08 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Joe Onorato [Wed, 14 Jul 2010 02:05:43 +0000 (19:05 -0700)]
The ICU data is no longer compiled directly into the shared library.
Change-Id: Iff0a8c1152c9be1ea49f1856f3edc4383a1a5640
Jeff Brown [Wed, 14 Jul 2010 00:46:27 +0000 (17:46 -0700)]
am
652e9a01: Migrate to new keycode constants in keycodes.h.
Merge commit '
652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp
* commit '
652e9a017a7c5c772361bf57279fae0c26992329':
Migrate to new keycode constants in keycodes.h.
Jeff Brown [Tue, 13 Jul 2010 23:17:11 +0000 (16:17 -0700)]
Migrate to new keycode constants in keycodes.h.
Change-Id: I523d6fab2964cec4610424f6fd7bbe86d38b7306
The Android Open Source Project [Fri, 9 Jul 2010 18:03:29 +0000 (11:03 -0700)]
merge from open-source master
Change-Id: Ib725f9df8c1d3a5105a126bf9475ec060ac0a98a
Patrick Scott [Thu, 1 Jul 2010 11:59:04 +0000 (04:59 -0700)]
am
9d4701f9: Push a local reference frame to avoid table overflow.
Merge commit '
9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread
* commit '
9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be':
Push a local reference frame to avoid table overflow.
Patrick Scott [Tue, 29 Jun 2010 19:55:10 +0000 (15:55 -0400)]
Push a local reference frame to avoid table overflow.
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
Bruce Beare [Fri, 25 Jun 2010 16:07:54 +0000 (09:07 -0700)]
Fix missing NL
Change-Id: I6757ab42e52b9d878f06da4bdc757c4626e3d0c5
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
The Android Open Source Project [Tue, 18 May 2010 17:54:40 +0000 (10:54 -0700)]
am
ec92ec7c: merge from open-source master
Merge commit '
ec92ec7cd8fe4ad6c8137865ec2d6b43c1a56ee5' into kraken
* commit '
ec92ec7cd8fe4ad6c8137865ec2d6b43c1a56ee5':
Check for the absence of a frame.
The Android Open Source Project [Tue, 18 May 2010 17:52:22 +0000 (10:52 -0700)]
merge from open-source master
Change-Id: I906635459af677aceff46ff10de93d45670481cd
Jean-Baptiste Queru [Tue, 18 May 2010 15:16:33 +0000 (08:16 -0700)]
Merge "Check for the absence of a frame. This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. b/issue?id=
2346028"
The Android Open Source Project [Mon, 17 May 2010 20:53:30 +0000 (13:53 -0700)]
am
18e97e57: merge from open-source master
Merge commit '
18e97e57694ae8596ac316af30cb5512fe8ef1bf' into kraken
* commit '
18e97e57694ae8596ac316af30cb5512fe8ef1bf':
Fix focus ring on links with non-latin text
The Android Open Source Project [Mon, 17 May 2010 17:23:33 +0000 (10:23 -0700)]
merge from open-source master
Change-Id: I0b566897309348d094f93ed7ae5d9af7b0e8a377
Jean-Baptiste Queru [Mon, 17 May 2010 15:58:16 +0000 (08:58 -0700)]
Merge "Fix focus ring on links with non-latin text"
Leon Clarke [Thu, 14 Jan 2010 16:39:36 +0000 (16:39 +0000)]
Check for the absence of a frame.
This crashes in the situation where the XHR responseXML method is being
called on a document with meta tags.
http://b/issue?id=
2346028
Nicolas Roard [Tue, 11 May 2010 17:24:06 +0000 (10:24 -0700)]
am
75238a0c: am
2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from 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.
Nicolas Roard [Tue, 11 May 2010 17:19:03 +0000 (10:19 -0700)]
am
2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from 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.
Nicolas Roard [Mon, 10 May 2010 22:13:30 +0000 (15:13 -0700)]
Fix the 'wobbling fixed elements' bug.
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
Ben Murdoch [Thu, 6 May 2010 19:44:09 +0000 (12:44 -0700)]
am
ec366141: am
7f034a17: Fix a ref counting bug in touch event handling. 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
Ben Murdoch [Thu, 6 May 2010 19:35:44 +0000 (12:35 -0700)]
am
7f034a17: Fix a ref counting bug in touch event handling. 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 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
Ben Murdoch [Thu, 6 May 2010 14:49:14 +0000 (15:49 +0100)]
Fix a ref counting bug in touch event handling. 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 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
Ben Murdoch [Wed, 5 May 2010 17:08:02 +0000 (10:08 -0700)]
am
cc7f2722: am
da713c02: Fix a crash caused by navigating away from a page 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
Ben Murdoch [Wed, 5 May 2010 16:37:59 +0000 (09:37 -0700)]
am
da713c02: Fix a crash caused by navigating away from a page 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 '
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
Ben Murdoch [Wed, 5 May 2010 14:42:24 +0000 (15:42 +0100)]
Fix a crash caused by navigating away from a page 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.
Cherry pick of webkit.org revision 58760.
Bug=
2543728
Change-Id: I4c9a896ff81881211746451f49158b7e99eb9166
Derek Sollenberger [Mon, 3 May 2010 21:55:26 +0000 (14:55 -0700)]
am
6452300d: am
d294ab99: Update plugin\'s dirtyRect to match the dirtyRect 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.
Derek Sollenberger [Mon, 3 May 2010 20:48:39 +0000 (13:48 -0700)]
am
d294ab99: Update plugin\'s dirtyRect to match the dirtyRect returned when 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.
Derek Sollenberger [Mon, 3 May 2010 19:26:15 +0000 (15:26 -0400)]
Update plugin's dirtyRect to match the dirtyRect returned when locking a surface.
Change-Id: I2c3e6daa10eb9eb651be52bf9387008f154b176d
http://b/
2650954
Cary Clark [Thu, 22 Apr 2010 20:25:51 +0000 (13:25 -0700)]
am
6ec27fea: am
5076efcd: don\'t hide transparent nodes
Merge commit '
6ec27fea860849da854f5c3bcfd7b4798b08efc0' into kraken
* commit '
6ec27fea860849da854f5c3bcfd7b4798b08efc0':
don't hide transparent nodes
Cary Clark [Thu, 22 Apr 2010 20:24:19 +0000 (13:24 -0700)]
am
0f92e845: am
55ab51c0: Merge "nextTextField may walk off the end or try invalid frames" into froyo
Merge commit '
0f92e845ed6499088958acf229f196ad67965f63' into kraken
* commit '
0f92e845ed6499088958acf229f196ad67965f63':
nextTextField may walk off the end or try invalid frames
Cary Clark [Thu, 22 Apr 2010 19:56:22 +0000 (12:56 -0700)]
am
5076efcd: don\'t hide transparent nodes
Merge commit '
5076efcd053da090680d27026645b6a7d26ca79b' into froyo-plus-aosp
* commit '
5076efcd053da090680d27026645b6a7d26ca79b':
don't hide transparent nodes
Cary Clark [Thu, 22 Apr 2010 19:48:12 +0000 (15:48 -0400)]
don't hide transparent nodes
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
Cary Clark [Thu, 22 Apr 2010 13:55:13 +0000 (06:55 -0700)]
am
55ab51c0: Merge "nextTextField may walk off the end or try invalid frames" into froyo
Merge commit '
55ab51c027055eb6f5ab777712cf4aa058ab7891' into froyo-plus-aosp
* commit '
55ab51c027055eb6f5ab777712cf4aa058ab7891':
nextTextField may walk off the end or try invalid frames
Cary Clark [Thu, 22 Apr 2010 13:51:03 +0000 (06:51 -0700)]
Merge "nextTextField may walk off the end or try invalid frames" into froyo
Cary Clark [Wed, 21 Apr 2010 18:18:24 +0000 (14:18 -0400)]
nextTextField may walk off the end or try invalid frames
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
Andrei Popescu [Wed, 21 Apr 2010 16:34:58 +0000 (09:34 -0700)]
am
da70a732: am
42496a8f: Add cleanspec rules after re-enabling V8 snapshots.
Merge commit '
da70a73229ffd53fe61eee809ca96f2cb3853f58' into kraken
* commit '
da70a73229ffd53fe61eee809ca96f2cb3853f58':
Add cleanspec rules after re-enabling V8 snapshots.
Andrei Popescu [Wed, 21 Apr 2010 16:30:54 +0000 (09:30 -0700)]
am
42496a8f: Add cleanspec rules after re-enabling V8 snapshots.
Merge commit '
42496a8f108674defe617aac3b7b646ee058d3aa' into froyo-plus-aosp
* commit '
42496a8f108674defe617aac3b7b646ee058d3aa':
Add cleanspec rules after re-enabling V8 snapshots.
Andrei Popescu [Wed, 21 Apr 2010 15:20:48 +0000 (16:20 +0100)]
Add cleanspec rules after re-enabling V8 snapshots.
Fix bug:
2612919
Change-Id: Id65eae5ed3ad34bf10fafdd35cfae2ea873483ce
Anders Edenbrandt [Wed, 10 Feb 2010 09:41:22 +0000 (10:41 +0100)]
Fix focus ring on links with non-latin text
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
Patrick Scott [Wed, 14 Apr 2010 23:33:40 +0000 (16:33 -0700)]
am
233b1e5a: am
54070f49: Merge "Make sure to layout the view with the final dimensions." into froyo
Merge commit '
233b1e5ab6e18ef2db20b5179e891d1a73293225' into kraken
* commit '
233b1e5ab6e18ef2db20b5179e891d1a73293225':
Make sure to layout the view with the final dimensions.
Grace Kloba [Wed, 14 Apr 2010 23:33:37 +0000 (16:33 -0700)]
am
34a423ba: am
22804c07: Pass scroll mode to Java so that we can handle overflow on html and body correctly.
Merge commit '
34a423ba5b431f032c09b5a6702b2cd3944bda3b' into kraken
* commit '
34a423ba5b431f032c09b5a6702b2cd3944bda3b':
Pass scroll mode to Java so that we can handle
Patrick Scott [Wed, 14 Apr 2010 23:27:13 +0000 (16:27 -0700)]
am
54070f49: Merge "Make sure to layout the view with the final dimensions." into froyo
Merge commit '
54070f490711d3ec763c006c9b84adf55d32f0a2' into froyo-plus-aosp
* commit '
54070f490711d3ec763c006c9b84adf55d32f0a2':
Make sure to layout the view with the final dimensions.
Grace Kloba [Wed, 14 Apr 2010 23:27:09 +0000 (16:27 -0700)]
am
22804c07: Pass scroll mode to Java so that we can handle overflow on html and body correctly.
Merge commit '
22804c073ffc06fd1fc520d1afbad71e353e488d' into froyo-plus-aosp
* commit '
22804c073ffc06fd1fc520d1afbad71e353e488d':
Pass scroll mode to Java so that we can handle
Patrick Scott [Wed, 14 Apr 2010 20:28:28 +0000 (13:28 -0700)]
Merge "Make sure to layout the view with the final dimensions." into froyo
Patrick Scott [Wed, 14 Apr 2010 19:07:36 +0000 (15:07 -0400)]
Make sure to layout the view with the final dimensions.
Bug:
2532684
Change-Id: I6500fc08760f8dbc99d1d279e6beca7bdb3345c9
Grace Kloba [Wed, 14 Apr 2010 05:45:39 +0000 (22:45 -0700)]
Pass scroll mode to Java so that we can handle
overflow on html and body correctly.
Fix http://b/issue?id=
2512549
Mathias Agopian [Mon, 12 Apr 2010 23:24:57 +0000 (16:24 -0700)]
don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.
Change-Id: Icb894b09b3c9a4878b4bfb4dd24f752fa5f0dcde
Andrei Popescu [Mon, 12 Apr 2010 19:07:47 +0000 (12:07 -0700)]
am
ac90fdd7: Merge "Cherry pick codereview.chromium.org/
1560007" into froyo
Merge commit '
ac90fdd70d8a2f6051fdc959dac8edf5819f38bd' into froyo-plus-aosp
* commit '
ac90fdd70d8a2f6051fdc959dac8edf5819f38bd':
Cherry pick http://codereview.chromium.org/
1560007
Andrei Popescu [Mon, 12 Apr 2010 19:06:14 +0000 (12:06 -0700)]
am
d71ec47f: Merge "Cherry pick codereview.chromium.org/
1549001" into froyo
Merge commit '
d71ec47fc759286ee28567b4ff2a6dd67fc89dcd' into froyo-plus-aosp
* commit '
d71ec47fc759286ee28567b4ff2a6dd67fc89dcd':
Cherry pick http://codereview.chromium.org/
1549001
Andrei Popescu [Mon, 12 Apr 2010 19:06:12 +0000 (12:06 -0700)]
am
30f14070: Merge "Cherry-pick codereview.chromium.org/
1594015" into froyo
Merge commit '
30f1407065eeef96453ba46aa338ee7ff6dd2165' into froyo-plus-aosp
* commit '
30f1407065eeef96453ba46aa338ee7ff6dd2165':
Cherry-pick http://codereview.chromium.org/
1594015
Andrei Popescu [Mon, 12 Apr 2010 19:06:09 +0000 (12:06 -0700)]
am
61c1b0ac: Merge "Cherry pick 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
Andrei Popescu [Mon, 12 Apr 2010 19:04:56 +0000 (12:04 -0700)]
Merge "Cherry pick codereview.chromium.org/
1560007" into froyo
Andrei Popescu [Mon, 12 Apr 2010 19:04:22 +0000 (12:04 -0700)]
Merge "Cherry pick codereview.chromium.org/
1549001" into froyo
Andrei Popescu [Mon, 12 Apr 2010 19:03:32 +0000 (12:03 -0700)]
Merge "Cherry-pick codereview.chromium.org/
1594015" into froyo
Andrei Popescu [Mon, 12 Apr 2010 19:02:36 +0000 (12:02 -0700)]
Merge "Cherry pick src.chromium.org/viewvc/chrome?view=rev&revision=43874" into froyo
Andrei Popescu [Mon, 12 Apr 2010 18:45:23 +0000 (19:45 +0100)]
Cherry pick http://codereview.chromium.org/
1560007
Fix bug:
2588946
Change-Id: I80d144dd735e367bde8ba91ef0ab4ba3090da9d6
Grace Kloba [Mon, 12 Apr 2010 18:15:29 +0000 (11:15 -0700)]
am
164756aa: Merge "Do not set touch state to TouchStationary as EventHandler doesn\'t handle it. The result is preventDefault will be always false and trigger the unexpected behavior for Flash." into froyo
Merge commit '
164756aae729daa66d9e87c1c930be7568054912' into froyo-plus-aosp
* commit '
164756aae729daa66d9e87c1c930be7568054912':
Do not set touch state to TouchStationary as EventHandler
Grace Kloba [Mon, 12 Apr 2010 18:13:36 +0000 (11:13 -0700)]
Merge "Do not set touch state to TouchStationary as EventHandler doesn't handle it. The result is preventDefault will be always false and trigger the unexpected behavior for Flash." into froyo
Andrei Popescu [Mon, 12 Apr 2010 17:46:37 +0000 (18:46 +0100)]
Cherry pick http://codereview.chromium.org/
1549001
Fix bug:
2588926
Change-Id: I4d077f109c3b415e1a0fa4765e939bea3b56f7fc
Andrei Popescu [Mon, 12 Apr 2010 17:32:58 +0000 (18:32 +0100)]
Cherry-pick http://codereview.chromium.org/
1594015
Fix bug:
2588909
Change-Id: I4102e4aebb9edb8219e6b9f3bb57f0cb969f1d15
Andrei Popescu [Mon, 12 Apr 2010 16:03:04 +0000 (17:03 +0100)]
Cherry pick src.chromium.org/viewvc/chrome?view=rev&revision=43874
Fix bug:
2588887
Change-Id: I06d64e58a95d9dd8d7e4308e1601c55d6d33663f
Grace Kloba [Fri, 9 Apr 2010 21:44:39 +0000 (14:44 -0700)]
Do not set touch state to TouchStationary as EventHandler
doesn't handle it. The result is preventDefault will
be always false and trigger the unexpected behavior
for Flash.
Fix http://b/issue?id=
2585109
Nicolas Roard [Thu, 8 Apr 2010 22:30:54 +0000 (15:30 -0700)]
Nicolas Roard [Thu, 8 Apr 2010 22:28:22 +0000 (15:28 -0700)]
Merge "Fix for Bug:
2579468" into froyo
Nicolas Roard [Thu, 8 Apr 2010 00:47:00 +0000 (17:47 -0700)]
Fix for Bug:
2579468
Instead of deleting the PluginTimer in unschedule(), we just flag it, and delete it if necessary when it fires.
Change-Id: I55bdc38705204e0197917af4eb5bc2784553e68f
Derek Sollenberger [Thu, 8 Apr 2010 14:47:52 +0000 (07:47 -0700)]
am
18f501d6: Fix bug that causes plugins not be notified of the change to the visible screen dimensions as a result of pinch to zoom.
Merge commit '
18f501d6904704ce0eff4bfdc68f2ca4aeb66af9' into froyo-plus-aosp
* commit '
18f501d6904704ce0eff4bfdc68f2ca4aeb66af9':
Fix bug that causes plugins not be notified of the change to the
Derek Sollenberger [Thu, 8 Apr 2010 13:32:17 +0000 (09:32 -0400)]
Fix bug that causes plugins not be notified of the change to the
visible screen dimensions as a result of pinch to zoom.
http://b/
2578820
Change-Id: I98576e9937ec469a1dfa7162954ac93e120bc149
Nicolas Roard [Wed, 7 Apr 2010 18:20:26 +0000 (11:20 -0700)]
am
0c736339: Only allow animations computed on the UI if we have two steps -- 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.
Nicolas Roard [Wed, 7 Apr 2010 02:49:13 +0000 (19:49 -0700)]
Only allow animations computed on the UI if we have two steps -- otherwise let webkit do it.
Bug:
2576137
Change-Id: Ib86814f5edaff518df9d30839098ac3e8633341e
Grace Kloba [Wed, 7 Apr 2010 17:59:35 +0000 (10:59 -0700)]
am
72d9dfdf: Merge "Document can be detached when CachedFrame is destroyed. 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.
Grace Kloba [Wed, 7 Apr 2010 17:56:32 +0000 (10:56 -0700)]
Merge "Document can be detached when CachedFrame is destroyed. 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." into froyo
Grace Kloba [Wed, 7 Apr 2010 05:39:38 +0000 (22:39 -0700)]
Document can be detached when CachedFrame is destroyed.
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
Nicolas Roard [Wed, 7 Apr 2010 05:03:06 +0000 (22:03 -0700)]
am
5c13f89a: Merge "Revert "Mark positioned elements as needing a relayout 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."
Nicolas Roard [Wed, 7 Apr 2010 01:27:18 +0000 (18:27 -0700)]
Merge "Revert "Mark positioned elements as needing a relayout when checking for hit test."" into froyo
Nicolas Roard [Wed, 7 Apr 2010 01:15:16 +0000 (18:15 -0700)]
Revert "Mark positioned elements as needing a relayout when checking for hit test."
Not needed anymore.
This reverts commit
84b2cee4185865d37e64bb3cc7a9e1bd6051eb7c.
Bug:
2457215
Change-Id: I945e6ebe520b1490f4bf62809b4f375750f5c597