OSDN Git Service

android-x86/external-webkit.git
14 years agoUse the new stlport build configuration.
Patrick Scott [Mon, 8 Feb 2010 23:38:13 +0000 (18:38 -0500)]
Use the new stlport build configuration.

14 years agoMerge "Adds an XPath generated header to the Android build to avoid a guard on an...
Steve Block [Tue, 16 Feb 2010 14:53:06 +0000 (06:53 -0800)]
Merge "Adds an XPath generated header to the Android build to avoid a guard on an include in V8DocumentCustom.cpp"

14 years agoAdds an XPath generated header to the Android build to avoid a guard on an include...
Steve Block [Mon, 15 Feb 2010 16:26:50 +0000 (16:26 +0000)]
Adds an XPath generated header to the Android build to avoid a guard on an include in V8DocumentCustom.cpp

Adding generated headers to the build, even when for disabled features, is preferred to using guards around includes.
See https://bugs.webkit.org/show_bug.cgi?id=34812

Also cleans up some other Android-specific changes in WebCore/bindings/v8.

Change-Id: I37a174bfaef0d659fc3cef08d084af8861b65ac9

14 years agoMerge "Fix the sim-eng build"
Steve Block [Tue, 16 Feb 2010 14:33:09 +0000 (06:33 -0800)]
Merge "Fix the sim-eng build"

14 years agoMerge "Add toV8 conversion for touch event type."
Ben Murdoch [Tue, 16 Feb 2010 14:29:39 +0000 (06:29 -0800)]
Merge "Add toV8 conversion for touch event type."

14 years agoFix the sim-eng build
Steve Block [Tue, 16 Feb 2010 14:22:56 +0000 (14:22 +0000)]
Fix the sim-eng build

Change-Id: Icc67c8786c1a1b98993fb27caf71bd4895118589

14 years agoAdd toV8 conversion for touch event type.
Ben Murdoch [Tue, 16 Feb 2010 14:06:01 +0000 (14:06 +0000)]
Add toV8 conversion for touch event type.

Change-Id: I91cd4224ee4df8de105dca179b42ee1428ab288d

14 years agoMerge webkit.org at r54731 : Update WEBKIT_MERGE_REVISION
Steve Block [Thu, 11 Feb 2010 15:18:03 +0000 (15:18 +0000)]
Merge webkit.org at r54731 : Update WEBKIT_MERGE_REVISION

Change-Id: I8c416f93989d0992f02b9c28590557caf8ba70ed

14 years agoMerge webkit.org at r54731 : Refactoring of BiDi support
Steve Block [Mon, 15 Feb 2010 13:04:53 +0000 (13:04 +0000)]
Merge webkit.org at r54731 : Refactoring of BiDi support

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

Change-Id: Ieffcf1b8d0401af5403ae9e3cea4414198ee612a

14 years agoMerge webkit.org at r54731 : Refactoring in font cache
Steve Block [Mon, 15 Feb 2010 12:59:58 +0000 (12:59 +0000)]
Merge webkit.org at r54731 : Refactoring in font cache

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

Change-Id: Id463962ae17e6d980122bfb0456b29c65b3bf69a

14 years agoMerge webkit.org at r54731 : Update Android graphics to reflect addition of AffineTra...
Steve Block [Thu, 11 Feb 2010 14:59:15 +0000 (14:59 +0000)]
Merge webkit.org at r54731 : Update Android graphics to reflect addition of AffineTransform class

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

Change-Id: Ib14c0f2cce4f63aab2e047a1c4725d1e62b059ba

14 years agoMerge webkit.org at r54731 : Update Android to reflect refactoring of RuntimeEnabledF...
Steve Block [Thu, 11 Feb 2010 14:42:22 +0000 (14:42 +0000)]
Merge webkit.org at r54731 : Update Android to reflect refactoring of RuntimeEnabledFeatures.cpp

see http://trac.webkit.org/changeset/54593

Change-Id: Iab1af86c65db24849fbdb07cc4b1692133d7ae87

14 years agoMerge webkit.org at r54731 : Fix remaining merge conflicts
Steve Block [Tue, 16 Feb 2010 11:44:48 +0000 (11:44 +0000)]
Merge webkit.org at r54731 : Fix remaining merge conflicts

- AutoFillPopupMenuClient.h - Take theirs, git got confused
- PluginView.h - Conflict due to new OS macro
- Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform
- Android.derived.v8bindings.mk - Keep ours
- DragImage.h - Take both
- V8DocumentCustom.cpp - Take theirs
- XCode project - Take both to keep Android-addition of GeolocationPositionCache

Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15

14 years agoMerge webkit.org at r54731 : Fix merge conflicts due to frame flattening
Steve Block [Tue, 16 Feb 2010 11:42:26 +0000 (11:42 +0000)]
Merge webkit.org at r54731 : Fix merge conflicts due to frame flattening

Common frame flattening code was added upstream in http://trac.webkit.org/changeset/54440
We take this code, but also keep the current Android-specific implementation.
Currently, the common code is disabled and we continue to use the Android version.
The two will be combined at a later date.

Change-Id: I194c7028b84a05d85040ca6199802c42a520be96

14 years agoMerge webkit.org at r54731 : Initial merge by git
Steve Block [Mon, 15 Feb 2010 12:23:52 +0000 (12:23 +0000)]
Merge webkit.org at r54731 : Initial merge by git

Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a

14 years agoMerge changes Ic6718a7c,Ie4e6f65e,Iff5e29c7
Ben Murdoch [Mon, 15 Feb 2010 17:22:13 +0000 (09:22 -0800)]
Merge changes Ic6718a7c,Ie4e6f65e,Iff5e29c7

* changes:
  Don't add something to a hash map and then get it out again immediately if we don't need to.
  Fix the creation of the touchTargets list to match what the iPhone does and maintain compatability with existing apps like SuperPudu.
  Store the originating target for a touch (i.e. calculated in touchstart) in a hash map, so that we can use that originating target as the target for future move/end/cancel events that that touch generates.

14 years agoMerge "checkpoint for refactoring"
Mike Reed [Mon, 15 Feb 2010 17:13:03 +0000 (09:13 -0800)]
Merge "checkpoint for refactoring"

14 years agocheckpoint for refactoring
Mike Reed [Mon, 15 Feb 2010 16:59:37 +0000 (11:59 -0500)]
checkpoint for refactoring

14 years agoDon't add something to a hash map and then get it out again immediately if we don...
Ben Murdoch [Mon, 15 Feb 2010 17:00:16 +0000 (17:00 +0000)]
Don't add something to a hash map and then get it out again immediately if we don't need to.

Change-Id: Ic6718a7c23e8896f5bbbb5cadcc22aa9a3108530

14 years agoFix the creation of the touchTargets list to match what the iPhone does and maintain...
Ben Murdoch [Thu, 11 Feb 2010 14:26:19 +0000 (14:26 +0000)]
Fix the creation of the touchTargets list to match what the iPhone does and maintain compatability with existing apps like SuperPudu.

touchTargets should always have at least one element and should be based on the target where the touch originated, not where it is now.

This needs to be upstreamed to webkit.

Change-Id: Ie4e6f65e77484e0eac6d0f239df9dd3a460e7bce

14 years agoMerge "Fix Mac build"
Steve Block [Mon, 15 Feb 2010 17:07:35 +0000 (09:07 -0800)]
Merge "Fix Mac build"

14 years agoFix Mac build
Steve Block [Mon, 15 Feb 2010 16:46:20 +0000 (16:46 +0000)]
Fix Mac build

- Database.cpp - This Android-specific change was made in https://android-git.corp.google.com/g/#change,39575
- XCode project - GeolocationPositionCache was accidentally removed in https://android-git.corp.google.com/g/#change,40365

Change-Id: I60f8361ba352c7fa8d35dc829e203f6c653f0ef2

14 years agoUse common version of PluginView::parentFrame
Steve Block [Mon, 15 Feb 2010 16:05:31 +0000 (16:05 +0000)]
Use common version of PluginView::parentFrame

This was added in http://trac.webkit.org/changeset/42748

Change-Id: Ifcb9308d817203b6e23945ceedd83b9f9eb2e80f

14 years agoStore the originating target for a touch (i.e. calculated in touchstart) in a hash...
Ben Murdoch [Thu, 28 Jan 2010 10:15:52 +0000 (10:15 +0000)]
Store the originating target for a touch (i.e. calculated in touchstart) in a hash map, so that we can use that originating target as the target for future move/end/cancel events that that touch generates.

This matches the behaviour that the iPhone exhibits.

Change-Id: Iff5e29c795b8ae6128e67ad5d42a959b61f966f2

14 years agoMerge webkit.org at r54340 : Update WEBKIT_MERGE_REVISION
Steve Block [Fri, 5 Feb 2010 15:36:34 +0000 (15:36 +0000)]
Merge webkit.org at r54340 : Update WEBKIT_MERGE_REVISION

Change-Id: I267e0288b20fc62d4c300d0f9cb4fb0120d84174

14 years agoMerge webkit.org at r54340 : Cherry-pick WebKit change 54658 to add required headers...
Steve Block [Thu, 11 Feb 2010 18:30:31 +0000 (18:30 +0000)]
Merge webkit.org at r54340 : Cherry-pick WebKit change 54658 to add required headers to V8 generated code.

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

Change-Id: If52c6dc9b2c09d4ae028d913da653c2373eb151b

14 years agoMerge webkit.org at r54340 : Cherry-pick WebKit change 54653 to generate Notification...
Steve Block [Thu, 11 Feb 2010 13:32:40 +0000 (13:32 +0000)]
Merge webkit.org at r54340 : Cherry-pick WebKit change 54653 to generate Notifications and WebSockets headers for V8

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

Change-Id: I98d73ffb861da1694f24635c8e372a0e9a065f6f

14 years agoMerge webkit.org at r54340 : Cherry-pick WebKit change 54652 to generate XPath header...
Steve Block [Thu, 11 Feb 2010 13:31:39 +0000 (13:31 +0000)]
Merge webkit.org at r54340 : Cherry-pick WebKit change 54652 to generate XPath header for V8

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

Change-Id: I9e513f408f5a812b9c79cec4fcc2a2e633c95fe9

14 years agoMerge webkit.org at r54340 : Cherry-pick WebKit change 54651 to generate Inspector...
Steve Block [Thu, 11 Feb 2010 11:43:12 +0000 (11:43 +0000)]
Merge webkit.org at r54340 : Cherry-pick WebKit change 54651 to generate Inspector headers for V8

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

Change-Id: Ieefd3b78f67eecf3a2ddd5d3869acff0a7ef4833

14 years agoMerge webkit.org at r54340 : Cherry-pick WebKit change 54650 to add SVG guards for V8
Steve Block [Thu, 11 Feb 2010 11:31:37 +0000 (11:31 +0000)]
Merge webkit.org at r54340 : Cherry-pick WebKit change 54650 to add SVG guards for V8

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

Change-Id: Ieda3be45b1979c0f9d776cf6b7639f0e67f1466f

14 years agoMerge webkit.org at r54340 : Cherry-pick WebKit change 54417 to fix ENABLE_DEBUGGER...
Steve Block [Wed, 10 Feb 2010 18:55:09 +0000 (18:55 +0000)]
Merge webkit.org at r54340 : Cherry-pick WebKit change 54417 to fix ENABLE_DEBUGGER guards for V8

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

Change-Id: I03e7f8f1ddb9af92e5ce7494136ea2d2a6de6800

14 years agoMerge webkit.org at r54340 : Update use of processingUserGesture to pass DOMWrapperWorld
Steve Block [Wed, 10 Feb 2010 18:35:38 +0000 (18:35 +0000)]
Merge webkit.org at r54340 : Update use of processingUserGesture to pass DOMWrapperWorld

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

Change-Id: I71b4de3bbef2963c1332eef229bd23646c3ee23a

14 years agoMerge webkit.org at r54340 : Implement new GraphicsContext::concatCTM and Path::trans...
Steve Block [Wed, 10 Feb 2010 18:18:34 +0000 (18:18 +0000)]
Merge webkit.org at r54340 : Implement new GraphicsContext::concatCTM and Path::transform methods for Android

We copy the Skia implementations
See http://trac.webkit.org/changeset/54112

Change-Id: I7575b7fe2690b0eacf4c3da2cc9fd6645d8d2c6f

14 years agoMerge webkit.org at r54340 : Implement new Pattern methods for Android
Steve Block [Fri, 5 Feb 2010 16:13:18 +0000 (16:13 +0000)]
Merge webkit.org at r54340 : Implement new Pattern methods for Android

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

Change-Id: Ib68d10f5b7d045b19ae815613ffb0ff836aafe56

14 years agoMerge webkit.org at r54340 : Update Android V8 Makefile to generate toV8 converter...
Steve Block [Wed, 10 Feb 2010 16:18:59 +0000 (16:18 +0000)]
Merge webkit.org at r54340 : Update Android V8 Makefile to generate toV8 converter functions

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

Change-Id: Idcc5b54d9b31133e6d304222a2cf11355736b83c

14 years agoMerge webkit.org at r54340 : Fix Makefiles
Steve Block [Wed, 10 Feb 2010 16:20:18 +0000 (16:20 +0000)]
Merge webkit.org at r54340 : Fix Makefiles

Change-Id: I86b9b8485cc9594841407ac6958c8dea3903749e

14 years agoMerge webkit.org at r54340 : Fix merge conflicts
Steve Block [Fri, 5 Feb 2010 14:38:24 +0000 (14:38 +0000)]
Merge webkit.org at r54340 : Fix merge conflicts

- Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream
- Take theirs for XCode project file and ChangeLog
- Fix trivial header conflict in V8DocumentCustom
- Keep ours for fix in JNIUtilityPrivate.cpp
- Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259
- Take both for Android addition of applicationInstalledCallback
- Take both for Android JSC JIT changes in Platform.h

Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7

14 years agoMerge webkit.org at r54340 : Initial merge by git
Steve Block [Fri, 5 Feb 2010 14:27:46 +0000 (14:27 +0000)]
Merge webkit.org at r54340 : Initial merge by git

Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44

14 years agoFix the build by including the right header for INVALID_STATE_ERR
Andrei Popescu [Fri, 12 Feb 2010 18:58:13 +0000 (18:58 +0000)]
Fix the build by including the right header for INVALID_STATE_ERR

14 years agoImplement navigator.isApplicationInstalled() API
Andrei Popescu [Thu, 11 Feb 2010 15:33:07 +0000 (15:33 +0000)]
Implement navigator.isApplicationInstalled() API

This CL contains the wiring between the API and the Java side.

Fix b: 2371005

14 years agoAdd indent for writeLength
Nicolas Roard [Fri, 12 Feb 2010 17:00:51 +0000 (17:00 +0000)]
Add indent for writeLength

14 years agoAdd dump layers capability (triggered the same way as the dump tree trick,
Nicolas Roard [Fri, 12 Feb 2010 16:00:05 +0000 (16:00 +0000)]
Add dump layers capability (triggered the same way as the dump tree trick,
saving the layres tree in /sdcard/layersTree.plist)

14 years agoMerge "move children into SkLayer make SkLayer inherit from SkRefCnt.h"
Mike Reed [Fri, 12 Feb 2010 15:52:34 +0000 (07:52 -0800)]
Merge "move children into SkLayer make SkLayer inherit from SkRefCnt.h"

14 years agoAdd code that enables SquirrelFish Extreme (a.k.a JSCX, JSC JIT) in Android.
Huahui Wu [Thu, 11 Feb 2010 16:30:33 +0000 (11:30 -0500)]
Add code that enables SquirrelFish Extreme (a.k.a JSCX, JSC JIT) in Android.
It's disabled by default, but is enabled when the enveronment variable
ENABLE_ANDROID_JSC_JIT is set to true.

14 years agomove children into SkLayer
Mike Reed [Fri, 12 Feb 2010 14:56:12 +0000 (14:56 +0000)]
move children into SkLayer
make SkLayer inherit from SkRefCnt.h

14 years agoMerge "Cherry-pick recent WebKit changes to JavaClassJSC.cpp"
Steve Block [Fri, 12 Feb 2010 14:16:29 +0000 (06:16 -0800)]
Merge "Cherry-pick recent WebKit changes to JavaClassJSC.cpp"

14 years agoRefactor the layers to use calcPosition().
Nicolas Roard [Fri, 12 Feb 2010 12:44:28 +0000 (12:44 +0000)]
Refactor the layers to use calcPosition().
Add accessors to the picture and the children.
Add a bounds() method.

14 years agoPut back the animations in the UI thread
Nicolas Roard [Thu, 11 Feb 2010 18:40:34 +0000 (18:40 +0000)]
Put back the animations in the UI thread

14 years agosplit libsurfaceflinger_client and libcamera_client out of libui
Mathias Agopian [Wed, 10 Feb 2010 22:43:56 +0000 (14:43 -0800)]
split libsurfaceflinger_client and libcamera_client out of libui

14 years agoLayers refactoring
Nicolas Roard [Thu, 11 Feb 2010 17:40:33 +0000 (17:40 +0000)]
Layers refactoring

14 years agoMerge "cleanup (cherry picked from commit fc34a9dc6e4aa1d0e96fc5523ee77e618648e615)"
Nicolas Roard [Thu, 11 Feb 2010 14:39:33 +0000 (06:39 -0800)]
Merge "cleanup (cherry picked from commit fc34a9dc6e4aa1d0e96fc5523ee77e618648e615)"

14 years agoCherry-pick recent WebKit changes to JavaClassJSC.cpp
Steve Block [Thu, 11 Feb 2010 14:16:22 +0000 (14:16 +0000)]
Cherry-pick recent WebKit changes to JavaClassJSC.cpp

These changes were made in http://trac.webkit.org/changeset/53865, so should
have been picked up in the last WebKit merge to r54127, but were somehow missed.

Change-Id: Id21807fe9bf6507a591b6b12e914aea41a62c3de

14 years agocleanup
Nicolas Roard [Wed, 10 Feb 2010 18:14:11 +0000 (18:14 +0000)]
cleanup
(cherry picked from commit fc34a9dc6e4aa1d0e96fc5523ee77e618648e615)

14 years agoRemove superfluous CSSUnknownRule from makefiles
Steve Block [Wed, 10 Feb 2010 17:09:24 +0000 (17:09 +0000)]
Remove superfluous CSSUnknownRule from makefiles

Change-Id: Iea3432422e589a50242452a86df507c929f89563

14 years agoCleans up use of the make_names script for derived sources
Steve Block [Fri, 5 Feb 2010 17:12:14 +0000 (17:12 +0000)]
Cleans up use of the make_names script for derived sources

The --wrapperFactory option is not required when building V8.

Change-Id: I87dc6e5412da31c00d004a08629a2e7395673230

14 years agoMerge "Update fix in convertNPVariantToJValue to reflect final version submitted...
Steve Block [Wed, 10 Feb 2010 11:51:54 +0000 (03:51 -0800)]
Merge "Update fix in convertNPVariantToJValue to reflect final version submitted to webkit.org"

14 years agoMerge "Correctly guard V8Counters::initCounters() in WebCoreFrameBridge"
Steve Block [Wed, 10 Feb 2010 11:51:16 +0000 (03:51 -0800)]
Merge "Correctly guard V8Counters::initCounters() in WebCoreFrameBridge"

14 years agoMerge "Implement navigator.isApplicationInstalled() API"
Andrei Popescu [Tue, 9 Feb 2010 16:52:45 +0000 (08:52 -0800)]
Merge "Implement navigator.isApplicationInstalled() API"

14 years agoRemove code which retrieves the action associated with a textfield.
Leon Scroggins [Mon, 8 Feb 2010 16:34:36 +0000 (11:34 -0500)]
Remove code which retrieves the action associated with a textfield.

This code was written because we previously only had one action
button on the IME for textfields.  Now that textfields can always
have a next button, we no longer need it.

14 years agoImplement navigator.isApplicationInstalled() API
Andrei Popescu [Tue, 9 Feb 2010 15:13:31 +0000 (15:13 +0000)]
Implement navigator.isApplicationInstalled() API

This CL contains the JSC DOM bindings.

Fix b: 2371005

14 years agoFix the V8 build by adding files missing from ece0a38a9778edd2ae7a550df7dcd38d1e11e7d0
Andrei Popescu [Tue, 9 Feb 2010 12:34:54 +0000 (12:34 +0000)]
Fix the V8 build by adding files missing from ece0a38a9778edd2ae7a550df7dcd38d1e11e7d0

14 years agoMerge "Implement navigator.isApplicationInstalled() API"
Andrei Popescu [Tue, 9 Feb 2010 12:25:48 +0000 (04:25 -0800)]
Merge "Implement navigator.isApplicationInstalled() API"

14 years agoImplement navigator.isApplicationInstalled() API
Andrei Popescu [Mon, 8 Feb 2010 21:23:18 +0000 (21:23 +0000)]
Implement navigator.isApplicationInstalled() API

This CL contains the V8 DOM bindings and IDL changes.

Fix b:2371005

14 years agoRemove Android code that skipped functions for retrieving the source name and line...
Ben Murdoch [Mon, 8 Feb 2010 19:16:41 +0000 (19:16 +0000)]
Remove Android code that skipped functions for retrieving the source name and line number in V8Proxy, as we now support that.

This requires an external/v8 change, see 39929.

Change-Id: Ie4cab862ebef7ad569b070b11a8bae67e89f2c38

14 years agoam 8e03c5a1: am c3e14116: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 22:24:36 +0000 (14:24 -0800)]
am 8e03c5a1: am c3e14116: reconcile main tree with open-source eclair

Merge commit '8e03c5a1ccd98fdf4960318b8c0e3e0c7c5c225b'

* commit '8e03c5a1ccd98fdf4960318b8c0e3e0c7c5c225b':
  android-2.1_r1 snapshot

14 years agouse SkPaint::containsText for much faster containsCharacters in webkit
Mike Reed [Fri, 5 Feb 2010 22:00:38 +0000 (17:00 -0500)]
use SkPaint::containsText for much faster containsCharacters in webkit

14 years agoam c3e14116: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:49:21 +0000 (08:49 -0800)]
am c3e14116: reconcile main tree with open-source eclair

Merge commit 'c3e141168cbc8e4ca4cb7355210237aed4807ee1' into eclair-plus-aosp

* commit 'c3e141168cbc8e4ca4cb7355210237aed4807ee1':
  android-2.1_r1 snapshot
  Check null for WebViewCore's nativeClass before calling

14 years agoreconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair

14 years agoSpeculative build fix for sim-eng
Steve Block [Fri, 5 Feb 2010 15:10:43 +0000 (15:10 +0000)]
Speculative build fix for sim-eng

Change-Id: I8cdd95a002b21c317e77eb456d3eddf2f3036cc1

14 years agoUpdate fix in convertNPVariantToJValue to reflect final version submitted to webkit.org
Steve Block [Fri, 5 Feb 2010 14:15:08 +0000 (14:15 +0000)]
Update fix in convertNPVariantToJValue to reflect final version submitted to webkit.org

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

14 years agoCorrectly guard V8Counters::initCounters() in WebCoreFrameBridge
Steve Block [Fri, 5 Feb 2010 12:38:27 +0000 (12:38 +0000)]
Correctly guard V8Counters::initCounters() in WebCoreFrameBridge

14 years agoMerge webkit.org at r54127 : Update WEBKIT_MERGE_REVISION
Steve Block [Tue, 2 Feb 2010 18:47:35 +0000 (18:47 +0000)]
Merge webkit.org at r54127 : Update WEBKIT_MERGE_REVISION

Change-Id: Ifb43cc186611cc8a9b89552132f85e4f46e182ee

14 years agoMerge webkit.org at r54127 : Fix missing virtual destructors in V8DOMMap
Steve Block [Tue, 2 Feb 2010 18:52:14 +0000 (18:52 +0000)]
Merge webkit.org at r54127 : Fix missing virtual destructors in V8DOMMap

This is achieved by cherry-picking WebKit patch http://trac.webkit.org/changeset/54218

Change-Id: I953939c9ee0a478c26f0481d923595325b67f718

14 years agoMerge webkit.org at r54127 : Implement new overload of GraphicsContext::drawFocusRing...
Steve Block [Tue, 2 Feb 2010 18:47:02 +0000 (18:47 +0000)]
Merge webkit.org at r54127 : Implement new overload of GraphicsContext::drawFocusRing on Android

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

Change-Id: I9e8f980ef8ecccd206d56b73d5834dab74a96ee8

14 years agoMerge webkit.org at r54127 : mainWorldScriptState is now a global function.
Steve Block [Tue, 2 Feb 2010 18:46:44 +0000 (18:46 +0000)]
Merge webkit.org at r54127 : mainWorldScriptState is now a global function.

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

Change-Id: I1f904a812dab1acf3eafd4c287571df245d4fa0d

14 years agoMerge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.
Steve Block [Tue, 2 Feb 2010 18:46:10 +0000 (18:46 +0000)]
Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.

ImageDecoder requires numerous additional include paths.

Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079

14 years agoMerge webkit.org at r54127 : Fix some WebKit includes
Steve Block [Tue, 2 Feb 2010 18:39:30 +0000 (18:39 +0000)]
Merge webkit.org at r54127 : Fix some WebKit includes

Change-Id: Ibcdef84d6e49c7e4a725ac1d22ae59a165418280

14 years agoMerge webkit.org at r54127 : Make FLATTEN_IFRAME method overrides protected
Steve Block [Tue, 2 Feb 2010 18:38:55 +0000 (18:38 +0000)]
Merge webkit.org at r54127 : Make FLATTEN_IFRAME method overrides protected

RenderPartObject inherits calcWidth/calcHeight as public methods throught the
chain RenderPart -> RenderWidget -> RenderReplaced -> RenderBox.

On Android, RenderPartObject overrides calcWidth/calcHeight as private methods
for FLATTEN_IFRAME. This is not yet upstreamed.

The new WebKit uses calcWidth/calcHeight from RenderEmbeddedObject, which
inherits from RenderPartObject. So we need to make the these methods protected
in RenderPartObject

Change-Id: Ifb48d5daa10fc14c80f6da987cbd034713febc12

14 years agoMerge webkit.org at r54127 : Update GraphicsContext::drawFocusRing to reflect refactoring
Steve Block [Tue, 2 Feb 2010 18:38:22 +0000 (18:38 +0000)]
Merge webkit.org at r54127 : Update GraphicsContext::drawFocusRing to reflect refactoring

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

Change-Id: I4bb5569de809169a9d170328ef1671a66a45929c

14 years agoMerge webkit.org at r54127 : Fix Makefiles
Steve Block [Tue, 2 Feb 2010 18:38:11 +0000 (18:38 +0000)]
Merge webkit.org at r54127 : Fix Makefiles

Note that we update the XCode project file to add the new
GeolocationPositionCache files to allow us to build Android WebKit on Mac.

Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50

14 years agoMerge webkit.org at r54127 : Fix conflicts due to V8 feature runtime enabler flags
Steve Block [Wed, 3 Feb 2010 19:30:45 +0000 (19:30 +0000)]
Merge webkit.org at r54127 : Fix conflicts due to V8 feature runtime enabler flags

These have been modified to default to true on Android.
We also set the new flags to default to true.

Note that the enabler flag for database has changed.
See http://trac.webkit.org/changeset/53595

Change-Id: I2832c4bcb316f481a33a8c00e7fe90dffa8dcdcf

14 years agoMerge webkit.org at r54127 : Fix conflict with addition of virtual destructor to...
Steve Block [Tue, 2 Feb 2010 18:33:51 +0000 (18:33 +0000)]
Merge webkit.org at r54127 : Fix conflict with addition of virtual destructor to Visitor class

Android had added a virtual destructor to DOMWrapperMap::Vistor
See https://android-git.corp.google.com/g/#change,21263

DOMWrapperMap::Vistor was removed and WeakReferenceMap::Visitor was added in
http://trac.webkit.org/changeset/51998
DOMWrapperMap inherits from WeakReferenceMap.

The virtual desctructor was upstreamed to webkit.org for WeakReferenceMap::Visitor in
http://trac.webkit.org/changeset/53401
Note that the message in the ChangeLog is incorrect.

Change-Id: Ia801155d0b42100e91b891b0568486fc76d037e1

14 years agoMerge webkit.org at r54127 : Fix conflicts with Android addition of touch event time
Steve Block [Wed, 3 Feb 2010 19:28:15 +0000 (19:28 +0000)]
Merge webkit.org at r54127 : Fix conflicts with Android addition of touch event time

This is not yet upstreamed, so we keep ours.
See https://android-git.corp.google.com/g/#change,39424

Change-Id: I65233af30227b7dd84a1c2b29e5dfc6da20e905e

14 years agoMerge webkit.org at r54127 : Fix final trivial merges
Steve Block [Tue, 2 Feb 2010 18:32:28 +0000 (18:32 +0000)]
Merge webkit.org at r54127 : Fix final trivial merges

Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33

14 years agoMerge webkit.org at r54127 : Fix conflicts in touchevents IDL files as GenerateConstr...
Steve Block [Tue, 2 Feb 2010 18:31:56 +0000 (18:31 +0000)]
Merge webkit.org at r54127 : Fix conflicts in touchevents IDL files as GenerateConstructor is no longer required

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

Change-Id: Id985ac707e30ce100dd06d8e57826af6184c10e6

14 years agoMerge webkit.org at r54127 : Fix merge conflict in break_lines.cpp
Steve Block [Tue, 2 Feb 2010 18:31:32 +0000 (18:31 +0000)]
Merge webkit.org at r54127 : Fix merge conflict in break_lines.cpp

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

Change-Id: I123e8296c4b6bcfa4abd70ef67f9db14275bdf4c

14 years agoMerge webkit.org at r54127 : Merge conflicts due to longpress and doubletap touchevents
Steve Block [Wed, 3 Feb 2010 19:21:02 +0000 (19:21 +0000)]
Merge webkit.org at r54127 : Merge conflicts due to longpress and doubletap touchevents

Keep ours as this code has not yet been upstreamed.
Change-Id: Ia05ab6c8c36b2d332fec2fe4c16ceacff2933382

14 years agoMerge webkit.org at r54127 : Resolve conflicts for handleTouchEvent
Steve Block [Tue, 2 Feb 2010 18:27:44 +0000 (18:27 +0000)]
Merge webkit.org at r54127 : Resolve conflicts for handleTouchEvent

On Android, handleTouchEvent returns int, rather than bool.

Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5

14 years agoMerge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.
Steve Block [Tue, 2 Feb 2010 18:27:20 +0000 (18:27 +0000)]
Merge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.

The V8 touch event bindings weren't upstreamed, but this code has now all been deleted in favour of auto-generation.
See http://trac.webkit.org/changeset/52663 for the change that removes the indexed getters used for touch events

Change-Id: Ie59c504d7efcb408c18f76d085db63bc1c4a96c4

14 years agoMerge webkit.org at r54127 : Resolve conflicts due to code being moved from V8Proxy...
Steve Block [Tue, 2 Feb 2010 18:26:56 +0000 (18:26 +0000)]
Merge webkit.org at r54127 : Resolve conflicts due to code being moved from V8Proxy.cpp to V8DOMWindowShell.cpp

This caused conflicts with Android instrumentation additions
See http://trac.webkit.org/changeset/52666

Change-Id: I3b24bb00a00d7e02705bac7fc87c99fb9ba89478

14 years agoMerge webkit.org at r54127 : Fix conflict in V8DocumentCustom.cpp
Steve Block [Tue, 2 Feb 2010 18:26:23 +0000 (18:26 +0000)]
Merge webkit.org at r54127 : Fix conflict in V8DocumentCustom.cpp

The whole method is now guarded in IDL.
See http://trac.webkit.org/changeset/53271

Change-Id: If319bcc542bd042c63fb060cac473de2dcbed81a

14 years agoMerge webkit.org at r54127 : Fix conflict in FrameLoader.cpp due to Android ARCHIVE
Steve Block [Tue, 2 Feb 2010 18:26:06 +0000 (18:26 +0000)]
Merge webkit.org at r54127 : Fix conflict in FrameLoader.cpp due to Android ARCHIVE

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

Change-Id: Ic6d1b8164ebe646450d5866882e1b692e3076060

14 years agoMerge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ANDROID_BLOCK_NET...
Steve Block [Tue, 2 Feb 2010 18:25:42 +0000 (18:25 +0000)]
Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ANDROID_BLOCK_NETWORK_IMAGE

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

Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42

14 years agoMerge webkit.org at r54127 : Update RenderLayerCompositor.cpp to account for syntax...
Steve Block [Tue, 2 Feb 2010 18:24:37 +0000 (18:24 +0000)]
Merge webkit.org at r54127 : Update RenderLayerCompositor.cpp to account for syntax change.

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

Change-Id: Ib82ce428fc761a2791a7ce1fc0de486b6903a43a

14 years agoMerge webkit.org at r54127 : Network type access has not yet been upstreamed
Steve Block [Tue, 2 Feb 2010 18:24:12 +0000 (18:24 +0000)]
Merge webkit.org at r54127 : Network type access has not yet been upstreamed

Have marked these additions with TODOs until upstreamed.

See https://android-git.corp.google.com/g/#change,37402

Change-Id: I0cae1865546797bd17dc76d0c1517f065cae32b1

14 years agoMerge webkit.org at r54127 : Merge with additional comment in SharedBuffer.cpp
Steve Block [Tue, 2 Feb 2010 18:23:55 +0000 (18:23 +0000)]
Merge webkit.org at r54127 : Merge with additional comment in SharedBuffer.cpp

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

Change-Id: I0ba4c6499090fa1405ab7bc50b90f278f76e916f

14 years agoMerge webkit.org at r54127 : Take theirs for refactoring in Node.cpp
Steve Block [Tue, 2 Feb 2010 18:23:32 +0000 (18:23 +0000)]
Merge webkit.org at r54127 : Take theirs for refactoring in Node.cpp

This isn't a genuine conflict.
It looks like git got confused due to changes made to Android for touch events.
See https://android-git.corp.google.com/g/#change,38141 and http://trac.webkit.org/changeset/53564

Change-Id: I8f45a2be90f10b3718ea977430d3bfa65433c373

14 years agoMerge webkit.org at r54127 : Merge in Node.cpp due to Android instrumentation
Steve Block [Tue, 2 Feb 2010 18:23:15 +0000 (18:23 +0000)]
Merge webkit.org at r54127 : Merge in Node.cpp due to Android instrumentation

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

Change-Id: I0aa44a36bea6f04f2fd1c91907339f6630321132

14 years agoMerge webkit.org at r54127 : Keep ours for PlatformBridge.
Steve Block [Tue, 2 Feb 2010 18:22:59 +0000 (18:22 +0000)]
Merge webkit.org at r54127 : Keep ours for PlatformBridge.

Change-Id: I19c5c5ea530813b6665c0d4beacae94be9d65d5d

14 years agoMerge webkit.org at r54127 : Take theirs for extra layout delay.
Steve Block [Tue, 2 Feb 2010 18:22:31 +0000 (18:22 +0000)]
Merge webkit.org at r54127 : Take theirs for extra layout delay.

See http://trac.webkit.org/changeset/52919 and http://trac.webkit.org/changeset/53027

Change-Id: I0a5d442520651184b23ac30cf78b3c0d220c619b