summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "The m_projectionMatrix in the ShaderProgram need to be updated" into ↵Teng-Hui Zhu2011-01-121-0/+1
|\ | | | | | | honeycomb
| * The m_projectionMatrix in the ShaderProgram need to be updatedTeng-Hui Zhu2011-01-121-0/+1
| | | | | | | | | | | | | | | | | | When there is only layers (no baseLayer), m_projectionMatrix is not updated for every draw call, such that it doesn't reflect the visibleRect info. Change-Id: I527f86d6d16034e56c3215f011c20196b02b16c2 b:3335132
* | Revert "Only use the name part when opening files that start with file://"Guang Zhu2011-01-123-12/+0
| | | | | | | | This reverts commit 5bc439a352fa4a52aa5be1eab0dc72420f40d49f.
* | Do not open the keyboard if 'click' came from a keypress.Leon Scroggins2011-01-122-18/+25
| | | | | | | | | | | | | | | | Bug:3344162 Requires a change in frameworks/base. Change-Id: Id6fddcb2f179695998ef9372b8bca36bebbb54a3
* | Merge "Make sure there is a focus before derefing it." into honeycombLeon Scroggins2011-01-121-2/+2
|\ \
| * | Make sure there is a focus before derefing it.Leon Scroggins2011-01-121-2/+2
| | | | | | | | | | | | | | | Bug:3344795 Change-Id: I8c4bb2aa3c105da1d08260daa9a9d11d39de7840
* | | Merge "always compute cx, cy in select text" into honeycombCary Clark2011-01-121-6/+4
|\ \ \
| * | | always compute cx, cy in select textCary Clark2011-01-121-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cx, cy locals are later stored as part of the best character found. They must always be computed so that the best state can compare with the test state. bug:3339016 Change-Id: I4cbb791dc8d3836b027c6a9088dc3a59031c40b9
* | | | Merge "Fix a ref count issue." into honeycombPatrick Scott2011-01-121-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix a ref count issue.Patrick Scott2011-01-121-2/+2
| |/ / | | | | | | | | | | | | | | | | | | setBridge calls adoptRef on the bridge and the stack object deletes the bridge. Deleted memory is no good. Change-Id: I80c5f614da604c0362530a54ff04b892d96ef6b1
* | | Merge "Disable rounding hacks." into honeycombLeon Scroggins2011-01-124-0/+82
|\ \ \
| * | | Disable rounding hacks.Leon Scroggins2011-01-114-0/+82
| | | | | | | | | | | | | | | | | | | | Bug:3085564 Change-Id: Ie570cbac6a445a337c72466598d5550c84d803ad
* | | | Merge "Remove the WebTextView always when moving off a textfield." into ↵Leon Scroggins2011-01-121-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | honeycomb
| * | | | Remove the WebTextView always when moving off a textfield.Leon Scroggins2011-01-111-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug:3341272 Change-Id: Ibf00b2cb5a2c34eed9e5ac0355b59f8507ade446
* | | | Merge "Fix <select> with size." into honeycombLeon Scroggins2011-01-121-1/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix <select> with size.Leon Scroggins2011-01-111-1/+17
| |/ / | | | | | | | | | | | | Bug:3328480 Change-Id: I47a7df3e5ffb043e6162b661a6de3a837d141c88
* | | Only use the name part when opening files that start with file://Kristian Monsen2011-01-123-0/+12
| |/ |/| | | | | | | | | | | Part of fix for bug 2862096 Fix for bug 3280996 Change-Id: I82d872aff834524fb105f42e83eee580d6c98c0b
* | Fix the invalidate on the layerTeng-Hui Zhu2011-01-111-1/+6
| | | | | | | | | | | | | | For each layer, if its content is dirty, it should tell the Java to redraw. Change-Id: If1fe006c0777130083ddc84778104fff35435a1b b:3327600
* | Merge "Use float to preserve scales' accuracy." into honeycombShimeng (Simon) Wang2011-01-115-25/+26
|\ \
| * | Use float to preserve scales' accuracy.Shimeng (Simon) Wang2011-01-115-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change helps page navigation, since the restored scale is accurate. This change has a corresponding change in frameworks/base. https://android-git.corp.google.com/g/#change,88121 issue: 3225233 Change-Id: I7e5601e8412e8b81e7f32c9ffb9e6c114db95169
* | | Merge "Prevent a crash by caching overflow scrolling." into honeycombPatrick Scott2011-01-114-24/+16
|\ \ \ | |/ / |/| |
| * | Prevent a crash by caching overflow scrolling.Patrick Scott2011-01-114-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use adoptRef when creating a new bridge item. Use toRenderBoxModelObject instead of toRenderBox as RenderInlines have layers. Bug: 3321493 Change-Id: I4283681eba961aedaa8d80bfdfb3d1a468aab1ac
* | | Merge "Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.h" into honeycombShimeng (Simon) Wang2011-01-113-15/+0
|\ \ \ | |_|/ |/| |
| * | Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.hShimeng (Simon) Wang2011-01-073-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This helps scrolling to a page#anchor link as shown in the bug. Not sure I understand the reason to have that setting at the first place. issue: 3225233 Change-Id: If2960d3c77be94b150e138a534007708f025dbad
* | | Merge changes ↵Ben Murdoch2011-01-118-34/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Iad96314e,Ic978944b,Iea1a5a55,Id22f7f0c,Ia1a391a9,Ic4642c38,I561d89dc,Ia102dea1 into honeycomb * changes: Merge Chromium at 9.0.597.55: Move formsSeen call to IO thread. Merge Chromium at 9.0.597.55: Remove URLRequest forward declaration. Merge Chromium at 9.0.597.55: Merge 67599. (2/2) Merge Chromium at 9.0.597.55: Merge r67599 (1/2) Merge Chromium at 9.0.597.55: Merge r67192 Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructor Merge Chromium at 9.0.597.55: Autofill: Merge r66860 Merge Chromium at 9.0.597.55: Autofill: Merge r66850
| * | | Merge Chromium at 9.0.597.55: Move formsSeen call to IO thread.Ben Murdoch2011-01-112-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we search the document for forms to be autofilled, we make a URL request to the AutoFill server to ask it for form field data. With Chromium r67655, this URL request needs to be made on a Chrome thread. This is a simple fix for the merge, which blocks until the call completes. See http://src.chromium.org/viewvc/chrome?view=rev&revision=67655 Change-Id: Iad96314e4ecb66ee7e65c1ef846709e9c41b0e2e
| * | | Merge Chromium at 9.0.597.55: Remove URLRequest forward declaration.Ben Murdoch2011-01-111-2/+0
| | | | | | | | | | | | | | | | Change-Id: Ic978944b7a4e0bdda4ab09a18234456098ad26ca
| * | | Merge Chromium at 9.0.597.55: Merge 67599. (2/2)Ben Murdoch2011-01-112-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needed a bit of work so I've split into two commits. This is part 2, where we now need to pass both the field that was focussed and the form it belongs to. To achieve this I have a new class that encapsulates the pointers. Change-Id: Iea1a5a55696c63255bcc57b070116409a2195f4c
| * | | Merge Chromium at 9.0.597.55: Merge r67599 (1/2)Ben Murdoch2011-01-113-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a slightly tricky merge. This first part is the easy bit. See http://src.chromium.org/viewvc/chrome?view=rev&revision=67599 Change-Id: Id22f7f0ce0f0b7eca62f39d4e6ae65b9ea1bdcda
| * | | Merge Chromium at 9.0.597.55: Merge r67192Ben Murdoch2011-01-112-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | See http://src.chromium.org/viewvc/chrome?view=rev&revision=67192 Change-Id: Ia1a391a9e7634e86e5c3166349befc47841b570e
| * | | Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructorBen Murdoch2011-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://src.chromium.org/viewvc/chrome?view=rev&revision=66985 Change-Id: Ic4642c38646b94fb6db9e839a671cd335f9d5c6b
| * | | Merge Chromium at 9.0.597.55: Autofill: Merge r66860Ben Murdoch2011-01-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://src.chromium.org/viewvc/chrome?view=rev&revision=66860 Change-Id: I561d89dcc060af7f3e0b975e4a940c7de63d89d4
| * | | Merge Chromium at 9.0.597.55: Autofill: Merge r66850Ben Murdoch2011-01-113-13/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Autofill: Prefer maxLength to size attribute for form filling heuristics. See http://src.chromium.org/viewvc/chrome?view=rev&revision=66850 Change-Id: Ia102dea1c861474e878639b91288e6845d7250ef
* | | remove push/pop around bitmapCary Clark2011-01-111-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | The algorithm that analyzes cursor rings in pictures stores the changes to the canvas (e.g. push layer, pop) but it turns out that bitmaps may have push/pop pairs around them that don't represent a state change. Remove the push/pop pairs around bitmaps when creating the cursor region stack. bug:3299913 bug:3329011 Change-Id: I14e0508285821e2723ff460e6b09faccb44f4565
* | Merge "layer or save push/pop should start new rect" into honeycombCary Clark2011-01-111-1/+5
|\ \
| * | layer or save push/pop should start new rectCary Clark2011-01-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In computing cursor rings, consecutive rectangles from the picture may be combined. If the picture pushes or pops a canvas context, the rects should no longer be combined, because they come from different DOM nodes. bug:3336522 Change-Id: I2b09220d84238873f209528bf822b9c203de9ce8
* | | Merge "Fix a warning" into honeycombKristian Monsen2011-01-111-3/+3
|\ \ \
| * | | Fix a warningKristian Monsen2011-01-101-3/+3
| |/ / | | | | | | | | | | | | | | | Just changing the order so they are matched in the .h and .cpp Change-Id: I88afbdded260a389da2134ccdc7946f649b8db37
* | | Remove nativeCursorMatchesFocus method.Leon Scroggins2011-01-101-13/+4
| | | | | | | | | | | | | | | Bug:3335014 Change-Id: I55e60cec72f27ab2877455a7899a21cbd86a0efa
* | | Cherrypick of https://android-git.corp.google.com/g/#change,88039Derek Sollenberger2011-01-101-13/+29
| | | | | | | | | | | | | | | | | | Pass multiTouch events to plugins so Adobe could try it. Change-Id: I2c1120a85ef15db0ce45161403d56843c0037abf
* | | Add Null check to the root layerTeng-Hui Zhu2011-01-101-1/+1
| | | | | | | | | | | | | | | bug:3284834 Change-Id: If537400333a6884f92d688481ff4efe3ae5796a3
* | | Merge "Enable fixed layers for all websites" into honeycombNicolas Roard2011-01-102-18/+6
|\ \ \
| * | | Enable fixed layers for all websitesNicolas Roard2011-01-102-18/+6
| | | | | | | | | | | | | | | | | | | | bug:2797422 Change-Id: Ide0867a06d61a7ee92af751ae824fe6c3b23c41f
* | | | Merge "Change the transition from cross-fading to simple fading of only one ↵Nicolas Roard2011-01-101-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | of the TiledPage." into honeycomb
| * | | Change the transition from cross-fading to simple fading of only one ofNicolas Roard2011-01-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the TiledPage. bug:3335076 Change-Id: Ia2a0de24e7c13d7cf3bbae8b17e9db1e377aa8a4
* | | | Merge "selectBestAt missing another null check" into honeycombCary Clark2011-01-101-2/+3
|\ \ \ \
| * | | | selectBestAt missing another null checkCary Clark2011-01-101-2/+3
| | |/ / | |/| | | | | | | | | | | | | | bug:3334943 Change-Id: I0183634bfbe64b145edafcc84f42e213509cbc2c
* | | | Merge "Ensure that PopupReply does not take action after disconnection." ↵Leon Scroggins2011-01-102-8/+36
|\ \ \ \ | |/ / / |/| | | | | | | into honeycomb
| * | | Ensure that PopupReply does not take action after disconnection.Leon Scroggins2011-01-102-8/+36
| | | | | | | | | | | | | | | | | | | | Bug:3326203 Change-Id: Ieec8765fae0af7d4f2b0f56167cb1b221fa73687
* | | | return the scrollable layer's content boundsCary Clark2011-01-101-10/+27
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute and return the scrollable layer's bounds in content space and return it to the java side. The layer's bounds is used to determine if the select text touch point is close to the edge and should invoke scrolling. Also, added a null check to selectBestAt Requires a companion change in frameworks/base bug:3191699 bug:3334943 Change-Id: Id066997f56da59f37350c14a4cc43fe4a7ce7312