summaryrefslogtreecommitdiffstats
path: root/WebKit/android
Commit message (Collapse)AuthorAgeFilesLines
* More fixes after the merge, setting a proxy service.Kristian Monsen2010-08-051-7/+8
| | | | | | | Setting the proxy to 0 was not too smart as it crashes when used. The ProxyService::CreateNull is for a usercase like ours where we basicly don't want a proxy. Also changed the includes in this file to be correct for files from other libraries. Change-Id: I7b8ccadf01cdeb10cc141e07bea7dbb57bb80073
* Merge "Compile fix after chromium merge"Kristian Monsen2010-08-041-3/+7
|\
| * Compile fix after chromium mergeKristian Monsen2010-08-041-3/+7
| | | | | | | | Change-Id: Ie984365f5bc35305ec1c2899be25a791ad354ef1
* | Merge "Removing the list of active loaders"Kristian Monsen2010-08-042-39/+14
|\ \ | |/
| * Removing the list of active loadersKristian Monsen2010-08-032-39/+14
| | | | | | | | | | | | | | A loader will not be deleted before the WebRequest has called didFinishLoading() now, so there is no longer a need for this. There was also a problem with that list. If a loader got deleted and a new one created with the same pointer value the deleted one could be mistaken for the new one. Change-Id: I856519e751f6f1d15cfbd426a2cd2ba71315850b
* | Merge WebKit at r64264 : Compile fix, how to create WebCore::Page changedKristian Monsen2010-08-042-23/+16
| | | | | | | | | | | | http://trac.webkit.org/changeset/64208 Change-Id: If0c6a616bd9eb1f1c90041f9c83d1770d8acd9bd
* | Merge WebKit at r64264 : Compile fix: registerURLSchemeAsLocal movedKristian Monsen2010-08-041-1/+2
| | | | | | | | | | | | | | SecurityOrigin::registerURLSchemeAsLocal got moved to a new class. http://trac.webkit.org/changeset/63863 Change-Id: If1baa94d90506a9de321ad3303545e133ee446e9
* | Enable navigation in scrollable layers.Patrick Scott2010-08-028-25/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EventHandler: * Added IgnoreClipping in order to touch nodes that are clipped out. android_graphics: * Remember the absolute bounds of the node for invals. RenderBox: * Fix a compiler warning. RenderLayer: * Do not record the entire layer contents unless the scroll dimensions are larger than the client dimensions. * Change isSelfPaintingLayer to check for an overflow clip instead of the scrollable dimensions since it can be too early to check at this point. RenderLayerCompositor: * Same as RenderLayer for checking the overflow clip. WebViewCore: * Scroll the containing layer to the node bounds and offset the mouse position if scrolled. Once the mouse event is processed, restore the layer to 0,0. CacheBuilder: * The body position is no longer used. * Do not clip out nodes if the layer is scrollable. CachedFrame: * Add unadjustBounds to restore adjusted bounds to their original position (fixed position elements). * Call unadjustBounds when a node has been found. This new set of bounds is passed over to WebViewCore to handle clicks. * Reject empty node bounds. CachedLayer: * Document adjustBounds and add unadjustBounds. Add in the scroll position to the node bounds. CachedRoot: * Unadjust the mouse bounds. WebView: * Unadjust the mouse bounds and use the absolute bounds of the ring during inval. Bug: 1566791 Change-Id: Ia55f2cbb61869087176d3ff61882e40324614c6a
* | Revert "Add CSS cursor ring definitions"Cary Clark2010-07-307-216/+0
| | | | | | | | This reverts commit 0ed6485271097ecf1b4cf4e790f9cfdbb57d921c.
* | Add CSS cursor ring definitionsCary Clark2010-07-307-0/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows web pages to have fine-grain control over the appearance of the rings drawn around nodes. Generated links (email, addresses, phone numbers) are no longer given unique colors. To preserve this feature, a separate change could add an HTML extension similar to vlink to provide the cursor ring defintions for theses links. The mechanism implemented below isn't appropriate since these links don't necessarily correspond to single DOM nodes or other DOM elements. ------------ CSS examples ------------ The CSS to specify the ring looks like: -webkit-ring-fill-color:rgba(0,0,255,0.4); -webkit-ring-inner-width:2 px; -webkit-ring-outer-width:3.5 px; -webkit-ring-outset: 8 px; -webkit-ring-pressed-inner-color:rgba(0,0,255,0.8); -webkit-ring-pressed-outer-color:rgba(0,0,127,0.3); -webkit-ring-radius: 10 px; -webkit-ring-selected-inner-color:rgba(63,63,255,0.8); -webkit-ring-selected-outer-color:rgba(63,63,127,0.3); and may be alternately defined with a property shortcut: -webkit-ring:rgba(255,0,0,0.4) 5px 7px rgba(255,0,0,0.8) rgba(127,0,0,0.3) 20px rgba(255,63,63,0.8) rgba(127,63,63,0.3); -------------------- Property definitions -------------------- A vertical cross-section of the ring corresponds to these parameters as shown: ______ R / ___O_ R = corner radius / / __I_ o I = inner ring / / / _O_ ^ O = outer ring | | | / F | F = fill |O|I|O| L o = outset | | | \_F_ | L = original link \ \ \__O_ V \ \___I_ o R \____O_ The fill color specifies what to draw inside the ring when the link is followed. The fill area consists of the original link area the outset. The inner and outer widths specify the stoke width of the inner and outer rings, respectively. The widths may be specified in fractional pixels. The implementation captures 4 bits of the fraction. The outset specifies the distance from the edge of the original link to the rings' center. Both rings are drawn at the same center location. The radius specifies the curvature of the corners at the center of the rings. ------------- Data lifetime ------------- The selected colors specify the colors of the inner and outer rings when the trackball or D-pad hovers over the link. The pressed colors specify the colors of the rings when the trackball center is pressed or the link is tapped. The CSS data is recorded in the RenderStyle when the DOM is parsed. The widths are scaled up by 16 to preserve the fraction. When the nav cache is built, the CSS style information is recorded in the CachedColor class. Only unique style sets are recorded; many CachedNode instances can share the same CachedColor instance. When the cursor ring is drawn, the CachedColor is retrieved by getting the index from the CachedNode, and looking up the entry in the CachedFrame. The widths are scaled down by 16 since Lengths are stored by the webkit as integers. ---------- File Edits ---------- WebCore/Android.derived.mk - Build the CSS data property tables by concatentating Android specific data and optionally SVG data. WebCore/config.h - Add switch for these rings. This switch is meant as a convenience for finding the code in WebKit that was added to enable this feature. Since the old code in DrawCursor has been removed, it does not revert to the old behavior if the switch is turned off. WebCore/css/AndroidCSSPropertyNames.in - The new ring properties, plus an old one we added before. WebCore/css/CSSComputedStyleDeclaration.cpp WebCore/css/CSSMutableStyleDeclaration.cpp WebCore/css/CSSParser.cpp WebCore/css/CSSStyleSelector.cpp - I can guess what these functions are for as well as anyone, but I really don't know. Do I need all of them? Do I need to modify Mutable at all? WebCore/css/CSSPropertyNames.in - Moved Android addition to AndroidCSSPropertyNames.in WebCore/platform/graphics/Color.h - Added initial color values here. WebCore/platform/graphics/android/android_graphics.* - This draws the cursor ring. The code that draws 'synthetic' links has been discarded. WebCore/rendering/style/RenderStyle.h - Functions to get, set, and initialize the style data. WebCore/rendering/style/StyleRareInheritedData.* - The storage for the style data and an equivalence function. WebKit/Android.mk - Added CachedColor to the build. WebKit/android/nav/CacheBuilder.cpp - Record the color from the DOM into the cache. WebKit/android/nav/CachedColor.* - Store the cached color info. WebKit/android/nav/CachedFrame.* - Where the array of colors is stored. WebKit/android/nav/CachedNode.* - Where the index to the colors is stored. Change-Id: Ia3a931f41d6545e47678e245aafe7c84d4658f94 http://b/2603197
* | Add back nativeClearContent since it's used in Java side.Shimeng (Simon) Wang2010-07-291-0/+11
|/ | | | | issue: 2841402 Change-Id: Ia147b39f84be91a92dd4f491e8d3de263df4244b
* Merge "Crash fix, don't delete WebUrlLoaderClient before WebRequest is ↵Kristian Monsen2010-07-271-2/+0
|\ | | | | | | finished."
| * Crash fix, don't delete WebUrlLoaderClient before WebRequest is finished.Kristian Monsen2010-07-271-2/+0
| | | | | | | | | | | | Already approved in https://android-git.corp.google.com/g/#change,58487 Change-Id: Ib9718053edacd76b77a41b76782fd20769f57823
* | Merge Webkit at r63859 : Bindings code generators now enforce that generated ↵Ben Murdoch2010-07-271-4/+4
| | | | | | | | | | | | constants match their enums. See http://trac.webkit.org/changeset/63331 Change-Id: Ida82337eec825e26ab4afb8fc26e22fdb6c18786
* | Merge Webkit at r63859 : ResourceHandleInternal::m_request has been renamed. ↵Ben Murdoch2010-07-271-1/+1
| | | | | | | | | | | | See http://trac.webkit.org/changeset/63332 Change-Id: Id019ee222d0b7dcfa464f97cfffdd5c08e2d0ee8
* | Merge Webkit at r63859 : PluginWidget class has been renamed and moved to ↵Ben Murdoch2010-07-272-6/+11
| | | | | | | | | | | | WebKit. See http://trac.webkit.org/changeset/63638 Change-Id: I97784c98b694f28804421637716afa649aa09a6e
* | Merge Webkit at r63859 : Update call to hitTestResultAtPoint with the ↵Ben Murdoch2010-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | default hit test request as we also wish to pass a padding rect to use the HITTEST_WITHSIZE codepath. See http://trac.webkit.org/changeset/63807 Change-Id: I62109577c9468639971522a72adc3a543237516a
* | Merge Webkit at r63859 : Add new EditorClient method stub. See ↵Ben Murdoch2010-07-272-0/+5
| | | | | | | | | | | | http://trac.webkit.org/changeset/63602 Change-Id: I22392960cf91a1f826d37f257325fc988e2a8347
* | Merge Webkit at r63859 : PlatformCursorHandle -> Cursor. See ↵Ben Murdoch2010-07-272-3/+2
|/ | | | | | http://trac.webkit.org/changeset/63339 Change-Id: I26df53fba097893a5adee2a957a63a0f1720def8
* Merge "Compile fix after recent merge, name change in OwnPtr."Kristian Monsen2010-07-231-1/+1
|\
| * Compile fix after recent merge, name change in OwnPtr.Kristian Monsen2010-07-221-1/+1
| | | | | | | | Change-Id: I5741bfe5d0907deb8a5158390b44e74b4485be67
* | Enable scrollable divs.Patrick Scott2010-07-221-0/+70
|/ | | | | | | | | | | | | | Force a composite layer when the style says the content is scrollable. Record the border and background in the main content picture. When the contents of the layer are bigger than the size, record the foreground contents in a separate picture which is clipped by the border and size. When updating the base layer, remember the scroll position of each layer and update the new layer with the same position. Bug: 1566791 Change-Id: If440e4f215db6bda9df32a781d754d1f5a238162
* select text out of orderCary Clark2010-07-211-117/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | When the selected text visual order doesn't match the picture order, the text is selected spacially. The rectangle described by the start and end points limits what text is selected. This can fail when the rectangle described is too narrow to enclose all the lines between the top and bottom. This change extends the lines by including the text adjacent to the start and end when computing the limit bounds. And: - Refactor the code so that drawing the region and selecting the text can share this logic. - Add slashes as characters that prevent inserting spaces at the ends of lines. (ASCII characters space, dash, slash, and backslash cause lines to wrap.) - Narrow the error term for detecting spaces. The 1/2 value before inserted spaces incorrectly. Change-Id: I645f38dc246c61b1bc7c94e61553e5e6e36e3f85 http://b/2817635
* Merge WebKit at r63173 : Following @62607 Page takes a BackForwardClientLeon Clarke2010-07-202-2/+4
| | | | Change-Id: I1c86a2881f5bef152f1b9841d6dce41da91b03ac
* Chrome http: Persistent cookies and cache.Kristian Monsen2010-07-202-15/+18
| | | | | | Sharing one RequestContex. Adding a persistent cookie store and on disk cache to that request. Change-Id: I7f45cda3803340672585e5b0f84eb0d5e2fd6b75
* Removing ANDROID_USER_GESTURE ifdefKristian Monsen2010-07-152-12/+1
| | | | | | | As discussed on CL https://android-git.corp.google.com/g/#change,56717, removing the ifdef is a good thing as this is not a feature we want to turn on and off. Change-Id: Ic7a062e2bb15850ca17fcb46fbd25d786e08028d
* Fix for bug 2816268: Refactor ANDROID_USER_GESTURE codeKristian Monsen2010-07-153-17/+23
| | | | | | | | | | | | | | | | | | | Used the UserGestureIndicator class instead of the local ANDROID_USER_GESTURE code. I have made a simple test case for the problem at: http://updates.monsen.it/source.html This cannot be made into a layout test since the Android Dumprendertree does not support focus on windows other than the main one. Lots of local changes removed, but not many actual changes. Most are in parameters sent to other functions. As far as I can see they user gestures are only checked for in ChromeClientAndroid.cpp and WebCoreFrameBridge.cpp, and I replaced ANDROID_USER_GESTURE with UserGestureIndicator::processingUserGesture(). The UserGestureIndicator class was added to webkit in this CL: http://trac.webkit.org/changeset/57045 ResourceRequest.h is a cherry-pick of this CL from webkit.org http://trac.webkit.org/changeset/62668 Change-Id: Ia254b2cee833459fcc2cacfb2751ef7a29a8f64a
* Initial check-in of the external/webkit part of the chrome http stack.Kristian Monsen2010-07-158-0/+1010
| | | | | | | | | | | There are no changes in WebCore anymore, the new files live in WebKit/android/WebCoreSupport. There are two WebCore functions implemented in WebUrlLoader.cpp, they are one-liners that call a WebKit function or return a bool. Only async downloads are implemented so far. There are crashes on some websites, but better to get things checked in, and then start fixing outstanding issues. I have tried to address all the issues from the reviews, but since the code has changed a bit I have not replied to each of them. Change-Id: Ie83798e2f82ce78cb00ee5a4a558c9d8085c9567
* am b47b5d4a: am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-133-11/+39
|\ | | | | | | | | | | | | Merge commit 'b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf' * commit 'b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf': Migrate to new keycode constants in keycodes.h.
| * am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-133-11/+39
| |\ | | | | | | | | | | | | | | | | | | Merge commit '652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp * commit '652e9a017a7c5c772361bf57279fae0c26992329': Migrate to new keycode constants in keycodes.h.
| | * Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-133-11/+39
| | | | | | | | | | | | Change-Id: I523d6fab2964cec4610424f6fd7bbe86d38b7306
* | | Browser save page as web archive.Elliott Slaughter2010-07-121-0/+91
| | | | | | | | | | | | Change-Id: Ie92953142ed31fc859975289a978172bdb8b6d79
* | | Merge "handle out of order selections"Cary Clark2010-07-092-108/+298
|\ \ \
| * | | handle out of order selectionsCary Clark2010-07-092-108/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually, the text on a webpage is drawn from top to bottom but sometimes it is drawn out of order. In these cases the picture finds the select end before it finds the select start. When the select start and end are ordered, all of the text in the picture between the two are selected. This allows selecting all of the text on the page, even if the start isn't spacially before the end. When the select start and end are flipped, select the text spacially between the two. The flipped page scenario was found by http://code.google.com/p/android/issues/detail?id=8533 Change-Id: Ia22d49396d68fefc3d64fad438c4b0c02f668c1c
* | | | am b34d9d68: merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010' * commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010': Fix missing NL
| * | | merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | Change-Id: Ib725f9df8c1d3a5105a126bf9475ec060ac0a98a
| | * | Fix missing NLBruce Beare2010-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6757ab42e52b9d878f06da4bdc757c4626e3d0c5 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
| * | | am 75238a0c: am 2943c136: Fix the \'wobbling fixed elements\' bug. ↵Nicolas Roard2010-05-111-9/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from master. This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150). Merge commit '75238a0c6749b428ac76d812d1ab08bedaec5ee3' into kraken * commit '75238a0c6749b428ac76d812d1ab08bedaec5ee3': Fix the 'wobbling fixed elements' bug.
| | * | Fix the 'wobbling fixed elements' bug.Nicolas Roard2010-05-101-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from master. This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150). Bug:2665696 Change-Id: I408a3e2f089a491c340e0f9eb8633870dae84997
* | | | Combine base PictureSet with composite layers intoGrace Kloba2010-07-096-261/+155
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one SkLayer tree. The BaseLayerAndroid is the root of the composite layers and it has the PictureSet as its base content. Before, WebViewCore uses m_contentMutex and both UI and WebCore threads access the m_content. Now we use the layer approach. When WebCore thread updates its content in recordContent, it creates a new BaseLayerAndroid and copy both PictureSet and composite layers into it. Then it is sent to be consumed by UI thread. Clean up sync layer in both ChromeClientAndroid and GraphicsLayerAndroid. splitContent can be a little tricky with this change. Now UI has its own copy of PictureSet. When it takes too long to draw, it will send a request to WebCore to split the PictureSet. When it is done, a copy of the new PictureSet will be sent back to UI. There is a matching change in framework/base
* | | Merge "don't walk off the end of the DOM when looking for text"Cary Clark2010-07-021-3/+4
|\ \ \
| * | | don't walk off the end of the DOM when looking for textCary Clark2010-07-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fix a couple of minor changes in debugging code to stay sync'd with webkit. Change-Id: If4263bab97715e2a2d12f06f2359554740bf5dbc http://b/2816549
* | | | Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cppKristian Monsen2010-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New document parser in webkit. Just taking in the new parser. See http://trac.webkit.org/changeset/61674 This file is now what is in webkit at the time of the merge, with ANDROID_INSTRUMENT added. The instrumentation for Parsing now includes inline script execution, this will have to be fixed later. Updated the description for the parsing counter. Change-Id: I2c1bae725fe8989999620430e4745e1dfa7c450b
* | | | Detect if we're a webapp from the meta tag and send a message throughBen Murdoch2010-06-304-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to java land if that is the case. Requires a frameworks/base change. b/2766917 Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
* | | | Merge "refine text selection"Cary Clark2010-06-291-24/+26
|\ \ \ \
| * | | | refine text selectionCary Clark2010-06-291-24/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'select all' to begin with the first character and end with the last rather than relying on the top left and bottom right. The old algorithm failed for pages broken into multiple columns. Similarly, capture the text from the beginning selection to the ending selection, rather than relying on the characters contained by the selection region. Reduce the gap required to add a linebreak from twice the lineheight to 1.5x the lineheight. Change-Id: Ib90a719ea3353feeaa3a6cc692d0dd9cff498cb5 http://b/262451
* | | | set maximum image sizeCary Clark2010-06-291-0/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our use of web settings does not specify the maximum image size, although we have some hard-coded values used when decoding the image. For defective images, the hard-coded values are not enough, since we may exceed memory in the decoder before the limit is reached. Pass along our limits to the decoder, and respect any limits set by the caller. companion change in frameworks/base Change-Id: Icdfca87a44a3af8bcc1f0ed4792e04e060a67333 http://b/2689053
* | | Merge "Don't use the validity of the border color to determine whether the ↵Leon Clarke2010-06-281-4/+8
|\ \ \ | | | | | | | | | | | | border will be drawn, but instead use the appearance, which is effectively what webkit uses to decide whether to draw its border http://b/issue?id=2661748"
| * | | Don't use the validity of the border color to determineLeon Clarke2010-06-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether the border will be drawn, but instead use the appearance, which is effectively what webkit uses to decide whether to draw its border http://b/issue?id=2661748 Change-Id: I8200f9e1ae68c1e16360bab25a0c7e6b0fe9ee34
* | | | Refactor find and select dialogsCary Clark2010-06-253-173/+937
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SelectText now permits incremental extension of the selection using either touch or trackball data. SelectText adds word selection and select all interfaces. SelectText has been rewritten to do a better job of finding space characters and selecting text outside of the visible window. Companion changes in frameworks/base and packages/apps/Browser Change-Id: I917a14124a41a3c9bd72ffa48fe36e55e7c4e543 http://b/2626451
generated by cgit v1.1 at 2025-11-27 08:25:16 +0000