summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-09381-2687/+13096
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge "Fix incorrect cherry-pick of WebKit change 64465 in merge to WebKit ↵Steve Block2010-08-051-1/+1
|\ | | | | | | r64264"
| * Fix incorrect cherry-pick of WebKit change 64465 in merge to WebKit r64264Steve Block2010-08-051-1/+1
| | | | | | | | | | | | See https://android-git.corp.google.com/g/#change,59749 Change-Id: I0ea44ef95fcd8035adc27a32fb75e7c19f23c975
* | Fix for issue 2857086 - page cycler hanging.Ben Murdoch2010-08-041-0/+1
|/ | | | | | Cherry pick of webkit.org r64638. Change-Id: I50ea47544af219cc04717a060d4b70f478a40877
* Merge WebKit at r64264 : Compile fix: A method got an extra parameter in ↵Kristian Monsen2010-08-041-1/+1
| | | | | | | | GraphicsContext.h Change introduced here: http://trac.webkit.org/changeset/63864/trunk/WebCore/platform/graphics/GraphicsContext.h Change-Id: I471797fff394396ec375db10c3bcb4e9c00feb3e
* Merge WebKit at r64264 : Compile fix: Filter guards in SVGKristian Monsen2010-08-041-0/+7
| | | | | | | | | | | Introduced here: http://trac.webkit.org/changeset/64196/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp Partially upstreamed as the file has changed upstream after the merge, and the newer version doesn't have both places where guards were needed. Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=43338 Upstream CL: http://trac.webkit.org/changeset/64465/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp Upstream change after merge where we have guards: http://trac.webkit.org/changeset/64440/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp Change-Id: Iaab4595ded78485c81d6f61a726a5bd0f48c5621
* Merge WebKit at r64264 : Compile fix: Inspector guards in V8Kristian Monsen2010-08-041-0/+2
| | | | | | | | | | | | Introduced here: http://trac.webkit.org/changeset/63891/trunk/WebCore/bindings/v8/ScriptValue.cpp The JSC version is guarded. This change has been upstreamed, and this is the bug: https://bugs.webkit.org/show_bug.cgi?id=43345 And the webkit CL: http://trac.webkit.org/changeset/64464/trunk/WebCore/bindings/v8/ScriptValue.cpp Change-Id: Ic1e5b7a7352a9f290210776f2f1ce220952c6725
* Merge WebKit at r64264 : Compile fix: CellStruct changed.Kristian Monsen2010-08-041-2/+2
| | | | | | http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.h Change-Id: I52787b9723791822d9c95ef52d7a81c23c2aeca7
* Merge Webkit at r64264 : Fix Makefiles.Kristian Monsen2010-08-042-5/+2
| | | | Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
* Merge Webkit at r64264 : Fix conflicts.Kristian Monsen2010-08-049-53/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracs of the changes: WebCore/html/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp WebCore/page/EventHandler.cpp WebCore/page/EventHandler.h http://trac.webkit.org/changeset/63888 WebCore/page/Page.cpp http://trac.webkit.org/changeset/64208 WebCore/page/Settings.cpp WebCore/page/Settings.h http://trac.webkit.org/changeset/64110 WebCore/rendering/RenderLayerCompositor.h http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp WebCore/rendering/break_lines.cpp http://trac.webkit.org/changeset/64207 Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-04374-3878/+10713
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Enable navigation in scrollable layers.Patrick Scott2010-08-027-37/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3014-366/+41
| | | | This reverts commit 0ed6485271097ecf1b4cf4e790f9cfdbb57d921c.
* Add CSS cursor ring definitionsCary Clark2010-07-3014-41/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge "Put the webkit version into android code base."Shimeng (Simon) Wang2010-07-281-33/+27
|\
| * Put the webkit version into android code base.Shimeng (Simon) Wang2010-07-271-33/+27
| | | | | | | | | | | | | | The original webkit change is: http://trac.webkit.org/changeset/64087 Change-Id: Ide7141ffec0a8a37f333c06bddabe3703d79af54
* | Merge "Bug 2811402:Fixed parenthesis are not mirrored correctly in bidi layout."claireho2010-07-271-2/+31
|\ \
| * | Bug 2811402:Fixed parenthesis are not mirrored correctly in bidi layout.claireho2010-07-261-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ported the webkit fixes from http://trac.webkit.org/changeset/62965. Harfbuzz does not do mirroring, so we iterate each character in the string and mirror it if needed before passing the string to harfbuzz for shaping. Change-Id: Ifee1035f96e4e82a5a2641b57dd839cec3427b59
* | | Fix focus rings by adding back in the SkPicture constructor.Patrick Scott2010-07-272-0/+22
| |/ |/| | | | | Change-Id: I31e3786742f0ae05c9f6c8ab23b4dbd0c790dfc5
* | Add DeviceOrientation LayoutTests at r63859 and enable the featureSteve Block2010-07-271-0/+2
| | | | | | | | | | | | | | | | | | All tests pass. Note that the JSC-specific expected result for window-property.html is a placeholder until https://bugs.webkit.org/show_bug.cgi?id=43025 is fixed. Change-Id: I60a978231a10f0a57b3dc654876b181dc47eb455
* | Merge Webkit at r63859 : New method Path::currentPoint added, stub it out on ↵Ben Murdoch2010-07-271-0/+7
| | | | | | | | | | | | | | | | Android. See http://trac.webkit.org/changeset/63599 See b/2869593 Change-Id: Ib7c8fda4a9bf62d470a4fa63823fa0951b5974ea
* | Merge Webkit at r63859 : SVG code now required ImageBuffer::transformColorSpace,Ben Murdoch2010-07-272-1/+8
| | | | | | | | | | | | | | so add it and stub out platformTransformColorSpace. See http://trac.webkit.org/changeset/63450 Change-Id: I2c84c13a19b1a787b0edbfb9fcefd08acd9ed6ff
* | Merge Webkit at r63859 : Bindings code generators now enforce that generated ↵Ben Murdoch2010-07-272-6/+6
| | | | | | | | | | | | constants match their enums. See http://trac.webkit.org/changeset/63331 Change-Id: Ida82337eec825e26ab4afb8fc26e22fdb6c18786
* | Merge Webkit at r63859 : New code in SVGResourceContainer is missing an include.Ben Murdoch2010-07-271-0/+1
| | | | | | | | | | | | This is a cherry pick of http://trac.webkit.org/changeset/64007 to fix the build. Change-Id: Ic86639eb7dbcd09f0273f614537354bfa7fd369d
* | 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 : The static AccessibilityObject::getAttribute(Node*, ↵Ben Murdoch2010-07-271-6/+0
| | | | | | | | | | | | | | | | const QualfiedName&) function has been removed. See http://trac.webkit.org/changeset/63358 Change-Id: I89c6a0a98d04f0a0cd40492229fa03f2e9782622
* | Merge Webkit at r63859 : PluginWidget class has been renamed and moved to ↵Ben Murdoch2010-07-271-5/+0
| | | | | | | | | | | | WebKit. See http://trac.webkit.org/changeset/63638 Change-Id: I97784c98b694f28804421637716afa649aa09a6e
* | Merge Webkit at r63859 : Fix Makefiles.Ben Murdoch2010-07-274-1/+5
| | | | | | | | Change-Id: I5a218be0b26003f4fceb964e7add0f1eda410710
* | Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-2711-49/+8
| | | | | | | | | | | | | | | | | | | | | | | | html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502 html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622 Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735 WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537 WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807 WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193 WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332 Change-Id: I03c929b97550014373f044f56c248040b66118f0
* | Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-27550-6496/+18249
| | | | | | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* | Add node check to prevent crash.Shimeng (Simon) Wang2010-07-261-1/+1
|/ | | | | issue: 2870827 Change-Id: I49f9a83fd7cd79100d7d8b0833db7d9f03c7e4f8
* Merge "Bug 2843604 : Layout_tests crash in FontAndroid.cpp."claireho2010-07-231-5/+23
|\
| * Bug 2843604 : Layout_tests crash in FontAndroid.cpp.claireho2010-07-231-5/+23
| | | | | | | | | | | | | | | | 2 problems were found in JSON-stringify.html test crash. 1. Dirty memory is re-used in FontAndroid.cpp. 2. Unnecessary delete/new GlyphArrays. Change-Id: I16bfe96943815f35ef1730287d61295ecd3ea2ad
* | Fix page cycler crashes.Patrick Scott2010-07-232-8/+10
| | | | | | | | | | Bug: 2862822 Change-Id: I9de300517eaa2bd4027608d6bae093bf5a1072e0
* | Enable scrollable divs.Patrick Scott2010-07-228-30/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651 ↵Leon Clarke2010-07-218-17/+6
|\ \ | | | | | | | | | because it fixes http://b/issue?id=2838936, but includes more refactoring than my original fix at https://android-git.corp.google.com/g/#change,58175"
| * | Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651Leon Clarke2010-07-218-17/+6
| | | | | | | | | | | | | | | | | | | | | because it fixes http://b/issue?id=2838936, but includes more refactoring than my original fix at https://android-git.corp.google.com/g/#change,58175 Change-Id: I67884fc153bff81c9580f36b7be1662acdda194e
* | | Prepare browser web archive patch for upstreamming to webkit.Elliott Slaughter2010-07-203-38/+37
|/ / | | | | | | Change-Id: I38c7939b81cd0afaaf925b9f74104bcbe27b5977
* | Fix http://b/issue?id=2838936Leon Clarke2010-07-201-1/+1
| | | | | | | | | | | | isPrefetch should return true when the resource is a prefetch, not when it isn't Change-Id: I73389e302ba7c57b6c4f6bf871f230a968d09c81
* | Merge WebKit at r63173 : Following @62551, PassOwnPtr no longer has a ↵Leon Clarke2010-07-201-1/+1
| | | | | | | | | | | | | | | | release method. leakPtr appears to be the alternative. Change-Id: I55d7c2a927e86cfd23ec5a1bb292d2058bcacb09
* | Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector ↵Leon Clarke2010-07-204-0/+17
| | | | | | | | | | | | case doesn't seem to compile Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b
* | Merge Webkit at r63173 : Fix Makefiles.Leon Clarke2010-07-205-21/+59
| | | | | | | | | | | | | | | | | | | | | | Note that MathML tags and attribute names are now generated, and SVG tags and attribute names are always generated. This is because the HTML5 parser relies on knowing about the tags even if the features are disabled. See https://bugs.webkit.org/show_bug.cgi?id=42050 https://bugs.webkit.org/show_bug.cgi?id=42059 Change-Id: Ie8b66217989673f90ffc61aabf499ab91a6a6bd1
* | Merge Webkit at r63173 : Fix conflicts.Leon Clarke2010-07-209-52/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064 CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038 'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end' HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165 'HTML5 Parser: document.write after onload blows away document' Navigator.h conflict caused by http://trac.webkit.org/changeset/62577 Page.cpp caused by http://trac.webkit.org/changeset/62502 ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736 HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032 Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0
* | Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-20498-4718/+24641
| | | | | | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* | Removing ANDROID_USER_GESTURE ifdefKristian Monsen2010-07-151-3/+0
| | | | | | | | | | | | | | 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-1510-85/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Set smaller minHeight for button."Shimeng (Simon) Wang2010-07-141-7/+4
|\ \
| * | Set smaller minHeight for button.Shimeng (Simon) Wang2010-07-141-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The logic is similar to safari. In ChromimumSkia, seems there's no setting for the minHeight. Other settings in safari are not copied, since after trying, it's not working well. Issue: 2732674 Change-Id: I5235f092f44d9e70e3aede7b7c50f425473db163
* | | am b47b5d4a: am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-131-68/+68
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-131-68/+68
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp * commit '652e9a017a7c5c772361bf57279fae0c26992329': Migrate to new keycode constants in keycodes.h.