OSDN Git Service
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."
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)]
The Android Open Source Project [Fri, 9 Jul 2010 18:03:29 +0000 (11:03 -0700)]
merge from open-source master
Change-Id: Ib725f9df8c1d3a5105a126bf9475ec060ac0a98a
Grace Kloba [Thu, 8 Jul 2010 21:50:52 +0000 (14:50 -0700)]
Combine base PictureSet with composite layers into
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
Steve Block [Fri, 9 Jul 2010 15:02:34 +0000 (16:02 +0100)]
Add dom/xhtml/level1 layout tests at WebKit r62496
These all pass.
Change-Id: If26268844fe87cd6ed8d0fc823ecf59b6eab1938
Ben Murdoch [Thu, 8 Jul 2010 15:59:07 +0000 (16:59 +0100)]
Add fast/xpath tests to the tree at the current webkit revision 62496. They all pass.
Note the addition of the android-v8 specific result for fast/xpath/nsresolver-exception.html
(this is added due to a V8 exception printing difference).
Change-Id: I685cb62a438b742cba3f7496b2e1bdad9a7d8d82
Ben Murdoch [Wed, 23 Jun 2010 18:01:43 +0000 (19:01 +0100)]
Fix fast/xpath layout test failures.
These failures are caused by
https://bugs.webkit.org/show_bug.cgi?id=41862 and this patch is a
cherry pick of the patch attached to that bug.
Change-Id: I9c897086a7a2903aaa6a11da5fb95b81086287cc
Steve Block [Thu, 8 Jul 2010 12:28:28 +0000 (13:28 +0100)]
Merge WebKit at r62496: Update WEBKIT_MERGE_REVISION
Change-Id: Ibe32800f15d1d1b1c2d36d60e35bddf380029cee
Steve Block [Fri, 9 Jul 2010 10:32:52 +0000 (11:32 +0100)]
Merge WebKit at r62496: Update Android-specific layout test results
sql-error-codes.html - Take updated chromium result - http://trac.webkit.org/changeset/62094
Change-Id: Ibb2f90c22cd59d6656900ed440f6d88fe3469844
Steve Block [Thu, 8 Jul 2010 14:07:02 +0000 (15:07 +0100)]
Merge WebKit at r62496: Stub out new GraphicsContext::clipConvexPolygon()
See http://trac.webkit.org/changeset/62035
Change-Id: Iaa2c76ac96d7dd95a6203b969679759dd1b306a3
Steve Block [Thu, 8 Jul 2010 12:31:04 +0000 (13:31 +0100)]
Merge WebKit at r62496: PaintInfo is no longer a member of RenderObject
See http://trac.webkit.org/changeset/62104
Change-Id: I89f38ef8d8e76b8e2872848dbab1bf103429783b
Steve Block [Thu, 8 Jul 2010 23:17:52 +0000 (00:17 +0100)]
Merge WebKit at r62496: Fix Makefiles
New files added in http://trac.webkit.org/changeset/62215
Change-Id: I8fd5b51f0c38396060fac61d64bc8d159e234a5d
Steve Block [Thu, 8 Jul 2010 12:18:23 +0000 (13:18 +0100)]
Merge WebKit at r62496: Fix conflicts
HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033
FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135
Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284
DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124
RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104
Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
Steve Block [Thu, 8 Jul 2010 11:51:48 +0000 (12:51 +0100)]
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Steve Block [Fri, 9 Jul 2010 11:06:11 +0000 (12:06 +0100)]
Properly guard local changes for link prefetching
This fixes the WebKit build for PLATFORM(MAC)
Change-Id: Ic19e8840363bc1d42b569c3e732ee3ee4e92c00a
Shimeng (Simon) Wang [Thu, 8 Jul 2010 18:41:55 +0000 (11:41 -0700)]
Merge "Fix issue
2823805: let expanded iframe scroll."
Shimeng (Simon) Wang [Thu, 8 Jul 2010 18:15:02 +0000 (11:15 -0700)]
Fix issue
2823805: let expanded iframe scroll.
issue:
2823805
Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861
Kristian Monsen [Thu, 8 Jul 2010 10:49:34 +0000 (03:49 -0700)]
Merge "Merge WebKit at r61871: Update WEBKIT_MERGE_REVISION"
Kristian Monsen [Thu, 8 Jul 2010 09:59:28 +0000 (10:59 +0100)]
Merge WebKit at r61871: Update WEBKIT_MERGE_REVISION
Change-Id: Iccb0bd9a2908dda6310fa6543a5ae0018b40825b
Grace Kloba [Wed, 7 Jul 2010 17:34:21 +0000 (10:34 -0700)]
Merge "Enable composite layers for the sub frame."
Grace Kloba [Wed, 7 Jul 2010 17:28:13 +0000 (10:28 -0700)]
Enable composite layers for the sub frame.
Fix the visibleContentRect for iframe. It should be
relative to its parent instead of the viewport.
For fixed position, we still check for the top frame
as the current logic positions the object relative to
the screen which only applied to the top frame.
For plugin, it depends on PluginWidget's platformLayer().
The default is 0.
For video, it depends on MediaPlayer's supportsAcceleratedRendering().
The default is false.
Fix the crash in the GraphicsLayerAndroid. The root
layer is a container layer, there is no need to draw
them. As LayerAndroid doesn't create Picture for them,
we should ensure to skip draw.
Fix http://b/issue?id=
2733947
Steve Block [Wed, 7 Jul 2010 13:23:20 +0000 (06:23 -0700)]
Merge "Update JavaInstance to reflect final version upstreamed to WebKit"
Steve Block [Wed, 7 Jul 2010 10:58:25 +0000 (11:58 +0100)]
Update JavaInstance to reflect final version upstreamed to WebKit
See https://bugs.webkit.org/show_bug.cgi?id=41516
Bug:
2807132
Change-Id: I080978d1a6b90f2d8da1f62adbb62c60ef0034c9
Cary Clark [Fri, 2 Jul 2010 14:47:47 +0000 (07:47 -0700)]
Merge "don't walk off the end of the DOM when looking for text"
Cary Clark [Fri, 2 Jul 2010 14:35:08 +0000 (10:35 -0400)]
don't walk off the end of the DOM when looking for text
Also, fix a couple of minor changes in debugging code to
stay sync'd with webkit.
Change-Id: If4263bab97715e2a2d12f06f2359554740bf5dbc
http://b/
2816549
Kristian Monsen [Wed, 30 Jun 2010 18:13:28 +0000 (19:13 +0100)]
Merge WebKit at r61871: Update expected layout test.
The initial chromium expected matches what we see on android so using that.
http://trac.webkit.org/changeset/61352
Change-Id: Ie8dec2c650f45fe6c84884d800043b42897bc7bc
Kristian Monsen [Wed, 30 Jun 2010 19:53:48 +0000 (20:53 +0100)]
Merge WebKit at r61871: Refactoring of MimeClassInfo class.
http://trac.webkit.org/changeset/61168 String suffixes changed to Vector<String> extensions
http://trac.webkit.org/changeset/61150 pluginIndex removed
Change-Id: I8e81d95da1a6795beb94247102317cf9b449979f
Kristian Monsen [Wed, 30 Jun 2010 19:50:54 +0000 (20:50 +0100)]
Merge WebKit at r61871: Floating-point support for text selection.
http://trac.webkit.org/changeset/61253
Change-Id: If90b8c599f64c659436278c217d678a981db262f
Kristian Monsen [Wed, 30 Jun 2010 19:19:05 +0000 (20:19 +0100)]
Merge WebKit at r61871: Compile fix for PrintContext.cpp
http://trac.webkit.org/changeset/61232.
Not sure why it compiles on other platforms.
Change-Id: I6f109ebdb6069b00cefbb528a9d38cc3df0079f7
Kristian Monsen [Wed, 30 Jun 2010 19:23:58 +0000 (20:23 +0100)]
Merge WebKit at r61871: Fix conflicts in Frame.cpp
Code was moved from Frame.cpp, this created problems for local changes. Should be working again now (with more local changes).
http://trac.webkit.org/changeset/61217/trunk/WebCore/page/Frame.cpp
Change-Id: Ica56218eb972a1d0d311900efc1a2b3c609dae75
Kristian Monsen [Wed, 30 Jun 2010 18:48:55 +0000 (19:48 +0100)]
Merge WebKit at r61871: Fix conflicts in FrameLoader.cpp
Cleaing up of frameloader removed one of our local changes, this should fix it.
http://trac.webkit.org/changeset/61546
Change-Id: Ic0c08e8f944ab93b8a08f500042ce9fdeaa57238
Kristian Monsen [Wed, 30 Jun 2010 18:31:09 +0000 (19:31 +0100)]
Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cpp
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
Kristian Monsen [Wed, 30 Jun 2010 18:28:40 +0000 (19:28 +0100)]
Merge WebKit at r61871: Fix conflicts
V8Proxy.cpp
http://trac.webkit.org/changeset/61499
npapi.h:
http://trac.webkit.org/changeset/61277
Document.cpp
http://trac.webkit.org/changeset/61787
XMLDocumentParser.h:
http://trac.webkit.org/changeset/61663
HTMLLinkElement.*:
http://trac.webkit.org/changeset/61424
HTMLTableCellElement.cpp
http://trac.webkit.org/changeset/61630
ResourceHandleAndroid.cpp:
http://trac.webkit.org/changeset/61768
Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
Kristian Monsen [Wed, 30 Jun 2010 18:09:38 +0000 (19:09 +0100)]
Merge WebKit at r61871: Update makefiles
Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113
Kristian Monsen [Mon, 28 Jun 2010 15:42:48 +0000 (16:42 +0100)]
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Doug Kwan [Thu, 1 Jul 2010 20:52:15 +0000 (13:52 -0700)]
Merge "Disable ICF for libwebcore.so"
Patrick Scott [Thu, 1 Jul 2010 18:55:49 +0000 (11:55 -0700)]
am
939d1819: am
9d4701f9: Push a local reference frame to avoid table overflow.
Merge commit '
939d1819c550af9e179aa2fa46668206333e1ebc'
* commit '
939d1819c550af9e179aa2fa46668206333e1ebc':
Push a local reference frame to avoid table overflow.
Doug Kwan [Thu, 1 Jul 2010 18:52:11 +0000 (11:52 -0700)]
Disable ICF for libwebcore.so
Change-Id: I314231a5f7d831f940b8cbc7c1d5bcd0fe09424e
claireho [Thu, 1 Jul 2010 15:56:15 +0000 (08:56 -0700)]
Merge "Bug2790521 - complex script overlap issue."
Steve Block [Thu, 1 Jul 2010 15:41:43 +0000 (08:41 -0700)]
Merge "Clean up FEATURE_DEFINES in V8 generated sources Makefile"
Patrick Scott [Thu, 1 Jul 2010 11:59:04 +0000 (04:59 -0700)]
am
9d4701f9: Push a local reference frame to avoid table overflow.
Merge commit '
9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread
* commit '
9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be':
Push a local reference frame to avoid table overflow.
Steve Block [Thu, 1 Jul 2010 11:37:35 +0000 (12:37 +0100)]
Clean up FEATURE_DEFINES in V8 generated sources Makefile
The define V8_BINDING is intended to be on a line on its own to allow the
other defines on the line above to be identical between JSC and V8.
Change-Id: I278a135ba3f205283ae66f8ef1ff58fd139c4687
Steve Block [Thu, 1 Jul 2010 09:18:21 +0000 (02:18 -0700)]
Merge "Pass the WebView context to the GeolocationService from WebKit"
claireho [Wed, 30 Jun 2010 23:00:48 +0000 (16:00 -0700)]
Bug2790521 - complex script overlap issue.
Applied the fixes for complex script overlap for webkit/Chrome to
webkit/Android.
Change-Id: I4e34e36230b832524d7b8e78406de1e4c8438cf1
Grace Kloba [Wed, 30 Jun 2010 22:31:33 +0000 (15:31 -0700)]
Merge "Remove the double traversal in GraphicsLayerAndroid, so we should draw much less now."
Grace Kloba [Tue, 29 Jun 2010 23:31:27 +0000 (16:31 -0700)]
Remove the double traversal in GraphicsLayerAndroid,
so we should draw much less now.
As we use Picture instead of PictureSet, ignore the
m_invalidatedRects for now. This should also reduce
the number of draws when m_invalidatedRects has more
than one rect.
Ben Murdoch [Wed, 23 Jun 2010 18:56:02 +0000 (19:56 +0100)]
Detect if we're a webapp from the meta tag and send a message through
to java land if that is the case.
Requires a frameworks/base change.
b/
2766917
Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
Patrick Scott [Tue, 29 Jun 2010 19:55:10 +0000 (15:55 -0400)]
Push a local reference frame to avoid table overflow.
Similar to jsc's implementation, this is needed to restrict the
amount of local references in a given jni frame. Once the frame is
popped from the stack, all local references are cleaned.
Bug:
2807132
Change-Id: I5f4153509c513bec142472927a1787869a57f530
Cary Clark [Tue, 29 Jun 2010 18:36:19 +0000 (11:36 -0700)]
Merge "refine text selection"
Cary Clark [Tue, 29 Jun 2010 18:11:45 +0000 (14:11 -0400)]
refine text selection
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