OSDN Git Service

android-x86/external-webkit.git
14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Mon, 20 Sep 2010 14:50:22 +0000 (07:50 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoHTTP auth for Chromium HTTP stack (C++ side)
Iain Merrick [Mon, 23 Aug 2010 16:35:30 +0000 (17:35 +0100)]
HTTP auth for Chromium HTTP stack (C++ side)

On receiving an auth request:
- WebRequest (on the IO thread) sends a message to WebUrlLoaderClient
- WebUrlLoaderClient (webkit thread) calls WebCoreFrameBridge.
- WebCoreFrameBridge makes a JNI call to BrowserFrame.java.

Each JNI call has a WebUrlLoaderClient pointer, cast to an int.
We use this to recover the context when we're called back, and
dispatch a message back to WebRequest.

Corresponding Java change: https://android-git.corp.google.com/g/63762

Change-Id: Ieb72f2eaa996a55916c987859f47f6dacf92e06c

14 years agoMerge "Remove superfluous Geolocation::stop() method rogue LayoutTests"
Steve Block [Fri, 17 Sep 2010 15:41:10 +0000 (08:41 -0700)]
Merge "Remove superfluous Geolocation::stop() method rogue LayoutTests"

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Thu, 16 Sep 2010 15:16:54 +0000 (08:16 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoRemove superfluous Geolocation::stop() method rogue LayoutTests
Steve Block [Thu, 16 Sep 2010 11:46:38 +0000 (12:46 +0100)]
Remove superfluous Geolocation::stop() method rogue LayoutTests

The stop() method and LayoutTests were added in
https://android-git.corp.google.com/g/#change,53849 which
cherry-picked a WebKit change to attempt to stop leaks. This change
has been rolled back in WebKit pending a better solution, but was
retained in Android as a temporary fix.

Later changes to Geolocation in WebKit have now fixed the underlying
problem and this has been confirmed on Android.

The temporary fix was mostly removed in the merge to WebKit r65615 in
https://android-git.corp.google.com/g/#change,62318 This patch simply
removes the superfluous stop() method and LayoutTests, which were
missed in the above patch.

Bug: 3001031
Change-Id: Id17117f285cb1a8fa600945cc6a87fc336709cab

14 years agoMerge WebKit at r67178 : Update WebKit revision number.
Iain Merrick [Tue, 14 Sep 2010 13:37:22 +0000 (14:37 +0100)]
Merge WebKit at r67178 : Update WebKit revision number.

Change-Id: I8c5e753cb69f136ea891317b74687622d114c0e2

14 years agoMerge WebKit at r67178 : Cherry-pick fix for DeviceOrientation test.
Iain Merrick [Thu, 16 Sep 2010 10:04:41 +0000 (11:04 +0100)]
Merge WebKit at r67178 : Cherry-pick fix for DeviceOrientation test.

Bug in fast/dom/DeviceOrientation/add-listener-from-callback.
To ensure we get a clean merge with no LayoutTest failures,
cherry-picking fix from http://trac.webkit.org/changeset/67557

Change-Id: I381b0cc695eb7f05768c30b790d66318c5369af3

14 years agoMerge WebKit at r67178 : Add FrameNetworkingContextAndroid.
Iain Merrick [Mon, 13 Sep 2010 16:24:46 +0000 (17:24 +0100)]
Merge WebKit at r67178 : Add FrameNetworkingContextAndroid.

This is needed to implement a new callback in FrameLoaderClient
which was added in http://trac.webkit.org/changeset/66794

Implementation copied from chromium's FrameNetworkingContextImpl.
(We can't just call FrameNetworkingContext's constructor directly
because it's protected.)

Change-Id: I10a318daed219a1b05972052aaea286c719b4b3c

14 years agoMerge WebKit at r67178 : Cherry-pick fix for V8DOMWrapper.
Iain Merrick [Mon, 13 Sep 2010 19:11:40 +0000 (20:11 +0100)]
Merge WebKit at r67178 : Cherry-pick fix for V8DOMWrapper.

Copying http://trac.webkit.org/changeset/67324, which fixes a
circular header file inclusion when compiling with both XPATH
and V8 enabled (which is our default build config).

Change-Id: I244870c2b612314ac2c6248eeeb1c8dc5e5b362b

14 years agoMerge WebKit at r67178 : Fix CacheBuilder.
Iain Merrick [Mon, 13 Sep 2010 17:14:16 +0000 (18:14 +0100)]
Merge WebKit at r67178 : Fix CacheBuilder.

The internal representation of column rects was changed in
http://trac.webkit.org/changeset/66903

Change-Id: I774c9fc487c0c88f7dec60e90f4096ba3cf657a7

14 years agoMerge WebKit at r67178 : Fix AndroidAnimation.
Iain Merrick [Mon, 13 Sep 2010 16:36:35 +0000 (17:36 +0100)]
Merge WebKit at r67178 : Fix AndroidAnimation.

TimingFunction was previously a simple struct with an enum to
select different behaviors. It's now an abstract class with
a different subclass for each behavior. Fixing AndroidAnimation
so that it holds a RefPtr to the timing function rather than
trying to store its value directly.

See http://trac.webkit.org/changeset/67032

Change-Id: Icb7f2911aea341975531c95594ab1c30ac48cd87

14 years agoMerge WebKit at r67178 : Fix Makefiles.
Iain Merrick [Mon, 13 Sep 2010 19:42:59 +0000 (20:42 +0100)]
Merge WebKit at r67178 : Fix Makefiles.

Change-Id: I8d14775998f5bad70cb01ce71a0f88e16dde85e0

14 years agoMerge WebKit at r67178 : Fix conflicts.
Iain Merrick [Mon, 13 Sep 2010 16:10:07 +0000 (17:10 +0100)]
Merge WebKit at r67178 : Fix conflicts.

V8DOMWindowShell::initContextIfNeeded now has a return value:
  http://trac.webkit.org/changeset/66840

DocLoader renamed to CachedResourceLoader. This affects
loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp
  http://trac.webkit.org/changeset/66963

Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45

14 years agoMerge WebKit at r67178 : Initial merge by git.
Iain Merrick [Mon, 13 Sep 2010 15:35:48 +0000 (16:35 +0100)]
Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

14 years agoMerge "Remove LayoutTests/fast/dom/StyleSheet"
Steve Block [Thu, 16 Sep 2010 10:08:53 +0000 (03:08 -0700)]
Merge "Remove LayoutTests/fast/dom/StyleSheet"

14 years agoam 71d8d800: (-s ours) am 1441f89d: Do not merge -- restrict text selection to the...
Cary Clark [Wed, 15 Sep 2010 23:49:42 +0000 (16:49 -0700)]
am 71d8d800: (-s ours) am 1441f89d: Do not merge -- restrict text selection to the main layer

Merge commit '71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479'

* commit '71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479':
  Do not merge -- restrict text selection to the main layer

14 years agoMerge "Remove alt http from chrome stack user agent"
Kristian Monsen [Wed, 15 Sep 2010 19:19:19 +0000 (12:19 -0700)]
Merge "Remove alt http from chrome stack user agent"

14 years agoRemove alt http from chrome stack user agent
Kristian Monsen [Wed, 15 Sep 2010 18:54:19 +0000 (19:54 +0100)]
Remove alt http from chrome stack user agent

Fix for bug 3004055

Change-Id: I6e313880c7f8bb7033f302717209befba34819ad

14 years agoam 1441f89d: Do not merge -- restrict text selection to the main layer
Cary Clark [Wed, 15 Sep 2010 17:36:46 +0000 (10:36 -0700)]
am 1441f89d: Do not merge -- restrict text selection to the main layer

Merge commit '1441f89dceb65cbe25d23b1b90005e51d3ed28bd' into gingerbread-plus-aosp

* commit '1441f89dceb65cbe25d23b1b90005e51d3ed28bd':
  Do not merge -- restrict text selection to the main layer

14 years agoMerge "Fix prototype for V8Proxy::compileScriptInternal"
Kristian Monsen [Wed, 15 Sep 2010 15:40:11 +0000 (08:40 -0700)]
Merge "Fix prototype for V8Proxy::compileScriptInternal"

14 years agoDo not merge -- restrict text selection to the main layer
Cary Clark [Wed, 15 Sep 2010 15:29:20 +0000 (11:29 -0400)]
Do not merge -- restrict text selection to the main layer

Gmail causes layers to appear as a message is scrolled. This confuses
the text selection logic. To workaround this in Gingerbread,
text selection is only allowed to be drawn in the main layer.

Change-Id: Idd814bcb5dfeef2fc12d6b0d586a63f711351d96
http://b/2998882

14 years agoRemove LayoutTests/fast/dom/StyleSheet
Iain Merrick [Wed, 15 Sep 2010 14:42:09 +0000 (15:42 +0100)]
Remove LayoutTests/fast/dom/StyleSheet

These tests were added in https://android-git.corp.google.com/g/#change,64773
but they don't all pass with the JSC JavaScript engine.

Change-Id: I93e4b6778b826fc453f0cfc0e60a44938b17fa5d

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Tue, 14 Sep 2010 14:34:37 +0000 (07:34 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoFix prototype for V8Proxy::compileScriptInternal
Iain Merrick [Tue, 14 Sep 2010 13:13:01 +0000 (14:13 +0100)]
Fix prototype for V8Proxy::compileScriptInternal

Looks like this was broken in the last WebKit merge. It's only
used when compiling with #define ANDROID_INSTRUMENT.

Change-Id: Idc6d879cf733f84122c3b3f0608d8df1598eff36

14 years agoMerge "clip img elements the same as text"
Cary Clark [Tue, 14 Sep 2010 13:07:44 +0000 (06:07 -0700)]
Merge "clip img elements the same as text"

14 years agoclip img elements the same as text
Cary Clark [Mon, 13 Sep 2010 20:04:18 +0000 (16:04 -0400)]
clip img elements the same as text

The nav cache builds the cursor ring by collecting the bounds of
the text and images contained by the clickable node. The clip
described by the parent node is available when the bounds are
collected.

The current code clips the text. Generalize this to clip the
images also.

Also, print whether the node is transparent in the node dumper.

Change-Id: I44d6cbacb95211f191cf11b6abd5273e0712930f
http://b/2463829

14 years agoMerge "Accessibility support for WebViews"
Shimeng (Simon) Wang [Mon, 13 Sep 2010 18:04:44 +0000 (11:04 -0700)]
Merge "Accessibility support for WebViews"

14 years agoAccessibility support for WebViews
Svetoslav Ganov [Mon, 21 Jun 2010 16:58:25 +0000 (09:58 -0700)]
Accessibility support for WebViews

Change-Id: Ia63a74b0de66d40acb08ec0ea6f39dc85adac9be

14 years agoMerge "Initial autofill changes in libwebcore."
Ben Murdoch [Mon, 13 Sep 2010 17:40:13 +0000 (10:40 -0700)]
Merge "Initial autofill changes in libwebcore."

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Mon, 13 Sep 2010 15:31:22 +0000 (08:31 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoInitial autofill changes in libwebcore.
Ben Murdoch [Fri, 10 Sep 2010 18:21:43 +0000 (19:21 +0100)]
Initial autofill changes in libwebcore.

Initial checkin of WebKit source for enabling AutoFill on
Android. This code calls into the chromium library to perform the
autofill magic.

There's still lots to do, but this and a corresponding change in
external/chromium enable the feature (basically) end to end.
The feature is disabled by default until we implement it more fully
with some proper UI.

To turn it on, set the ENABLE_AUTOFILL environment variable to "true"
and rebuild. This is only useful for preliminary testing though as
for now we use a precanned profile, which won't be relevant unless
your name happens to be John Smith.

Change-Id: I4a3e0e840617f7cf8f522af33ae1be560768a6c5

14 years agoMerge "Fix view_source.php for DumpRenderTree2"
Steve Block [Mon, 13 Sep 2010 13:58:02 +0000 (06:58 -0700)]
Merge "Fix view_source.php for DumpRenderTree2"

14 years agoam d7ab5cca: (-s ours) am e3a33d1e: Cherry-pick security fix in WebKit change 63048...
Steve Block [Mon, 13 Sep 2010 13:56:11 +0000 (06:56 -0700)]
am d7ab5cca: (-s ours) am e3a33d1e: Cherry-pick security fix in WebKit change 63048. Do not merge

Merge commit 'd7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9'

* commit 'd7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9':
  Cherry-pick security fix in WebKit change 63048. Do not merge

14 years agoam e3a33d1e: Cherry-pick security fix in WebKit change 63048. Do not merge
Steve Block [Mon, 13 Sep 2010 13:53:45 +0000 (06:53 -0700)]
am e3a33d1e: Cherry-pick security fix in WebKit change 63048. Do not merge

Merge commit 'e3a33d1e0c60357ad9f36df6e16799ddb5942917' into gingerbread-plus-aosp

* commit 'e3a33d1e0c60357ad9f36df6e16799ddb5942917':
  Cherry-pick security fix in WebKit change 63048. Do not merge

14 years agoFix view_source.php for DumpRenderTree2
Steve Block [Mon, 13 Sep 2010 13:46:30 +0000 (14:46 +0100)]
Fix view_source.php for DumpRenderTree2

highlight_string() echos the result of the highlighting and returns
a boolean success value. The existing code incorrectly echoes this
boolean as part of the result.

Change-Id: Icbfca6d8232ba3ad196f5909ad6c1ab4ac61f890

14 years agoCherry-pick security fix in WebKit change 63048. Do not merge
Steve Block [Mon, 13 Sep 2010 09:38:59 +0000 (10:38 +0100)]
Cherry-pick security fix in WebKit change 63048. Do not merge

See http://trac.webkit.org/changeset/63048

Note that this required a manual merge as we do not have
http://trac.webkit.org/changeset/59988

Bug: 2986936
Change-Id: I82617a011f68aeea953000d5487f40b32dcc7c72

14 years agoMerge WebKit at r66666 : Update WebKit revision number.
Kristian Monsen [Fri, 10 Sep 2010 10:50:01 +0000 (11:50 +0100)]
Merge WebKit at r66666 : Update WebKit revision number.

Change-Id: I9ea57dea7c42952ca49673ecaa51ae83c09246e6

14 years agoMerge Webkit at r66666 : Renamed function in Document.h
Kristian Monsen [Tue, 7 Sep 2010 11:09:30 +0000 (12:09 +0100)]
Merge Webkit at r66666 : Renamed function in Document.h

Webkit CL:
http://trac.webkit.org/changeset/66115

The function had a parameter added, I set it as RecalcStyleImmediately the
other option being DeferCalcStyle. This should maintain the current behaviour.

Change-Id: Id0d31eb00e9e4d78d77cb9f21e28e62f6b296a16

14 years agoMerge Webkit at r66666 : Fix include in V8Bindings generation
Kristian Monsen [Tue, 7 Sep 2010 11:04:13 +0000 (12:04 +0100)]
Merge Webkit at r66666 : Fix include in V8Bindings generation

Submitted upstream patch:
https://bugs.webkit.org/show_bug.cgi?id=45292

Fix is in:
http://trac.webkit.org/changeset/66888/trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

Change-Id: Ia4b009b2744bca744711f567f2ec182288cfe011

14 years agoMerge Webkit at r66666 : Adding Exception code to collapseToStart
Kristian Monsen [Mon, 6 Sep 2010 17:49:32 +0000 (18:49 +0100)]
Merge Webkit at r66666 : Adding Exception code to collapseToStart

From Webkit CL:
http://trac.webkit.org/changeset/66590/trunk/WebCore/page/DOMSelection.cpp

Created a bug so the contributor can have a look at the code after the merge:
http://b/issue?id=2990497

Change-Id: I63480cbcb0b3edfd009e1387b7875d6a5819f60b

14 years agoMerge Webkit at r66666 : Renamed function in Settings.h
Kristian Monsen [Mon, 6 Sep 2010 17:37:26 +0000 (18:37 +0100)]
Merge Webkit at r66666 : Renamed function in Settings.h

Webkit CL:
http://trac.webkit.org/changeset/66247/trunk/WebCore/page/Settings.h

Change-Id: Ied8f51db04683ddc51e6c2f5179928be2285f7fc

14 years agoMerge Webkit at r66666 : Renamed function in GraphicsContext.h.
Kristian Monsen [Mon, 6 Sep 2010 17:22:56 +0000 (18:22 +0100)]
Merge Webkit at r66666 : Renamed function in GraphicsContext.h.

Webkit CL:
http://trac.webkit.org/changeset/66643

Change-Id: Ia17bde54d46e1792cfe309f19e229abe513ed52c

14 years agoMerge Webkit at r66666 : Fix makefiles, including some conflicts.
Kristian Monsen [Mon, 6 Sep 2010 16:14:08 +0000 (17:14 +0100)]
Merge Webkit at r66666 : Fix makefiles, including some conflicts.

Change-Id: Ia903fa56d31594944939f03d0b8dec021f7964bb

14 years agoMerge Webkit at r66666 : Fix conflicts.
Kristian Monsen [Mon, 6 Sep 2010 16:18:53 +0000 (17:18 +0100)]
Merge Webkit at r66666 : Fix conflicts.

css/CSSParser.cpp
Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery):
http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp

dom/Document.cpp
Removed a function call next to an Android specific change:
http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp

html/HTMLPlugInElement.cpp
Removed a function next to an Android change:
http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp

page/Settings.h
Whitespace change in this CL:
http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h

svg/SVGFontFaceUriElement.h
Small change next to an Android change:
http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h

Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0

14 years agoMerge WebKit at r66666 : Initial merge by git.
Kristian Monsen [Wed, 8 Sep 2010 11:18:00 +0000 (12:18 +0100)]
Merge WebKit at r66666 : Initial merge by git.

Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f

14 years agoAllow WebKit to scroll selection on screen.
Leon Scroggins [Fri, 14 May 2010 19:38:53 +0000 (15:38 -0400)]
Allow WebKit to scroll selection on screen.

Requires a change to frameworks/base

Bug 2679411
Bug 2659028

Change-Id: I482cefadc24c620c6d07cbce44acc216bdb9b8df

14 years agoam 574b2420: am 946ea101: Cherry-pick security fix in WebKit change 66052
Steve Block [Fri, 10 Sep 2010 12:01:08 +0000 (05:01 -0700)]
am 574b2420: am 946ea101: Cherry-pick security fix in WebKit change 66052

Merge commit '574b2420d2e43cab716a4ae8b5c18ff48dd7ee9f'

* commit '574b2420d2e43cab716a4ae8b5c18ff48dd7ee9f':
  Cherry-pick security fix in WebKit change 66052

14 years agoam d8a7ee4d: (-s ours) am 93f07dbc: Cherry-pick security fix in WebKit change 65826
Steve Block [Fri, 10 Sep 2010 12:01:06 +0000 (05:01 -0700)]
am d8a7ee4d: (-s ours) am 93f07dbc: Cherry-pick security fix in WebKit change 65826

Merge commit 'd8a7ee4d40714f2434265e0f76549ef9ce79a036'

* commit 'd8a7ee4d40714f2434265e0f76549ef9ce79a036':
  Cherry-pick security fix in WebKit change 65826

14 years agoam e21fd1b6: am badca5a6: Cherry-pick security fix in WebKit change 65748
Steve Block [Fri, 10 Sep 2010 11:58:10 +0000 (04:58 -0700)]
am e21fd1b6: am badca5a6: Cherry-pick security fix in WebKit change 65748

Merge commit 'e21fd1b62f9e51013dcbdc28fdb35b7e5751397d'

* commit 'e21fd1b62f9e51013dcbdc28fdb35b7e5751397d':
  Cherry-pick security fix in WebKit change 65748

14 years agoam 4b59a578: am 0a05678e: Cherry-pick security fix in WebKit change 65329
Steve Block [Fri, 10 Sep 2010 11:58:07 +0000 (04:58 -0700)]
am 4b59a578: am 0a05678e: Cherry-pick security fix in WebKit change 65329

Merge commit '4b59a578dfea4d5ae9b902b834ca44cc28ac993b'

* commit '4b59a578dfea4d5ae9b902b834ca44cc28ac993b':
  Cherry-pick security fix in WebKit change 65329

14 years agoam 7777773e: (-s ours) am 6dba6e09: Cherry-pick security fix in WebKit change 65280
Steve Block [Fri, 10 Sep 2010 11:58:02 +0000 (04:58 -0700)]
am 7777773e: (-s ours) am 6dba6e09: Cherry-pick security fix in WebKit change 65280

Merge commit '7777773eaa086fa6180ab47e86dd7d903a2e7b2f'

* commit '7777773eaa086fa6180ab47e86dd7d903a2e7b2f':
  Cherry-pick security fix in WebKit change 65280

14 years agoam 229c8c38: (-s ours) am 3f2f7e2f: Cherry-pick security fix in WebKit change 65090
Steve Block [Fri, 10 Sep 2010 11:54:59 +0000 (04:54 -0700)]
am 229c8c38: (-s ours) am 3f2f7e2f: Cherry-pick security fix in WebKit change 65090

Merge commit '229c8c38532f7fb3da4cb45a4d18f559613af829'

* commit '229c8c38532f7fb3da4cb45a4d18f559613af829':
  Cherry-pick security fix in WebKit change 65090

14 years agoam 4c6e224c: am e1d3e323: Cherry-pick security fix in WebKit change 64293
Steve Block [Fri, 10 Sep 2010 11:49:59 +0000 (04:49 -0700)]
am 4c6e224c: am e1d3e323: Cherry-pick security fix in WebKit change 64293

Merge commit '4c6e224cc337ee1c7b0f677b0f1f78408e42052e'

* commit '4c6e224cc337ee1c7b0f677b0f1f78408e42052e':
  Cherry-pick security fix in WebKit change 64293

14 years agoam a9b9e574: am da4ffba3: Cherry-pick security fix in WebKit change 64077
Steve Block [Fri, 10 Sep 2010 11:49:53 +0000 (04:49 -0700)]
am a9b9e574: am da4ffba3: Cherry-pick security fix in WebKit change 64077

Merge commit 'a9b9e574f280df13a7bd1d3c2adc93e56ac74276'

* commit 'a9b9e574f280df13a7bd1d3c2adc93e56ac74276':
  Cherry-pick security fix in WebKit change 64077

14 years agoam 359de72a: am 237faca5: Cherry-pick security fix in WebKit change 63773
Steve Block [Fri, 10 Sep 2010 11:49:47 +0000 (04:49 -0700)]
am 359de72a: am 237faca5: Cherry-pick security fix in WebKit change 63773

Merge commit '359de72a0d7182dbfbcccc0f9909b1421b1751a9'

* commit '359de72a0d7182dbfbcccc0f9909b1421b1751a9':
  Cherry-pick security fix in WebKit change 63773

14 years agoam e772cff7: (-s ours) am 440c0366: Cherry-pick security fix in WebKit change 63772
Steve Block [Fri, 10 Sep 2010 11:49:40 +0000 (04:49 -0700)]
am e772cff7: (-s ours) am 440c0366: Cherry-pick security fix in WebKit change 63772

Merge commit 'e772cff7e4f4e6838bc95ad69c7b17a12b11ed43'

* commit 'e772cff7e4f4e6838bc95ad69c7b17a12b11ed43':
  Cherry-pick security fix in WebKit change 63772

14 years agoam a8a44d01: am be2b5a3f: Cherry-pick security fix in WebKit change 62873
Steve Block [Fri, 10 Sep 2010 11:44:34 +0000 (04:44 -0700)]
am a8a44d01: am be2b5a3f: Cherry-pick security fix in WebKit change 62873

Merge commit 'a8a44d01c8c57974c92ba7d924cf600cde71ed27'

* commit 'a8a44d01c8c57974c92ba7d924cf600cde71ed27':
  Cherry-pick security fix in WebKit change 62873

14 years agoam 866b5c80: (-s ours) am d8dd893d: Cherry-pick security fix in WebKit change 62271
Steve Block [Fri, 10 Sep 2010 11:44:29 +0000 (04:44 -0700)]
am 866b5c80: (-s ours) am d8dd893d: Cherry-pick security fix in WebKit change 62271

Merge commit '866b5c801e7591db2d365b09b35a90d337eb147c'

* commit '866b5c801e7591db2d365b09b35a90d337eb147c':
  Cherry-pick security fix in WebKit change 62271

14 years agoam 48c3fafe: am eea24577: Cherry-pick security fix in WebKit change 62134
Steve Block [Fri, 10 Sep 2010 11:35:16 +0000 (04:35 -0700)]
am 48c3fafe: am eea24577: Cherry-pick security fix in WebKit change 62134

Merge commit '48c3fafefe720cb153f52c69ea70e95c86d28e89'

* commit '48c3fafefe720cb153f52c69ea70e95c86d28e89':
  Cherry-pick security fix in WebKit change 62134

14 years agoam 9836c30e: am a926fcfd: Cherry-pick security fix in WebKit change 61709
Steve Block [Fri, 10 Sep 2010 11:35:05 +0000 (04:35 -0700)]
am 9836c30e: am a926fcfd: Cherry-pick security fix in WebKit change 61709

Merge commit '9836c30e301e8c144507e06ef2482d33c89a7d1c'

* commit '9836c30e301e8c144507e06ef2482d33c89a7d1c':
  Cherry-pick security fix in WebKit change 61709

14 years agoam 946ea101: Cherry-pick security fix in WebKit change 66052
Steve Block [Fri, 10 Sep 2010 11:32:59 +0000 (04:32 -0700)]
am 946ea101: Cherry-pick security fix in WebKit change 66052

Merge commit '946ea101a7673e7f566d52b1ba81f85b75666d16' into gingerbread-plus-aosp

* commit '946ea101a7673e7f566d52b1ba81f85b75666d16':
  Cherry-pick security fix in WebKit change 66052

14 years agoam 93f07dbc: Cherry-pick security fix in WebKit change 65826
Steve Block [Fri, 10 Sep 2010 11:32:57 +0000 (04:32 -0700)]
am 93f07dbc: Cherry-pick security fix in WebKit change 65826

Merge commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd' into gingerbread-plus-aosp

* commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd':
  Cherry-pick security fix in WebKit change 65826

14 years agoam badca5a6: Cherry-pick security fix in WebKit change 65748
Steve Block [Fri, 10 Sep 2010 11:32:54 +0000 (04:32 -0700)]
am badca5a6: Cherry-pick security fix in WebKit change 65748

Merge commit 'badca5a6d49b048c5dc9c5a847ab2d729b936b09' into gingerbread-plus-aosp

* commit 'badca5a6d49b048c5dc9c5a847ab2d729b936b09':
  Cherry-pick security fix in WebKit change 65748

14 years agoam 0a05678e: Cherry-pick security fix in WebKit change 65329
Steve Block [Fri, 10 Sep 2010 11:32:52 +0000 (04:32 -0700)]
am 0a05678e: Cherry-pick security fix in WebKit change 65329

Merge commit '0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp

* commit '0a05678e32a04623b93aa4d3990d14877ee80386':
  Cherry-pick security fix in WebKit change 65329

14 years agoam 6dba6e09: Cherry-pick security fix in WebKit change 65280
Steve Block [Fri, 10 Sep 2010 11:32:49 +0000 (04:32 -0700)]
am 6dba6e09: Cherry-pick security fix in WebKit change 65280

Merge commit '6dba6e09f232d333432972b64d0074cbee59ca7a' into gingerbread-plus-aosp

* commit '6dba6e09f232d333432972b64d0074cbee59ca7a':
  Cherry-pick security fix in WebKit change 65280

14 years agoam 3f2f7e2f: Cherry-pick security fix in WebKit change 65090
Steve Block [Fri, 10 Sep 2010 11:32:46 +0000 (04:32 -0700)]
am 3f2f7e2f: Cherry-pick security fix in WebKit change 65090

Merge commit '3f2f7e2fd4924ef8eaf542740438ede42a81732e' into gingerbread-plus-aosp

* commit '3f2f7e2fd4924ef8eaf542740438ede42a81732e':
  Cherry-pick security fix in WebKit change 65090

14 years agoam e1d3e323: Cherry-pick security fix in WebKit change 64293
Steve Block [Fri, 10 Sep 2010 11:32:42 +0000 (04:32 -0700)]
am e1d3e323: Cherry-pick security fix in WebKit change 64293

Merge commit 'e1d3e323642600e02d50760bd7dacd11e4ccfa83' into gingerbread-plus-aosp

* commit 'e1d3e323642600e02d50760bd7dacd11e4ccfa83':
  Cherry-pick security fix in WebKit change 64293

14 years agoam da4ffba3: Cherry-pick security fix in WebKit change 64077
Steve Block [Fri, 10 Sep 2010 11:32:39 +0000 (04:32 -0700)]
am da4ffba3: Cherry-pick security fix in WebKit change 64077

Merge commit 'da4ffba387f70730453d4533272dd55870dd81bb' into gingerbread-plus-aosp

* commit 'da4ffba387f70730453d4533272dd55870dd81bb':
  Cherry-pick security fix in WebKit change 64077

14 years agoam 237faca5: Cherry-pick security fix in WebKit change 63773
Steve Block [Fri, 10 Sep 2010 11:32:35 +0000 (04:32 -0700)]
am 237faca5: Cherry-pick security fix in WebKit change 63773

Merge commit '237faca5ff0377c7fda5c4dcc0f287e67fe66091' into gingerbread-plus-aosp

* commit '237faca5ff0377c7fda5c4dcc0f287e67fe66091':
  Cherry-pick security fix in WebKit change 63773

14 years agoam 440c0366: Cherry-pick security fix in WebKit change 63772
Steve Block [Fri, 10 Sep 2010 11:32:31 +0000 (04:32 -0700)]
am 440c0366: Cherry-pick security fix in WebKit change 63772

Merge commit '440c0366ae0192fb737c7dd87dc2d7156266b3f7' into gingerbread-plus-aosp

* commit '440c0366ae0192fb737c7dd87dc2d7156266b3f7':
  Cherry-pick security fix in WebKit change 63772

14 years agoam be2b5a3f: Cherry-pick security fix in WebKit change 62873
Steve Block [Fri, 10 Sep 2010 11:32:27 +0000 (04:32 -0700)]
am be2b5a3f: Cherry-pick security fix in WebKit change 62873

Merge commit 'be2b5a3fe0063db46087ef38f78a1e2aa7b47631' into gingerbread-plus-aosp

* commit 'be2b5a3fe0063db46087ef38f78a1e2aa7b47631':
  Cherry-pick security fix in WebKit change 62873

14 years agoam d8dd893d: Cherry-pick security fix in WebKit change 62271
Steve Block [Fri, 10 Sep 2010 11:32:22 +0000 (04:32 -0700)]
am d8dd893d: Cherry-pick security fix in WebKit change 62271

Merge commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4' into gingerbread-plus-aosp

* commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4':
  Cherry-pick security fix in WebKit change 62271

14 years agoam eea24577: Cherry-pick security fix in WebKit change 62134
Steve Block [Fri, 10 Sep 2010 11:32:15 +0000 (04:32 -0700)]
am eea24577: Cherry-pick security fix in WebKit change 62134

Merge commit 'eea2457721313546f0b5ddab3836282e338847b9' into gingerbread-plus-aosp

* commit 'eea2457721313546f0b5ddab3836282e338847b9':
  Cherry-pick security fix in WebKit change 62134

14 years agoam a926fcfd: Cherry-pick security fix in WebKit change 61709
Steve Block [Fri, 10 Sep 2010 11:32:10 +0000 (04:32 -0700)]
am a926fcfd: Cherry-pick security fix in WebKit change 61709

Merge commit 'a926fcfd627808c13994eb22aa991c82fd57673a' into gingerbread-plus-aosp

* commit 'a926fcfd627808c13994eb22aa991c82fd57673a':
  Cherry-pick security fix in WebKit change 61709

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Thu, 9 Sep 2010 15:20:47 +0000 (08:20 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoCherry-pick security fix in WebKit change 66052
Steve Block [Thu, 9 Sep 2010 10:55:43 +0000 (11:55 +0100)]
Cherry-pick security fix in WebKit change 66052

See http://trac.webkit.org/changeset/66052

Bug: 2986936
Change-Id: I42d1b546b328e28d8dd817c5904fa1d0ee0b759c

14 years agoCherry-pick security fix in WebKit change 65826
Steve Block [Thu, 9 Sep 2010 10:56:25 +0000 (11:56 +0100)]
Cherry-pick security fix in WebKit change 65826

See http://trac.webkit.org/changeset/65826

Bug: 2986936
Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b

14 years agoCherry-pick security fix in WebKit change 65748
Steve Block [Thu, 9 Sep 2010 10:55:57 +0000 (11:55 +0100)]
Cherry-pick security fix in WebKit change 65748

See http://trac.webkit.org/changeset/65748

Bug: 2986936
Change-Id: Idd9927f39d49b8eadd589f1513cf5210cd9dfee0

14 years agoCherry-pick security fix in WebKit change 65329
Steve Block [Thu, 9 Sep 2010 10:52:21 +0000 (11:52 +0100)]
Cherry-pick security fix in WebKit change 65329

See http://trac.webkit.org/changeset/65329

Bug: 2986936
Change-Id: I664cc00bba4cdd68cc5e23d2566279de614f5f64

14 years agoCherry-pick security fix in WebKit change 65280
Steve Block [Thu, 9 Sep 2010 10:17:57 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 65280

See http://trac.webkit.org/changeset/65280

Bug: 2986936
Change-Id: Ia70edaa46747536a9e7adc05493ef70a9baec610

14 years agoCherry-pick security fix in WebKit change 65090
Steve Block [Thu, 9 Sep 2010 10:18:29 +0000 (11:18 +0100)]
Cherry-pick security fix in WebKit change 65090

See http://trac.webkit.org/changeset/65090

Note that this required a manual merge due to our not having
http://trac.webkit.org/changeset/60251

Bug: 2986936
Change-Id: I035ec5d92c4e31cc8f7667dfc46e22d2a02cda97

14 years agoCherry-pick security fix in WebKit change 64293
Steve Block [Thu, 9 Sep 2010 10:17:44 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 64293

See http://trac.webkit.org/changeset/64293

Bug: 2986936
Change-Id: I2b4e9d218909872260e031032356b02038b73ced

14 years agoCherry-pick security fix in WebKit change 64077
Steve Block [Thu, 9 Sep 2010 10:17:13 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 64077

See http://trac.webkit.org/changeset/64077

Bug: 2986936
Change-Id: Ic3e825e880f2094f274758af93a0949b0b9278f0

14 years agoCherry-pick security fix in WebKit change 63773
Steve Block [Thu, 9 Sep 2010 10:16:44 +0000 (11:16 +0100)]
Cherry-pick security fix in WebKit change 63773

See http://trac.webkit.org/changeset/63773

Bug: 2986936
Change-Id: I5536ceeee25b07476a92e4531862c7c9d7beb6c8

14 years agoCherry-pick security fix in WebKit change 63772
Steve Block [Thu, 9 Sep 2010 10:20:02 +0000 (11:20 +0100)]
Cherry-pick security fix in WebKit change 63772

See http://trac.webkit.org/changeset/63772

Note that this is only a partial cherry-pick. I don't think that the
fix to RenderBlock::canMergeContiguousAnonymousBlocks() is required as
we don't have this method in our version of WebKit. The method was
added in http://trac.webkit.org/changeset/60201). Attempting to make
the fix without this change, or cherry-picking this change too, would
be too high risk.

Bug: 2986936
Change-Id: I8d9f1924611e693e340dcb2f05a43d5673ef23b1

14 years agoCherry-pick security fix in WebKit change 62873
Steve Block [Thu, 9 Sep 2010 11:00:30 +0000 (12:00 +0100)]
Cherry-pick security fix in WebKit change 62873

See http://trac.webkit.org/changeset/62873

Bug: 2986936
Change-Id: I8353bade3fb14aedeaa517e6bc8331cd05ee3fd8

14 years agoCherry-pick security fix in WebKit change 62271
Steve Block [Thu, 9 Sep 2010 10:53:31 +0000 (11:53 +0100)]
Cherry-pick security fix in WebKit change 62271

See http://trac.webkit.org/changeset/62271

Bug: 2986936
Change-Id: I368b10ff368aef5317c01b18524f1e0521df056e

14 years agoCherry-pick security fix in WebKit change 62134
Steve Block [Thu, 9 Sep 2010 10:53:17 +0000 (11:53 +0100)]
Cherry-pick security fix in WebKit change 62134

See http://trac.webkit.org/changeset/62134

Bug: 2986936
Change-Id: Ie5c1698e58b9183519aae5dfa8cf5fb8f158feb1

14 years agoCherry-pick security fix in WebKit change 61709
Steve Block [Thu, 9 Sep 2010 11:00:49 +0000 (12:00 +0100)]
Cherry-pick security fix in WebKit change 61709

See http://trac.webkit.org/changeset/61709

Bug: 2986936
Change-Id: Ib2be95d12bb89c57b6f30d57cd6422bbbf364fc6

14 years agoSet mime type for special android urls
Kristian Monsen [Wed, 8 Sep 2010 20:27:21 +0000 (21:27 +0100)]
Set mime type for special android urls

Change-Id: I66f1643c78563c8aa7d9941b788f7533a8185cb4

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Wed, 8 Sep 2010 15:59:50 +0000 (08:59 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoRemove WEBKIT_MERGE_REVISION in favour of ThirdPartyProject.prop
Steve Block [Tue, 7 Sep 2010 20:47:51 +0000 (21:47 +0100)]
Remove WEBKIT_MERGE_REVISION in favour of ThirdPartyProject.prop

Change-Id: Id7330a7535f9cf00557ad11627d40f2ad1ca9537

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Tue, 7 Sep 2010 16:10:00 +0000 (09:10 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoAdds a number of fast/ LayoutTest directories to the triaged set
Steve Block [Tue, 7 Sep 2010 15:06:44 +0000 (16:06 +0100)]
Adds a number of fast/ LayoutTest directories to the triaged set

Tests are added at r66079. All tests pass

fast/constructors/
fast/cookies/
fast/dom/Attr/
fast/dom/CSSStyleDeclaration/
fast/dom/DOMImplementation/
fast/dom/DeviceMotion/
fast/dom/EntityReference/
fast/dom/HTMLAnchorElement/
fast/dom/HTMLButtonElement/
fast/dom/HTMLFontElement/
fast/dom/HTMLFormElement/
fast/dom/HTMLHtmlElement/
fast/dom/HTMLKeygenElement/
fast/dom/HTMLLabelElement/
fast/dom/HTMLMetaElement/
fast/dom/HTMLTableRowElement/
fast/dom/HTMLTableSectionElement/
fast/dom/Node/
fast/dom/NodeList/
fast/dom/Selection/
fast/dom/StyleSheet/
fast/dom/Text/
fast/dom/TreeWalker/
fast/dom/beforeload/
fast/dom/getElementsByClassName/
fast/leaks/

Change-Id: I9a2c401151f7abf5bb22b764b1327022ab651e04

14 years agoRestoring the ability to set the stack from the shell.
Kristian Monsen [Mon, 6 Sep 2010 10:57:53 +0000 (11:57 +0100)]
Restoring the ability to set the stack from the shell.

This was lost in the last CL:
https://android-git.corp.google.com/g/#change,63956

Change-Id: I5737da8ae6da35fe33b87dc6de344b2dfb0c1a32

14 years agoAdd fast/url LayoutTests at r66079
Steve Block [Fri, 3 Sep 2010 17:46:30 +0000 (18:46 +0100)]
Add fast/url LayoutTests at r66079

All tests pass.

Change-Id: I2564b234be722a743e48ad07e3995a654202a208

14 years agoRevert "Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/.""
Steve Block [Sat, 4 Sep 2010 19:46:56 +0000 (20:46 +0100)]
Revert "Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/.""

This change broke LayoutTest fast/url/ipv4.html

This reverts commit ff93a851c578d0b570c84b3a83a41a4930e7107c.

Change-Id: Ic27602be9fdd855fbc1517deed9e7e9737f5b9b5

14 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Fri, 3 Sep 2010 19:43:03 +0000 (12:43 -0700)]
Merge branch 'master' into honeycomb-release

14 years agoMerge "Update to Merge WebKit at r61871: Floating-point support for text selection."
Kristian Monsen [Thu, 2 Sep 2010 18:14:42 +0000 (11:14 -0700)]
Merge "Update to Merge WebKit at r61871: Floating-point support for text selection."

14 years agoMerge changes I54430bd1,I61a04cf7,I4961f561,I36170123,I5dc94bad,Ie2e1440f
Steve Block [Thu, 2 Sep 2010 17:54:48 +0000 (10:54 -0700)]
Merge changes I54430bd1,I61a04cf7,I4961f561,I36170123,I5dc94bad,Ie2e1440f

* changes:
  Merge WebKit at r66079 : Update WebKit revision
  Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing IndexedDB guards
  Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha argument
  Merge WebKit at r66079 : Fix makefiles
  Merge WebKit at r66079 : Fix conflicts
  Merge WebKit at r66079 : Initial merge by git