| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
|
|
|
|
| |
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
|
|
|
|
| |
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
|
|
|
|
| |
This reverts commit 0ed6485271097ecf1b4cf4e790f9cfdbb57d921c.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
|
|
|
|
| |
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
|
|
|
|
| |
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
|
|
|
|
| |
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
|
|
|
|
| |
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
|
|
|
|
| |
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
|
|
|
|
| |
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
|
|
|
|
| |
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to
recently upstreamed change http://trac.webkit.org/changeset/58110
Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can
be removed post-merge.
Fix conflict: WebCore/platform/ScrollView.cpp
Fix conflict: WebCore/platform/ScrollView.h
Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove
ScrollView::platformProhibitsScrolling and
ScrollView::scrollRectIntoViewRecursively as they have been
removed upstream in http://trac.webkit.org/changeset/58428,
http://trac.webkit.org/changeset/58445 and
http://trac.webkit.org/changeset/58611.
platformProhibitsScrolling was an Android specific function
called only from scrollRectIntoViewRecursively.
Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both
(we have an Android specific addition).
Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs,
our fix has been upstreamed in
http://trac.webkit.org/changeset/58490.
Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs.
See http://trac.webkit.org/changeset/58177
Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android
specific addition).
Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific
addition).
Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs.
see http://trac.webkit.org/changeset/58775
Fix conflict: FileSystemAndroid.cpp:
Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been
upstreamed but beyond 58596. See
http://trac.webkit.org/changeset/59226
Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
|
|
|
|
| |
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
|
|
|
|
| |
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
|
|
|
|
| |
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
|
|
|
|
| |
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
|
|
|
|
| |
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
|
|
|
|
| |
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
|
|
|
|
| |
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
|
|
|
|
| |
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
|
| |
|
| |
|
| |
|
|
|
|
| |
Automated import of CL 145796
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|