summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * am 86ca6e2e: am c74d30ac: Merge "Fix calculation in ↵Russell Brenner2011-05-101-8/+0
| |\ | | | | | | | | | | | | | | | | | | WebView::scrollRectOnScreen" into honeycomb-mr2 * commit '86ca6e2e4d40c69c268633e600ef5b045d102180': Fix calculation in WebView::scrollRectOnScreen
| | * am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into ↵Russell Brenner2011-05-101-8/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'c74d30ac1079750a0d7f87704a9962f8045cce94': 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
* | | | | am 53cd6a87: (-s ours) am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-100-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb': DO NOT MERGE
| * | | | am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'aecd2790ab5d8d358eb7a7ee0181a52ca18bc179': DO NOT MERGE
| | * | | am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'c3da3ea3d67930a5593b455cdc697171a9115cae': DO NOT MERGE
| | | * | DO NOT MERGENicolas Roard2011-05-094-20/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from Master Fix for maps - Fix a repaint scheduling bug preventing layers containing only and image to update - Use an SkBitmap instead of SkBitmapRef and do a deep copy instead to prevent synchronization issues with the webkit thread. bug:4173057 Change-Id: Iace8e21b776df7b357654f66d40d159a1701b86d
* | | | | Clean up makefiles in preparation for new Source/ directorySteve Block2011-05-104-102/+103
| | | | | | | | | | | | | | | | | | | | Change-Id: Iebb4d96933c59028f024ac29b348b98d13a29610
* | | | | Clean up includes in WebStorage.cppSteve Block2011-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I66d260c506b0a3bd0379866bd5e794497b20c9c5
* | | | | Merge WebKit at r74534: Update ThirdPartyProject.propBen Murdoch2011-05-101-5/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I2548b0257a8eb52bbe12149640a23352476b05c0
* | | | | Merge WebKit at r74534: Fix build. (XSLTProcessoeLibxslt.cpp)Ben Murdoch2011-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick r86144 to fix the build. See http://trac.webkit.org/changeset/86144 Change-Id: Ief3510eeaedcd433ce9e1d2ddd9bb5ed1b0a6808
* | | | | Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp ↵Ben Murdoch2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (setPlatformCompositeOperation) Implement new setPlatformCompositeOperation method from upstream. See http://trac.webkit.org/changeset/73729 Change-Id: Ic87c3b8beec48c6b4c7bef5db61c6082f7e53639
* | | | | 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-103-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Fix ImageSourceAndroid.cppBen Murdoch2011-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use enums instead of booleans after upstream refactoring. See http://trac.webkit.org/changeset/73819 Change-Id: Ifbfd886e7ff3779068b9aa2f0c849b2a8a449b84
* | | | | Merge WebKit at r74534: Fix ImageBufferAndroid.cppBen Murdoch2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our platform ImageBuffer class after new features added upstream. See http://trac.webkit.org/changeset/73949 and http://trac.webkit.org/changeset/73925 Change-Id: I40a982c855faabbbdbc0cb13dd503d3bbe76f3ef
* | | | | Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (Paths)Ben Murdoch2011-05-101-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our platform FraphicsContext after upstream Path refactoring. See http://trac.webkit.org/changeset/72926 Change-Id: I574ede8dfc74fce5edc3558cd63c6b703f45fe7c
* | | | | Merge WebKit at r74534: Fix GraphicsContextAndroid.cppBen Murdoch2011-05-101-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our platform GraphicsContext after upstream refactoring. See http://trac.webkit.org/changeset/73492 See http://trac.webkit.org/changeset/73728 Change-Id: I1d5ea12a57e7b96a90c1df250c716647bc4e0f26
* | | | | Merge WebKit at r74534: Fix FontDataAndroid.cppBen Murdoch2011-05-102-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new functions introduced upstream for CSS text-emphasis property. See http://trac.webkit.org/changeset/74169 Change-Id: I5fff00db5b30979e29c9af75650e5df8d9eaff64
* | | | | Merge WebKit at r74534: Fix FontAndroid.cpp (TextMode constants)Ben Murdoch2011-05-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port style changes to our code. See http://trac.webkit.org/changeset/73284 Change-Id: I03a5a7aa7a9a319ac4dbfc257c7adf83b362107c
* | | | | Merge WebKit at r74534: Fix FontAndroid.cpp (getShadow)Ben Murdoch2011-05-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GraphicsContext::getShadow callsite with new parameter. See http://trac.webkit.org/changeset/74463 Change-Id: Ibfb36831800a57968963a5619c8425f5551829f5
* | | | | Merge WebKit at r74534: Fix GraphicsContext.cppBen Murdoch2011-05-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git got confused in the initial merge, and inserted the new version of this function but left the old one too, so remove the old definition of GraphicsContext::shadowsIgnoreTransforms() See http://trac.webkit.org/changeset/74532 Change-Id: Ide2cebc27122560349d715c25063a5a93cb54a0d
* | | | | Merge WebKit at r74534: Fix CachedResourceLoader.cppBen Murdoch2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make upstream changes in our code. See http://trac.webkit.org/changeset/73749 Change-Id: I6764c637cf0c7ed0bf0dabde47488b95c1fa7062
* | | | | Merge WebKit at r74534: Fix MakefilesBen Murdoch2011-05-109-7/+79
| | | | | | | | | | | | | | | | | | | | Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e
* | | | | Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-1025-849/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
* | | | | Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-103820-213542/+424018
| | | | | | | | | | | | | | | | | | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* | | | | Cleanspec needed for change https://android-git.corp.google.com/g/#change,109065Kristian Monsen2011-05-101-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic0627398c525f9c616024a81a70380775a981361
* | | | | Better support for exiting full screenTeng-Hui Zhu2011-05-096-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When exiting the full screen, we need to let the webkit know the status. bug:4312214 Change-Id: I4e475da3b426176fd232551e16fbe740994d8d36
* | | | | am 23652748: (-s ours) am 1d62edec: Merge remote branch ↵The Android Automerger2011-05-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'goog/honeycomb-mr2\' into honeycomb-LTE * commit '23652748ca27723b6da70f90460064d542f62130': DO NOT MERGE DO NOT MERGE Fix issue with zooming in/out quickly DO NOT MERGE ANR fix DO NOT MERGE priority queue based tile manager
| * | | | am 1d62edec: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-0915-312/+283
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d62edecbc901d7d88ac6729e25aa0ad44b3aa04': DO NOT MERGE DO NOT MERGE Fix issue with zooming in/out quickly DO NOT MERGE ANR fix DO NOT MERGE priority queue based tile manager
| | * | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-0815-312/+283
| | |\ \ \ | | | |/ /
| | | * | Merge "DO NOT MERGE" into honeycomb-mr2Russell Brenner2011-05-061-2/+17
| | | |\ \
| | | | * | 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
| | | * | Merge "DO NOT MERGE Fix issue with zooming in/out quickly" into honeycomb-mr2John Reck2011-05-061-2/+2
| | | |\ \
| | | | * | DO NOT MERGE Fix issue with zooming in/out quicklyJohn Reck2011-05-051-2/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where BaseLayer would get stuck in a state trying to prepare the next page, but no longer needed to prepare a new page. This is caused by setting kWillScheduleRequest, but then the user zooming back to the starting scale. Change-Id: I4717482e451e3b9ce74b4cc431d7cec6760d1012
| | | * | Merge "DO NOT MERGE ANR fix" into honeycomb-mr2John Reck2011-05-062-31/+23
| | | |\ \
| | | | * | DO NOT MERGE ANR fixJohn Reck2011-05-052-31/+23
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Race condition in BaseTile could cause a texture's owner to change to a BaseTile, without that BaseTile actually using that texture. This could cause two texture's to point to the same BaseTile. Bug: 4268381 Change-Id: I66b38a042e66fc32f4e098428d1f4a537d76a9d8
| | | * | DO NOT MERGE priority queue based tile managerJohn Reck2011-05-0514-277/+241
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes TileSets and queues tiles individually Uses a priority queue to determine which tiles to render first Stops rendering the front tile page if we are prepping the back one Limits queue spam by tracking which tiles are already in the queue Change-Id: Idd4154b8a2771d0db2da94c84a683314597f8542
* | | | Fix issue where solid was drawn instead of ringJohn Reck2011-05-053-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4283275 Change-Id: Ie05440e3618ffa36004af35fed3d350763f09d50
* | | | Merge "Fix issue with zooming in then out very quickly"John Reck2011-05-051-2/+2
|\ \ \ \
| * | | | Fix issue with zooming in then out very quicklyJohn Reck2011-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I38d38d9c84a32182c84c3f89365ea8760664bd52
* | | | | Add the touch event handling for the slider.Teng-Hui Zhu2011-05-046-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4232704 Change-Id: Ia3ac8a6003c1ff7b06d2a226b3206a3be0f8c6b5
generated by cgit v1.1 at 2025-06-01 15:53:02 +0000