summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated the test_expectations.txt to use FAIL instead of IGNORE_RESULT.Maksymilian Osowski2010-09-021-111/+111
| | | | | Bug: 2899965 Change-Id: Ia61ab8d7f269d4d3b2db4531fd8e2031b1ae44b4
* Merge "Added script to show the source of the test."Maksymilian Osowski2010-09-011-0/+53
|\
| * Added script to show the source of the test.Maksymilian Osowski2010-09-011-0/+53
| | | | | | | | Change-Id: I192b0ecd7830f69193111ebf1d081dcd9495a51b
* | Merge "Move all external/chromiumn includes to one file"Kristian Monsen2010-09-0110-28/+82
|\ \ | |/ |/|
| * Move all external/chromiumn includes to one fileKristian Monsen2010-08-3110-28/+82
| | | | | | | | | | | | | | | | There are several logging errors and warnings when including files from external/chromium and the <cutils/log.h>. This commit moves all external/chromium includes to one place, and and LOG_ASSERT to what it is in <cutils/log.h> Change-Id: If908262cf1b859247d7b8a5880807a2e9ec16980
* | am cd011297: am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that ↵Melanie Clements2010-08-311-0/+7
|\ \ | |/ |/| | | | | | | | | | | | | starts with "/." Merge commit 'cd011297fda5b6f6093453d59c2624aaf878e2fb' * commit 'cd011297fda5b6f6093453d59c2624aaf878e2fb': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| * am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-311-0/+7
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp * commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| | * Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | fix monkey crash in nav cacheCary Clark2010-08-311-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView::motionUp() got the latest nav cache, extracted some nodes from it with findAt(), then called setNavBounds() which got a newer cache. The older cache node was sent to CachedRoot::setCursor() which crashed trying to use the state pointer. The flaw was that, although motionUp requests the newest cache up front, and then setNavBounds() requests the stale cache, in rare circumstances it can receive a newer cache as well. The fix is to replace the setNavBounds() function with a direct call on the valid cache. Change-Id: If23ee9222f2b701d916911f4b667185f1c3d3d18 http://b/2316138
* | | am 586c8632: (-s ours) am 90fa57cd: DO NOT MERGE make the text selection ↵Cary Clark2010-08-270-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | easier to hit Merge commit '586c86325776ca506c6380ab41f9e66a69704f45' * commit '586c86325776ca506c6380ab41f9e66a69704f45': DO NOT MERGE make the text selection easier to hit
| * | am 90fa57cd: DO NOT MERGE make the text selection easier to hitCary Clark2010-08-271-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp * commit '90fa57cd8b940ab1b46a85da92d950392a77e9da': DO NOT MERGE make the text selection easier to hit
| | * | DO NOT MERGE make the text selection easier to hitCary Clark2010-08-261-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I47b7aa04ebc2a8f0bf2c6b4399ef65e5f4c58d4e http://b/2626451
* | | | Merge "Add ANGLE at r65615"Steve Block2010-08-27131-0/+44548
|\ \ \ \
| * | | | Add ANGLE at r65615Steve Block2010-08-27131-0/+44548
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANGLE is now required for the Mac build, so should have been added as part of the merge to r65615. Change-Id: I048185d196cf3150651fff0e3761fc57928f18ce
* | | | | Merge "Checking that all load operations are done in order."Kristian Monsen2010-08-272-3/+63
|\ \ \ \ \
| * | | | | Checking that all load operations are done in order.Kristian Monsen2010-08-272-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a m_loadState variable and checking that everything is happening when they are supposed to. There were some problems were race conditions between the threads created some issues. Change-Id: I7fca570aa917eaaa741c3745f6b8417a656d18c4
* | | | | | Merge "Restore LayoutTests/storage/sql-error-codes-expected.txt"Steve Block2010-08-271-0/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Restore LayoutTests/storage/sql-error-codes-expected.txtSteve Block2010-08-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been added in the merge to WebKit r61871, but was accidentally removed when creating the Android V8-specific result. See https://android-git.corp.google.com/g/#change,56250 Change-Id: I48849d32f649009bcb935911558f2543eebb3d2f
* | | | | | fix button cursor stateCary Clark2010-08-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the pressed state for buttons when the cursor is shown indefinitely, and set look for the pressed cursor state when recording the button colors. Change-Id: I78095ec9a7580c372c66b83913447b8214a6a432 http://b/2135321
* | | | | | Merge "Use upstream version of ANDROID_HITTEST_WITHSIZE"Steve Block2010-08-278-61/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use upstream version of ANDROID_HITTEST_WITHSIZESteve Block2010-08-278-61/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the last occurrences of ANDROID_HITTEST_WITHSIZE and updates WebKit to use the upstream version of this logic. This follows on from https://android-git.corp.google.com/g/#change,60166 which merged the upstream logic into the Android tree but maintained the existing behaviour for Android, guarded with ANDROID_HITTEST_WITHSIZE. This change introduces the following functional changes ... - HitTestResult::addNodeToRectBasedTestResult() The Android version proceeded with the containment test if the node is null. We now early out and continue the hit test. We also record the node's shadowAncestorNode, rather than the node itself. - RenderLayer::hitTestList() The android version always updates the result, but only updates the result layer if the result is not a rect based result. We now always update result layer, but only update the result if the result is not a rect based result. - RenderSVGRoot::nodeAtPoint() The Android version returned true only if it's not a rect based hit test. Now we return true always. - HitTestResult::m_isRectBased In the Android version, a padding must have positive width and height. Now we allow one of the two to be zero, provided the other is positive All other changes are non-functional and should probably have been done as part of https://android-git.corp.google.com/g/#change,60166 Note that the change to RenderBlock::nodeAtPoint() is a non-functional change because we don't pass a rect to addNodeToRectBasedTestResult(), so the default zero rect is used and the hit test always fails. Change-Id: I4163fddad59ad6485df40cd48794aa262f76ced7
* | | | | | Merge "Add missing Indexed DB tests at r65615"Steve Block2010-08-273-0/+143
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Add missing Indexed DB tests at r65615Steve Block2010-08-273-0/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should have been added as part of the merge to WebKit r65615 See http://trac.webkit.org/changeset/65509 Change-Id: I18ff50f54caa6682e8adfc6ae152bce4e94636a9
* | | | | Merge "Create HttpAuthHandlerFactory to fix HTTP auth crashes."Kristian Monsen2010-08-261-1/+2
|\ \ \ \ \
| * | | | | Create HttpAuthHandlerFactory to fix HTTP auth crashes.Iain Merrick2010-08-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still need to hook in the necessary callbacks to present the user with a login prompt. Change-Id: Id4ccb8209d2ffdfcc35f9104a2e448ed552e6390
* | | | | | Update get_layout_tests_dir_contents.php to account for new server document rootSteve Block2010-08-261-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#change,63194 which updates apach2.py to serve HTTP tests at server root Bug: 2951727 Change-Id: I4a5777d71843c1c2fdcd74a69b13e3c4750a45a0
* | | | | | Merge "Updated the script to allow for chosing the mode (list files vs. list ↵Maksymilian Osowski2010-08-261-26/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | folders)."
| * | | | | Updated the script to allow for chosing the mode (list files vs. list folders).Maksymilian Osowski2010-08-261-26/+43
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a87e5591aef888f47cceaf3f30f5f2752e336aa
* | | | | | Merge "Fix line endings on a couple of Android-specific expected results"Steve Block2010-08-262-26/+26
|\ \ \ \ \ \
| * | | | | | Fix line endings on a couple of Android-specific expected resultsSteve Block2010-08-262-26/+26
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files were checked in with DOS line endings See https://android-git.corp.google.com/g/#change,62547 Change-Id: I849afbab74df789b6c1df83a28a65ec92ad10d24
* | | | | | Add a NULL guard.Shimeng (Simon) Wang2010-08-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue:2884022 Change-Id: I471fca7296ca233bc4d9e1c75d173094265c9a9f
* | | | | | Merge "Preserve the zoomFactor when a new frameview is created."Shimeng (Simon) Wang2010-08-251-0/+4
|\ \ \ \ \ \
| * | | | | | Preserve the zoomFactor when a new frameview is created.Shimeng (Simon) Wang2010-08-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the default font size is set "LARGE", it'll be ignored when a page is loaded, since it's lost in the new frameview. Change-Id: If4579459cb679fdc9666dda25cd557761f4820b5
* | | | | | | Merge "simplify cursor ring draw state"Cary Clark2010-08-253-73/+49
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | simplify cursor ring draw stateCary Clark2010-08-253-73/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old code and state that used to allow for the cursor ring to be different if a synthetic link was pressed, state that allowed the ring to animate, and state that attempted to show the ring until the link it represented was replaced by a new page. The new code - shows the cursor ring indefinitely when the trackball or dpad is moved - shows the cursor for 500 ms when the trackball or dpad is clicked or if the screen is tapped. This is separate from logic that attempts to select whether to show the cursor ring at all; this merely chooses how long to show the cursor ring when the cursor changes. Requires a companion change in frameworks/base Change-Id: I309abe346f6b67ed3b665aaa79c367f4599bf1cd http://b/2135321
* | | | | | | Merge "Do not clip out found matches."Leon Scroggins2010-08-251-45/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Do not clip out found matches.Leon Scroggins2010-08-251-45/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 1691733 We were comparing against the total clip to determine whether each match was valid. This is likely never necessary, and causes problems, for example on the textfield on Google's homepage. Change-Id: Ib6567554ea2ef7ee11fffe7329132406aed33397
* | | | | | | Add LayoutTests/http/tests/resources at r65615Steve Block2010-08-2511-0/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These scripts are required to run the http tests, eg http/tests/appcache/fail-on-update.html Change-Id: I6173fcb9bc0d77a5cfc94fce45d02b1704ee6306
* | | | | | | Copy WebKit python files to intermediates directory for buildSteve Block2010-08-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the generation of Python bytecode files in the source directory. Note that Python's -B option to suppress generation of these files is not supported until Python 2.6. Change-Id: Ie0bee31d00d921daf0184109c27719345e568302
* | | | | | | am e7a07088: am 21ed5a45: Merge "check for null pictures when selecting ↵Cary Clark2010-08-241-0/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | text" into gingerbread Merge commit 'e7a0708886b515f34d0a7e034cdea391681bf7f1' * commit 'e7a0708886b515f34d0a7e034cdea391681bf7f1': check for null pictures when selecting text
| * | | | | am 21ed5a45: Merge "check for null pictures when selecting text" into ↵Cary Clark2010-08-241-0/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '21ed5a4502b3ce76875505aa220f187d165f47b1' into gingerbread-plus-aosp * commit '21ed5a4502b3ce76875505aa220f187d165f47b1': check for null pictures when selecting text
| | * | | | Merge "check for null pictures when selecting text" into gingerbreadCary Clark2010-08-241-0/+9
| | |\ \ \ \
| | | * | | | check for null pictures when selecting textCary Clark2010-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am f3151d7b: am 828ef22d: merge -s ours from froyo-release so that upgrading ↵Jean-Baptiste Queru2010-08-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to gingerbread is a git fast-forward Merge commit 'f3151d7b79fdd18bb98f61e807bf7b0780645cf7' * commit 'f3151d7b79fdd18bb98f61e807bf7b0780645cf7': 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
| * | | | | | am 828ef22d: merge -s ours from froyo-release so that upgrading to ↵Jean-Baptiste Queru2010-08-230-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | merge -s ours from froyo-release so that upgrading to gingerbread is a git ↵Jean-Baptiste Queru2010-08-230-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | fast-forward Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2
| | | * | | | Cherry-pick WebKit change 61921 to fix exploitable memory corruption in ↵Steve Block2010-08-181-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderBoxModelObject Bug: 2895569 Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
| | | * | | | Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is ↵Steve Block2010-08-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed Bug: 2895569 Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
* | | | | | | Merge "communicate drawing pause to webkit to pause gif animation"Cary Clark2010-08-244-1/+37
|\ \ \ \ \ \ \
| * | | | | | | communicate drawing pause to webkit to pause gif animationCary Clark2010-08-244-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gif frames continue even if the webkit changes aren't drawn. When we suspend drawing, suspend the gif animation as well. This is accomplished by fooling webkit into thinking the browser window is offscreen. When the webkit drawing is resumed, invalidate the entire content so the gif animations start up once more. requires companion change in frameworks/base Change-Id: I78846214048b038cd8d0401dad103d451cd5a269 http://b/2621902
generated by cgit v1.1 at 2024-12-26 02:37:18 +0000