OSDN Git Service
Steve Block [Wed, 4 Aug 2010 23:04:49 +0000 (00:04 +0100)]
Fix incorrect cherry-pick of WebKit change 64465 in merge to WebKit r64264
See https://android-git.corp.google.com/g/#change,59749
Change-Id: I0ea44ef95fcd8035adc27a32fb75e7c19f23c975
Steve Block [Mon, 2 Aug 2010 09:30:48 +0000 (10:30 +0100)]
Implement DeviceOrientationClientAndroid
This class acts simply as a proxy to the real or mock client, which is owned by
the WebView. DEVICE_ORIENTATION is eabled on Android, so we must implement the
client before we pull in http://trac.webkit.org/changeset/64356, which calls
DeviceOrientationClient::setController() from the Page constructor.
Change-Id: Ie21957249e5bef7a58c51205732f4fb1b82fbbd3
Kristian Monsen [Wed, 4 Aug 2010 12:28:09 +0000 (05:28 -0700)]
Merge "Removing the list of active loaders"
Kristian Monsen [Tue, 3 Aug 2010 12:27:10 +0000 (13:27 +0100)]
Merge WebKit at r64264 : Update WEBKIT_MERGE_REVISION to the new webkit version
Change-Id: I03f3535b7764f420c4bd89981d9cdbe9ac0d0a8b
Kristian Monsen [Wed, 4 Aug 2010 11:47:50 +0000 (12:47 +0100)]
Merge WebKit at r64264 : LayoutTest expected result
The expected result for fast/dom/DeviceOrientation/window-property-expected is now the jsc output. Removing the old file from the android expected output.
Webkit CL that changed the expected from v8 to jsc:
http://trac.webkit.org/changeset/64125/trunk/LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt
Change-Id: Idc040906b80dd90c26b115f8c97d6d2e3b35a1b7
Kristian Monsen [Tue, 3 Aug 2010 10:56:57 +0000 (11:56 +0100)]
Merge WebKit at r64264 : Compile fix: A method got an extra parameter in GraphicsContext.h
Change introduced here: http://trac.webkit.org/changeset/63864/trunk/WebCore/platform/graphics/GraphicsContext.h
Change-Id: I471797fff394396ec375db10c3bcb4e9c00feb3e
Kristian Monsen [Tue, 3 Aug 2010 10:43:11 +0000 (11:43 +0100)]
Merge WebKit at r64264 : Compile fix: Filter guards in SVG
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
Kristian Monsen [Tue, 3 Aug 2010 10:40:17 +0000 (11:40 +0100)]
Merge WebKit at r64264 : Compile fix: Inspector guards in V8
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
Kristian Monsen [Mon, 2 Aug 2010 10:42:56 +0000 (11:42 +0100)]
Merge WebKit at r64264 : Compile fix: CellStruct changed.
http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.h
Change-Id: I52787b9723791822d9c95ef52d7a81c23c2aeca7
Kristian Monsen [Mon, 2 Aug 2010 10:10:24 +0000 (11:10 +0100)]
Merge WebKit at r64264 : Compile fix, how to create WebCore::Page changed
http://trac.webkit.org/changeset/64208
Change-Id: If0c6a616bd9eb1f1c90041f9c83d1770d8acd9bd
Kristian Monsen [Mon, 2 Aug 2010 10:07:38 +0000 (11:07 +0100)]
Merge WebKit at r64264 : Compile fix: registerURLSchemeAsLocal moved
SecurityOrigin::registerURLSchemeAsLocal got moved to a new class.
http://trac.webkit.org/changeset/63863
Change-Id: If1baa94d90506a9de321ad3303545e133ee446e9
Kristian Monsen [Fri, 30 Jul 2010 14:23:17 +0000 (15:23 +0100)]
Merge Webkit at r64264 : Fix Makefiles.
Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
Kristian Monsen [Fri, 30 Jul 2010 14:20:36 +0000 (15:20 +0100)]
Merge Webkit at r64264 : Fix conflicts.
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
Kristian Monsen [Fri, 30 Jul 2010 09:46:49 +0000 (10:46 +0100)]
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Kristian Monsen [Tue, 27 Jul 2010 15:54:46 +0000 (16:54 +0100)]
Removing the list of active loaders
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
Patrick Scott [Mon, 2 Aug 2010 12:09:31 +0000 (08:09 -0400)]
Enable navigation in scrollable layers.
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
Maksymilian Osowski [Mon, 2 Aug 2010 15:23:24 +0000 (08:23 -0700)]
Merge "Added test_expectations.txt file to platform/android/"
Maksymilian Osowski [Mon, 2 Aug 2010 10:28:02 +0000 (11:28 +0100)]
Added test_expectations.txt file to platform/android/
The original data in this file comes from FileFilter class in the old Dump Render Tree and was extracted from there on 30/07/2010
Change-Id: Ibc1101d08123ffaff51b765e5333d1b96c5ab02f
Cary Clark [Fri, 30 Jul 2010 20:01:44 +0000 (16:01 -0400)]
Revert "Add CSS cursor ring definitions"
This reverts commit
0ed6485271097ecf1b4cf4e790f9cfdbb57d921c.
Cary Clark [Wed, 28 Jul 2010 21:11:14 +0000 (17:11 -0400)]
Add CSS cursor ring definitions
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
Shimeng (Simon) Wang [Fri, 30 Jul 2010 00:21:31 +0000 (17:21 -0700)]
Merge "Add back nativeClearContent since it's used in Java side."
Shimeng (Simon) Wang [Thu, 29 Jul 2010 23:32:54 +0000 (16:32 -0700)]
Add back nativeClearContent since it's used in Java side.
issue:
2841402
Change-Id: Ia147b39f84be91a92dd4f491e8d3de263df4244b
Shimeng (Simon) Wang [Wed, 28 Jul 2010 17:41:47 +0000 (10:41 -0700)]
Merge "Put the webkit version into android code base."
claireho [Tue, 27 Jul 2010 22:30:29 +0000 (15:30 -0700)]
Merge "Bug
2811402:Fixed parenthesis are not mirrored correctly in bidi layout."
Shimeng (Simon) Wang [Tue, 27 Jul 2010 18:27:44 +0000 (11:27 -0700)]
Put the webkit version into android code base.
The original webkit change is:
http://trac.webkit.org/changeset/64087
Change-Id: Ide7141ffec0a8a37f333c06bddabe3703d79af54
Patrick Scott [Tue, 27 Jul 2010 20:24:31 +0000 (16:24 -0400)]
Fix focus rings by adding back in the SkPicture constructor.
Change-Id: I31e3786742f0ae05c9f6c8ab23b4dbd0c790dfc5
Steve Block [Tue, 27 Jul 2010 11:44:36 +0000 (04:44 -0700)]
Merge "Add DeviceOrientation LayoutTests at r63859 and enable the feature"
Kristian Monsen [Tue, 27 Jul 2010 11:42:15 +0000 (04:42 -0700)]
Merge "Crash fix, don't delete WebUrlLoaderClient before WebRequest is finished."
Kristian Monsen [Tue, 27 Jul 2010 11:33:29 +0000 (12:33 +0100)]
Crash fix, don't delete WebUrlLoaderClient before WebRequest is finished.
Already approved in https://android-git.corp.google.com/g/#change,58487
Change-Id: Ib9718053edacd76b77a41b76782fd20769f57823
Steve Block [Tue, 27 Jul 2010 10:05:56 +0000 (11:05 +0100)]
Add DeviceOrientation LayoutTests at r63859 and enable the feature
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
Steve Block [Tue, 27 Jul 2010 09:53:45 +0000 (02:53 -0700)]
Merge "Add dom/xhtml/level3 layout tests at WebKit r63173"
Ben Murdoch [Fri, 23 Jul 2010 15:51:19 +0000 (16:51 +0100)]
Merge Webkit at r63859 : Update WebKit revision.
Change-Id: I2979ff9ad9c3813dbfc33874aea23414d6c71bdf
Ben Murdoch [Thu, 22 Jul 2010 17:23:32 +0000 (18:23 +0100)]
Merge Webkit at r63859 : New method Path::currentPoint added, stub it out on Android. See trac.webkit.org/changeset/63599
See b/
2869593
Change-Id: Ib7c8fda4a9bf62d470a4fa63823fa0951b5974ea
Ben Murdoch [Thu, 22 Jul 2010 17:22:43 +0000 (18:22 +0100)]
Merge Webkit at r63859 : SVG code now required ImageBuffer::transformColorSpace,
so add it and stub out platformTransformColorSpace.
See http://trac.webkit.org/changeset/63450
Change-Id: I2c84c13a19b1a787b0edbfb9fcefd08acd9ed6ff
Ben Murdoch [Thu, 22 Jul 2010 17:07:50 +0000 (18:07 +0100)]
Merge Webkit at r63859 : Bindings code generators now enforce that generated constants match their enums. See trac.webkit.org/changeset/63331
Change-Id: Ida82337eec825e26ab4afb8fc26e22fdb6c18786
Ben Murdoch [Thu, 22 Jul 2010 16:16:03 +0000 (17:16 +0100)]
Merge Webkit at r63859 : New code in SVGResourceContainer is missing an include.
This is a cherry pick of http://trac.webkit.org/changeset/64007 to fix the build.
Change-Id: Ic86639eb7dbcd09f0273f614537354bfa7fd369d
Ben Murdoch [Thu, 22 Jul 2010 16:07:51 +0000 (17:07 +0100)]
Merge Webkit at r63859 : ResourceHandleInternal::m_request has been renamed. See trac.webkit.org/changeset/63332
Change-Id: Id019ee222d0b7dcfa464f97cfffdd5c08e2d0ee8
Ben Murdoch [Thu, 22 Jul 2010 16:05:30 +0000 (17:05 +0100)]
Merge Webkit at r63859 : The static AccessibilityObject::getAttribute(Node*, const QualfiedName&) function has been removed.
See http://trac.webkit.org/changeset/63358
Change-Id: I89c6a0a98d04f0a0cd40492229fa03f2e9782622
Ben Murdoch [Thu, 22 Jul 2010 16:02:31 +0000 (17:02 +0100)]
Merge Webkit at r63859 : PluginWidget class has been renamed and moved to WebKit. See trac.webkit.org/changeset/63638
Change-Id: I97784c98b694f28804421637716afa649aa09a6e
Ben Murdoch [Thu, 22 Jul 2010 15:54:39 +0000 (16:54 +0100)]
Merge Webkit at r63859 : Update call to hitTestResultAtPoint with the 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
Ben Murdoch [Thu, 22 Jul 2010 15:51:28 +0000 (16:51 +0100)]
Merge Webkit at r63859 : Add new EditorClient method stub. See trac.webkit.org/changeset/63602
Change-Id: I22392960cf91a1f826d37f257325fc988e2a8347
Ben Murdoch [Thu, 22 Jul 2010 15:44:15 +0000 (16:44 +0100)]
Merge Webkit at r63859 : PlatformCursorHandle -> Cursor. See trac.webkit.org/changeset/63339
Change-Id: I26df53fba097893a5adee2a957a63a0f1720def8
Ben Murdoch [Thu, 22 Jul 2010 15:25:33 +0000 (16:25 +0100)]
Merge Webkit at r63859 : Fix Makefiles.
Change-Id: I5a218be0b26003f4fceb964e7add0f1eda410710
Ben Murdoch [Thu, 22 Jul 2010 14:46:12 +0000 (15:46 +0100)]
Merge WebKit at r63859: Fix conflicts.
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
Ben Murdoch [Thu, 22 Jul 2010 14:37:06 +0000 (15:37 +0100)]
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
claireho [Mon, 26 Jul 2010 23:48:56 +0000 (16:48 -0700)]
Bug
2811402:Fixed parenthesis are not mirrored correctly in bidi layout.
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
Shimeng (Simon) Wang [Mon, 26 Jul 2010 23:37:25 +0000 (16:37 -0700)]
Add node check to prevent crash.
issue:
2870827
Change-Id: I49f9a83fd7cd79100d7d8b0833db7d9f03c7e4f8
claireho [Fri, 23 Jul 2010 20:37:01 +0000 (13:37 -0700)]
Merge "Bug
2843604 : Layout_tests crash in FontAndroid.cpp."
claireho [Thu, 22 Jul 2010 00:57:14 +0000 (17:57 -0700)]
Bug
2843604 : Layout_tests crash in FontAndroid.cpp.
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
Patrick Scott [Fri, 23 Jul 2010 15:08:20 +0000 (11:08 -0400)]
Fix page cycler crashes.
Bug:
2862822
Change-Id: I9de300517eaa2bd4027608d6bae093bf5a1072e0
Kristian Monsen [Fri, 23 Jul 2010 09:56:57 +0000 (02:56 -0700)]
Merge "Compile fix after recent merge, name change in OwnPtr."
Steve Block [Fri, 9 Jul 2010 15:04:25 +0000 (16:04 +0100)]
Add dom/xhtml/level3 layout tests at WebKit r63173
These all pass.
Note that the Android-V8-specific results are required because these tests rely
on Error.line, which is non-standard and not provided by V8.
A further 15 tests have no expected results so will be added to the
DumpRenderTree ignore list.
None of these tests are run on Chromium.
Change-Id: I6b7ea492586fa2d9cd60858f06641941c87ede14
Kristian Monsen [Thu, 22 Jul 2010 13:15:31 +0000 (14:15 +0100)]
Compile fix after recent merge, name change in OwnPtr.
Change-Id: I5741bfe5d0907deb8a5158390b44e74b4485be67
Patrick Scott [Fri, 16 Jul 2010 16:43:07 +0000 (12:43 -0400)]
Enable scrollable divs.
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
Ben Murdoch [Thu, 22 Jul 2010 10:16:10 +0000 (11:16 +0100)]
Revert "Add -fno-data-sections to WebCore makefile."
This reverts commit
31dbf1e39c75fa71a6175b95ce2172727630129b.
The underlying issue in the compiler has been fixed.
Cary Clark [Mon, 19 Jul 2010 15:52:30 +0000 (11:52 -0400)]
select text out of order
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
Leon Clarke [Wed, 21 Jul 2010 12:19:53 +0000 (05:19 -0700)]
Merge "Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651 because it fixes b/issue?id=
2838936, but includes more refactoring than my original fix at https://android-git.corp.google.com/g/#change,58175"
Leon Clarke [Wed, 21 Jul 2010 11:59:28 +0000 (12:59 +0100)]
Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651
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
Elliott Slaughter [Tue, 20 Jul 2010 23:08:54 +0000 (16:08 -0700)]
Prepare browser web archive patch for upstreamming to webkit.
Change-Id: I38c7939b81cd0afaaf925b9f74104bcbe27b5977
Leon Clarke [Tue, 20 Jul 2010 17:01:16 +0000 (18:01 +0100)]
Fix http://b/issue?id=
2838936
isPrefetch should return true when the resource is a prefetch, not when it isn't
Change-Id: I73389e302ba7c57b6c4f6bf871f230a968d09c81
Leon Clarke [Fri, 16 Jul 2010 08:48:17 +0000 (09:48 +0100)]
Merge WebKit at r63173 : Update WebKit revision number.
Change-Id: I5f7614cdfda3e1c73027c60cb71dff1d9b7d3282
Leon Clarke [Thu, 15 Jul 2010 13:40:46 +0000 (14:40 +0100)]
Merge WebKit at r63173 : Following @62551, PassOwnPtr no longer has a release method.
leakPtr appears to be the alternative.
Change-Id: I55d7c2a927e86cfd23ec5a1bb292d2058bcacb09
Leon Clarke [Thu, 15 Jul 2010 12:12:51 +0000 (13:12 +0100)]
Merge WebKit at r63173 : Following @62607 Page takes a BackForwardClient
Change-Id: I1c86a2881f5bef152f1b9841d6dce41da91b03ac
Leon Clarke [Thu, 15 Jul 2010 12:02:14 +0000 (13:02 +0100)]
Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector case doesn't seem to compile
Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b
Leon Clarke [Thu, 15 Jul 2010 11:41:11 +0000 (12:41 +0100)]
Merge Webkit at r63173 : Fix Makefiles.
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
Leon Clarke [Thu, 15 Jul 2010 11:22:47 +0000 (12:22 +0100)]
Merge Webkit at r63173 : Fix conflicts.
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
Leon Clarke [Thu, 15 Jul 2010 11:03:35 +0000 (12:03 +0100)]
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Kristian Monsen [Wed, 14 Jul 2010 15:08:30 +0000 (16:08 +0100)]
Chrome http: Persistent cookies and cache.
Sharing one RequestContex. Adding a persistent cookie store and on disk cache to that request.
Change-Id: I7f45cda3803340672585e5b0f84eb0d5e2fd6b75
Kristian Monsen [Tue, 20 Jul 2010 09:59:51 +0000 (02:59 -0700)]
Merge "Removing ANDROID_USER_GESTURE ifdef"
Doug Kwan [Mon, 19 Jul 2010 06:27:00 +0000 (23:27 -0700)]
Revert "Disable ICF for libwebcore.so"
This reverts commit
4d9904fcc4161d144bfd84ca9d294f21d55444d2.
The Android Open Source Project [Fri, 16 Jul 2010 18:56:41 +0000 (11:56 -0700)]
am
02f67ae0: am
ae583467: add meta-files about 3rd party projects
Merge commit '
02f67ae036c6acabb72e337a53c601d53ef6592c'
* commit '
02f67ae036c6acabb72e337a53c601d53ef6592c':
add meta-files about 3rd party projects
The Android Open Source Project [Fri, 16 Jul 2010 18:52:51 +0000 (11:52 -0700)]
am
ae583467: add meta-files about 3rd party projects
Merge commit '
ae583467c6ceda8b918b6d3e38cceca26d0715eb' into gingerbread-plus-aosp
* commit '
ae583467c6ceda8b918b6d3e38cceca26d0715eb':
add meta-files about 3rd party projects
The Android Open Source Project [Fri, 16 Jul 2010 18:41:36 +0000 (11:41 -0700)]
add meta-files about 3rd party projects
Change-Id: I1cc3b4d6e2165285a27b5d848c39d3965553382a
Joe Onorato [Thu, 15 Jul 2010 18:54:05 +0000 (11:54 -0700)]
am
72533818: am
4da2dabd: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '
725338187e8e5e36ec3647b675caf1fcd8e5cab7'
* commit '
725338187e8e5e36ec3647b675caf1fcd8e5cab7':
The ICU data is no longer compiled directly into the shared library.
Joe Onorato [Thu, 15 Jul 2010 18:13:02 +0000 (11:13 -0700)]
am
4da2dabd: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '
4da2dabd9828e43b05c234be082905c7825a22ec' into gingerbread-plus-aosp
* commit '
4da2dabd9828e43b05c234be082905c7825a22ec':
The ICU data is no longer compiled directly into the shared library.
Joe Onorato [Thu, 15 Jul 2010 18:08:20 +0000 (11:08 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Kristian Monsen [Thu, 15 Jul 2010 15:46:22 +0000 (16:46 +0100)]
Removing ANDROID_USER_GESTURE ifdef
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
Kristian Monsen [Tue, 6 Jul 2010 10:37:41 +0000 (11:37 +0100)]
Fix for bug
2816268: Refactor ANDROID_USER_GESTURE code
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
Ben Murdoch [Thu, 15 Jul 2010 09:53:23 +0000 (10:53 +0100)]
Add -fno-data-sections to WebCore makefile.
Change-Id: I9a79b98a5888137d044057e9a2595f3f5bb979f2
Kristian Monsen [Mon, 22 Mar 2010 18:15:40 +0000 (18:15 +0000)]
Initial check-in of the external/webkit part of the chrome http stack.
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
Shimeng (Simon) Wang [Thu, 15 Jul 2010 00:28:39 +0000 (17:28 -0700)]
Merge "Set smaller minHeight for button."
Shimeng (Simon) Wang [Wed, 14 Jul 2010 22:55:07 +0000 (15:55 -0700)]
Set smaller minHeight for button.
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
Joe Onorato [Wed, 14 Jul 2010 02:05:43 +0000 (19:05 -0700)]
The ICU data is no longer compiled directly into the shared library.
Change-Id: Iff0a8c1152c9be1ea49f1856f3edc4383a1a5640
Jeff Brown [Wed, 14 Jul 2010 00:49:05 +0000 (17:49 -0700)]
am
b47b5d4a: am
652e9a01: Migrate to new keycode constants in keycodes.h.
Merge commit '
b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf'
* commit '
b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf':
Migrate to new keycode constants in keycodes.h.
Jeff Brown [Wed, 14 Jul 2010 00:46:27 +0000 (17:46 -0700)]
am
652e9a01: Migrate to new keycode constants in keycodes.h.
Merge commit '
652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp
* commit '
652e9a017a7c5c772361bf57279fae0c26992329':
Migrate to new keycode constants in keycodes.h.
Jeff Brown [Tue, 13 Jul 2010 23:17:11 +0000 (16:17 -0700)]
Migrate to new keycode constants in keycodes.h.
Change-Id: I523d6fab2964cec4610424f6fd7bbe86d38b7306
Shimeng (Simon) Wang [Tue, 13 Jul 2010 15:57:43 +0000 (08:57 -0700)]
Merge "Implements the lastHyphenLocation for Android."
Leon Clarke [Tue, 13 Jul 2010 11:14:52 +0000 (04:14 -0700)]
Merge "Copy back the upstreamed version of prefetch https://bugs.webkit.org/show_bug.cgi?id=3652"
Shimeng (Simon) Wang [Tue, 13 Jul 2010 00:22:32 +0000 (17:22 -0700)]
Implements the lastHyphenLocation for Android.
Upstream webkit implemented the hyphenation working draft
http://www.w3.org/TR/2010/WD-css3-gcpm-
20100608/#hyphenation
in:
http://trac.webkit.org/changeset/61548
This change implements the interface function for Android.
English only support for now.
Issue:
2672163
Change-Id: I6763adc0ff56de1431bdb09e79b110b30bac01d1
Shimeng (Simon) Wang [Fri, 9 Jul 2010 20:47:45 +0000 (13:47 -0700)]
Fix issue:
2741016 and refactor visible width logic in android layout.
The site is not reflowed, because for some RenderBlock, the m_visibleWidth
is set twice before layout; the current logic will think the visibleWidth
is not changed, hence no relayout children and no reflow.
The logic is refactored to to make it modularlized.
issue:
2741016
Change-Id: I1f433e263add974c0981c332ad4ea092ddb395e0
Steve Block [Mon, 12 Jul 2010 17:34:30 +0000 (10:34 -0700)]
Merge "Add dom/xhtml/level2 layout tests at WebKit r62496"
Steve Block [Mon, 12 Jul 2010 17:34:10 +0000 (10:34 -0700)]
Merge "Update CachedFont.cpp to reflect upstreaming in WebKit change 63088"
Steve Block [Fri, 9 Jul 2010 15:04:07 +0000 (16:04 +0100)]
Add dom/xhtml/level2 layout tests at WebKit r62496
These all pass.
Note that the Android-V8-specific results for the HTMLDocument tests are
required because the tests rely on Error.line, which is non-standard and not
provided by V8.
The Android-specific result for HTMLFormElement10.xhtml is required because the
test appears to be flawed, and navigates the page before notifyDone is called.
None of these tests are run on Chromium.
Change-Id: I491d87a9dac4c132093369d1bde974baed77a757
Elliott Slaughter [Wed, 23 Jun 2010 17:29:48 +0000 (10:29 -0700)]
Browser save page as web archive.
Change-Id: Ie92953142ed31fc859975289a978172bdb8b6d79
Leon Clarke [Mon, 12 Jul 2010 15:00:49 +0000 (16:00 +0100)]
Copy back the upstreamed version of prefetch
https://bugs.webkit.org/show_bug.cgi?id=3652
Change-Id: Ibda522afed15e7581019a198e773785b7cad57ca
Steve Block [Mon, 12 Jul 2010 15:09:38 +0000 (16:09 +0100)]
Update CachedFont.cpp to reflect upstreaming in WebKit change 63088
See http://trac.webkit.org/changeset/63088
Change-Id: I41778e43e0e731b6e0116e6e1569e91d5c18750a
Steve Block [Mon, 12 Jul 2010 10:27:46 +0000 (03:27 -0700)]
Merge "Add dom/xhtml/level1 layout tests at WebKit r62496"
Cary Clark [Fri, 9 Jul 2010 19:48:33 +0000 (12:48 -0700)]
Merge "handle out of order selections"
Cary Clark [Thu, 8 Jul 2010 21:02:39 +0000 (17:02 -0400)]
handle out of order selections
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
The Android Open Source Project [Fri, 9 Jul 2010 18:06:12 +0000 (11:06 -0700)]