OSDN Git Service

android-x86/external-webkit.git
13 years agoRemove unnecessary mutex locks from texture sharing code
Derek Sollenberger [Tue, 12 Oct 2010 18:56:35 +0000 (14:56 -0400)]
Remove unnecessary mutex locks from texture sharing code

The DoubleBufferedTexture currently uses a mutex to protect access
to m_frontTexture on the producer functions.  This mutex is not needed
in the producerLock/producerRelease functions as they will always be
called by the thread that sets m_frontTexture.  Additionally, this
data will be initialized before calls to those funtions as the thread
must always call aquireContext() before calling these functions.

Change-Id: I110ad357c5eed4c0f5501761174e0da4b872af5d
http://b/3089605

13 years agoAdd new API for plugin audio track latency.
Derek Sollenberger [Tue, 12 Oct 2010 17:31:25 +0000 (13:31 -0400)]
Add new API for plugin audio track latency.

This CL extends the existing udio API with a new function to
measure the latency of a audio track. To preserve binary
compatibility with the already released v0 API we have created
a v1 extension.

Change-Id: I656ac10470f2262bac7039aa45458d2100a37612
http://b/3088633

13 years agoMerge "check for columns before looking at column data"
Cary Clark [Tue, 12 Oct 2010 11:57:55 +0000 (04:57 -0700)]
Merge "check for columns before looking at column data"

13 years agocheck for columns before looking at column data
Cary Clark [Mon, 11 Oct 2010 21:32:42 +0000 (17:32 -0400)]
check for columns before looking at column data

Also, fix some debug info to sync up with latest
webkit.

Change-Id: Iea8f019619b701fc2d3267228b9412379334b66e
http://b/3074179

13 years agoMerge "Fixed browser crash when plugins remove themselves from the DOM."
Derek Sollenberger [Mon, 11 Oct 2010 18:51:24 +0000 (11:51 -0700)]
Merge "Fixed browser crash when plugins remove themselves from the DOM."

13 years agoFixed browser crash when plugins remove themselves from the DOM.
Derek Sollenberger [Mon, 11 Oct 2010 16:59:16 +0000 (12:59 -0400)]
Fixed browser crash when plugins remove themselves from the DOM.

If a plugin removes itself from the DOM and it is the only plugin
of that type on the page then the browser will attempt to unload
the plugin's shared library. This causes a problem since there is
plugin code still on the stack. The solution is to post a message
that removes the plugin's libary at a later time. This solution
was disabled in the past due to an unknown issue, but was tested
as working on both the Adobe plugin and a development sample plugin.

Change-Id: If60394336790f833d6b9333424836cbd32dc31e7
http://b/3084460

13 years agoMerge "style cleanup on GraphicsContextAndroid.cpp"
Teng-Hui Zhu [Mon, 11 Oct 2010 16:17:24 +0000 (09:17 -0700)]
Merge "style cleanup on GraphicsContextAndroid.cpp"

13 years agoam ffbc540c: (-s ours) am 3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.
Patrick Scott [Sun, 10 Oct 2010 19:48:47 +0000 (12:48 -0700)]
am ffbc540c: (-s ours) am 3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.

Merge commit 'ffbc540cfff9dfbd5909d7731c143f5d1181bbf1'

* commit 'ffbc540cfff9dfbd5909d7731c143f5d1181bbf1':
  Revert to skia's decoder for gifs with 1 frame.

13 years agostyle cleanup on GraphicsContextAndroid.cpp
Teng-Hui Zhu [Tue, 5 Oct 2010 20:58:55 +0000 (13:58 -0700)]
style cleanup on GraphicsContextAndroid.cpp

Reduce the style check error from 118 to 1.
Mostly are one space for end of line comment, underscore in function
name, NULL Vs 0, comparing with 0 etc...
Only one function name android_gc2canvas still contain underscore and
chaning that need to touch multiple files.
That will be fixed when we come to clean up the whole directory.

Change-Id: Ibcbc4d368452943825a4b3421315732eb03c292c
http://b/3003023

13 years agoFix WebCore/WebKit layering violation.
Ben Murdoch [Fri, 8 Oct 2010 15:00:21 +0000 (16:00 +0100)]
Fix WebCore/WebKit layering violation.

Move the call to WebViewCore::updateTextfield() to the PlatformBridge
so that WebCore code does not depend on WebKit code to compile.

In addition to being a layering violation, the inclusion of
WebViewCore.h includes WebCoreJni.h, which in a future change
causes LOG to get #undefined when using the chromium net stack.

Change-Id: Id88d332624323e03ce82120ef55db200cbabe63b

13 years agoFix a WebCore/WebKit layering violation
Ben Murdoch [Fri, 8 Oct 2010 13:43:10 +0000 (14:43 +0100)]
Fix a WebCore/WebKit layering violation

Move the call to WebViewCore::updateViewport() from HTMLBodyElement
and HTMLMetaElement to the PlatformBridge so that WebCore code does
not depend on WebKit code to compile.

In addition to being a layering violation, the inclusion of
WebViewCore.h includes WebCoreJni.h, which in a future change
causes LOG to get #undefined when using the chromium net stack.

Change-Id: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb

13 years agoMerge "Prepare DeviceOrientationManager for implementation of DeviceMotion"
Steve Block [Fri, 8 Oct 2010 14:50:41 +0000 (07:50 -0700)]
Merge "Prepare DeviceOrientationManager for implementation of DeviceMotion"

13 years agoRemove dependency of WebCore ScreenAndroid on platform API
Steve Block [Fri, 8 Oct 2010 14:24:49 +0000 (15:24 +0100)]
Remove dependency of WebCore ScreenAndroid on platform API

Note that this change forks two WebCore files, but both files are
already forked and are unlikely to be changed upstream by non-Android
contributors. All changes to both files will be upstreamed at a later
date.

Bug: 2439218
Change-Id: I1e56ee12cec17df38a1404ab06c8897c22f2fd19

13 years agoam 3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.
Patrick Scott [Thu, 7 Oct 2010 21:48:21 +0000 (14:48 -0700)]
am 3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.

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

* commit '3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65':
  Revert to skia's decoder for gifs with 1 frame.

13 years agoRevert "Prohibit scrolling not initiated by the user."
Leon Scroggins [Thu, 7 Oct 2010 20:13:31 +0000 (16:13 -0400)]
Revert "Prohibit scrolling not initiated by the user."

Bug:3067265

This reverts commit f116b073399a3c3f644d6e6aeb2521ef9d2c9e9b.

Conflicts:

WebCore/platform/android/PlatformBridge.h
WebKit/android/WebCoreSupport/PlatformBridge.cpp

Change-Id: I358ce936a8c6f99717b976cfa07e7fe26014760a

13 years agoRevert to skia's decoder for gifs with 1 frame.
Patrick Scott [Thu, 7 Oct 2010 19:11:03 +0000 (15:11 -0400)]
Revert to skia's decoder for gifs with 1 frame.

If a site has a bunch of gifs, they will all be kept in memory.  If the gif only
has one frame, revert to using skia's decoder so that we can share the memory
and use RLE encoding.

Bug: 3060919
Change-Id: I3091b184ce4a8c27a264473526ce4ea83a20e74f

13 years agoPrepare DeviceOrientationManager for implementation of DeviceMotion
Steve Block [Tue, 5 Oct 2010 12:09:08 +0000 (13:09 +0100)]
Prepare DeviceOrientationManager for implementation of DeviceMotion

To avoid additional boilerplate, this class will will be used for both
DeviceOrientation and DeviceMotion. This change does not involve any
change in behaviour, only renaming and adding stubs.

Change-Id: I0d6c9e1c2fc8d919ccbd048b068d898110707f0e

13 years agoMerge WebKit at r68651 : Update WebKit revision and deps file
Kristian Monsen [Wed, 6 Oct 2010 18:57:35 +0000 (19:57 +0100)]
Merge WebKit at r68651 : Update WebKit revision and deps file

Change-Id: I48411abdd210ef9afd7363cdfb2a1cfa06d81820

13 years agoMerge WebKit at r68651 : No prelinking after merge
Kristian Monsen [Wed, 6 Oct 2010 13:41:37 +0000 (14:41 +0100)]
Merge WebKit at r68651 : No prelinking after merge

WebKit has grown during the merge, and doesn't fit in the prelink map anymore

Reopened http://b/issue?id=2917906 to track this

Change-Id: I40fb143a25a0637cd2c9359331576acb5a1c1fba

13 years agoMerge WebKit at r68651 : Renamed variables
Kristian Monsen [Tue, 5 Oct 2010 20:51:00 +0000 (21:51 +0100)]
Merge WebKit at r68651 : Renamed variables

Changed m_minPrefWidth and m_maxPrefWidth to m_minPreferredLogicalWidth
and m_maxPreferredLogicalWidth in this CL:
http://trac.webkit.org/changeset/68276/trunk/WebCore/rendering/RenderBox.h

This changed containerWidth to containerLogicalWidth
http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp

Also changed calcReplacedWidthUsing to computeReplacedWidthUsing here:
http://trac.webkit.org/changeset/68239/trunk/WebCore/rendering/RenderBox.h

Change-Id: I8eb912128aa5e09f55f4495671209cb8ca2ba3f0

13 years agoMerge WebKit at r68651 : Added WebCore::Page* parameter to didTransferChildFrameToNew...
Kristian Monsen [Tue, 5 Oct 2010 20:26:05 +0000 (21:26 +0100)]
Merge WebKit at r68651 : Added WebCore::Page* parameter to didTransferChildFrameToNewDocument

Introduced in webkit CL:
http://trac.webkit.org/changeset/68576

Most platforms do not use the parameter in the first implementation.

Change-Id: I704b45af56bee85f277b737412549abcfeb90b08

13 years agoMerge WebKit at r68651 : Default implementation for allowScriptExtension
Kristian Monsen [Tue, 5 Oct 2010 19:53:27 +0000 (20:53 +0100)]
Merge WebKit at r68651 : Default implementation for allowScriptExtension

Just added a default implementation that always return true.
http://trac.webkit.org/changeset/68061

Change-Id: I0f740ac32369580953b2fdbe071316521b9b2382

13 years agoMerge WebKit at r68651 : Use the Android version of release/retainPlatformWidget
Kristian Monsen [Tue, 5 Oct 2010 19:23:04 +0000 (20:23 +0100)]
Merge WebKit at r68651 : Use the Android version of release/retainPlatformWidget

Empty declarations for these were added in the header file, probably safest
to keep the Android ones around.

In the Fix conflicts merge these were removed from Widget.cpp, so this should
match the old behaviour.

Webkit CL:
http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.h

Change-Id: Ifdc0ad47816e03a7d424eb7130f2f7c1a61f7067

13 years agoMerge WebKit at r68651 : Implement controller destroyed callbacks for DeviceOrientati...
Steve Block [Tue, 5 Oct 2010 14:00:26 +0000 (15:00 +0100)]
Merge WebKit at r68651 : Implement controller destroyed callbacks for DeviceOrientation and DeviceMotion

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

Change-Id: Ide94a861a7468d4eef3a238696aad754c8924aed

13 years agoMerge WebKit at r68651 : Compile fix, add missing include
Kristian Monsen [Mon, 4 Oct 2010 16:29:31 +0000 (17:29 +0100)]
Merge WebKit at r68651 : Compile fix, add missing include

Fix in a later revision of Webkit, this is a cherry-pick:
http://trac.webkit.org/changeset/68780/trunk/WebCore/loader/PingLoader.cpp

Change-Id: I95ecfd0de7ef494fbf0eb7413976e326b525a026

13 years agoMerge WebKit at r68651 : Add ANDROID guards
Kristian Monsen [Mon, 4 Oct 2010 16:11:14 +0000 (17:11 +0100)]
Merge WebKit at r68651 : Add ANDROID guards

m_axObjectCache is not used for Android, so adding guards like in
similar functions.

Change-Id: I6179bb23fce275095b9521680282eb4ba8b3d29e

13 years agoMerge Webkit at r68651 : Add guards for ENABLED(INSPECTOR)
Kristian Monsen [Mon, 4 Oct 2010 15:54:35 +0000 (16:54 +0100)]
Merge Webkit at r68651 : Add guards for ENABLED(INSPECTOR)

This has been fixed upstream in this CL (which this is a cherrry-pick of):
http://trac.webkit.org/changeset/68763/trunk/WebCore/inspector/InspectorController.h

And later removed upstream in this CL:
http://trac.webkit.org/changeset/68767/trunk/WebCore/inspector/InspectorController.h

Change-Id: I4c724f2f52a5a9db6dca6b58032b6a902aac74b5

13 years agoMerge Webkit at r68651 : Fix conflicts.
Kristian Monsen [Thu, 30 Sep 2010 14:42:16 +0000 (15:42 +0100)]
Merge Webkit at r68651 : Fix conflicts.

    ChromeClient.h:
    Conflict due to ANDROID_INSTALLABLE_WEB_APPS
    http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h

    CSSParser.cpp:
    Conflict due to ANDROID_INSTRUMENT
    http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp

    Node.cpp:
    Conflict due to ANDROID_DOM_LOGGING
    http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp

    npapi.h:
    Conflicts due to various #ifdef ANDROID
    http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h

    PlatformTouchEvent.h:
    PlatformTouchEventAndroid.cpp:
    PlatformTouchPoint.h:
    Conflicts due to new BREWMP code next to changed Android code
    Initial webkit CL:
    http://trac.webkit.org/changeset/68499
    Later fix after merge revision, so cherry-picked:
    http://trac.webkit.org/changeset/69034

    RenderBox.cpp:
    Several changes, conflicts due to ANDROID_LAYOUT
    http://trac.webkit.org/changeset/68238#file2
    http://trac.webkit.org/changeset/68239#file3
    http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp
    The correct resolution here is unclear. A closer investiagtion by somebdoy
    more familiar with the code is tracked with b/3071198

    RenderBox.h:
    Conflicts due to ANDROID_LAYOUT
    http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h

    RenderIFrame.cpp:
    Conflicts due to ANDROID_FLATTEN_IFRAME
    http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp

    RenderTable.cpp:
    Conflicts due to ANDROID_LAYOUT
    http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp

    RenderView.cpp:
    Conflicts due to ANDROID_LAYOUT
    http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp

    Settings.cpp:
    Settings.h:
    Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL
    http://trac.webkit.org/changeset/68166

    Widget.cpp:
    http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp

Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2

13 years agoMerge Webkit at r68651 : Fix Makefiles.
Kristian Monsen [Thu, 30 Sep 2010 16:25:16 +0000 (17:25 +0100)]
Merge Webkit at r68651 : Fix Makefiles.

Two perl scripts now generate .cpp files as well as .h files:
http://trac.webkit.org/changeset/68521/trunk/WebCore/css/makevalues.pl
http://trac.webkit.org/changeset/65942/trunk/WebCore/css/makeprop.pl

Change-Id: Ic820536494d259200a69e07711d8cf19d5654b31

13 years agoMerge WebKit at r68651 : Initial merge by git.
Kristian Monsen [Thu, 30 Sep 2010 14:42:16 +0000 (15:42 +0100)]
Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12

13 years agoImplement supportsType in MediaPlayerPrivateAndroid.
Shimeng (Simon) Wang [Thu, 16 Sep 2010 22:03:07 +0000 (15:03 -0700)]
Implement supportsType in MediaPlayerPrivateAndroid.

Use Java API to obtain this info.

issue: 2816278
Change-Id: Ia525cc84f9a18ad2f9868d9f13d3671da527e5e0

13 years agoHook up WebView.clearCache() for the Chromium HTTP stack
Steve Block [Mon, 4 Oct 2010 16:11:19 +0000 (17:11 +0100)]
Hook up WebView.clearCache() for the Chromium HTTP stack

Bug: 2999397
Change-Id: If104a32fa2fd56cf60fdd37a4193a0ec4e0065e2

13 years agoMerge "Fix a compiler warning"
Steve Block [Wed, 6 Oct 2010 15:07:49 +0000 (08:07 -0700)]
Merge "Fix a compiler warning"

13 years agoFix a compiler warning
Steve Block [Tue, 5 Oct 2010 12:05:26 +0000 (13:05 +0100)]
Fix a compiler warning

Change-Id: Iccf9b5bf8f39491b737e6d7e4e82237a4874c6d7

13 years agoMerge changes I27224716,I6102bbce
Kristian Monsen [Tue, 5 Oct 2010 15:59:28 +0000 (08:59 -0700)]
Merge changes I27224716,I6102bbce

* changes:
  Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
  Generate files correctly

13 years agoDon't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
Kristian Monsen [Tue, 5 Oct 2010 12:18:43 +0000 (13:18 +0100)]
Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h

This is a cherry-pick of the following upstream CL:
https://bugs.webkit.org/show_bug.cgi?id=47179

This violates the rules at the top of the file, and means that it
will be included before any other includes for all compilation
units.

We are now just including JavaScriptCore/config.h from
WebCore/config.h so if you include one you get both.

This created a compile error in V8Counters.cpp, which is also fixed

Change-Id: I272247161877ddc680b3aab509bc413ab3445219

13 years agoGenerate files correctly
Kristian Monsen [Tue, 5 Oct 2010 12:15:29 +0000 (13:15 +0100)]
Generate files correctly

Instead of creating them at . and moving to the right place, just
create them at the right place. This way any additional files
created will be in the right place as well.

Change-Id: I6102bbcee2b4bec3f780fdbed20ba15c9d1a6017

13 years agoMerge "Block network loads based on the setting."
Patrick Scott [Tue, 5 Oct 2010 14:05:31 +0000 (07:05 -0700)]
Merge "Block network loads based on the setting."

13 years agoBlock network loads based on the setting.
Patrick Scott [Tue, 5 Oct 2010 13:32:44 +0000 (09:32 -0400)]
Block network loads based on the setting.

Bug: 3053149
Change-Id: Idb6850b2aac5de2ab19850779a65496ef356961d

13 years agoMerge "When a page fails to load, notify that the page is finished"
Leon Scroggins III [Tue, 5 Oct 2010 13:43:54 +0000 (06:43 -0700)]
Merge "When a page fails to load, notify that the page is finished"

13 years agob/3039749 resolving the conflicts for WebKit.
Huahui Wu [Mon, 4 Oct 2010 22:23:22 +0000 (15:23 -0700)]
b/3039749 resolving the conflicts for WebKit.

Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5

13 years agoAdd AA to the border radius
Teng-Hui Zhu [Thu, 30 Sep 2010 22:32:21 +0000 (15:32 -0700)]
Add AA to the border radius

In order to enable AA for the border radius, add an extra layer for drawing and then clearing by using AA paint. The reason why clipping can't show AA is that it is 1-bit clip.

Change-Id: Ic9fa99915fb908e502dcb90cfe1428bb4d8e136b
http://b/3003023

13 years agoWhen a page fails to load, notify that the page is finished
Leon Scroggins III [Mon, 4 Oct 2010 15:34:43 +0000 (11:34 -0400)]
When a page fails to load, notify that the page is finished

Bug:2974418
Change-Id: I55f8ee1c235004da9ea6bed13af0758f10b715a8

13 years agoMerge "Use SelectionController to determine whether to open IME."
Leon Scroggins III [Mon, 4 Oct 2010 14:47:16 +0000 (07:47 -0700)]
Merge "Use SelectionController to determine whether to open IME."

13 years agoMerge "Add failing test expectations for DumpRenderTree2 for tests which rely on...
Steve Block [Mon, 4 Oct 2010 11:35:49 +0000 (04:35 -0700)]
Merge "Add failing test expectations for DumpRenderTree2 for tests which rely on being served from file://"

13 years agoUse SelectionController to determine whether to open IME.
Leon Scroggins III [Fri, 1 Oct 2010 22:30:49 +0000 (18:30 -0400)]
Use SelectionController to determine whether to open IME.

Bug: 2863136

Previously we were checking the focused Node, which does
not always tell properly whether the current selection is
in a contentEditable location.  Check the
SelectionController instead, which seems to be more
accurate.

Change-Id: Ibb64ad13275470da722529891f85f9dc347f9e8d

13 years agoMerge "Build fix for the simulator."
Patrick Scott [Fri, 1 Oct 2010 18:39:33 +0000 (11:39 -0700)]
Merge "Build fix for the simulator."

13 years agoBuild fix for the simulator.
Patrick Scott [Fri, 1 Oct 2010 17:33:40 +0000 (13:33 -0400)]
Build fix for the simulator.

Change-Id: Id6d2fa0d5b9ee9641466ee119ced28cfcda2f8ca

13 years agoMerge "Bug2811469 - wide space in RTL layout"
claireho [Fri, 1 Oct 2010 16:04:54 +0000 (09:04 -0700)]
Merge "Bug2811469 - wide space in RTL layout"

13 years agoam 8dd042ec: (-s ours) am 8180f816: Do not merge: fix array overwrite crasher
Cary Clark [Fri, 1 Oct 2010 14:03:37 +0000 (07:03 -0700)]
am 8dd042ec: (-s ours) am 8180f816: Do not merge: fix array overwrite crasher

Merge commit '8dd042ec5ff3a28fd7e0291b0b092a98306229f7'

* commit '8dd042ec5ff3a28fd7e0291b0b092a98306229f7':
  Do not merge: fix array overwrite crasher

13 years agoam 8180f816: Do not merge: fix array overwrite crasher
Cary Clark [Fri, 1 Oct 2010 13:57:35 +0000 (06:57 -0700)]
am 8180f816: Do not merge: fix array overwrite crasher

Merge commit '8180f8161470f2d0d6080c64149cf25ed3b755a5' into gingerbread-plus-aosp

* commit '8180f8161470f2d0d6080c64149cf25ed3b755a5':
  Do not merge: fix array overwrite crasher

13 years agoUpdate AndroidURLRequestContextGetter to take a pointer to the getter function
Steve Block [Thu, 30 Sep 2010 11:10:26 +0000 (12:10 +0100)]
Update AndroidURLRequestContextGetter to take a pointer to the getter function

This allows users of AndroidURLRequestContextGetter to instantiate a
URLRequestContext lazilly.

When used in AutoFill++, this means that when the URLRequestContext is
first initialized, the WebCore thread is set-up and the necessary
settings are available.

Also re-enables AutoFill++

The corresponding external/chromium change is
https://android-git.corp.google.com/g/71275

Bug: 3044989
Change-Id: I4b577f08717775bce5268f3f4b4f5fcf23e54536

13 years agoUpdate WebRequestContext static getters to return pointers to the base class
Steve Block [Thu, 30 Sep 2010 10:53:33 +0000 (11:53 +0100)]
Update WebRequestContext static getters to return pointers to the base class

This allows us to use these static getters with Chromium APIs which
can use only the Chromium base class, not the Android derived class.

Change-Id: I9690ef00a775cff2b580ae5c0c745d7b24021a4c

13 years agoDo not merge: fix array overwrite crasher
Cary Clark [Thu, 30 Sep 2010 19:14:40 +0000 (15:14 -0400)]
Do not merge: fix array overwrite crasher

If two nodes have the same coordinates, one is deleted.
If either has focus, the focus needs to be transfered
to the other, and the focus index recomputed, so the
index won't point to the wrong node.

If the two nodes are at the end of the list, the
index may point off the end of the array, subsequently
crashing on access.

This is a possible security issue.

Change-Id: I1ca934074637fbf68e40318fbc354e28c6b474ba
http://b/3043268

13 years agoFix the compiler error while disabling overflow scroll.
Shimeng (Simon) Wang [Wed, 29 Sep 2010 19:22:10 +0000 (12:22 -0700)]
Fix the compiler error while disabling overflow scroll.

Change-Id: I4d74ac00a6d348ce00b551572da6ceb5f2793b1f

13 years agoPrelink libwebcore.so, fix for b 2917906
Kristian Monsen [Thu, 30 Sep 2010 11:23:08 +0000 (12:23 +0100)]
Prelink libwebcore.so, fix for b 2917906

After switching to thumb mode for external/chromium, libwebcore.so now fits in the reserved
space in the prelink map. Enabling prelinking with the Chrome HTTP stack.

Change-Id: I69a798a66a32ab3efb46e8728a3e276877c328e0

13 years agoJSC build fix
Kristian Monsen [Wed, 29 Sep 2010 20:20:19 +0000 (21:20 +0100)]
JSC build fix

Need by this webkit CL:
http://trac.webkit.org/changeset/67898

Change-Id: Ic6180c845bf2d51036925e9329be6cb9a0cc0ab6

13 years agoBug2811469 - wide space in RTL layout
claireho [Wed, 29 Sep 2010 15:41:26 +0000 (08:41 -0700)]
Bug2811469 - wide space in RTL layout

1. Fixed extra wide space in RTL pages.
2. Removed the tailing space in FontAndroid.cpp.

Change-Id: I73b6cd7a7bed7a92929d3c4ef8af3b2c84020d0f

13 years agoAdd failing test expectations for DumpRenderTree2 for tests which rely on being serve...
Steve Block [Wed, 29 Sep 2010 14:34:04 +0000 (15:34 +0100)]
Add failing test expectations for DumpRenderTree2 for tests which rely on being served from file://

Change-Id: I6b13741412125edaf856d24a369e7a0a4d40a7d5

13 years agoReclassify failing multi-touch tests in test_expectations.txt
Steve Block [Wed, 29 Sep 2010 09:18:58 +0000 (10:18 +0100)]
Reclassify failing multi-touch tests in test_expectations.txt

Change-Id: If0fc3da76b46a7c45dabfa0f25f2e440d27ffd62

13 years agoMerge WebKit at r67908: Update WebKit merge revision
Steve Block [Tue, 21 Sep 2010 17:59:18 +0000 (18:59 +0100)]
Merge WebKit at r67908: Update WebKit merge revision

Change-Id: Iba3c15bea94293909b64145f5f2d67eab240d2d4

13 years agoMerge WebKit at r67908: FrameView zoom methods renamed and moved
Steve Block [Wed, 22 Sep 2010 13:53:38 +0000 (14:53 +0100)]
Merge WebKit at r67908: FrameView zoom methods renamed and moved

See http://trac.webkit.org/changeset/67274 and
http://trac.webkit.org/changeset/67762

Change-Id: I3842c599327b564550a2f76ae4ae3628f70a7aff

13 years agoMerge WebKit at r67908: ResourceLoader now makes use of NetworkingContext
Steve Block [Wed, 22 Sep 2010 13:50:30 +0000 (14:50 +0100)]
Merge WebKit at r67908: ResourceLoader now makes use of NetworkingContext

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

Change-Id: I620cba25ea40451830b86df90631a2c88792ce16

13 years agoMerge WebKit at r67908: ColumnInfo no longer provides columnRectAt()
Steve Block [Wed, 22 Sep 2010 13:46:42 +0000 (14:46 +0100)]
Merge WebKit at r67908: ColumnInfo no longer provides columnRectAt()

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

Change-Id: Ia3c17881d27919b20d62a47218cdb95293736b2e

13 years agoMerge WebKit at r67908: FrameLoaderClient now commits data directly to Loader
Steve Block [Wed, 22 Sep 2010 13:25:39 +0000 (14:25 +0100)]
Merge WebKit at r67908: FrameLoaderClient now commits data directly to Loader

See http://trac.webkit.org/changeset/67223 and
http://trac.webkit.org/changeset/67253

Change-Id: I46eb23df9a216f2d5a7b0dce857fd5fc323c2fb7

13 years agoMerge WebKit at r67908: Frame::revealSelection() moved to SelectionController
Steve Block [Wed, 22 Sep 2010 13:10:16 +0000 (14:10 +0100)]
Merge WebKit at r67908: Frame::revealSelection() moved to SelectionController

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

Change-Id: Ie2e1feb0f63acc90397bccd78b55811d1d58be28

13 years agoMerge WebKit at r67908: Implement new FrameLoaderClient::canShowMIMETypeAsHTML()
Steve Block [Wed, 22 Sep 2010 13:05:32 +0000 (14:05 +0100)]
Merge WebKit at r67908: Implement new FrameLoaderClient::canShowMIMETypeAsHTML()

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

Change-Id: I1407f44baf0b97f3fd8445528b49297a65a0b7bb

13 years agoMerge WebKit at r67908: ResourceHandleClient::didFinishLoading() now takes finish...
Steve Block [Wed, 22 Sep 2010 11:53:55 +0000 (12:53 +0100)]
Merge WebKit at r67908: ResourceHandleClient::didFinishLoading() now takes finish time

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

Change-Id: Ie8c470f86ee7919495ae24e460f81952f75a0f1f

13 years agoMerge WebKit at r67908: Remove GraphicsLayer::compositingCoordinatesOrientation()
Steve Block [Wed, 22 Sep 2010 11:47:50 +0000 (12:47 +0100)]
Merge WebKit at r67908: Remove GraphicsLayer::compositingCoordinatesOrientation()

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

Change-Id: I2f212e6591b4d7c1a48cae5be9e8e4911d9c3a50

13 years agoMerge WebKit at r67908: Remove call to SharedGraphicsContext3D::removeTexturesFor()
Steve Block [Wed, 22 Sep 2010 11:09:32 +0000 (12:09 +0100)]
Merge WebKit at r67908: Remove call to SharedGraphicsContext3D::removeTexturesFor()

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

Change-Id: I327df5aa81770a4eab885933ac6339ae26aca62a

13 years agoMerge WebKit at r67908: HTMLInputElement::InputType renamed
Steve Block [Wed, 22 Sep 2010 10:40:10 +0000 (11:40 +0100)]
Merge WebKit at r67908: HTMLInputElement::InputType renamed

InputType renamed to DeprecatedInputType

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

Change-Id: I9efb9889588523dd2b9489809fb2c44bd799d2ba

13 years agoMerge WebKit at r67908: Fix Makefiles
Steve Block [Wed, 22 Sep 2010 13:54:19 +0000 (14:54 +0100)]
Merge WebKit at r67908: Fix Makefiles

Change-Id: I2ce222e3f946987d9d544df5f015e06a2e5c7f4d

13 years agoMerge WebKit at r67908: Fix conflicts
Steve Block [Tue, 21 Sep 2010 18:03:24 +0000 (19:03 +0100)]
Merge WebKit at r67908: Fix conflicts

Whitespace difference in config.h - http://trac.webkit.org/changeset/67323
- WebCore/config.h

Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882
- WebCore/css/CSSComputedStyleDeclaration.cpp

Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704
- WebCore/css/CSSParser.cpp

Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667
- WebCore/css/CSSParser.cpp
- WebCore/css/CSSStyleSelector.cpp

Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292
- WebCore/dom/Document.cpp

Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903
- WebCore/html/HTMLInputElement.cpp

Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198
- WebCore/loader/DocumentLoader.cpp
- WebCore/loader/FrameLoader.cpp

Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253
- WebCore/loader/FrameLoader.cpp

Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762
- WebCore/page/DOMWindow.cpp

Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h

Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375
- WebCore/platform/MIMETypeRegistry.cpp

Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325
- WebCore/plugins/PluginView.cpp

Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBlockLineLayout.cpp

Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBox.h
- WebCore/rendering/RenderTable.cpp

Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862
- WebCore/rendering/RenderTableCell.cpp

Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667
- WebCore/rendering/style/RenderStyle.h

Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c

fix conflicts

Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673

13 years agoMerge WebKit at r67908: Initial merge by Git
Steve Block [Wed, 29 Sep 2010 16:32:26 +0000 (17:32 +0100)]
Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

13 years agoAdd fast/encoding layout tests.
Iain Merrick [Wed, 29 Sep 2010 09:59:30 +0000 (10:59 +0100)]
Add fast/encoding layout tests.

Merged from WebKit at r67178.

The vast majority of these are passing. The exceptions:
- Three Mac-specific tests, won't fix.
- Four failures in the Java HTTP stack (no problem for the Chrome HTTP stack).
- fast/encoding/mailto-always-utf-8 needs a new LayoutTestController callback.

Change-Id: I16c613d42acd0ea2dc146909d514376d0a2e5aaa

13 years agoAdd a cleanspec for the makefile change.
Shimeng (Simon) Wang [Wed, 29 Sep 2010 01:04:35 +0000 (18:04 -0700)]
Add a cleanspec for the makefile change.

Change-Id: I64fa67c042b8510d79dee6fda613e98e531fa23b

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"