OSDN Git Service
Ben Murdoch [Wed, 5 May 2010 18:08:34 +0000 (11:08 -0700)]
am
4190ab28: 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 c
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
Steve Block [Wed, 5 May 2010 12:40:08 +0000 (05:40 -0700)]
Merge "Fix typo in FrameLoaderClientAndroid.cpp"
Steve Block [Wed, 28 Apr 2010 10:49:02 +0000 (11:49 +0100)]
Fix typo in FrameLoaderClientAndroid.cpp
Change-Id: Ia852fa791d5c77ba80500e59926568cb9990bcac
Shimeng (Simon) Wang [Tue, 4 May 2010 20:38:53 +0000 (13:38 -0700)]
Merge "Enable SVG compiling in gingerbread."
Shimeng (Simon) Wang [Tue, 4 May 2010 00:54:32 +0000 (17:54 -0700)]
Enable SVG compiling in gingerbread.
Compiled successfully for both V8 and JSC.
The libwebcore size changes from
5354080 to
6072344, the diff is 700KB.
Change-Id: Id95abd8b8f2181ed7789a95e0675cb8436e11bf7
Leon Clarke [Tue, 9 Mar 2010 14:12:21 +0000 (14:12 +0000)]
Link prefetch support
http://b/issue?id=
2268353
Derek Sollenberger [Mon, 3 May 2010 22:23:36 +0000 (15:23 -0700)]
am
ce99ade6: am
6452300d: am
d294ab99: Update plugin\'s dirtyRect to match the dirtyRect returned when locking a surface.
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
Jing Yu [Mon, 3 May 2010 16:26:01 +0000 (09:26 -0700)]
Merge "Fix a return type bug which is complained by gcc-4.6. If compile this function iwht gcc-4.6, gcc complains that "error: 'GlyphSet::GlyphSet' names the constructor, not the type"."
Jing Yu [Mon, 3 May 2010 03:07:53 +0000 (20:07 -0700)]
Fix a return type bug which is complained by gcc-4.6.
If compile this function iwht gcc-4.6, gcc complains that
"error: 'GlyphSet::GlyphSet' names the constructor, not the type".
Change-Id: I34f3a66dc33f8dca93e4c0db1d87236bf3efc6ae
Tested:
With the patch, gcc-4.4.0 is still working correctly.
With the patch, gcc-4.6 works well too.
Steve Block [Thu, 29 Apr 2010 09:02:09 +0000 (02:02 -0700)]
Merge changes Ie9ba4c69,I35363367,I18aaae5f,I2c315360,I4f163c97,Ib640e64c,I98a4af82
* changes:
Merge webkit.org at r55033 : Update WebKit revision
Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result
Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android
Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android
Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android
Merge webkit.org at r55033 : Fix merge conflicts
Merge webkit.org at r55033 : Initial merge by git
Ben Murdoch [Wed, 28 Apr 2010 11:50:09 +0000 (04:50 -0700)]
Merge changes I347b2c80,I9e3185de
* changes:
Cherry pick of WebKit.org revision r58323. Improves documentation for the TouchStationary handler after discussions in webkit bug 37609.
Removing the TouchStationary state from PlatformTouchPoint resulted in unforseen build problems upstream at webkit.org so it was reverted.
Ben Murdoch [Mon, 26 Apr 2010 22:46:55 +0000 (15:46 -0700)]
Cherry pick of WebKit.org revision r58323. Improves documentation for the TouchStationary handler after discussions in webkit bug 37609.
Change-Id: I347b2c8050505fd8747f46d90596882258451d3f
Ben Murdoch [Mon, 26 Apr 2010 22:45:40 +0000 (15:45 -0700)]
Removing the TouchStationary state from PlatformTouchPoint resulted
in unforseen build problems upstream at webkit.org so it was reverted.
This change implements the revert inside WebCore. As we only support
single touch on Android, we still do not use the TouchStationary event
so we keep it removed from the WebKit/android layer.
Change-Id: I9e3185de42c21bd50e9c206fa7e6d46d50e037e1
Leon Scroggins [Tue, 27 Apr 2010 16:10:53 +0000 (09:10 -0700)]
Merge "Do not hide the cursor ring when clicking on a <select> element."
Steve Block [Mon, 26 Apr 2010 04:33:40 +0000 (21:33 -0700)]
Merge webkit.org at r55033 : Update WebKit revision
Change-Id: Ie9ba4c69af684735ef4e884c75457738f33f0a3f
Steve Block [Mon, 26 Apr 2010 16:40:59 +0000 (09:40 -0700)]
Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result
Update the V8 expected output to reflect updated test at r55033.
Change-Id: I35363367af1ed5adf59e0c22e328256e3ac361f3
Steve Block [Mon, 26 Apr 2010 01:36:43 +0000 (18:36 -0700)]
Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android
This method is required because the latest version of WebKit adds the ability
for an existing Frame object to be relocated in the DOM.
See http://trac.webkit.org/changeset/54938 and http://trac.webkit.org/changeset/53871
Change-Id: I18aaae5f6db005b7a0d29c3d783207fa37548572
Steve Block [Mon, 26 Apr 2010 01:35:48 +0000 (18:35 -0700)]
Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android
See http://trac.webkit.org/changeset/54940
Change-Id: I2c3153606ab0eb9a4598e211def2f07f60eab3da
Steve Block [Mon, 26 Apr 2010 01:35:18 +0000 (18:35 -0700)]
Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android
See http://trac.webkit.org/changeset/54923
Change-Id: I4f163c9716ca5e01b24f04337cf6c813e9faf0f7
Steve Block [Mon, 26 Apr 2010 01:33:18 +0000 (18:33 -0700)]
Merge webkit.org at r55033 : Fix merge conflicts
- Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp
- V8Index.h - Keep ours, conflict due to upstreaming of touch events
- GeolocationService.h - Take both, conflict due to Android-specific change for pausing service
- PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers
- V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards
Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126
Steve Block [Tue, 27 Apr 2010 15:23:55 +0000 (16:23 +0100)]
Merge webkit.org at r55033 : Initial merge by git
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
Steve Block [Tue, 27 Apr 2010 16:03:37 +0000 (09:03 -0700)]
Merge "Remove Python generated files accidentally added to tree in WebKit merge"
Leon Scroggins [Tue, 27 Apr 2010 15:47:28 +0000 (16:47 +0100)]
Do not hide the cursor ring when clicking on a <select> element.
Add a CachedNodeType for <select> elements. If the cursor node is
a <select> element, do not call setFollowedLink, which would hide
the cursor ring.
Bug
1694023
Change-Id: I2df2e70391b5f5969683b71b1e69bc24cba8946f
Cary Clark [Tue, 27 Apr 2010 08:50:21 +0000 (01:50 -0700)]
Merge "move CachedInput::init() to cpp"
Cary Clark [Mon, 26 Apr 2010 18:32:27 +0000 (14:32 -0400)]
move CachedInput::init() to cpp
The implementation of init() calls bzero, which is defined
in CachedPrefix.h. if CachedInput.h is included directly
bzero may not be defined. It is always defined for
CachedInput.cpp.
http://b/
2535696
enter the commit message for your changes. Lines starting
Change-Id: I995498cd4bc611f0f1a45aadf27a1fd330e62410
Leon Clarke [Wed, 21 Apr 2010 13:20:35 +0000 (14:20 +0100)]
Add more padding round select boxes, use different assets at
different resolutions, use new assets and don't deform the arrows
when stretching the select box.
http://b/issue?id=
2506670
Steve Block [Mon, 26 Apr 2010 02:33:01 +0000 (03:33 +0100)]
Remove Python generated files accidentally added to tree in WebKit merge
These were added in the WebKit merge to r54127 in https://android-git.corp.google.com/g/39242
Change-Id: I9cdcf2730d826393191e74cb77ab2ddf8de52920
Steve Block [Fri, 23 Apr 2010 20:38:04 +0000 (13:38 -0700)]
Merge "Add touch event LayoutTests to Android tree (at current WebKit revision, 54731)."
Steve Block [Fri, 23 Apr 2010 20:31:11 +0000 (13:31 -0700)]
Add touch event LayoutTests to Android tree (at current WebKit revision, 54731).
These tests should all pass. Current failures will be added to the DumpRenderTree ignore list.
Change-Id: Id9a273154e2e70ea6fdea6e39797708e2f5132ed
Steve Block [Fri, 23 Apr 2010 20:24:53 +0000 (13:24 -0700)]
Merge "Fixes the Geolocation mock position timestamp"
Steve Block [Fri, 23 Apr 2010 19:57:22 +0000 (12:57 -0700)]
Fixes the Geolocation mock position timestamp
Change-Id: I96010209387446306fd548a87cf203a9505e6d03
Shimeng (Simon) Wang [Thu, 22 Apr 2010 20:58:26 +0000 (13:58 -0700)]
Merge "Revert the ANDROID_FIX which is the same as the original."
Shimeng (Simon) Wang [Thu, 22 Apr 2010 20:52:18 +0000 (13:52 -0700)]
Revert the ANDROID_FIX which is the same as the original.
Since the ! operator is overloaded to check whether the string is NULL.
I tested it out, the ! works when the http-referrer is not defined. So the
ANDROID_FIX is redundant.
Change-Id: If6b54e195a954ec7f2705da89c13563a8698467d
Cary Clark [Thu, 22 Apr 2010 20:37:03 +0000 (13:37 -0700)]
am
29189dc4: am
6ec27fea: am
5076efcd: don\'t hide transparent nodes
Cary Clark [Thu, 22 Apr 2010 20:37:01 +0000 (13:37 -0700)]
am
68b8e349: am
0f92e845: am
55ab51c0: Merge "nextTextField may walk off the end or try invalid frames" into froyo
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
Steve Block [Thu, 22 Apr 2010 20:15:36 +0000 (13:15 -0700)]
Merge "Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamed"
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
Steve Block [Thu, 22 Apr 2010 19:55:32 +0000 (20:55 +0100)]
Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamed
Android's stlport now provides isinf etc. in the std namespace (see
https://android-git.corp.google.com/g/41036). This allows us to remove the
Android special-case from MathExtras.h (see
https://android-git.corp.google.com/g/41037).
This change has now been upstreamed in http://trac.webkit.org/changeset/58110
so we can remove the ANDROID guard marking this change.
Change-Id: I7c06a5a5a8f9a0a7909a649e68424688bf02893a
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
Shimeng (Simon) Wang [Thu, 22 Apr 2010 00:31:08 +0000 (17:31 -0700)]
Enable XSLT in Android webkit.
Before this change, the libwebcore size is:
4902184 Bytes
After this change, the libwebcore size is:
5103712 Bytes
The diff is: 200KB.
Change-Id: I2554a043c2686de56c802e8a9e02cce604fb25c0
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 17:16:19 +0000 (18:16 +0100)]
resolved conflicts for merge of
3c27e79b to master
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
Shimeng (Simon) Wang [Mon, 19 Apr 2010 22:55:04 +0000 (15:55 -0700)]
Add one more clean step to make sure people rebuild webcore for xpath change.
Change-Id: I5e871bc37fd640dd89a5d90ae52440e39a521736
Shimeng (Simon) Wang [Mon, 19 Apr 2010 21:06:35 +0000 (14:06 -0700)]
Enable XPATH in Android browser.
Issue:
2582105
Change-Id: I270de4478e639bba8ba9a12558dff05746e991b0
Nicolas Roard [Thu, 15 Apr 2010 19:51:53 +0000 (12:51 -0700)]
Performance improvements in GraphicsLayer: implement the simple image code path.
Bug:
2599955
Change-Id: I530a02c64abff40223005d6dc07c7495ca475ffe
Nicolas Roard [Thu, 15 Apr 2010 23:02:46 +0000 (16:02 -0700)]
Revert previous CL due to side-effect.
Bug:
2600918
Change-Id: I72189bd2edf725b4f0db426d2735590e846dcba4
Patrick Scott [Thu, 15 Apr 2010 19:33:54 +0000 (12:33 -0700)]
am
f635101c: am
233b1e5a: am
54070f49: Merge "Make sure to layout the view with the final dimensions." into froyo
Grace Kloba [Thu, 15 Apr 2010 19:33:51 +0000 (12:33 -0700)]
am
5c6e2c78: am
34a423ba: am
22804c07: Pass scroll mode to Java so that we can handle overflow on html and body correctly.
Ben Murdoch [Thu, 15 Apr 2010 17:22:47 +0000 (10:22 -0700)]
Merge "Remove the TouchStationary state from PlatformTouchPoint."
Mathias Agopian [Thu, 15 Apr 2010 13:36:08 +0000 (06:36 -0700)]
am
069d5161: don\'t hardcode "mSurface" throughout our source code
Ben Murdoch [Thu, 15 Apr 2010 00:40:16 +0000 (17:40 -0700)]
Remove the TouchStationary state from PlatformTouchPoint.
This is being tracked upstream at webkit.org in https://bugs.webkit.org/show_bug.cgi?id=37609
Change-Id: Ideb26d7457e27799564e8db9b3308a703a1110e2
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
Andrei Popescu [Tue, 13 Apr 2010 00:02:12 +0000 (17:02 -0700)]
am
13aa9bd5: am
ac90fdd7: Merge "Cherry pick codereview.chromium.org/
1560007" into froyo
Andrei Popescu [Tue, 13 Apr 2010 00:02:10 +0000 (17:02 -0700)]
am
3ee9e897: am
d71ec47f: Merge "Cherry pick codereview.chromium.org/
1549001" into froyo
Andrei Popescu [Tue, 13 Apr 2010 00:02:02 +0000 (17:02 -0700)]
am
b303a4d8: am
30f14070: Merge "Cherry-pick codereview.chromium.org/
1594015" into froyo
Andrei Popescu [Tue, 13 Apr 2010 00:01:54 +0000 (17:01 -0700)]
am
1f2e23af: am
61c1b0ac: Merge "Cherry pick src.chromium.org/viewvc/chrome?view=rev&revision=43874" into froyo
Grace Kloba [Tue, 13 Apr 2010 00:01:50 +0000 (17:01 -0700)]
am
46051e5e: 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
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:41:51 +0000 (15:41 -0700)]
am
a22aa62c: am
411a8ae3: Merge "Fix for Bug:
2579468" into froyo
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:57:13 +0000 (07:57 -0700)]
am
b60bbcfb: 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.
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:31:50 +0000 (11:31 -0700)]
am
18fc0da0: am
0c736339: Only allow animations computed on the UI if we have two steps -- otherwise let webkit do it.