summaryrefslogtreecommitdiffstats
path: root/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75993: Move WebKit/android files to SourceBen Murdoch2011-05-16204-48905/+0
| | | | Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161827-610334/+0
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge changes ↵Steve Block2011-05-13196-1730/+5510
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3 * changes: Merge WebKit at r75315: Update WebKit version Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs Merge WebKit at r75315: Stub out AXObjectCache::remove() Merge WebKit at r75315: Fix ImageBuffer Merge WebKit at r75315: Fix PluginData::initPlugins() Merge WebKit at r75315: Fix conflicts Merge WebKit at r75315: Fix Makefiles Merge WebKit at r75315: Move Android-specific WebCore files to Source Merge WebKit at r75315: Initial merge by git.
| * Merge WebKit at r75315: Add FrameLoaderClient PageCache stubsSteve Block2011-05-131-0/+3
| | | | | | | | | | | | See http://trac.webkit.org/changeset/74571 Change-Id: Ic49f367c0f35c2aa04d255193ff6ebd4d7e41d54
| * Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12195-1730/+5507
| | | | | | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* | update for new audio.h header locationDima Zavin2011-05-121-1/+1
| | | | | | | | | | Change-Id: I62351e590d89ef68b26248936a4d63df4557182c Signed-off-by: Dima Zavin <dima@android.com>
* | Clean up JavaBridgeSteve Block2011-05-121-11/+12
| | | | | | | | | | | | | | | | This is in preparation for the fix for null weak global references. No functional change. Bug: 4336862 Change-Id: I4ef7d999cf6b915b3f2af7a76c2414d5537891e5
* | Clean up DeviceMotionClientImpl and DeviceOrientationClientImplSteve Block2011-05-122-6/+4
| | | | | | | | | | | | | | | | This is in preparation for the fix for null weak global references. No functional change. Bug: 4336862 Change-Id: I1718df5e4b443471e3c166e5ad8ae984b395ec38
* | Clean up WebViewCoreSteve Block2011-05-122-44/+35
|/ | | | | | | | This is in preparation for the fix for null weak global references. No functional change. Bug: 4336862 Change-Id: Icaf11948b0488d10ef112372275a254114a7efb3
* Add null pointer check when searching for a plugin widget.Derek Sollenberger2011-05-111-1/+1
| | | | | bug: 4395730 Change-Id: I4fb5c129084a8f1d1e3f3951c9cac77a0df4d296
* am 5581ea83: am 86ca6e2e: am c74d30ac: Merge "Fix calculation in ↵Russell Brenner2011-05-101-8/+0
|\ | | | | | | | | | | | | WebView::scrollRectOnScreen" into honeycomb-mr2 * commit '5581ea8383a0348a04997c772f8a032c146459af': Fix calculation in WebView::scrollRectOnScreen
| * Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2Russell Brenner2011-05-101-8/+0
| |\
| | * Fix calculation in WebView::scrollRectOnScreenRussell Brenner2011-05-051-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Call to subtractLayers() was always returning an empty rect and, as a result, we would exit without calling viewInvalidate(). Bug: 4310520 Change-Id: Icad9e3efd157e5ae970a3200f5b0bbecbee66f79
| * | DO NOT MERGEDavid Deephanphongs2011-05-051-2/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick change I2ae80ddc from master: Fix crash in font-handling code caused by repainting while a style recalculation was pending. The Android FrameCache was being updated while a style recalculation was pending. This would cause the cached fonts in the FontFallbackList to be accessed, but that cache is not necessarily consistant while a recalculation is pending. A similar issue was occurring with recordPictureSet. In updateFrameCache() and recordPictureSet(), early-abort if the document is waiting for a style recalculation. In notifyProgressFinished(), remove the call to updateFrameCache(). Bug: 4292199 Bug: 4291311 Change-Id: Ie8bc4cb0637ccb7aee37597ac08fd8abffc149cd
| * DO NOT MERGEHuahui Wu2011-04-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry pick of https://android-git.corp.google.com/g/#change,106682 b/3491968 stop the hanging of dunkindonuts.com Sometimes, a sync load can wait forever and lock up the network thread, here we replace Wait() with TimedWait() with multiple tries to avoid locking. Unfortunately, TimedWait() doesn't return anything and can't tell if it's a timeout or a quick pass, so we query timeofday and allow a few seconds for the system timing error. Change-Id: I991617130f93b44518d28926725f261d4569d73c
* | Clean up includes in WebStorage.cppSteve Block2011-05-101-4/+4
| | | | | | | | Change-Id: I66d260c506b0a3bd0379866bd5e794497b20c9c5
* | Merge WebKit at r74534: Rename rendering methodsBen Murdoch2011-05-102-2/+2
| | | | | | | | | | | | | | | | | | Following the rename of *visible to *visual upstream, make them in our platform code. See http://trac.webkit.org/changeset/73385 Change-Id: Ic4cb1ed8736d67bbc6e963b9f409bfdae07d5c5f
* | Merge WebKit at r74534: Fix WebSettings.cppBen Murdoch2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | Fix our platform code after upstream refactoring to GeolocationPositionCache. http://trac.webkit.org/changeset/74226 Change-Id: I07202da9252741576f3133c2daa0222bc2b67e61
* | Merge WebKit at r74534: Fix WebCoreFrameBridge.cppBen Murdoch2011-05-101-1/+1
| | | | | | | | | | | | | | | | Update platform code after upstream refactoring. See http://trac.webkit.org/changeset/73444 Change-Id: I5ae9bc2cf49f7a2e6c27294fbf72ce7c68a80e4d
* | Merge WebKit at r74534: Fix EditorClientAndroid.cpp (SpellChecker)Ben Murdoch2011-05-102-0/+3
| | | | | | | | | | | | | | | | Add stub for new method added upstream: requestCheckingOfString(...) See http://trac.webkit.org/changeset/73886 Change-Id: I94d6940e48066c56e1032f12d683c530603bffc4
* | Merge WebKit at r74534: Fix EditorClientAndroid.cpp (getGuessesForWord)Ben Murdoch2011-05-102-2/+2
| | | | | | | | | | | | | | | | | | Update function signature of EditorClient::getGuessesForWord to match upstream change. See http://trac.webkit.org/changeset/73088 Change-Id: Iedffbb3216a0da036f5ea61f6b282d50f50b2d0f
* | Merge WebKit at r74534: Fix WebCoreFrameBridge.cpp andBen Murdoch2011-05-102-13/+25
| | | | | | | | | | | | | | | | | | | | FormManagerAndroid.cpp Platform code needs updating after upstream refactoring. See http://trac.webkit.org/changeset/73430 Change-Id: If9306164c5dae24fb11af724979c0187d28792da
* | Merge WebKit at r74534: Fix RenderBlockLineLayout.cpp and others.Ben Murdoch2011-05-102-2/+2
| | | | | | | | | | | | | | | | | | Fixes RenderBlockLineLayout.cpp, WebViewCore.cpp and CacheBuilder.cpp after upstream refactoring. See http://trac.webkit.org/changeset/73618 Change-Id: I7942d6d77ce70ceb147dd711c5229c649242b10c
* | Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-10279-9378/+18995
| | | | | | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* | Better support for exiting full screenTeng-Hui Zhu2011-05-093-0/+33
| | | | | | | | | | | | | | | | When exiting the full screen, we need to let the webkit know the status. bug:4312214 Change-Id: I4e475da3b426176fd232551e16fbe740994d8d36
* | Fix issue where solid was drawn instead of ringJohn Reck2011-05-051-1/+1
| | | | | | | | | | | | Bug: 4283275 Change-Id: Ie05440e3618ffa36004af35fed3d350763f09d50
* | Merge "Correct the move latest positioning"Teng-Hui Zhu2011-05-041-2/+1
|\ \
| * | Correct the move latest positioningTeng-Hui Zhu2011-05-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is fixing the issue when we move the slider, the moveLastest will send to 0,0, which cause a jump on the slider. bug:4232704 Change-Id: Ic7235158cbfb690a38f53ca1b3e4757a5d1a69f3
* | | Fix crash in font-handling code caused by repainting while a style ↵David Deephanphongs2011-05-041-2/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recalculation was pending. The Android FrameCache was being updated while a style recalculation was pending. This would cause the cached fonts in the FontFallbackList to be accessed, but that cache is not necessarily consistant while a recalculation is pending. A similar issue was occurring with recordPictureSet. In updateFrameCache() and recordPictureSet(), early-abort if the document is waiting for a style recalculation. In notifyProgressFinished(), remove the call to updateFrameCache(). BUG=4292199 Change-Id: I2ae80ddc2d596e2f15455f54f4de7dde6e42ade8
* | Merge "webkit: convert to use new audio.h"Dima Zavin2011-04-271-7/+9
|\ \
| * | webkit: convert to use new audio.hDima Zavin2011-04-191-7/+9
| | | | | | | | | | | | | | | Change-Id: I2754c4fdf8a367530e2be5c215e5a3823e4957c5 Signed-off-by: Dima Zavin <dima@android.com>
* | | Fix a compiler warning in handleTouchEvent()Steve Block2011-04-201-1/+1
| | | | | | | | | | | | Change-Id: I6aeafd3d83bbb114164445e7d9f6da0fbc0589f5
* | | Avoid prematurely deleting a JNI local ref in FindAddressSteve Block2011-04-201-3/+1
|/ / | | | | | | Change-Id: Ib0e34890dd37736f809bbdd044ecc63320fe0ed6
* | b/3491968 stop the hanging of dunkindonuts.comHuahui Wu2011-04-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | Same as https://android-git.corp.google.com/g/#change,105743 but in Master. Changed the waiting to 10 seconds each attempt after asking around. Sometimes, a sync load can wait forever and lock up the network thread, here we replace Wait() with TimedWait() with multiple tries to avoid locking. Unfortunately, TimedWait() doesn't return anything and can't tell if it's a timeout or a quick pass, so we query timeofday and allow a few seconds for the system timing error. Change-Id: I391fb3f815413f17b2927c1e90cbddab7faed071
* | Implements the focus ring drawing in GL.Nicolas Roard2011-04-111-6/+11
| | | | | | | | | | | | | | | | | | In WebView::drawGL(), we check if the extras to draw are rings, and if so we get their rectangles and pass that to GLWebViewState. Updated with holo colors Change-Id: Id5f8941f16dba1733e8a84eae8cd2b317fbc7c55
* | am f1a6509b: am b6ac9086: Merge "Fix for bug:4183801" into honeycomb-mr1Nicolas Roard2011-04-071-19/+12
|\ \ | |/ | | | | | | * commit 'f1a6509bb189c2240a8723c2a96d677d98d8b142': Fix for bug:4183801
| * Fix for bug:4183801Nicolas Roard2011-04-071-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | The computation for the invalidated / clipping rects were wrong, sometimes causing the linked bug when layers had a transparent background (they were not obeying the clipping rect passed by the framework). java counterpart CL: https://android-git.corp.google.com/g/#change,105503 Change-Id: I60769e7cbf1a3a939724c57b3d3ce63a6f87aa87
* | am bb69eea5: am e4cbbfc0: Merge "Show the fullscreen button all the time" ↵Teng-Hui Zhu2011-04-071-5/+1
|\ \ | |/ | | | | | | | | | | into honeycomb-mr1 * commit 'bb69eea599d55bb1958713e8f1614c9e7f38b2f2': Show the fullscreen button all the time
| * Show the fullscreen button all the timeTeng-Hui Zhu2011-04-071-5/+1
| | | | | | | | | | bug:4232704 Change-Id: I64833baeab708fabe88873573235a896b86b6098
* | Remove unsafe jclass member variable that was not a JNI global referenceBrian Carlstrom2011-04-061-5/+4
| | | | | | | | Change-Id: I8a7c2ff1325685ac03517f7277b057f7d1d56661
* | Merge 'Render media button and buttons properly.' into master.Leon Scroggins2011-03-252-19/+12
| | | | | | | | | | | | | | | | Bug:3009375 Requires a change to frameworks/base. Change-Id: I0cb921b17ffc00992c3ad299c96f8e72c8daaf25
* | am 28b632cb: am 9d342774: Merge "Possible fix for bug 4155219 IPv6 support: ↵Bart Sears2011-03-231-0/+5
|\ \ | |/ | | | | | | | | | | DNS is not reset when switching from IPv4/IPv6 network to IPv4 network" into honeycomb-mr1 * commit '28b632cb7811e88493697f19a1be5d989651633f': Possible fix for bug 4155219 IPv6 support: DNS is not reset when switching from IPv4/IPv6 network to IPv4 network
| * Merge "Possible fix for bug 4155219 IPv6 support: DNS is not reset when ↵Bart Sears2011-03-231-0/+5
| |\ | | | | | | | | | switching from IPv4/IPv6 network to IPv4 network" into honeycomb-mr1
| | * Possible fix for bug 4155219 IPv6 support: DNS is not reset when switching ↵Kristian Monsen2011-03-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | from IPv4/IPv6 network to IPv4 network Enable network change notifier Change-Id: I89919c8a8bc54aaf0b2e1b013fbdf43abe657295
* | | am f58a40bf: am ef25442f: don\'t call bounder when uninitializedCary Clark2011-03-231-1/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'f58a40bf15e13380b82713b5b229a9bf57fe4b0e': don't call bounder when uninitialized
| * | don't call bounder when uninitializedCary Clark2011-03-231-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | If the canvas' device list has never been set up, or has been set to an empty clip, the bounder's clip will not be initialized, and checking bounding rect may fail. Check to see if the bounder was ever called for an individual glyph before checking the result. bug:4155270 Change-Id: I625e885d13208e82c44259277c74b8f0cef5b0cb
* | resolved conflicts for merge of 4691a532 to masterTeng-Hui Zhu2011-03-213-7/+17
|\ \ | |/ | | | | Change-Id: I7a525d5179545e4faec46e58e9606d9598c241ca
| * Merge "Support drawing paused and loading image as GL texture" into ↵Teng-Hui Zhu2011-03-213-9/+19
| |\ | | | | | | | | | honeycomb-mr1
| | * Support drawing paused and loading image as GL textureTeng-Hui Zhu2011-03-213-9/+19
| | | | | | | | | | | | | | | | | | bug:4142131 Change-Id: I871924cb7587077f50fdf4f9a00056f795a8daea
* | | am eecdc5b2: am 4c6c5a28: Merge "Turns out args should not be decoded ↵Bart Sears2011-03-211-3/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | twice." into honeycomb-mr1 * commit 'eecdc5b297922df6c0be702e5d2c5905855e273b': Turns out args should not be decoded twice.