summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-20914-7484/+38141
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Chrome http: Persistent cookies and cache.Kristian Monsen2010-07-203-16/+20
| | | | | | Sharing one RequestContex. Adding a persistent cookie store and on disk cache to that request. Change-Id: I7f45cda3803340672585e5b0f84eb0d5e2fd6b75
* Merge "Removing ANDROID_USER_GESTURE ifdef"Kristian Monsen2010-07-203-15/+1
|\
| * Removing ANDROID_USER_GESTURE ifdefKristian Monsen2010-07-153-15/+1
| | | | | | | | | | | | | | As discussed on CL https://android-git.corp.google.com/g/#change,56717, removing the ifdef is a good thing as this is not a feature we want to turn on and off. Change-Id: Ic7a062e2bb15850ca17fcb46fbd25d786e08028d
* | Revert "Disable ICF for libwebcore.so"Doug Kwan2010-07-181-7/+0
| | | | | | | | This reverts commit 4d9904fcc4161d144bfd84ca9d294f21d55444d2.
* | am 02f67ae0: am ae583467: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '02f67ae036c6acabb72e337a53c601d53ef6592c' * commit '02f67ae036c6acabb72e337a53c601d53ef6592c': add meta-files about 3rd party projects
| * \ am ae583467: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ae583467c6ceda8b918b6d3e38cceca26d0715eb' into gingerbread-plus-aosp * commit 'ae583467c6ceda8b918b6d3e38cceca26d0715eb': add meta-files about 3rd party projects
| | * | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | | | | | | | | | | | | | | | Change-Id: I1cc3b4d6e2165285a27b5d848c39d3965553382a
* | | | am 72533818: am 4da2dabd: Merge "The ICU data is no longer compiled directly ↵Joe Onorato2010-07-151-1/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | into the shared library." into gingerbread Merge commit '725338187e8e5e36ec3647b675caf1fcd8e5cab7' * commit '725338187e8e5e36ec3647b675caf1fcd8e5cab7': The ICU data is no longer compiled directly into the shared library.
| * | am 4da2dabd: Merge "The ICU data is no longer compiled directly into the ↵Joe Onorato2010-07-151-1/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| | * Merge "The ICU data is no longer compiled directly into the shared library." ↵Joe Onorato2010-07-151-1/+0
| | |\ | | | | | | | | | | | | into gingerbread
| | | * The ICU data is no longer compiled directly into the shared library.Joe Onorato2010-07-131-1/+0
| | | | | | | | | | | | | | | | Change-Id: Iff0a8c1152c9be1ea49f1856f3edc4383a1a5640
* | | | Fix for bug 2816268: Refactor ANDROID_USER_GESTURE codeKristian Monsen2010-07-1513-102/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used the UserGestureIndicator class instead of the local ANDROID_USER_GESTURE code. I have made a simple test case for the problem at: http://updates.monsen.it/source.html This cannot be made into a layout test since the Android Dumprendertree does not support focus on windows other than the main one. Lots of local changes removed, but not many actual changes. Most are in parameters sent to other functions. As far as I can see they user gestures are only checked for in ChromeClientAndroid.cpp and WebCoreFrameBridge.cpp, and I replaced ANDROID_USER_GESTURE with UserGestureIndicator::processingUserGesture(). The UserGestureIndicator class was added to webkit in this CL: http://trac.webkit.org/changeset/57045 ResourceRequest.h is a cherry-pick of this CL from webkit.org http://trac.webkit.org/changeset/62668 Change-Id: Ia254b2cee833459fcc2cacfb2751ef7a29a8f64a
* | | | Add -fno-data-sections to WebCore makefile.Ben Murdoch2010-07-151-0/+1
| | | | | | | | | | | | | | | | Change-Id: I9a79b98a5888137d044057e9a2595f3f5bb979f2
* | | | Initial check-in of the external/webkit part of the chrome http stack.Kristian Monsen2010-07-1510-3/+1048
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes in WebCore anymore, the new files live in WebKit/android/WebCoreSupport. There are two WebCore functions implemented in WebUrlLoader.cpp, they are one-liners that call a WebKit function or return a bool. Only async downloads are implemented so far. There are crashes on some websites, but better to get things checked in, and then start fixing outstanding issues. I have tried to address all the issues from the reviews, but since the code has changed a bit I have not replied to each of them. Change-Id: Ie83798e2f82ce78cb00ee5a4a558c9d8085c9567
* | | | Merge "Set smaller minHeight for button."Shimeng (Simon) Wang2010-07-141-7/+4
|\ \ \ \
| * | | | Set smaller minHeight for button.Shimeng (Simon) Wang2010-07-141-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic is similar to safari. In ChromimumSkia, seems there's no setting for the minHeight. Other settings in safari are not copied, since after trying, it's not working well. Issue: 2732674 Change-Id: I5235f092f44d9e70e3aede7b7c50f425473db163
* | | | | am b47b5d4a: am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-134-79/+107
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | Merge commit 'b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf' * commit 'b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf': Migrate to new keycode constants in keycodes.h.
| * | | am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-134-79/+107
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp * commit '652e9a017a7c5c772361bf57279fae0c26992329': Migrate to new keycode constants in keycodes.h.
| | * | Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-134-79/+107
| | |/ | | | | | | | | | Change-Id: I523d6fab2964cec4610424f6fd7bbe86d38b7306
* | | Merge "Implements the lastHyphenLocation for Android."Shimeng (Simon) Wang2010-07-133-2/+105
|\ \ \
| * | | Implements the lastHyphenLocation for Android.Shimeng (Simon) Wang2010-07-123-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream webkit implemented the hyphenation working draft http://www.w3.org/TR/2010/WD-css3-gcpm-20100608/#hyphenation in: http://trac.webkit.org/changeset/61548 This change implements the interface function for Android. English only support for now. Issue: 2672163 Change-Id: I6763adc0ff56de1431bdb09e79b110b30bac01d1
* | | | Merge "Copy back the upstreamed version of prefetch ↵Leon Clarke2010-07-1321-320/+51
|\ \ \ \ | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652"
| * | | | Copy back the upstreamed version of prefetchLeon Clarke2010-07-1221-320/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=3652 Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
* | | | | Fix issue: 2741016 and refactor visible width logic in android layout.Shimeng (Simon) Wang2010-07-129-62/+45
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The site is not reflowed, because for some RenderBlock, the m_visibleWidth is set twice before layout; the current logic will think the visibleWidth is not changed, hence no relayout children and no reflow. The logic is refactored to to make it modularlized. issue: 2741016 Change-Id: I1f433e263add974c0981c332ad4ea092ddb395e0
* | | | Merge "Add dom/xhtml/level2 layout tests at WebKit r62496"Steve Block2010-07-122204-0/+134675
|\ \ \ \
| * | | | Add dom/xhtml/level2 layout tests at WebKit r62496Steve Block2010-07-122204-0/+134675
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These all pass. Note that the Android-V8-specific results for the HTMLDocument tests are required because the tests rely on Error.line, which is non-standard and not provided by V8. The Android-specific result for HTMLFormElement10.xhtml is required because the test appears to be flawed, and navigates the page before notifyDone is called. None of these tests are run on Chromium. Change-Id: I491d87a9dac4c132093369d1bde974baed77a757
* | | | | Merge "Update CachedFont.cpp to reflect upstreaming in WebKit change 63088"Steve Block2010-07-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update CachedFont.cpp to reflect upstreaming in WebKit change 63088Steve Block2010-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/63088 Change-Id: I41778e43e0e731b6e0116e6e1569e91d5c18750a
* | | | | Browser save page as web archive.Elliott Slaughter2010-07-127-1/+630
| |/ / / |/| | | | | | | | | | | Change-Id: Ie92953142ed31fc859975289a978172bdb8b6d79
* | | | Merge "Add dom/xhtml/level1 layout tests at WebKit r62496"Steve Block2010-07-12723-0/+50184
|\ \ \ \
| * | | | Add dom/xhtml/level1 layout tests at WebKit r62496Steve Block2010-07-09723-0/+50184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These all pass. Change-Id: If26268844fe87cd6ed8d0fc823ecf59b6eab1938
* | | | | Merge "handle out of order selections"Cary Clark2010-07-092-108/+298
|\ \ \ \ \
| * | | | | handle out of order selectionsCary Clark2010-07-092-108/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually, the text on a webpage is drawn from top to bottom but sometimes it is drawn out of order. In these cases the picture finds the select end before it finds the select start. When the select start and end are ordered, all of the text in the picture between the two are selected. This allows selecting all of the text on the page, even if the start isn't spacially before the end. When the select start and end are flipped, select the text spacially between the two. The flipped page scenario was found by http://code.google.com/p/android/issues/detail?id=8533 Change-Id: Ia22d49396d68fefc3d64fad438c4b0c02f668c1c
* | | | | | am b34d9d68: merge from open-source masterThe Android Open Source Project2010-07-093-3/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010' * commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010': Fix missing NL
| * | | | | merge from open-source masterThe Android Open Source Project2010-07-093-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | Change-Id: Ib725f9df8c1d3a5105a126bf9475ec060ac0a98a
| | * | | | Fix missing NLBruce Beare2010-06-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6757ab42e52b9d878f06da4bdc757c4626e3d0c5 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | | | | | Combine base PictureSet with composite layers intoGrace Kloba2010-07-0910-307/+210
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one SkLayer tree. The BaseLayerAndroid is the root of the composite layers and it has the PictureSet as its base content. Before, WebViewCore uses m_contentMutex and both UI and WebCore threads access the m_content. Now we use the layer approach. When WebCore thread updates its content in recordContent, it creates a new BaseLayerAndroid and copy both PictureSet and composite layers into it. Then it is sent to be consumed by UI thread. Clean up sync layer in both ChromeClientAndroid and GraphicsLayerAndroid. splitContent can be a little tricky with this change. Now UI has its own copy of PictureSet. When it takes too long to draw, it will send a request to WebCore to split the PictureSet. When it is done, a copy of the new PictureSet will be sent back to UI. There is a matching change in framework/base
* | | | | Add fast/xpath tests to the tree at the current webkit revision 62496. They ↵Ben Murdoch2010-07-09120-0/+6180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all pass. Note the addition of the android-v8 specific result for fast/xpath/nsresolver-exception.html (this is added due to a V8 exception printing difference). Change-Id: I685cb62a438b742cba3f7496b2e1bdad9a7d8d82
* | | | | Fix fast/xpath layout test failures.Ben Murdoch2010-07-091-1/+4
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | These failures are caused by https://bugs.webkit.org/show_bug.cgi?id=41862 and this patch is a cherry pick of the patch attached to that bug. Change-Id: I9c897086a7a2903aaa6a11da5fb95b81086287cc
* | | | Merge WebKit at r62496: Update WEBKIT_MERGE_REVISIONSteve Block2010-07-091-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ibe32800f15d1d1b1c2d36d60e35bddf380029cee
* | | | Merge WebKit at r62496: Update Android-specific layout test resultsSteve Block2010-07-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | sql-error-codes.html - Take updated chromium result - http://trac.webkit.org/changeset/62094 Change-Id: Ibb2f90c22cd59d6656900ed440f6d88fe3469844
* | | | Merge WebKit at r62496: Stub out new GraphicsContext::clipConvexPolygon()Steve Block2010-07-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/62035 Change-Id: Iaa2c76ac96d7dd95a6203b969679759dd1b306a3
* | | | Merge WebKit at r62496: PaintInfo is no longer a member of RenderObjectSteve Block2010-07-092-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/62104 Change-Id: I89f38ef8d8e76b8e2872848dbab1bf103429783b
* | | | Merge WebKit at r62496: Fix MakefilesSteve Block2010-07-094-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | New files added in http://trac.webkit.org/changeset/62215 Change-Id: I8fd5b51f0c38396060fac61d64bc8d159e234a5d
* | | | Merge WebKit at r62496: Fix conflictsSteve Block2010-07-097-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033 FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135 Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284 DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124 RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104 Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
* | | | Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-09902-11465/+33671
| | | | | | | | | | | | | | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* | | | Properly guard local changes for link prefetchingSteve Block2010-07-092-7/+19
| |_|/ |/| | | | | | | | | | | | | | This fixes the WebKit build for PLATFORM(MAC) Change-Id: Ic19e8840363bc1d42b569c3e732ee3ee4e92c00a
* | | Merge "Fix issue 2823805: let expanded iframe scroll."Shimeng (Simon) Wang2010-07-081-0/+2
|\ \ \
| * | | Fix issue 2823805: let expanded iframe scroll.Shimeng (Simon) Wang2010-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | issue: 2823805 Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861