OSDN Git Service
Leon Scroggins III [Wed, 19 May 2010 16:34:47 +0000 (12:34 -0400)]
Fix build.
Change-Id: Ic8251cd255785f7ad1081eba9a0eb8db84697b97
Leon Scroggins III [Tue, 18 May 2010 17:32:59 +0000 (13:32 -0400)]
Prohibit scrolling not initiated by the user.
We used to have an ANDROID specific change that was removed when
webkit changed. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
57a47dd4f75b9c15804c3c61479540cfdc11bd6e
Bug
1330729
Bug
2694223
Change-Id: Id51edbb4943eb0a1357477d4bcd31d838febb8fb
The Android Open Source Project [Tue, 18 May 2010 17:57:26 +0000 (10:57 -0700)]
am
5a1f66aa: am
ec92ec7c: merge from open-source master
The Android Open Source Project [Tue, 18 May 2010 17:54:40 +0000 (10:54 -0700)]
am
ec92ec7c: merge from open-source master
Merge commit '
ec92ec7cd8fe4ad6c8137865ec2d6b43c1a56ee5' into kraken
* commit '
ec92ec7cd8fe4ad6c8137865ec2d6b43c1a56ee5':
Check for the absence of a frame.
The Android Open Source Project [Tue, 18 May 2010 17:52:22 +0000 (10:52 -0700)]
merge from open-source master
Change-Id: I906635459af677aceff46ff10de93d45670481cd
Steve Block [Tue, 18 May 2010 15:28:49 +0000 (08:28 -0700)]
Merge "Make sure Geolocation is robust to location providers being absent on the device."
Jean-Baptiste Queru [Tue, 18 May 2010 15:16:33 +0000 (08:16 -0700)]
Merge "Check for the absence of a frame. This crashes in the situation where the XHR responseXML method is being called on a document with meta tags. b/issue?id=
2346028"
Steve Block [Tue, 18 May 2010 14:17:44 +0000 (15:17 +0100)]
Make sure Geolocation is robust to location providers being absent on the device.
Bug:
2692830
Change-Id: Ib6395a04ec916a04cdd3a09569c4ea373fb422e9
Steve Block [Tue, 18 May 2010 11:23:49 +0000 (04:23 -0700)]
Merge "Adds missing ENABLE(TOUCH_EVENTS) guards to Android-specific code"
Steve Block [Mon, 17 May 2010 16:28:09 +0000 (17:28 +0100)]
Adds missing ENABLE(TOUCH_EVENTS) guards to Android-specific code
This will allow us to build with touch events disabled once we've merged
https://bugs.webkit.org/show_bug.cgi?id=39222
Change-Id: Ia665e5e6c3b4169b6c5576aa26721d95e72934e9
The Android Open Source Project [Mon, 17 May 2010 22:03:04 +0000 (15:03 -0700)]
am
b7c854ae: am
18e97e57: merge from open-source master
The Android Open Source Project [Mon, 17 May 2010 20:53:30 +0000 (13:53 -0700)]
am
18e97e57: merge from open-source master
Merge commit '
18e97e57694ae8596ac316af30cb5512fe8ef1bf' into kraken
* commit '
18e97e57694ae8596ac316af30cb5512fe8ef1bf':
Fix focus ring on links with non-latin text
Cary Clark [Mon, 17 May 2010 15:50:45 +0000 (11:50 -0400)]
ignore offscreen drawing in SVG
Drawing outside of the visible window is recorded so that future
scrolls have the correct picture data. When SVG triggers this
code path on its way to drawing to an offscreen bitmap, it
has not instantiated a WebViewCore object. Since in SVG's case,
there's no reason to record drawing outside if the offscreen
bitmap, it's correct to do nothing.
Offscreen bitmaps do not work with SVG; but that problem is
independent of this bug fix.
Change-Id: I0b9c6d5506b6a35b2992abfa6bcb1db6cb872fd0
http://b/
2682606
The Android Open Source Project [Mon, 17 May 2010 17:23:33 +0000 (10:23 -0700)]
merge from open-source master
Change-Id: I0b566897309348d094f93ed7ae5d9af7b0e8a377
Jean-Baptiste Queru [Mon, 17 May 2010 15:58:16 +0000 (08:58 -0700)]
Merge "Fix focus ring on links with non-latin text"
Ben Murdoch [Mon, 17 May 2010 12:43:33 +0000 (13:43 +0100)]
Remove a superfluous ANDROID-only include from Node.cpp that has not been upstreamed.
Diff -=4! :)
Change-Id: Iafac0c2529bb66808e15efac63e75c63966d9673
Svetoslav Ganov [Sat, 8 May 2010 03:33:09 +0000 (20:33 -0700)]
Adding a mechanism for injecting accessibility in WebViews with disabled JavaScript.
Change-Id: If0d8fc9cffcd00356dffe46af094b65488b3ff5a
Cary Clark [Fri, 14 May 2010 19:31:44 +0000 (15:31 -0400)]
suppress partial screen updates if a canvas element is visible
A PictureSet contains a list of pictures. Each picture draws
part of the screen. If the picture contains a Canvas element,
the corresponding bitmap is not shared.
Small partial invalidates can create a dozen or so pictures,
each of which may be quite small, a few hundred bytes. But
the bitmap referenced by the picture may be large, several
meg.
The backing bitmap is unique to the Canvas element. Since
a canvas rarely benefits from small updates, disable the
partial invalidates if CacheBuilder detects a canvas.
Change-Id: I5761667db3d037d7363dcb01f8a26f7f62e2eabc
http://b/
2678787
Cary Clark [Fri, 14 May 2010 15:26:27 +0000 (08:26 -0700)]
Merge "clean up nav cache debugging"
Cary Clark [Thu, 13 May 2010 19:57:59 +0000 (15:57 -0400)]
clean up nav cache debugging
This adds additional content to the nav cache dump,
and cleans up a few formatting problems. This has no
effect on code that does not have nav cache debugging
enabled.
Change-Id: Ice2c4bb33138a8ddc96739d95ead58fbe328bfa8
Ben Murdoch [Wed, 12 May 2010 13:18:52 +0000 (14:18 +0100)]
Merge Webkit at r58956: Update WebKit revision number.
Change-Id: Ic2e7908a14f735ac9b0b995f032015e8eb216edf
Ben Murdoch [Wed, 12 May 2010 15:19:55 +0000 (16:19 +0100)]
Merge Webkit at r58956: Cherry pick of https://bugs.webkit.org/show_bug.cgi?id=38990 landed as r59459. Fixes touch event support with V8.
Change-Id: I5fb7da6570ce7ba5ed14f54e78ecb9a24664613a
Ben Murdoch [Wed, 12 May 2010 11:58:10 +0000 (12:58 +0100)]
Merge Webkit at r58956: SVGPaintServer has been deleted upstream and replaced with SVGResourceSolidColor.cpp.
We had local modifications in the deleted file to correctly guard some Chromium/Skia includes we don't have on
Android, so move the guards into the new file. See http://trac.webkit.org/changeset/58212
See http://trac.webkit.org/changeset/588212
Change-Id: I8e7e9ea39009019f7caefd68d99942be77ea602d
Ben Murdoch [Wed, 12 May 2010 11:09:29 +0000 (12:09 +0100)]
Merge Webkit at r58956: Update plugin code to use C99 types. See trac.webkit.org/changeset/58590
Change-Id: I73f3f008a88e69962de831a98d40e8d23c3cce30
Ben Murdoch [Wed, 12 May 2010 11:30:06 +0000 (12:30 +0100)]
Merge Webkit at r58956: Add bool parameter to Widget::setFocus. See trac.webkit.org/changeset/58821
Change-Id: I3ab2eb4fdb14e32106c4b2ef51b889f2ffcd3661
Ben Murdoch [Wed, 12 May 2010 11:23:21 +0000 (12:23 +0100)]
Merge Webkit at r58956: Remove GlyphMetrics from Font code. See trac.webkit.org/changeset/58192
Change-Id: I2b3876f4027d2d3afbf0cfaa76061c53d0bf018f
Ben Murdoch [Wed, 12 May 2010 11:00:26 +0000 (12:00 +0100)]
Merge Webkit at r58956: add new FrameLoaderClient methods. See trac.webkit.org/changeset/58686 and http://trac.webkit.org/changeset/58111
Change-Id: Iebc4ab59ac768d4dde2fe56f63657d98c4b9db3a
Ben Murdoch [Wed, 12 May 2010 10:02:25 +0000 (11:02 +0100)]
Merge Webkit at r58956: Update Android makefiles.
Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2
Ben Murdoch [Tue, 11 May 2010 17:45:47 +0000 (18:45 +0100)]
Merge Webkit at r58956: Fix conflicts.
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
Ben Murdoch [Tue, 11 May 2010 17:35:50 +0000 (18:35 +0100)]
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Nicolas Roard [Fri, 14 May 2010 00:31:19 +0000 (17:31 -0700)]
Fix a CSS position: fixed problem, where we were not using left or top if nothing was defined
Change-Id: Ib9f5b473cbda0518e332332cdc1c515652150a8c
Leon Clarke [Thu, 14 Jan 2010 16:39:36 +0000 (16:39 +0000)]
Check for the absence of a frame.
This crashes in the situation where the XHR responseXML method is being
called on a document with meta tags.
http://b/issue?id=
2346028
Cary Clark [Thu, 13 May 2010 19:55:51 +0000 (12:55 -0700)]
Merge "don't use animated gifs if gifs only have one frame"
Cary Clark [Thu, 13 May 2010 19:31:02 +0000 (15:31 -0400)]
don't use animated gifs if gifs only have one frame
Gifs use a different decoding mechanism from other images. The
default webkit implementation allocates a bitmap for the gif,
which is serialized when the picture is flattened. A page with
a 25K display list may flatten into a 20M file if GIFs are
included as bitmaps.
GIFs can be written like other image types, as streams; then
the display list flattens to a 140K file. Currently, the
Skia-based images only can handle non-animated types.
When animated gifs was recently enabled, the flattened file
size grew. All gifs were treated as if they could be animated,
and all were decoded into bitmaps with straight memory allocations.
This change uses the stream-allocation mechanism if the GIF
has only one frame, and is therefore not animating.
Change-Id: Ie2360bb6f20515b81bd62761ca97242f33ffb43b
http://b/
2650945
Ben Murdoch [Thu, 13 May 2010 16:46:15 +0000 (09:46 -0700)]
Merge "Fix crash in fast/frames/iframe-access-screen-of-deleted.html"
Ben Murdoch [Thu, 13 May 2010 10:51:29 +0000 (11:51 +0100)]
Fix crash in fast/frames/iframe-access-screen-of-deleted.html
This is a new layout test and triggers a crash inside screenRect() by
accessing the null page pointer. Other platform implementations perform
a null check on page in this function, so we now do the same to prevent
the crash.
Change-Id: I2403d7adc157daae69f6fb53bbbf212d9d04341c
Steve Block [Thu, 13 May 2010 10:09:15 +0000 (03:09 -0700)]
Merge "Add dom/html LayoutTests to Android tree."
Steve Block [Thu, 13 May 2010 09:55:31 +0000 (10:55 +0100)]
Add dom/html LayoutTests to Android tree.
The new link prefetching tests have already been added to
dom/html/level2/html on Android (though they may be relocated during
upstreaming). This change pulls the entire dom/html directory (at r58033) into
Android to keep the merge process as simple as possible. All tests currently
pass.
Change-Id: I6908177dd626e0e45f72c12503b3a115bb879715
Cary Clark [Wed, 12 May 2010 19:12:02 +0000 (15:12 -0400)]
restrict nav cache picture to content width, height
Formerly, the nav cache picture recorded a rectangle of
(0, 0, INT_MAX, INT_MAX). If the drawing was subsequently
translated, the rectangle wrapped around and futher drawing
was clipped out.
Now the drawing is constrained to the contentWidth and
contentHeight -- the enclosing picture already had this
restriction.
http://b/
2604141
Change-Id: Idde1cbaeb507310813a7c5b00e3dde9cacebe44d
Steve Block [Wed, 12 May 2010 18:17:57 +0000 (19:17 +0100)]
Add selfhtml.js which is required by the link prefetch LayoutTests
New link prefetch LayoutTests were added to the Android tree in
https://android-git.corp.google.com/g/#change,41229
These will be upstreamed to WebKit. They require selfhtml.js which
is already upstream.
Bug:
2268353
Change-Id: Ibae2c8d6ac979d6ade25443e86c1cabfbf105262
Steve Block [Wed, 12 May 2010 16:10:11 +0000 (09:10 -0700)]
Merge "No longer consider a semi-colon to be a separator character when parsing the meta-tag"
Steve Block [Wed, 12 May 2010 15:46:41 +0000 (08:46 -0700)]
Merge "Split the V8 FEATURE_DEFINES onto two lines to ease comparison with the list for JSC"
Steve Block [Wed, 12 May 2010 15:30:10 +0000 (16:30 +0100)]
No longer consider a semi-colon to be a separator character when parsing the meta-tag
The Android meta-tag parsing code was originally copied from the iPhone
implementation. A later change added the semi-colon to the list of separator
characters, motivated by Reader. See http://b/issue?id=
1416841 and
https://mondrian.corp.google.com/changelist/115656-p9
Meta-tag support has since been added to WebKit in
http://trac.webkit.org/changeset/57775. The upstream parsing code does not
consider the semi-colon to be a separator. The upstream parsing code was merged
into Android as part of the merge to WebKit r58033 in
https://android-git.corp.google.com/g/#change,50648
This change removes the Android-specific changes so the semi-colon is no longer
considered a separator. This brings Android back into line with iPhone and other
browsers.
Change-Id: Id4cbbadb414d0508a89006d9beb91c56fa1f8daf
Steve Block [Wed, 12 May 2010 14:42:00 +0000 (15:42 +0100)]
Split the V8 FEATURE_DEFINES onto two lines to ease comparison with the list for JSC
Change-Id: I142c9198785dd18ac9b727a42564b27036548958
Steve Block [Wed, 12 May 2010 14:19:48 +0000 (07:19 -0700)]
Merge "Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()"
Steve Block [Tue, 11 May 2010 15:09:46 +0000 (16:09 +0100)]
Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()
The Android version of writeToFile() tries to support interrupted writes, but
has a bug as the data pointer is not updated. So instead we take the standard
POSIX version.
See https://mondrian.corp.google.com/changelist/75998-p9
and https://bugs.webkit.org/show_bug.cgi?id=38908
Change-Id: I011671211017005a06727e436f92e8458902a7db
Nicolas Roard [Tue, 11 May 2010 22:46:00 +0000 (15:46 -0700)]
fix the pause() problem...
Change-Id: I997b2e5f1fed2bf5abba8bb027df9390c99a8c0f
Nicolas Roard [Tue, 11 May 2010 19:20:30 +0000 (12:20 -0700)]
Fix media element creation
Change-Id: I6545eab16de0c3355b188ffc643eec1f992877a2
Nicolas Roard [Tue, 11 May 2010 17:44:18 +0000 (10:44 -0700)]
am
c1cdea23: am
75238a0c: am
2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150).
Nicolas Roard [Tue, 11 May 2010 17:24:06 +0000 (10:24 -0700)]
am
75238a0c: am
2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from 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.
Nicolas Roard [Tue, 11 May 2010 17:19:03 +0000 (10:19 -0700)]
am
2943c136: Fix the \'wobbling fixed elements\' bug. Cherry-picked from This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150).
Merge commit '
2943c136f14cf8d0631249dd8764a0b6ab45fb98' into froyo-plus-aosp
* commit '
2943c136f14cf8d0631249dd8764a0b6ab45fb98':
Fix the 'wobbling fixed elements' bug.
Steve Block [Mon, 26 Apr 2010 06:39:10 +0000 (23:39 -0700)]
Merge webkit.org at r58033 : Update WebKit revision
Change-Id: I5c90103b547a4d4714adb4e128e76cb373259421
Steve Block [Fri, 7 May 2010 14:17:59 +0000 (15:17 +0100)]
Merge webkit.org at r58033 : Cherry-pick WebKit change 58826 to add a missing PassRefPtr.h include
See http://trac.webkit.org/changeset/58826
Change-Id: I00a2682dc0e9d9ca6cc9f3363b9f170075dd7817
Steve Block [Wed, 5 May 2010 09:42:25 +0000 (10:42 +0100)]
Merge webkit.org at r58033 : Cherry-pick WebKit change 58775 to include jni_jsobject.h for jlong_to_pt() and ptr_to_jlong()
See http://trac.webkit.org/changeset/58775
Change-Id: Id1efa09e2f3578f8c782da0686c2df4d87fc83c3
Steve Block [Wed, 5 May 2010 09:39:32 +0000 (10:39 +0100)]
Merge webkit.org at r58033 : Cherry-pick WebKit change 58774 to avoid conflicts with FileSystemPOSIX.cpp
See http://trac.webkit.org/changeset/58774
Change-Id: I646d82752feaafaf0ece6e1cdd099ae2a200995e
Steve Block [Mon, 26 Apr 2010 07:08:57 +0000 (00:08 -0700)]
Merge webkit.org at r58033 : Cherry-pick WebKit change 58061 to add Geolocation::suspend()/resume() back in
See http://trac.webkit.org/changeset/58061
Change-Id: Ie7b4b4891391656a6cc25cd30b3913f0638a0302
Steve Block [Mon, 10 May 2010 12:28:21 +0000 (13:28 +0100)]
Merge webkit.org at r58033 : Remove call to ScriptDebugServer::topStackFrame() on Android
ScriptDebugServer is guarded with (JAVASCRIPT_DEBUGGER), which is not defined on
Android. An attempt was made in https://bugs.webkit.org/show_bug.cgi?id=38531 to
move ScriptDebugServer::topStackFrame() to ScriptCallStack to avoid the linker
error. However, this causes crashes on Android as our version of the V8 snapshot
is not consistent with this.
This fix is a temporary work-around to avoid the problem by simply not calling
ScriptDebugServer::topStackFrame(). The problem will be fixed properly upstream
when this code is refactored, as described in the WebKit bug.
Change-Id: I3952eed2e56dbb5a6f6204276bd499e79bba2227
Steve Block [Thu, 29 Apr 2010 08:28:33 +0000 (09:28 +0100)]
Merge webkit.org at r58033 : Provide link stub for AccessibilityObject::getAttribute
This is used in RenderMenuList. Neither implementation nor call site are guarded
with HAVE(ACCESSIBILITY) but Android does not compile any accessibility code.
See http://trac.webkit.org/changeset/55425
Change-Id: I3e94a80052287d38c6266e4f01b1b31b127e7781
Steve Block [Fri, 30 Apr 2010 14:50:02 +0000 (15:50 +0100)]
Merge webkit.org at r58033 : Resolve conflicts due to navigator.connection
Some V8 bindings files have been removed now that more of the bindings are
auto-generated. Android has some modifications due to the addition of
navigator.connection, which causes conflicts. However, we can safely delete
these files.
Change-Id: I7188894a3d1dbe380eae7e2cc18409836ce8cafc
Steve Block [Fri, 30 Apr 2010 14:36:55 +0000 (15:36 +0100)]
Merge webkit.org at r58033 : Move Android iframe-flattening code to RenderIFrame.cpp
The Android iframe-flattening code was in RenderPartObject. The rendering
classes have been refactored upstream in http://trac.webkit.org/changeset/57866
so that most of RenderPartObject was moved to RenderIFrame. RenderPartObject was
then removed in http://trac.webkit.org/changeset/57900.
Iframe-flattening was also added upstream in
http://trac.webkit.org/changeset/56718.
This change takes the Android iframe-flattening code from RenderPartObject and
moves it to RenderIFrame. It also renames FLATTEN_IFRAME to
ANDROID_FLATTEN_IFRAME and FLATTEN_FRAMESET to ANDROID_FLATTEN_FRAMESET for
clarity.
Change-Id: I1af8d042f8d0c4abd513f8a315ac681360c1cc53
Steve Block [Thu, 29 Apr 2010 17:17:38 +0000 (18:17 +0100)]
Merge webkit.org at r58033 : Update V8 expected result for storage LayoutTests
Note that some appcache tests will fail until the LayoutTest server is updated.
Change-Id: I491b79529e837457a093aa76020676b76272b3f5
Steve Block [Thu, 29 Apr 2010 16:06:33 +0000 (17:06 +0100)]
Merge webkit.org at r58033 : Settings::setDatabasesEnabled() has been removed
We should use Database::setIsAvailable() instead.
See http://trac.webkit.org/changeset/55666,
http://trac.webkit.org/changeset/55667 and
http://trac.webkit.org/changeset/55809
Change-Id: Iead4dac03f791d2bde8e7ee20e452b2100ed1e4f
Steve Block [Thu, 29 Apr 2010 00:12:13 +0000 (01:12 +0100)]
Merge webkit.org at r58033 : Implement MIMETypeRegistry::isApplicationPluginMIMEType() for Android
See http://trac.webkit.org/changeset/56661
Change-Id: I3f0047c7a4424b9aed928388a24977b1b415267e
Steve Block [Thu, 29 Apr 2010 13:30:19 +0000 (14:30 +0100)]
Merge webkit.org at r58033 : Fix conflicts in V8NavigatorCustom.cpp
This file has been deleted upstream now that more V8 bindings are
auto-generated, but we have local modifications, so we must keep these parts.
Change-Id: I0d1497bf3f54f977ef4753800b127a32f38a30ea
Steve Block [Thu, 29 Apr 2010 14:21:20 +0000 (15:21 +0100)]
Merge webkit.org at r58033 : Update ChromeClientAndroid with refactoring of ChromeClient::repaint()
See http://trac.webkit.org/changeset/55675 and http://trac.webkit.org/changeset/55864
Change-Id: I8bf64fa0315877f8fafabe2a9e3c5ca8cc1e362c
Steve Block [Thu, 29 Apr 2010 14:11:20 +0000 (15:11 +0100)]
Merge webkit.org at r58033 : Update ChromeClient::iconForFiles()
See http://trac.webkit.org/changeset/56439 and http://trac.webkit.org/changeset/57903
Change-Id: I9e05104b452804a74623b6b8e915dcaebf9cca7c
Steve Block [Thu, 29 Apr 2010 13:58:23 +0000 (14:58 +0100)]
Merge webkit.org at r58033 : Update stubbed methods in InspectorClientAndroid
See http://trac.webkit.org/changeset/56051
Change-Id: I6b30d9fbb157ec77e8ba93cb0fa9a6e0c2a9ec81
Steve Block [Thu, 29 Apr 2010 13:47:46 +0000 (14:47 +0100)]
Merge webkit.org at r58033 : ChromeClient::cancelGeolocationPermissionRequestForFrame() now takes a Geolocation parameter
Change-Id: I26acb60fc15511968f81628c44c29670d8324cc7
Steve Block [Wed, 28 Apr 2010 23:56:24 +0000 (00:56 +0100)]
Merge webkit.org at r58033 : Provide new localized string methods for plugins
See http://trac.webkit.org/changeset/56337 and http://trac.webkit.org/changeset/57095
Change-Id: I79098600dd15de6c4d699bb75bbbc7dcb6b87754
Steve Block [Wed, 28 Apr 2010 23:46:27 +0000 (00:46 +0100)]
Merge webkit.org at r58033 : Use new PluginView::platformGetValue() and platformStaticGetValue()
See http://trac.webkit.org/changeset/55432
Change-Id: I21b1185ce5a86d902c7a5de3f7866e82c6fe3ee8
Steve Block [Wed, 28 Apr 2010 17:33:52 +0000 (18:33 +0100)]
Merge webkit.org at r58033 : FrameLoader::setEncoding() has moved
See http://trac.webkit.org/changeset/57927
Change-Id: I3ee9f44de1cbe22ab4a795791763ff9facfd298d
Steve Block [Wed, 28 Apr 2010 17:21:26 +0000 (18:21 +0100)]
Merge webkit.org at r58033 : Add missing SharedBuffer.h include
Change-Id: Ib7b420dd18f20c5a62c40080f698ec88edefb8b6
Steve Block [Wed, 28 Apr 2010 17:11:53 +0000 (18:11 +0100)]
Merge webkit.org at r58033 : Use new ZoomMode enum
See http://trac.webkit.org/changeset/55387
Change-Id: Ieacfed3cd4bfea79d22e42d909d9a88b7ec9b42c
Steve Block [Wed, 28 Apr 2010 16:56:59 +0000 (17:56 +0100)]
Merge webkit.org at r58033 : Update location of KeyboardCodes.h
See http://trac.webkit.org/changeset/56704
Change-Id: I0091045727b5dcbbeebcd0d3839a220d8af176c7
Steve Block [Wed, 28 Apr 2010 14:26:38 +0000 (15:26 +0100)]
Merge webkit.org at r58033 : Update location of CString.h
See http://trac.webkit.org/changeset/56825
Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
Steve Block [Wed, 28 Apr 2010 15:47:26 +0000 (16:47 +0100)]
Merge webkit.org at r58033 : Use ustringToString()
See http://trac.webkit.org/changeset/57738
Change-Id: I1d10e7858488f40013bffa3e8f8339db7fff7de0
Steve Block [Wed, 28 Apr 2010 15:09:50 +0000 (16:09 +0100)]
Merge webkit.org at r58033 : Add JSC guards around calls to JSLock
This was added to WebKit in http://trac.webkit.org/changeset/55433. It does not
cause problems on Chromium as they exclude this file from the build.
Change-Id: I77e94d5c18d99fb24578416ef31e559f35386372
Steve Block [Wed, 28 Apr 2010 15:01:40 +0000 (16:01 +0100)]
Merge webkit.org at r58033 : Update calls to ResourceHandle constructor
See http://trac.webkit.org/changeset/55688
Change-Id: I03ecd486149d48a36f65222c9ac8cc1a957306c0
Steve Block [Wed, 28 Apr 2010 14:59:17 +0000 (15:59 +0100)]
Merge webkit.org at r58033 : Update font method signatures
See http://trac.webkit.org/changeset/57215
Change-Id: I441f2905fe3882d3da2f4e9c8084a7d09d94b6f6
Steve Block [Wed, 28 Apr 2010 14:14:22 +0000 (15:14 +0100)]
Merge webkit.org at r58033 : Make use of part of upstream meta support code
See http://trac.webkit.org/changeset/57775
Change-Id: I2ab1caa2a90e4583afbf6a07ed68bdb360e9fb15
Steve Block [Thu, 29 Apr 2010 13:43:44 +0000 (14:43 +0100)]
Merge webkit.org at r58033 : Fix Makefiles
Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
Steve Block [Mon, 26 Apr 2010 06:41:36 +0000 (23:41 -0700)]
Merge webkit.org at r58033 : Resolve merge conflicts
- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see
285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See
7f034a1734d634dd1fdb3b64817d5828b5e46922 and
73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See
f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see
8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request
Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
Steve Block [Tue, 27 Apr 2010 15:31:00 +0000 (16:31 +0100)]
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Nicolas Roard [Mon, 10 May 2010 22:13:30 +0000 (15:13 -0700)]
Fix the 'wobbling fixed elements' bug.
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
Nicolas Roard [Mon, 10 May 2010 22:13:30 +0000 (15:13 -0700)]
Fix the 'wobbling fixed elements' bug.
This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150).
Bug:
2665696
Change-Id: I397100ac1b7ea9e0ecf799902d9ba04fba970cce
Steve Block [Mon, 10 May 2010 09:53:10 +0000 (10:53 +0100)]
Removes SVGURIRefernce.idl from build
This file is not needed and causes problems with the latest version of the V8 code generator.
It was removed from the Chromium build in http://trac.webkit.org/changeset/49309
Change-Id: I6966683e51479dc171ff7d271cc962e7ae059946
Shimeng (Simon) Wang [Fri, 7 May 2010 20:43:53 +0000 (13:43 -0700)]
Merge "Choose correct new/delete in case of multiple inheritance."
Shimeng (Simon) Wang [Fri, 7 May 2010 20:17:34 +0000 (13:17 -0700)]
Choose correct new/delete in case of multiple inheritance.
The compilation issue happens when android webcore instrumentation is turned on.
issue:
2582105
Change-Id: I403b43c69a0561ee52baf4265831dca185264ced
Nicolas Roard [Tue, 2 Feb 2010 13:11:32 +0000 (13:11 +0000)]
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Change-Id: Ief37a7d9879308f0749fcd569e82fddc3f989a8a
Steve Block [Fri, 7 May 2010 16:39:39 +0000 (17:39 +0100)]
Adds a couple of missing headers to CachedLinkPrefetch.h
These will be required with the upcoming WebKit merge.
Change-Id: I610d6bf5ea919c6842808fd6090f68dc010f4b2e
Leon Scroggins [Thu, 6 May 2010 21:41:43 +0000 (17:41 -0400)]
Provide access to current match highlighted.
Part of fix for issue
2663680
Requires a change to frameworks/base.
Change-Id: I79e460867973cbfcb3105d46058de705877f0aa9
Ben Murdoch [Thu, 6 May 2010 19:50:00 +0000 (12:50 -0700)]
am
bf13d116: am
ec366141: am
7f034a17: Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ende
Ben Murdoch [Thu, 6 May 2010 19:44:09 +0000 (12:44 -0700)]
am
ec366141: am
7f034a17: Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ended, the RefPtr
Merge commit '
ec3661418dd6a5edfca19848a0fa12a28959bd06' into kraken
* commit '
ec3661418dd6a5edfca19848a0fa12a28959bd06':
Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope
Ben Murdoch [Thu, 6 May 2010 19:35:44 +0000 (12:35 -0700)]
am
7f034a17: Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ended, the RefPtr destroyed it
Merge commit '
7f034a1734d634dd1fdb3b64817d5828b5e46922' into froyo-plus-aosp
* commit '
7f034a1734d634dd1fdb3b64817d5828b5e46922':
Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope
Ben Murdoch [Thu, 6 May 2010 14:49:14 +0000 (15:49 +0100)]
Fix a ref counting bug in touch event handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope
for the duration of the else block but we saved the raw pointer it wrapped. When the else block ended, the RefPtr destroyed itself, also
deleting it's enclosed pointer if it held the final ref. But we had a saved copy of this raw pointer and then went on to use
it later.
Fix bug
2543728.
Change-Id: I90e17693e15bff0969f103b5947d004837189c44
Leon Scroggins [Mon, 3 May 2010 13:21:02 +0000 (14:21 +0100)]
Enable contentEditable.
WebViewCore.cpp:
Open the keyboard when a contentEditable element is put
into focus by a click.
In key(), return whether the selection changed if a contentEditable
element is in focus.
CacheBuilder.cpp:
Add root contentEditable elements to the navigation tree.
CachedNode.h:
Include contentEditable elements as elements that want key events.
CachedNodeType.h
Add a type for contentEditable.
WebView.cpp:
Do not call setFollowedLink for contentEditable, so that the orange
selection ring stays around the field.
Add a check to determine whether the page should handle shift and
arrow keys.
Bug
1788820
Caveats:
Does not ensure that the caret remains on screen. Frame::revealSelection
is called, but we ignore it for other reasons. Need to investigate that.
The cursor will blink if the contentEditable node has focus, even if the
user has not clicked on it or has moved to a different input field. Further,
while in this state, the user can input text.
Requires a change to frameworks/base
Change-Id: Ife39254f46dcc1046a075eee2fda6cf4879b4ee8
Ben Murdoch [Wed, 5 May 2010 18:08:34 +0000 (11:08 -0700)]
am
4190ab28: am
cc7f2722: am
da713c02: Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage c
Ben Murdoch [Wed, 5 May 2010 17:08:02 +0000 (10:08 -0700)]
am
cc7f2722: am
da713c02: Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage collection.
Merge commit '
cc7f27228a13f253de0651478d67245e240a9dc6' into kraken
* commit '
cc7f27228a13f253de0651478d67245e240a9dc6':
Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have
Ben Murdoch [Wed, 5 May 2010 16:37:59 +0000 (09:37 -0700)]
am
da713c02: Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage collection.
Merge commit '
da713c0266664dc15b021e99cca31cadc5bd2bdc' into froyo-plus-aosp
* commit '
da713c0266664dc15b021e99cca31cadc5bd2bdc':
Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have
Ben Murdoch [Wed, 5 May 2010 14:42:24 +0000 (15:42 +0100)]
Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have
touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a
garbage collection.
Cherry pick of webkit.org revision 58760.
Bug=
2543728
Change-Id: I4c9a896ff81881211746451f49158b7e99eb9166