Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp
* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
If an icon add remove get coalesced, don't remove some other icon.
Since the UI uses multi-touch for zooming, the event is passed to webkit
only when the webpage doesn't allow zooming.
1. Updated the data structure TouchEventData in WebViewCore.java
to take multiple points and used it everywhere.
2. Added a passMultiTouchToWebkit() function to do what its name means.
3. Added the multi-point touch support to dumprendertree.
Change-Id: Iafc1aa7b21a587ad26efd2f124b9a66316297ab8
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp
* commit '287952c35e148811c106bc0f5036eabf20f71562':
Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.
Also fix some problems with this, such as not noting the kill
in battery stats.
And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.
And fix BatteryWaster to be better behaving for testing these
cases.
Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).
Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.
Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
This is required to make sure that the WebCore thread's message
handlers are ready to receive settings.
Change-Id: I2c4df95e3b7409535b739ada957d93a7e6cd78d6
We use a printf style approach when setting the run command in the
command string to be executed. When doing so, the printf must be
applied to only the relevant part of the string. This avoids problems
in the case that other parts of the string contain special character
sequences, such as '%s' in a custom log directive.
Change-Id: I87df773a2872320386a34cb6a5041a9e0ba6f31e
This change also adds full support for local transformation matrices on
sweep and radial gradients.
Change-Id: Id8773bc0766575190e3f3d51984fc5e57b266c3f
It avoids OOM issues by dumping the memory to the DB every
few hundred tests and then reading them in chunks when
generating summaries, etc.
Change-Id: I5f63d960d456f17e9f2189230a7ae0ca5607ce51
Currently DumpRenderTree2 serves HTTP tests on http://localhost:8080.
Some of the tests hardcode 'http://127.0.0.1:8000' for resources, so
we must use this scheme and port for the requests to be same-origin.
This fixes LayoutTest http/tests/appcache/credential-url.html
Change-Id: I2a9c402fc7b0e0b62eb4a278d67ac0e63ef96e8b
When adding JavaScript interfaces to a WebView, they must be passed to
the WebView constructor, rather than to
WebView.addJavascriptInterface() if they are to be used immediately
without the risk of race conditions.
This fixes LayoutTest
http/tests/appcache/crash-when-navigating-away-then-back.html
This was fixed for DumpRenderTree in
https://android-git.corp.google.com/g/23804
Change-Id: I1581d6d6cfc1b35be1ec2f2e5b5b944da2b4b935
Currently, DumpRenderTree2 asigns the following result codes
{PASS, FAIL_RESULT_DIFFERS, FAIL_NO_EXPECTED_RESULT, FAIL_TIMED_OUT,
FAIL_CRASHED}
This is not strictly correct, as a test may fail for any of three
reasons - crashing, timing out, or the the result not being as
expected. Therefore, it's possible for a test to fail even if the
result is as expected.
This patch updates AbstractResult to handle each of the three reasons
for failure separately. We then test all three to determine if the
test has passed.
This allows us to correctly report whether or not the result differs
from expected for a failing test.
Change-Id: I7adcfe72c4dd0bd3de2e1b868d9807be6eb5bddf
