OSDN Git Service
Steve Block [Wed, 27 Oct 2010 15:59:53 +0000 (16:59 +0100)]
Hook up CookieManager.getCookie() for Chromium HTTP stack
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76605
Bug:
3116410
Change-Id: I1b66c1ac9f9aaf5388ad1da92f54b1f16d4a3626
Steve Block [Mon, 25 Oct 2010 11:20:52 +0000 (12:20 +0100)]
Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack
We also update PlatformBridge::cookiesEnabled() to query the Chromium
HTTP stack directly. This avoids calling
CookieClient::cookiesEnabled(), which calls the Java
CookieManager::acceptCookie() which in turns calls back to native
code.
Also requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76065
Bug:
3116410
Change-Id: Id853463f3bcef76b220e8c44dd2b30c0d6752624
Steve Block [Wed, 27 Oct 2010 10:29:59 +0000 (11:29 +0100)]
Update Chromium HTTP stack to get database and cache paths from CookieSyncManager
Currently these paths are obtained from the BrowserFrame via JNI.
However, the paths are not synced to the BrowserFrame until the
WebCore thread has started up. This means that if the
WebRequestContext is created on the IO thread, the paths may not be
available.
This change moves the paths from BrowserFrame to CookieSyncManager to
avoid the need to wait for the WebCore thread.
Note that the new methods may be called on either the UI or WebCore
threads, so are synchronised.
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76580
Change-Id: I61f88772d13901d66892118c79db3cac412e6bd1
Steve Block [Wed, 27 Oct 2010 08:58:13 +0000 (09:58 +0100)]
Fix WebRequestContext::get() to be threadsafe
This allows the method to be called from both the WebCore thread and
the UI thread, as required to hook up CookieManager.
Change-Id: I895d14909b14f0baba77fb2cb75926d9103ee01f
Steve Block [Wed, 27 Oct 2010 08:49:32 +0000 (09:49 +0100)]
Fixes style in WebRequestContext
Previously this file used Chromium style, as it extends a Chromium
class. However, I think it's best to switch to WebKit style to prevent
Chromium style from leaking into the rest of WebKit.
Also switches static member methods to file-scope static functions
where possible.
Finally, return WebRequestContext* rather than URLRequestContext* to
allow us to call methods in the derived class. this will be required
to hook up CookieManager.
Change-Id: Ifdca62230a3728e338904ef1b9b392640af06a92
Derek Sollenberger [Wed, 27 Oct 2010 12:54:47 +0000 (05:54 -0700)]
Merge "Cleanup the getAvailableTexture() function."
Iain Merrick [Wed, 27 Oct 2010 11:23:51 +0000 (12:23 +0100)]
Fix build break.
Missing edit in I50da7599, ended up on the wrong CL.
Change-Id: I4d4c6713fbfe30cdc8cdf0e733c4725b33a09673
Iain Merrick [Wed, 27 Oct 2010 09:59:48 +0000 (10:59 +0100)]
Only AV formats should be handled by MediaPlayer (C++ side)
Fixing JNI bindings. See Java-side change for details (Id39b770b).
Change-Id: I50da7599475476ebaaf9609f44e13fbdf212c90e
Derek Sollenberger [Tue, 26 Oct 2010 17:42:04 +0000 (13:42 -0400)]
Cleanup the getAvailableTexture() function.
We now check to see if the tile owns a texture and immediately
return if that is the case. I also updated the documentation.
Change-Id: I88a6f2e38ef33fd37f5926c793c9e775e646bef2
Nicolas Roard [Fri, 22 Oct 2010 00:02:16 +0000 (17:02 -0700)]
Remove locks in BaseTile. Also fix the bug where the browser hangs when closing a tab.
Bug:
3112610
Change-Id: I4f4854a8a0688fc24b512e7671a2ad0708121075
Nicolas Roard [Tue, 19 Oct 2010 23:34:10 +0000 (16:34 -0700)]
Fix random crashes when HW acceleration is turned on.
Bug:
3107362
Change-Id: I354a07369056e696deed7458a4f4e14d54b7f6c8
Ben Murdoch [Tue, 26 Oct 2010 18:21:04 +0000 (11:21 -0700)]
Merge "Fix potential crash in Nav Cache code introduced by WebKit merge"
Steve Block [Tue, 26 Oct 2010 17:55:48 +0000 (10:55 -0700)]
Merge "libwebcore cleanspec."
Ben Murdoch [Tue, 26 Oct 2010 17:51:19 +0000 (18:51 +0100)]
libwebcore cleanspec.
Reports of build errors in master, fixed by a clean build.
Change-Id: Idfee8a890cc69f4b69b1d72738525c43770e65b8
Ben Murdoch [Tue, 26 Oct 2010 17:27:56 +0000 (18:27 +0100)]
Fix potential crash in Nav Cache code introduced by WebKit merge
The refactoring in the nav cache code caused by the recent merge
to webkit r70209 can crash. Fix that.
Bug:
3132882
Change-Id: I98b605ae2fdf24cf0f25adc919f2dbba581abef0
Nicolas Roard [Mon, 25 Oct 2010 08:24:41 +0000 (01:24 -0700)]
Add DEBUG_COUNT stuff
Change-Id: I99a0d2bc23da6299228ba5adea7cf161e01d8fbf
(cherry picked from commit
8f12379d1df1bc5f2e85bce687d89ba20d4a5e9e)
Leon Scroggins [Fri, 22 Oct 2010 22:16:01 +0000 (18:16 -0400)]
Update selection after keypresses.
Bug:
3054784
Change-Id: I5430969dc532feea10a960eb4117b3a3108ed702
Ben Murdoch [Mon, 25 Oct 2010 18:10:19 +0000 (19:10 +0100)]
Fix a layering violation in Document.
PlatformBridge already has the necessary functionality.
Change-Id: I67a5d68890d3976da69cff0c20f7b48931366b1d
Ben Murdoch [Fri, 22 Oct 2010 12:02:34 +0000 (13:02 +0100)]
Merge WebKit at r70209: Update WebKit revision
Change-Id: I9a95c19b76015bfb43393e0570bd35f155dc7809
Ben Murdoch [Mon, 25 Oct 2010 15:02:11 +0000 (16:02 +0100)]
Merge Webkit at r70209: Add Android expected results for new layout tests
fast/dom/DeviceOrientation/create-event-onorientationchange.html
See http://trac.webkit.org/changeset/69984
Change-Id: I345106587049a3e59040aa2c449432ac6d7fe5b1
Ben Murdoch [Mon, 25 Oct 2010 17:27:58 +0000 (18:27 +0100)]
Merge WebKit at r70209: Cherry pick build fix
See https://bugs.webkit.org/show_bug.cgi?id=48243 for details.
Change-Id: Idf1bf291f2370e611ebb2595f820598f68925336
Ben Murdoch [Fri, 22 Oct 2010 19:08:15 +0000 (20:08 +0100)]
Merge Webkit at r70209: defaultLanguage has been renamed.
It is now known as defaultPlatformLanguage.
See http://trac.webkit.org/changeset/70095
Change-Id: I523e93e78317a2e365429a8027967aa46d0370fa
Ben Murdoch [Fri, 22 Oct 2010 18:48:55 +0000 (19:48 +0100)]
Merge Webkit at r70209: Add stub for proxyServersForURL function.
This is a new function added to WebKit platform API. Currently left
unimplemented.
See http://trac.webkit.org/changeset/68951
Change-Id: I7bf33d1b054980918e42cee8da8ecd8494f0b543
Ben Murdoch [Fri, 22 Oct 2010 15:59:05 +0000 (16:59 +0100)]
Merge Webkit at r70209: StringBuilder.h moved to WTF.
See http://trac.webkit.org/changeset/69594
Change-Id: I17d01eae838c03ac198dd8b0df3717d058806aca
Ben Murdoch [Fri, 22 Oct 2010 15:04:33 +0000 (16:04 +0100)]
Merge Webkit at r70209: Path::debugString has been removed.
See http://trac.webkit.org/changeset/69505
Change-Id: Ic9e275531354b166d3a262399a1caa4482c5c5d3
Ben Murdoch [Fri, 22 Oct 2010 15:02:07 +0000 (16:02 +0100)]
Merge Webkit at r70209: ImageColorSpace type no longer exists.
It has been replaced with ColorSpace. Also DeviceColorSpace
has been renamed ColorSpaceDeviceRGB.
See http://trac.webkit.org/changeset/70143
Change-Id: Ib603dcef04dcfa51fca142d8b3d03689a18e110f
Ben Murdoch [Fri, 22 Oct 2010 14:50:17 +0000 (15:50 +0100)]
Merge Webkit at r70209: DeprecatedInputType is now private.
See http://trac.webkit.org/changeset/68749
Bug:
3132882
Change-Id: I51dfa144c5c289c759caa48e7dedc9020b7d8f12
Ben Murdoch [Fri, 22 Oct 2010 12:52:39 +0000 (13:52 +0100)]
Merge Webkit at r70209: Fix conflicts
WebCore/page/FrameView.cpp
http://trac.webkit.org/changeset/69896
WebCore/html/parser/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/69283
WebCore/html/HTMLPlugInElement.h
http://trac.webkit.org/changeset/69596
WebCore/html/HTMLInputElement.cpp
http://trac.webkit.org/changeset/68996
http://trac.webkit.org/changeset/69378
WebCore/plugins/npapi.cpp
http://trac.webkit.org/changeset/69808
WebCore/css/CSSComputedStyleDeclaration.cpp
http://trac.webkit.org/changeset/69220
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/69196
WebCore/rendering/style/RenderStyle.h
http://trac.webkit.org/changeset/68680
WebCore/rendering/RenderImage.cpp
http://trac.webkit.org/changeset/68917
WebCore/platform/android/FileSystemAndroid.cpp
http://trac.webkit.org/changeset/69594
WebCore/inspector/InspectorController.h
http://trac.webkit.org/changeset/68767
See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which
is why this is a conflict.
JavaScriptCore/parser/Parser.cpp
http://trac.webkit.org/changeset/69516
Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
Ben Murdoch [Fri, 22 Oct 2010 12:49:51 +0000 (13:49 +0100)]
Merge Webkit at r70209: Fix Makefiles.
Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf
Ben Murdoch [Fri, 22 Oct 2010 12:02:20 +0000 (13:02 +0100)]
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Derek Sollenberger [Tue, 26 Oct 2010 13:04:10 +0000 (06:04 -0700)]
Merge "Minor cleanup of the DoubleBufferedTexture."
Nicolas Roard [Mon, 25 Oct 2010 22:53:18 +0000 (15:53 -0700)]
Merge "Remove any scheduled painting for BaseTile that are going to be deallocated."
Nicolas Roard [Mon, 25 Oct 2010 08:25:04 +0000 (01:25 -0700)]
Remove any scheduled painting for BaseTile that are going to be deallocated.
Change-Id: I9f46df074fedb3b157f54b2f03b33ecc80fca9ab
Ben Murdoch [Mon, 25 Oct 2010 17:41:48 +0000 (10:41 -0700)]
Merge "Remove unused dispatchDidLoadResourceByXMLHttpRequest"
Ben Murdoch [Fri, 22 Oct 2010 15:51:56 +0000 (16:51 +0100)]
Remove unused dispatchDidLoadResourceByXMLHttpRequest
See http://trac.webkit.org/changeset/57210
Change-Id: I82ddff6e4d04e2c36dad2518e4e27a695728bc95
Steve Block [Fri, 22 Oct 2010 16:47:02 +0000 (17:47 +0100)]
Hide details of private browsing for URLRequestContext from Chromium AutoFill code
Change-Id: I58a388ecf16b2af4f1cd31afb39d0aa6c5c44a24
Steve Block [Fri, 22 Oct 2010 12:51:33 +0000 (13:51 +0100)]
Add a JNI method to determine which HTTP stack is in use
This will be required when hooking up CookieManager to the Chromium
stack, as we need to decide in Java whether or not to call into native
code.
Bug:
3116410
Change-Id: I4e148ad2c38a6e5771912dc419f52c8098027958
Kristian Monsen [Fri, 22 Oct 2010 18:39:01 +0000 (19:39 +0100)]
Fix for ALT_HTTP build break
Was broken by this CL:
https://android-git.corp.google.com/g/#change,75473
Change-Id: I6f60fd1e19eafe84f9d2f72f556493a25c2caf0e
Shimeng (Simon) Wang [Fri, 22 Oct 2010 00:27:10 +0000 (17:27 -0700)]
For non user-scrolled scroll, don't send scroll event.
This is in conjunction with Java side CL:
https://android-git.corp.google.com/g/75647
issue:
3063945
Change-Id: I3f0bb11e25ee4ea7615980e2bc6cefb2064d4d9d
Derek Sollenberger [Fri, 22 Oct 2010 15:22:18 +0000 (11:22 -0400)]
Minor cleanup of the DoubleBufferedTexture.
Change-Id: Ie3236502942eed684ac6b4602493cbf384fe8ba0
Derek Sollenberger [Wed, 20 Oct 2010 15:19:43 +0000 (11:19 -0400)]
Cleanup DoubleBufferedTexture and SharedTexture classes.
The cleanup consisted of...
1. removing uneeded mutex calls
2. ensuring user's of the class fully initialize them before use
3. hiding protected variables to prevent potential misuse by subclasses
There will be a follow on CL focusing on cleaning up the use of mutexes
in BackedDoubleBufferedTexture.
Change-Id: Ia642d54d8a5b154ac287640a07d8b2c0e5d85334
Ben Murdoch [Fri, 22 Oct 2010 11:42:07 +0000 (12:42 +0100)]
Add missing indexedDB tests at r68651.
These were missed in the merge to r67178 and are needed for the next
merge to r70157.
Change-Id: Ic76e75ffe5ed40e83534cee470ca10c9718aba8b
Steve Block [Fri, 22 Oct 2010 10:56:55 +0000 (03:56 -0700)]
Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"
Steve Block [Thu, 21 Oct 2010 16:46:42 +0000 (17:46 +0100)]
Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/75471
Bug:
3086308
Change-Id: I062015c990f6bc3d77ec22c746bd8465ed74bd08
Steve Block [Fri, 22 Oct 2010 08:54:35 +0000 (01:54 -0700)]
Merge "Fix a compiler warning in WebRequest.cpp"
Steve Block [Fri, 22 Oct 2010 08:49:48 +0000 (09:49 +0100)]
Fix a compiler warning in WebRequest.cpp
Change-Id: I4ece067b344b7a132f04451ce9810993d8ed73f0
Steve Block [Thu, 21 Oct 2010 11:33:17 +0000 (12:33 +0100)]
Fix naming for JNI registration methods
Change-Id: I1aba39bdcf217bff751e42d2a335cd230b8193f7
Ben Murdoch [Thu, 21 Oct 2010 22:31:03 +0000 (15:31 -0700)]
am
d844e1f0: (-s ours) am
2da7ed0b: Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Merge commit '
d844e1f030065939140c0fa927fe89b367d5bd40'
* commit '
d844e1f030065939140c0fa927fe89b367d5bd40':
Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:31:00 +0000 (15:31 -0700)]
am
c194fa2c: (-s ours) am
ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Merge commit '
c194fa2ce4ff53dae520be0ee6759a6f9f367db0'
* commit '
c194fa2ce4ff53dae520be0ee6759a6f9f367db0':
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:57 +0000 (15:30 -0700)]
am
219c89f0: (-s ours) am
3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Merge commit '
219c89f043c10eba31fc94db69a8136bbc115d1d'
* commit '
219c89f043c10eba31fc94db69a8136bbc115d1d':
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:54 +0000 (15:30 -0700)]
am
122a6b03: (-s ours) am
910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Merge commit '
122a6b03f21c5ec726d905d08531bdb8f1c7a376'
* commit '
122a6b03f21c5ec726d905d08531bdb8f1c7a376':
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:50 +0000 (15:30 -0700)]
am
d377cc76: (-s ours) am
80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Merge commit '
d377cc767167c529a2effc0b1740b31f01ba6f9d'
* commit '
d377cc767167c529a2effc0b1740b31f01ba6f9d':
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:46 +0000 (15:30 -0700)]
am
741c2272: (-s ours) am
d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Merge commit '
741c22725f573421f088db6a32064bf210ba80ae'
* commit '
741c22725f573421f088db6a32064bf210ba80ae':
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:42 +0000 (15:30 -0700)]
am
7616c8cd: (-s ours) am
8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Merge commit '
7616c8cd53cceb7d29b9382fc6754e46725af8fc'
* commit '
7616c8cd53cceb7d29b9382fc6754e46725af8fc':
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:34 +0000 (15:30 -0700)]
am
ec63c9f9: (-s ours) am
a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Merge commit '
ec63c9f977997c275ca985c2ffa5cad8a2e29523'
* commit '
ec63c9f977997c275ca985c2ffa5cad8a2e29523':
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Patrick Scott [Thu, 21 Oct 2010 19:14:48 +0000 (12:14 -0700)]
Merge "Fix debug statements."
Patrick Scott [Thu, 21 Oct 2010 18:51:28 +0000 (14:51 -0400)]
Fix debug statements.
Change-Id: Id37bf0a8b5864fea2490bd2dc5d4a1f52bc56c1d
Ben Murdoch [Thu, 21 Oct 2010 18:46:23 +0000 (11:46 -0700)]
am
2da7ed0b: Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Merge commit '
2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3' into gingerbread-plus-aosp
* commit '
2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3':
Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:21 +0000 (11:46 -0700)]
am
ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Merge commit '
ee4c9585fe53aff7a0aa833b9a5d3e861e16578e' into gingerbread-plus-aosp
* commit '
ee4c9585fe53aff7a0aa833b9a5d3e861e16578e':
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:18 +0000 (11:46 -0700)]
am
3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Merge commit '
3017f37b06cfa16f11a1e986e3c4ecc0c4757c32' into gingerbread-plus-aosp
* commit '
3017f37b06cfa16f11a1e986e3c4ecc0c4757c32':
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:15 +0000 (11:46 -0700)]
am
910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Merge commit '
910dc2ab50b8f32067f7b45f9e46d26a2aa681c6' into gingerbread-plus-aosp
* commit '
910dc2ab50b8f32067f7b45f9e46d26a2aa681c6':
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:11 +0000 (11:46 -0700)]
am
80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Merge commit '
80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf' into gingerbread-plus-aosp
* commit '
80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf':
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:06 +0000 (11:46 -0700)]
am
d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Merge commit '
d3bed0e7c739f46e955406b920498b86724e7705' into gingerbread-plus-aosp
* commit '
d3bed0e7c739f46e955406b920498b86724e7705':
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:46:02 +0000 (11:46 -0700)]
am
8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Merge commit '
8da84207b2b14801ccc039279df2a859a4a52847' into gingerbread-plus-aosp
* commit '
8da84207b2b14801ccc039279df2a859a4a52847':
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 18:45:53 +0000 (11:45 -0700)]
am
a7b8ec70: Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Merge commit '
a7b8ec708c2566cc6e69c0b464e416c018227b02' into gingerbread-plus-aosp
* commit '
a7b8ec708c2566cc6e69c0b464e416c018227b02':
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Steve Block [Thu, 21 Oct 2010 17:06:43 +0000 (10:06 -0700)]
Merge "Move jstringToStdString into WebCoreJni.h"
Iain Merrick [Thu, 21 Oct 2010 16:56:42 +0000 (17:56 +0100)]
Move jstringToStdString into WebCoreJni.h
Also tweaked the implementation slightly to match
jstringToString16, which is more robust.
Change-Id: I614576615a6f429ea1632c395d5bc4e068c32cfb
Ben Murdoch [Thu, 21 Oct 2010 16:25:55 +0000 (17:25 +0100)]
Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
See http://trac.webkit.org/changeset/67967
Note this is only a partial cherry pick of r67967 as it is
based on a CL later than our current revision and not all
deltas are relevant.
Change-Id: I7d153c9470abb2b0994900b2c5909fded4a94752
Ben Murdoch [Thu, 21 Oct 2010 16:18:11 +0000 (17:18 +0100)]
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
See http://trac.webkit.org/changeset/69345
Change-Id: Ie0f421c22fc4ec007417181c834e50033a389230
Ben Murdoch [Thu, 21 Oct 2010 16:16:55 +0000 (17:16 +0100)]
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
See http://trac.webkit.org/changeset/68705
Change-Id: I5a3b76fa6e536746af794a15b187bc197000387b
Ben Murdoch [Thu, 21 Oct 2010 16:09:00 +0000 (17:09 +0100)]
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
See http://trac.webkit.org/changeset/69476
Change-Id: If25c271f9d1cda225fbdf040d2f1d2bc57529768
Ben Murdoch [Thu, 21 Oct 2010 16:02:36 +0000 (17:02 +0100)]
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
See http://trac.webkit.org/changeset/68408
Change-Id: I53167c57f32a43c6bd80a1aca8126f41cb01da53
Ben Murdoch [Thu, 21 Oct 2010 15:28:03 +0000 (16:28 +0100)]
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
See http://trac.webkit.org/changeset/68096
Note that this is not an exact cherry pick of the above webkit
CL as it is dependant on http://trac.webkit.org/changeset/61094
that we do not have and provides the Element::isIdAttributName and
Element::getIdAttribute methods. 61094 is a large change so we do
not take it, rather use methods that achieve the same effect.
Change-Id: Ifae90116f794673a610dd7988ba366a0b51888d9
Ben Murdoch [Thu, 21 Oct 2010 15:26:08 +0000 (16:26 +0100)]
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
See http://trac.webkit.org/changeset/68485
Change-Id: I714d385759a6e30d315cd2ace4aa87a2d7b28e92
Ben Murdoch [Thu, 21 Oct 2010 15:17:55 +0000 (16:17 +0100)]
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
See http://trac.webkit.org/changeset/68860
Change-Id: I7860374528be836e1f4ea7c6faa48966fd3ed23c
Steve Block [Wed, 20 Oct 2010 16:24:30 +0000 (17:24 +0100)]
Fix Chromium HTTP request context getters to use raw pointers
All call sites into the Chromium stack take raw pointers rather than
scoped_refptr, so we should do the same for simplicity. This change
also makes the ownership model more clear.
Previously we were sometimes throwing away the scoped_refptr and using
the raw pointer, which is unsafe unless you know that somebody else
holds a reference.
Requires a change to external/chromium ...
https://android-git.corp.google.com/g/75220
Change-Id: I09c86d424193a3f3c2644bcf77a2d363fa24293b
Nicolas Roard [Wed, 20 Oct 2010 22:43:58 +0000 (15:43 -0700)]
Merge "Fix tiles starvation bug + some debug logs"
Nicolas Roard [Wed, 20 Oct 2010 22:13:17 +0000 (15:13 -0700)]
Fix tiles starvation bug + some debug logs
Bug:
3112643
Change-Id: I9d5adf51dc95f44b859b107666d2c2731f37b12c
Ben Murdoch [Wed, 20 Oct 2010 18:35:44 +0000 (11:35 -0700)]
Merge "Fix AutoFill after merge to Chromium merge to 7.0.540.0"
Ben Murdoch [Wed, 20 Oct 2010 15:36:11 +0000 (08:36 -0700)]
Merge "Implement file downloads for Chrome HTTP stack (C++ side)"
Iain Merrick [Mon, 18 Oct 2010 17:03:00 +0000 (18:03 +0100)]
Implement file downloads for Chrome HTTP stack (C++ side)
Due to the way the WebView API works, downloads are handled by the Java
client code via the DownloadListener interface, so we need to toss them
over the JNI wall.
I had to refactor WebResourceRequest slightly to save the user-agent
header before it gets stripped out. I have also made it const-correct.
Test: manually checked that we can download a file, with both stacks.
See matching change in frameworks/base (I87e71deb)
Change-Id: I8130040099d02c399d42b223444b333398628235
Steve Block [Wed, 20 Oct 2010 13:57:38 +0000 (06:57 -0700)]
Merge "Removes the unused default userAgent from WebRequestContext"
Steve Block [Wed, 20 Oct 2010 10:56:07 +0000 (11:56 +0100)]
Removes the unused default userAgent from WebRequestContext
Bug:
3035160
Change-Id: Iaf163ea571f5d9811b5d14f83e5b02948748ff84
Ben Murdoch [Wed, 20 Oct 2010 13:16:14 +0000 (14:16 +0100)]
Fix AutoFill after merge to Chromium merge to 7.0.540.0
Chromium now seems to enforce that profile unique ids cannot be
zero (as the default ctor leaves them). Read the correct id from
the Java WebSettings.AutoFillProfile class.
Requires a corresponding change in frameworks/base:
I88cd1e91b8c6043c732a1709a89fda4a3c9f921f.
Change-Id: I736220dccd8d68c395d6742e38a063da4140a13b
Derek Sollenberger [Wed, 20 Oct 2010 12:00:52 +0000 (05:00 -0700)]
Merge "Cleanup BaseTile and BackedDoubleBufferedTexture classes."
Leon Scroggins [Tue, 19 Oct 2010 17:16:11 +0000 (13:16 -0400)]
Fix for Find scrolling too often.
Bug:
3108852
Do not scroll if nativeFindAll is called with the same string
and the current match location has not changed.
Requires a change to frameworks/base.
Change-Id: Id3f104d91a0061f1d007b54a8fdd188b239e7970
Ben Murdoch [Tue, 19 Oct 2010 18:20:53 +0000 (11:20 -0700)]
am
2346109e: (-s ours) am
93bec1ec: DO NOT MERGE : Fix Webkit comments for document.createTouch
Merge commit '
2346109e92285bff201be0b45f51054d4b1f26a8'
* commit '
2346109e92285bff201be0b45f51054d4b1f26a8':
DO NOT MERGE : Fix Webkit comments for document.createTouch
Derek Sollenberger [Tue, 19 Oct 2010 17:56:10 +0000 (10:56 -0700)]
Merge "Fix crash in hardware accelerated webviews."
Derek Sollenberger [Mon, 18 Oct 2010 17:35:08 +0000 (13:35 -0400)]
Cleanup BaseTile and BackedDoubleBufferedTexture classes.
The cleanup consists of:
1. removing unused variables and functions
2. refactoring the backed texture to reduce number of exposed variables
Change-Id: I8a36725f61c5ecd77b7a215ec75a7b8129bf56af
Shimeng (Simon) Wang [Tue, 19 Oct 2010 17:43:57 +0000 (10:43 -0700)]
am
15643db2: am
77ab6dc8: Don\'t force video end event when full screen video playing is returned.
Merge commit '
15643db2b790d467b78582c3bad440fb42d35df1'
* commit '
15643db2b790d467b78582c3bad440fb42d35df1':
Don't force video end event when full screen video playing is returned.
Ben Murdoch [Tue, 19 Oct 2010 17:30:21 +0000 (10:30 -0700)]
am
93bec1ec: DO NOT MERGE : Fix Webkit comments for document.createTouch
Merge commit '
93bec1ec2d7bca6a6df6bb0391d1b6a0d6562f33' into gingerbread-plus-aosp
* commit '
93bec1ec2d7bca6a6df6bb0391d1b6a0d6562f33':
DO NOT MERGE : Fix Webkit comments for document.createTouch
Derek Sollenberger [Tue, 19 Oct 2010 17:24:00 +0000 (13:24 -0400)]
Fix crash in hardware accelerated webviews.
We are not freeing the baseTile objects when leaving a page and
are running out of memory.
bug:
3107362
Change-Id: I52539d7b94d914b9ede44715362cbde94a7c077e
Patrick Scott [Tue, 19 Oct 2010 15:31:58 +0000 (08:31 -0700)]
Merge "Fix a few drawing issues with layers."
Patrick Scott [Tue, 19 Oct 2010 15:20:53 +0000 (11:20 -0400)]
Fix a few drawing issues with layers.
The overflow layer clip was in the wrong location and caused some blank areas on
developer.android.com. Only scroll layers if they have overflow scrolling so
that image search draws correctly.
Bug:
3027644,
3022562
Change-Id: Iff4b27b9fd860e9d89286034c9ae82f76b1371c2
Iain Merrick [Wed, 13 Oct 2010 14:08:26 +0000 (15:08 +0100)]
Fixing WebKit APIs affected by Chromium 7.0.540.0 merge
WebUrlLoaderClient, WebRequest: changing std::wstring to string16
http://src.chromium.org/viewvc/chrome?view=rev&revision=54101
HostResolver parameters changed, fixing WebRequestContext.cpp
http://src.chromium.org/viewvc/chrome?view=rev&revision=57189
Icon parameter added to AutoFillHost, fixing AutoFillHostAndroid.
http://src.chromium.org/viewvc/chrome?view=rev&revision=54052
Change-Id: If6a17af7da3b80d039205883019e4a73eb35f562
Ben Murdoch [Sun, 17 Oct 2010 15:26:08 +0000 (16:26 +0100)]
DO NOT MERGE : Fix Webkit comments for document.createTouch
Cherry pick to GingerBread.
See WebKit bug https://bugs.webkit.org/show_bug.cgi?id=47676
for details.
Bug:
3101402
Change-Id: I8e2b0fc54468cd0827229243716c7d6bb62c7b3c
Ben Murdoch [Tue, 19 Oct 2010 12:49:14 +0000 (05:49 -0700)]
Merge "Fix Webkit review comments for document.createTouch"
Cary Clark [Tue, 19 Oct 2010 12:48:33 +0000 (05:48 -0700)]
Merge "compute cursor rings when layers are transparent"
Leon Clarke [Tue, 19 Oct 2010 01:11:12 +0000 (18:11 -0700)]
am
06308c2c: (-s ours) am
156ddd48: 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. b/issue?id=
2506670
Merge commit '
06308c2c073199a5f22f9c2f21cb7108d9a4bd29'
* commit '
06308c2c073199a5f22f9c2f21cb7108d9a4bd29':
Add more padding round select boxes, use different assets at
Nicolas Roard [Tue, 19 Oct 2010 01:11:09 +0000 (18:11 -0700)]
am
c79cedac: (-s ours) am
7d095dd5: fix the pause() problem...
Merge commit '
c79cedac9aa9e2d06331d855d654d63fc5165019'
* commit '
c79cedac9aa9e2d06331d855d654d63fc5165019':
fix the pause() problem...