OSDN Git Service

android-x86/external-webkit.git
13 years agoDisable autofill for now to let browser start.
Shimeng (Simon) Wang [Tue, 28 Sep 2010 22:25:34 +0000 (15:25 -0700)]
Disable autofill for now to let browser start.

Change-Id: I16167069d902bf3aba79de5d9e9d90a6a8667672

13 years agoMerge "Turn autofill on by default at compile time and make it a browser setting."
Steve Block [Tue, 28 Sep 2010 18:11:48 +0000 (11:11 -0700)]
Merge "Turn autofill on by default at compile time and make it a browser setting."

13 years agoTurn autofill on by default at compile time and make it a browser setting.
Ben Murdoch [Fri, 10 Sep 2010 21:00:37 +0000 (22:00 +0100)]
Turn autofill on by default at compile time and make it a browser setting.

Make autofill a runtime option configured through the browser.

Required a corresponding change in frameworks/base -
https://android-git.corp.google.com/g/65573
and packages/apps/browser -
https://android-git.corp.google.com/g/65579

Change-Id: I905b464a6338ff27b02f16d0b9a718154c3c98c1

13 years agoHide the soft keyboard when a blur happens.
Leon Scroggins [Fri, 24 Sep 2010 19:30:24 +0000 (15:30 -0400)]
Hide the soft keyboard when a blur happens.

Bug: 2953257

Requires a change in frameworks/base.

Change-Id: Ib0e7976cd5eb585be991b265087bff9ee7c4f4fd

13 years agoMerge "Update the storage locations used by the Chromium HTTP stack"
Steve Block [Tue, 28 Sep 2010 11:34:05 +0000 (04:34 -0700)]
Merge "Update the storage locations used by the Chromium HTTP stack"

13 years agoUpdate the storage locations used by the Chromium HTTP stack
Steve Block [Mon, 27 Sep 2010 17:44:53 +0000 (18:44 +0100)]
Update the storage locations used by the Chromium HTTP stack

This updates the strorage locations to better match those used by the
Android HTTP stack.

Corresponding frameworks/base change is
https://android-git.corp.google.com/g/70644

Bug: 3039536
Change-Id: I49162eb4d47791d4f42996650cc88bcf4aa2e330

13 years agoMerge "Bug: 2372180"
Huahui Wu [Mon, 27 Sep 2010 17:22:17 +0000 (10:22 -0700)]
Merge "Bug: 2372180"

13 years agoBug: 2372180
Huahui Wu [Thu, 2 Sep 2010 20:14:24 +0000 (13:14 -0700)]
Bug: 2372180

This CL adds support to pass multi-touch event from browser to webkit.
PlatformTouchEvent.h and PlatformTouchEventAndroid.cpp:
    changed the android constructor to take multiple touch points.
PlatformTouchPoint.h and PlatformTouchPointAndroid.cpp:
    changed the android constructor to take a touch point ID.
WebViewCore.h and WebViewCore.cpp:
    1. Updated handleTouchEvent(), HandleTouchEvent(), and jni interface
       to take multiple points.
    2. Added support of action
       MotionEvent.ACTION_POINTER_DOWN & MotionEvent.ACTION_POINTER_UP.

Change-Id: I79cffdba12a60ced9a571b4c1fd5b520a0fb6074

13 years agoMerge "Double Buffered Texture Support for WebKit."
Derek Sollenberger [Mon, 27 Sep 2010 16:18:15 +0000 (09:18 -0700)]
Merge "Double Buffered Texture Support for WebKit."

13 years agoFix the Android expected result for LayoutTest http/tests/appcache/local-content...
Steve Block [Mon, 27 Sep 2010 14:15:53 +0000 (15:15 +0100)]
Fix the Android expected result for LayoutTest http/tests/appcache/local-content.html

This change adds a trailing line to the Android expected result. The
actual output and thus the generic expected result has such a trailing
line. This discrepancy does not matter with DumpRenderTree, as it
ignores trailing whitespace when comparing results, but this is not
true of DumpRenderTree2.

Change-Id: Ib3ee6670ea4b4cbe07030ed7dddc97fe23128167

13 years agoDouble Buffered Texture Support for WebKit.
Derek Sollenberger [Wed, 22 Sep 2010 15:27:36 +0000 (11:27 -0400)]
Double Buffered Texture Support for WebKit.

This CL adds support for the DoubleBufferedTexture class which
can be used to pass textures between threads.

Bug-Id: 3034088
Change-Id: Idf4a5d367c02eae0cedb08f2167b9af370173851

13 years agoIntegrate AutoFill with WebTextView in Java.
Ben Murdoch [Fri, 10 Sep 2010 20:21:28 +0000 (21:21 +0100)]
Integrate AutoFill with WebTextView in Java.

Adds the necessary JNI hooks so that when the user focuses a form
field that AutoFill has identified as "autofillable", the Java side
WebTextView will show an option in the auto complete drop down box
that when selected will call back to AutoFill in native code and
actually fill out the form.

AutoFill is still disabled at compile time by default. To test the
feature set ENABLE_AUTOFILL=true and rebuild WebKit.

Needs a corresponding frameworks/base change.

Change-Id: Ie76ff9cbf0b44f3f3644079ed64ce71bfbc9859a

13 years agoRemove #if USE(CHROME_NETWORK_STACK) guards from headers
Kristian Monsen [Thu, 23 Sep 2010 14:31:45 +0000 (15:31 +0100)]
Remove #if USE(CHROME_NETWORK_STACK) guards from headers

Change-Id: Ib3c3037ab3f62d0c9c49f53850be5ff5c4f2a525

13 years agoMerge changes I359a952c,Idcafae15
Steve Block [Thu, 23 Sep 2010 15:10:47 +0000 (08:10 -0700)]
Merge changes I359a952c,Idcafae15

* changes:
  Fix a bug that would cause the AutoFill server to return an error.
  Add more profile data to the canned profile.

13 years agoFix a bug that would cause the AutoFill server to return an error.
Ben Murdoch [Tue, 14 Sep 2010 15:59:00 +0000 (16:59 +0100)]
Fix a bug that would cause the AutoFill server to return an error.

We were pushing the <option> elements associated with <select> tags
into the form field vector that AutoFill uses. This is not correct
as they are not used by the server and result in duplicate field
signatures in the XML requests. As the signatures should be unique,
the server returns an error response.

Change-Id: I359a952cf219e088c2cae886907f563d86756688

13 years agoAdd more profile data to the canned profile.
Ben Murdoch [Tue, 14 Sep 2010 15:56:38 +0000 (16:56 +0100)]
Add more profile data to the canned profile.

Change-Id: Idcafae151f6635394883fa45720cedd3b38bd9c8

13 years agoMake sure we don't try to build WebKit with incompatible options
Steve Block [Thu, 23 Sep 2010 11:32:52 +0000 (12:32 +0100)]
Make sure we don't try to build WebKit with incompatible options

In particular, make sure we don't build with JSC on the simulator or
the Chrome HTTP stack with JSC.

Change-Id: I446212e54a3751577f8c408a0b6ba2180a9a02fc

13 years agoMerge "Fix a compiler warning in WebResourceRequest"
Steve Block [Wed, 22 Sep 2010 15:13:44 +0000 (08:13 -0700)]
Merge "Fix a compiler warning in WebResourceRequest"

13 years agoMerge "Remove a superfluous comment from HTMLInputElement.cpp"
Steve Block [Wed, 22 Sep 2010 15:13:30 +0000 (08:13 -0700)]
Merge "Remove a superfluous comment from HTMLInputElement.cpp"

13 years agoFix a compiler warning in WebResourceRequest
Steve Block [Wed, 22 Sep 2010 14:51:56 +0000 (15:51 +0100)]
Fix a compiler warning in WebResourceRequest

Change-Id: Ie76a1abc87aa34486ca9724bcf87718e8722d315

13 years agoMerge "Fix WebStorage's DeleteAllData() to clear all AppCache entries from memory"
Steve Block [Wed, 22 Sep 2010 14:29:24 +0000 (07:29 -0700)]
Merge "Fix WebStorage's DeleteAllData() to clear all AppCache entries from memory"

13 years agoMerge "Fix a couple of WebSettings JNI getters to use GetLongField()"
Steve Block [Wed, 22 Sep 2010 14:28:49 +0000 (07:28 -0700)]
Merge "Fix a couple of WebSettings JNI getters to use GetLongField()"

13 years agoRemove a superfluous comment from HTMLInputElement.cpp
Steve Block [Wed, 22 Sep 2010 09:05:55 +0000 (10:05 +0100)]
Remove a superfluous comment from HTMLInputElement.cpp

This is an Android addition

Change-Id: I2784049bd97d970c5a21a08b256a2eb528700cd1

13 years agoMerge "GL utilities"
Nicolas Roard [Wed, 22 Sep 2010 00:25:19 +0000 (17:25 -0700)]
Merge "GL utilities"

13 years agoGL utilities
Nicolas Roard [Thu, 16 Sep 2010 20:01:02 +0000 (13:01 -0700)]
GL utilities

Change-Id: I5b4a008c51f409639059d2e47d5c8624c96b2981

13 years agoFix WebStorage's DeleteAllData() to clear all AppCache entries from memory
Steve Block [Tue, 21 Sep 2010 11:21:24 +0000 (12:21 +0100)]
Fix WebStorage's DeleteAllData() to clear all AppCache entries from memory

Previously we only cleared the DB, which has no effect if AppCache
entries are in memory. The fix clears from both memory and the DB.
This matches what we do in DeleteOrigin().

Change-Id: I45978d513a1cf31db3121fe34c9be7383ecf29d9

13 years agoFix a couple of WebSettings JNI getters to use GetLongField()
Steve Block [Tue, 21 Sep 2010 17:09:06 +0000 (18:09 +0100)]
Fix a couple of WebSettings JNI getters to use GetLongField()

Change-Id: I422957ae5ee2afdf78c0ec251efbab2fe1f2167d

13 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

13 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"

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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"

13 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

13 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"

13 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

13 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

13 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"

13 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

13 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

13 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

13 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"

13 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

13 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"

13 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

13 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."

13 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

13 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"

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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