OSDN Git Service

android-x86/external-webkit.git
14 years agoadd 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

14 years agoMerge "The ICU data is no longer compiled directly into the shared library." into...
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

14 years agoThe ICU data is no longer compiled directly into the shared library.
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

14 years agoMigrate 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

14 years agoam 9d4701f9: Push a local reference frame to avoid table overflow.
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.

14 years agoPush 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

14 years agoam ec92ec7c: merge from open-source master
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.

14 years agomerge from open-source master
The Android Open Source Project [Tue, 18 May 2010 17:52:22 +0000 (10:52 -0700)]
merge from open-source master

Change-Id: I906635459af677aceff46ff10de93d45670481cd

14 years agoMerge "Check for the absence of a frame. This crashes in the situation where the...
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"

14 years agoam 18e97e57: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Mon, 17 May 2010 17:23:33 +0000 (10:23 -0700)]
merge from open-source master

Change-Id: I0b566897309348d094f93ed7ae5d9af7b0e8a377

14 years agoMerge "Fix focus ring on links with non-latin text"
Jean-Baptiste Queru [Mon, 17 May 2010 15:58:16 +0000 (08:58 -0700)]
Merge "Fix focus ring on links with non-latin text"

14 years agoCheck for the absence of a frame.
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

14 years agoam 75238a0c: am 2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked...
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.

14 years agoam 2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master....
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.

14 years agoFix 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

14 years agoam ec366141: am 7f034a17: Fix a ref counting bug in touch event handling. The RefPtr...
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

14 years agoam 7f034a17: Fix a ref counting bug in touch event handling. The RefPtr returned...
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

14 years agoFix a ref counting bug in touch event handling. The RefPtr returned from m_originatin...
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

14 years agoam cc7f2722: am da713c02: Fix a crash caused by navigating away from a page with...
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

14 years agoam da713c02: Fix a crash caused by navigating away from a page with your finger still...
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

14 years agoFix a crash caused by navigating away from a page with your finger still down (when...
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

14 years agoam 6452300d: am d294ab99: Update plugin\'s dirtyRect to match the dirtyRect returned...
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.

14 years agoam d294ab99: Update plugin\'s dirtyRect to match the dirtyRect returned when locking...
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.

14 years agoUpdate 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

14 years agoam 6ec27fea: am 5076efcd: don\'t hide transparent nodes
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

14 years agoam 0f92e845: am 55ab51c0: Merge "nextTextField may walk off the end or try invalid...
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

14 years agoam 5076efcd: don\'t hide transparent nodes
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

14 years agodon'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

14 years agoam 55ab51c0: Merge "nextTextField may walk off the end or try invalid frames" into...
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

14 years agoMerge "nextTextField may walk off the end or try invalid frames" into froyo
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

14 years agonextTextField may walk off the end or try invalid frames
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

14 years agoam da70a732: am 42496a8f: Add cleanspec rules after re-enabling V8 snapshots.
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.

14 years agoam 42496a8f: 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.

14 years agoAdd 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

14 years agoFix focus ring on links with non-latin text
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

14 years agoam 233b1e5a: am 54070f49: Merge "Make sure to layout the view with the final dimensio...
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.

14 years agoam 34a423ba: am 22804c07: Pass scroll mode to Java so that we can handle overflow...
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

14 years agoam 54070f49: Merge "Make sure to layout the view with the final dimensions." into...
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.

14 years agoam 22804c07: Pass scroll mode to Java so that we can handle overflow on html and...
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

14 years agoMerge "Make sure to layout the view with the final dimensions." into froyo
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

14 years agoMake sure to layout the view with the final dimensions.
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

14 years agoPass scroll mode to Java so that we can handle
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

14 years agodon't hardcode "mSurface" throughout our source code
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

14 years agoam ac90fdd7: Merge "Cherry pick http://codereview.chromium.org/1560007" into froyo
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

14 years agoam d71ec47f: Merge "Cherry pick http://codereview.chromium.org/1549001" into froyo
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

14 years agoam 30f14070: Merge "Cherry-pick http://codereview.chromium.org/1594015" into froyo
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

14 years agoam 61c1b0ac: Merge "Cherry pick http://src.chromium.org/viewvc/chrome?view=rev&revisi...
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

14 years agoMerge "Cherry pick http://codereview.chromium.org/1560007" into froyo
Andrei Popescu [Mon, 12 Apr 2010 19:04:56 +0000 (12:04 -0700)]
Merge "Cherry pick codereview.chromium.org/1560007" into froyo

14 years agoMerge "Cherry pick http://codereview.chromium.org/1549001" into froyo
Andrei Popescu [Mon, 12 Apr 2010 19:04:22 +0000 (12:04 -0700)]
Merge "Cherry pick codereview.chromium.org/1549001" into froyo

14 years agoMerge "Cherry-pick http://codereview.chromium.org/1594015" into froyo
Andrei Popescu [Mon, 12 Apr 2010 19:03:32 +0000 (12:03 -0700)]
Merge "Cherry-pick codereview.chromium.org/1594015" into froyo

14 years agoMerge "Cherry pick http://src.chromium.org/viewvc/chrome?view=rev&revision=43874...
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

14 years agoCherry pick http://codereview.chromium.org/1560007
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

14 years agoam 164756aa: Merge "Do not set touch state to TouchStationary as EventHandler doesn...
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

14 years agoMerge "Do not set touch state to TouchStationary as EventHandler doesn't handle it...
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

14 years agoCherry pick http://codereview.chromium.org/1549001
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

14 years agoCherry-pick http://codereview.chromium.org/1594015
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

14 years agoCherry pick http://src.chromium.org/viewvc/chrome?view=rev&revision=43874
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

14 years agoDo not set touch state to TouchStationary as EventHandler
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

14 years agoam 411a8ae3: Merge "Fix for Bug:2579468" into froyo
Nicolas Roard [Thu, 8 Apr 2010 22:30:54 +0000 (15:30 -0700)]
am 411a8ae3: Merge "Fix for Bug:2579468" into froyo

Merge commit '411a8ae3907d3288c7e8ed008d61303f08fe265a' into froyo-plus-aosp

* commit '411a8ae3907d3288c7e8ed008d61303f08fe265a':
  Fix for Bug:2579468

14 years agoMerge "Fix for Bug:2579468" into froyo
Nicolas Roard [Thu, 8 Apr 2010 22:28:22 +0000 (15:28 -0700)]
Merge "Fix for Bug:2579468" into froyo

14 years agoFix for Bug:2579468
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

14 years agoam 18f501d6: Fix bug that causes plugins not be notified of the change to the visible...
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

14 years agoFix 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

14 years agoam 0c736339: Only allow animations computed on the UI if we have two steps -- otherwi...
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.

14 years agoOnly allow animations computed on the UI if we have two steps -- otherwise let webkit...
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

14 years agoam 72d9dfdf: Merge "Document can be detached when CachedFrame is destroyed. So we...
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.

14 years agoMerge "Document can be detached when CachedFrame is destroyed. So we can't use it...
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

14 years agoDocument can be detached when CachedFrame is destroyed.
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

14 years agoam 5c13f89a: Merge "Revert "Mark positioned elements as needing a relayout when check...
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."

14 years agoMerge "Revert "Mark positioned elements as needing a relayout when checking for hit...
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

14 years agoRevert "Mark positioned elements as needing a relayout when checking for hit test."
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

14 years agoam 213f1345: Merge "suppress compiler warnings in plugin code" into froyo
Cary Clark [Tue, 6 Apr 2010 21:29:54 +0000 (14:29 -0700)]
am 213f1345: Merge "suppress compiler warnings in plugin code" into froyo

Merge commit '213f1345619560709150e9510a9a22c3cb36eb23' into froyo-plus-aosp

* commit '213f1345619560709150e9510a9a22c3cb36eb23':
  suppress compiler warnings in plugin code

14 years agoMerge "suppress compiler warnings in plugin code" into froyo
Cary Clark [Tue, 6 Apr 2010 21:27:40 +0000 (14:27 -0700)]
Merge "suppress compiler warnings in plugin code" into froyo

14 years agosuppress compiler warnings in plugin code
Cary Clark [Tue, 6 Apr 2010 21:21:29 +0000 (17:21 -0400)]
suppress compiler warnings in plugin code

Change-Id: I0cadbf8946193ed7a4a7fe0cdeff82a2495d9ef9

14 years agoam 5e9b4f88: Merge "When handling Fixed position, always relative to the top document...
Grace Kloba [Tue, 6 Apr 2010 20:45:16 +0000 (13:45 -0700)]
am 5e9b4f88: Merge "When handling Fixed position, always relative to the top document." into froyo

Merge commit '5e9b4f88ec0abb578823e8225ad9614c1ba58c6b' into froyo-plus-aosp

* commit '5e9b4f88ec0abb578823e8225ad9614c1ba58c6b':
  When handling Fixed position, always relative to

14 years agoMerge "When handling Fixed position, always relative to the top document." into froyo
Grace Kloba [Tue, 6 Apr 2010 20:43:16 +0000 (13:43 -0700)]
Merge "When handling Fixed position, always relative to the top document." into froyo

14 years agoam e5b1750d: Merge "keep frames associated with regular hits and direct hits" into...
Cary Clark [Tue, 6 Apr 2010 20:19:47 +0000 (13:19 -0700)]
am e5b1750d: Merge "keep frames associated with regular hits and direct hits" into froyo

Merge commit 'e5b1750d38ff2208c180fe357355bf7e23e1d97d' into froyo-plus-aosp

* commit 'e5b1750d38ff2208c180fe357355bf7e23e1d97d':
  keep frames associated with regular hits and direct hits

14 years agoMerge "keep frames associated with regular hits and direct hits" into froyo
Cary Clark [Tue, 6 Apr 2010 20:17:25 +0000 (13:17 -0700)]
Merge "keep frames associated with regular hits and direct hits" into froyo

14 years agokeep frames associated with regular hits and direct hits
Cary Clark [Tue, 6 Apr 2010 20:07:01 +0000 (16:07 -0400)]
keep frames associated with regular hits and direct hits

The hit test on the nav cache returns a node/frame pair.
It looks for the closest hit, but gives priority to a direct
hit. Track the frame associated with the direct hit
separately, so that the correct node/frame pair is returned.

Change-Id: Icb1e3de4a0aad3c6dd9b2b81669f9c7bbb260282
http://b/2316138

14 years agoWhen handling Fixed position, always relative to
Grace Kloba [Tue, 6 Apr 2010 04:59:09 +0000 (21:59 -0700)]
When handling Fixed position, always relative to
the top document.

Fix http://b/issue?id=2281574

14 years agoam 3dc27326: Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
Andrei Popescu [Tue, 6 Apr 2010 17:59:40 +0000 (10:59 -0700)]
am 3dc27326: Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150

Merge commit '3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0' into froyo-plus-aosp

* commit '3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0':
  Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150

14 years agoCherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
Andrei Popescu [Tue, 6 Apr 2010 15:34:40 +0000 (16:34 +0100)]
Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150

Check the frame's context at PageCache save and restore time to avoid crashing when it's null.

Fix bug: 2564844

Change-Id: Ifef3fcf271b1366d4f63c42da1a9ac08bb8b78ed

14 years agoam c0cc84d6: Merge "Create a method to check to see if the focus has a following...
Cary Clark [Mon, 5 Apr 2010 18:35:32 +0000 (11:35 -0700)]
am c0cc84d6: Merge "Create a method to check to see if the focus has a following textfield." into froyo

Merge commit 'c0cc84d6a4d0db0b39a9036bdbeb67f6c7e9e56e' into froyo-plus-aosp

* commit 'c0cc84d6a4d0db0b39a9036bdbeb67f6c7e9e56e':
  Create a method to check to see if the focus has a following textfield.

14 years agoMerge "Create a method to check to see if the focus has a following textfield." into...
Cary Clark [Mon, 5 Apr 2010 18:29:47 +0000 (11:29 -0700)]
Merge "Create a method to check to see if the focus has a following textfield." into froyo

14 years agoam b721be96: Merge "When we stopUpdating(), we should cancel the outstanding timer...
Grace Kloba [Fri, 2 Apr 2010 23:14:15 +0000 (16:14 -0700)]
am b721be96: Merge "When we stopUpdating(), we should cancel the outstanding timer." into froyo

Merge commit 'b721be96061253a7a8e35313bb5ee794d03d9af8' into froyo-plus-aosp

* commit 'b721be96061253a7a8e35313bb5ee794d03d9af8':
  When we stopUpdating(), we should cancel the outstanding

14 years agoMerge "When we stopUpdating(), we should cancel the outstanding timer." into froyo
Grace Kloba [Fri, 2 Apr 2010 23:09:33 +0000 (16:09 -0700)]
Merge "When we stopUpdating(), we should cancel the outstanding timer." into froyo

14 years agoWhen we stopUpdating(), we should cancel the outstanding
Grace Kloba [Fri, 2 Apr 2010 22:26:11 +0000 (15:26 -0700)]
When we stopUpdating(), we should cancel the outstanding
timer.

When timer fired, we should check m_lastError before
calling errorOccurred().

Fix http://b/issue?id=2560897

14 years agoam 726a2501: Fix pluginstream delay timer as it is expecting seconds instead of milli...
Grace Kloba [Fri, 2 Apr 2010 20:13:44 +0000 (13:13 -0700)]
am 726a2501: Fix pluginstream delay timer as it is expecting seconds instead of milliseconds.

Merge commit '726a250195dce8f58044e80342e99ec8c0fa98df' into froyo-plus-aosp

* commit '726a250195dce8f58044e80342e99ec8c0fa98df':
  Fix pluginstream delay timer as it is expecting seconds

14 years agomerge from open-source master
The Android Open Source Project [Fri, 2 Apr 2010 18:08:51 +0000 (11:08 -0700)]
merge from open-source master

Change-Id: I87473a9657b8906b4933a7e22bf1125a65e44502

14 years agoFix pluginstream delay timer as it is expecting seconds
Grace Kloba [Fri, 2 Apr 2010 18:05:18 +0000 (11:05 -0700)]
Fix pluginstream delay timer as it is expecting seconds
instead of milliseconds.

While the timer is active, don't deliverData.

Fix http://b/issue?id=2567300

14 years agoMerge "Remove some oboslete code."
Jean-Baptiste Queru [Fri, 2 Apr 2010 17:01:47 +0000 (10:01 -0700)]
Merge "Remove some oboslete code."

14 years agoOn demand plugins are now per-page, not per-object.
Patrick Scott [Fri, 2 Apr 2010 13:43:08 +0000 (09:43 -0400)]
On demand plugins are now per-page, not per-object.

Traverse the frame tree and enable all plugins currently on the page. Remember
the setting for any future plugins that are created. Reset the setting in
makeRepresentation as that seems to be called for all new documents.

Bug: 2564543
Change-Id: I558f068992719ee0236ba40f76b918b10cfe0ed9

14 years agoMerge "If "widget" is already existed in the HashMap when createScriptInstanceForWidg...
Grace Kloba [Thu, 1 Apr 2010 16:49:56 +0000 (09:49 -0700)]
Merge "If "widget" is already existed in the HashMap when createScriptInstanceForWidget(widget) is called, we need to release the reference of the matching npObject to avoid leak." into froyo

14 years agoGet the correct class name from the JVM when constructing arrays in the JNI bindings.
Ben Murdoch [Thu, 1 Apr 2010 14:01:26 +0000 (15:01 +0100)]
Get the correct class name from the JVM when constructing arrays in the JNI bindings.

Also a change in packages/apps/Browser to update the unit tests for JNI bindings.

Fix for b/2540502

Change-Id: Ia86a1ac672bd6653427ac0a969b4d40c86141415

14 years agoIf "widget" is already existed in the HashMap when
Grace Kloba [Thu, 1 Apr 2010 07:18:59 +0000 (00:18 -0700)]
If "widget" is already existed in the HashMap when
createScriptInstanceForWidget(widget) is called,
we need to release the reference of the matching
npObject to avoid leak.

HTMLPlugInElement::getInstance() only calls
createScriptInstanceForWidget(widget) once. But
HTMLEmbedElement is using its closest ancestor who
has objectTag to get the widget. So the same widget
can exist in the HashMap if both <object> and its
child <embed>'s getInstance() are called.

Fix http://b/issue?id=2553266

14 years agoMake sure html plugin element supports focus so that
Grace Kloba [Wed, 31 Mar 2010 19:07:39 +0000 (12:07 -0700)]
Make sure html plugin element supports focus so that
plugin can call focus() on it.

By default, only nodes can be tabbed through supports
focus. We make plugin element like frame element where
it always supports focus. In Android, plugin has a
focused mode, so it requires this change.

Fix http://b/issue?id=2539608

14 years agoCreate a method to check to see if the focus has a following textfield.
Leon Scroggins [Wed, 31 Mar 2010 19:29:25 +0000 (15:29 -0400)]
Create a method to check to see if the focus has a following textfield.

Fixes http://b/issue?id=2559070

Requires a change to frameworks/base.

Change-Id: I450cb8ee109e9a1f38a7290032fb3ca948dcc71a

14 years agoMerge "Make sure the protocol is lower case in the redirect." into froyo
Patrick Scott [Wed, 31 Mar 2010 17:58:16 +0000 (10:58 -0700)]
Merge "Make sure the protocol is lower case in the redirect." into froyo

14 years agoMake sure the protocol is lower case in the redirect.
Patrick Scott [Wed, 31 Mar 2010 17:34:16 +0000 (13:34 -0400)]
Make sure the protocol is lower case in the redirect.

Bug: 2560217
Change-Id: I22a7c854a4e043682eac8b92ca2dece256af76b8