summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change r96779 to fix window.locationSteve Block2012-03-2819-43/+49
| | | | | | | | | | See http://trac.webkit.org/changeset/96779 Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the change is not required. Bug: 2159848 Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
* Cherry-pick WebKit change r94132 to fix default port in URLsSteve Block2012-03-289-289/+288
| | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that a manual edit to HTMLAnchorElement::port() was required to avoid the use of emptyString(). See http://trac.webkit.org/changeset/94132 Bug: 2159848 Change-Id: I13ef58e18df46c1d4592c102d4eb80f54ae53020
* Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()Steve Block2012-03-2817-35/+40
| | | | | | | | | | | | | | This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix window.location. Note that a conflict occurred in Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the change is not required. See http://trac.webkit.org/changeset/87623 Bug: 2159848 Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
* Cherry-pick WebKit change r84762 to fix URL canonicalizationSteve Block2012-03-287-28/+94
| | | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that the 'http:example.com/' test case in fast/url/standard-url.html fails with DRT2 because of an assumption in the test that it is served as a file scheme URL. See http://trac.webkit.org/changeset/84762 Bug: 2159848 Change-Id: Ie680debcad3d285efd40134932b72d429c0d2222
* Cherry-pick WebKit change r84756 to add some URL parsing testsSteve Block2012-03-284-0/+49
| | | | | | | | | | This is to improve test coverage prior to fixing window.location. See bug for details. See http://trac.webkit.org/changeset/84756 Bug: 2159848 Change-Id: I5ac9e5129938b31f2dc0fd244dcb233eafb17fb5
* Merge "Further clean up for baselayer merge"Teng-Hui Zhu2012-03-266-67/+46
|\
| * Further clean up for baselayer mergeTeng-Hui Zhu2012-03-226-67/+46
| | | | | | | | | | | | | | | | | | 1. Require a layer for every SurfaceCollection Now we don't need the null check any more. 2. drawBackground only in SurfaceCollectionManager. Change-Id: I3bbebac86e41a2367a05f71cffdc6cd72fda7506
* | Merge "Platform graphics refactor"John Reck2012-03-239-980/+1279
|\ \
| * | Platform graphics refactorJohn Reck2012-03-239-980/+1279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Push the bulk of the work to PlatformGraphicsContext PlatformGraphicsContext does not depend on having a GraphicsContext Get ImageAndroid::drawPattern off of mCanvas Get BitmapImage::draw off of mCanvas Get WebFrameView off of mCanvas Cleanup GradientAndroid and remove mCanvas usage Change-Id: I3c8ad10c030cbc384436463e197ca1c0a69d34eb
* | | Merge "Use the right opacity"Chris Craik2012-03-231-1/+1
|\ \ \
| * | | Use the right opacityJohn Reck2012-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6220093 Change-Id: Ie617a29ea8f0b28d69dfc29d1435f1fedade1ef9
* | | | Merge "add missing include"Mathias Agopian2012-03-231-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | add missing includeMathias Agopian2012-03-231-0/+1
| |/ / | | | | | | | | | Change-Id: Iec9f7f7ee481f105fd15d521393faf26f76b9adc
* | | Fix TilesManager race conditionJohn Reck2012-03-234-29/+13
|/ / | | | | | | Change-Id: Ibbb8d6fa7565cf7d2205b28c8a9e870eb338ea14
* | Merge "reimplement BaseLayerAndroid as a LayerAndroid subclass"Chris Craik2012-03-2347-1756/+311
|\ \ | |/
| * reimplement BaseLayerAndroid as a LayerAndroid subclassChris Craik2012-03-2247-1756/+311
| | | | | | | | | | | | Breaks low res tiling, and expanded rendering bounds. Change-Id: Iec3ba2adceb6bd95399594d29fd8c0b18c1122ce
* | Merge "Null out m_canvas if HTMLCanvasElement is destroyed"John Reck2012-03-223-16/+25
|\ \
| * | Null out m_canvas if HTMLCanvasElement is destroyedJohn Reck2012-03-223-16/+25
| |/ | | | | | | | | | | Bug: 6209508 Change-Id: I99be936cde28047d516ecdfcc20cd099241569ca
* | Add missing null checkJohn Reck2012-03-221-1/+1
|/ | | | | | | | | Bug: 6207830 HTMLCanvasElement will not create an imageBuffer if the size is empty or if the size is too large. Before attempting to use the copiedImage, make sure we have a buffer. Change-Id: I962c6f8d05e366631ceec911792ffb33f8cd7ca4
* Fix pure color check to be performed pre-visual indicatorJohn Reck2012-03-218-9/+25
| | | | Change-Id: Id15574e4b1988d73eaefed32718cd4698222d8f1
* Merge "Visual Indicator tweaks"John Reck2012-03-2110-287/+33
|\
| * Visual Indicator tweaksJohn Reck2012-03-2110-287/+33
| | | | | | | | Change-Id: I2652ca8d6d3008bb97c2d9ad795240880fd83006
* | Fix location of selection handles on rotated text.George Mount2012-03-211-1/+19
| | | | | | | | | | | | | | | | Bug 6206177 The left/bottom of the caret is always the point at which the selection should point. The top/right is at the "top" of the text. Change-Id: Ie13f6ad5bfea3614892c0f986e019393f77ab3cf
* | Merge "Make paste window and caret handle show up at the right time."George Mount2012-03-212-14/+20
|\ \
| * | Make paste window and caret handle show up at the right time.George Mount2012-03-202-14/+20
| | | | | | | | | | | | | | | | | | | | | Bug 6194009 Framework Change: I460db436bd79d8ff72b457b5878ffe468400031f Change-Id: I7f8bc7266df52a67245b0a971826fd14e0d715c5
* | | Plumb WebView and WebViewCore thru to MediaLayerJonathan Dixon2012-03-216-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on https://android-git.corp.google.com/g/171224 Changes the plugin code to provide the WebView (not WebViewClassic) jobject instance into the plugin, as this provides the full public API expected. As a knock-on, I had to plumb WebViewCore jobject through to MediaTexture so it can retain the sendPluginDrawMsg() call. This isn't pretty, but in terms of layering it's no worse than before. Change-Id: Iaaa6e0c6b65963fedaff078a20477d8595c82a5d
* | | Merge "Attempt to fix the GPL build"John Reck2012-03-201-2/+1
|\ \ \
| * | | Attempt to fix the GPL buildJohn Reck2012-03-201-2/+1
| | |/ | |/| | | | | | | Change-Id: Ibb0ae6b1c1ca429da122faa5e32a980399a41c13
* | | Remove unnecessary invertedTileSwitchJohn Reck2012-03-205-27/+1
|/ / | | | | | | Change-Id: Ifd27772aba0435ea55008400e4b42181bf45b944
* | Merge "Canvas on a texture"John Reck2012-03-2015-34/+697
|\ \
| * | Canvas on a textureJohn Reck2012-03-2015-34/+697
| | | | | | | | | | | | Change-Id: I841b3e021298738c91701068992798a55290a520
* | | Fix scrolling on sites that use <frame>sMangesh Ghiware2012-03-192-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the dimensions of a frame before expanding it to fit the content width and height. Also, force a relayout of the frame as necessary to sync the correct dimensions (i.e. when navigation occurs inside the frame) Bug: 5978268 Change-Id: Ia282d6e5753fd38b32854e01ca58fa41b3814b21
* | | Merge "Draw vertical text using by setting verticalText flag in SkPaint."Derek Sollenberger2012-03-191-19/+20
|\ \ \
| * | | Draw vertical text using by setting verticalText flag in SkPaint.Derek Sollenberger2012-03-141-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This approach replaces drawing each vertical character on a Path. The use of the verticalText flag requires an update to Skia's freetype implementation which in external/skia. bug: 5558851 Change-Id: If33288c348e3c51df2d8edc1ee4352de0ac521df
* | | | Merge "Fix selection positioning for RTL languages"Russell Brenner2012-03-161-2/+2
|\ \ \ \
| * | | | Fix selection positioning for RTL languagesRussell Brenner2012-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic error prevented placement of the cursor at the left edge of an RTL sequence. Bug: 5041179 Change-Id: I091f1d8ae546890b6a6be50f729b662742ca2221
* | | | | Merge "Paint tiles with the PaintTileOperation's painter"Chris Craik2012-03-166-17/+11
|\ \ \ \ \
| * | | | | Paint tiles with the PaintTileOperation's painterChris Craik2012-03-166-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refcounting there prevents the painter from being deallocated while painting bug:6064973 Change-Id: Ief4e615876aab74afb74e135acc1dd92c92af570
* | | | | | Merge "only report actual changes to matchCount"Victoria Lease2012-03-161-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | only report actual changes to matchCountVictoria Lease2012-03-161-3/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 6052412 Change-Id: If188ea2e54b52f16767d8df8d66c4a80f5a400c0
* | | | | Merge "Add libmedia_native"Glenn Kasten2012-03-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add libmedia_nativeGlenn Kasten2012-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6b835330c67a308834cafe35b916fa98869bebbf
* | | | | Update edit text size when the text changes so scroll works.George Mount2012-03-153-2/+42
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug 6176413 Framework Change: I6b8f244cd747d6d19c261d685a3cfb9ef4d71ec3 Change-Id: I487322ca9578c003f937b92ca4e8d46d34ea8c78
* | | | Merge "Scroll cursor with edited text."George Mount2012-03-151-0/+1
|\ \ \ \
| * | | | Scroll cursor with edited text.George Mount2012-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6175492 Change-Id: I0f36e3ff371df1b8941a47ee910c0729cd5a01e1
* | | | | Merge "Add scrolling editable text with a finger drag."George Mount2012-03-152-25/+89
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Add scrolling editable text with a finger drag.George Mount2012-03-142-25/+89
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bug 6156451 Framework Change: I1a16c708e5ea2ef8bd1f99197dacbc7831764ef4 Change-Id: Ie08712fb17b237fbb2d520d745ef8a2e489fd728
* | | Merge "Remove gmail specific mime code from webview"Selim Gurun2012-03-142-12/+3
|\ \ \
| * | | Remove gmail specific mime code from webviewSelim Gurun2012-03-142-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6019611 Remove gmail specific mime code from webview so the query parameters can be passed to asset files. The changes were added in honeycomb timeframe (see commit 7d2f6c10941c9083e9ec30fb08444a5755ff8bc9). The changes seem not in use anymore (tested for some attachments following the original commit above), also talked to gmail team and they also do not think it is in use. Also it seems a hack to modify webview for one app in such a way. Get rid of an unused private variable. Change-Id: Ic74414eaa0d6a2be77eefdd0b8a053f655b285ff
* | | | Merge "Refresh fonts when system locale is changed"Russell Brenner2012-03-144-0/+87
|\ \ \ \