summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0980-3364/+3577
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Update makefilesKristian Monsen2010-07-021-0/+2
| | | | Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0272-256/+4676
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-16108-1527/+4697
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0895-30226/+30677
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Fix Android makefilesSteve Block2010-05-271-0/+1
| | | | Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-27145-3474/+6019
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Fix makefilesKristian Monsen2010-05-252-0/+2
| | | | Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-25109-3836/+7752
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Update Android makefiles.Ben Murdoch2010-05-142-3/+10
| | | | Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-14123-2031/+6248
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Fix MakefilesSteve Block2010-05-111-1/+1
| | | | Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11269-5657/+17805
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2755-1799/+3292
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamedSteve Block2010-04-221-2/+0
| | | | | | | | | | | | Android's stlport now provides isinf etc. in the std namespace (see https://android-git.corp.google.com/g/41036). This allows us to remove the Android special-case from MathExtras.h (see https://android-git.corp.google.com/g/41037). This change has now been upstreamed in http://trac.webkit.org/changeset/58110 so we can remove the ANDROID guard marking this change. Change-Id: I7c06a5a5a8f9a0a7909a649e68424688bf02893a
* Refactor how we set up the layers hierarchy when using fixedNicolas Roard2010-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | composited layers, and fix the z-index position. Bug:2497910 Bug:2450006 We add a new COMPOSITED_FIXED_ELEMENTS define to isolate the changes in the webkit common code. We previously had a problem where the hierarchy of GraphicsLayer (i.e. the backed surfaces associated to the composited RenderLayer) was not reflecting that layers were children of a fixed layer. The workaround we currently have is not fully satisfactory, due to the way we draw layers on screen (in some cases layers were wrongly translated, see Bug:2497910). Instead, modifying the webkit common code simplify things a lot, and makes the patch more likely to be upstreamed to webkit, as it's now a reasonably well-delimited feature (use composited layers for fixed elements). What we do now is to consider fixed elements as a stacking context, which makes all layers children of such elements children too in the GraphicsLayer hierarchy, and modifying the offset of those children accordingly (in RenderLayer.cpp). In addition, we fixes the z-index bugs we had by signaling that there is a fixed element to its siblings, and turning the siblings as composited layers as well (so that the ordering works fully UI-side). Change-Id: I735c6c14d955ef54653f0053187d3495bef1f332
* Re-enable the layersNicolas Roard2010-02-241-1/+1
|
* While upstreaming the JSC JIT patch to the open source Webkit trunk,Huahui Wu2010-02-231-0/+1
| | | | | | there were a few small changes upon the review comments. This CL makes corresponding changes in Android code base to be consistent with the open source Webkit trunk.
* disable webkit layersCary Clark2010-02-211-1/+1
| | | | | With layers enabled, servicing timers saturate the CPU at times. This also fixes a compile-time switch in FindCanvas to disable layers.
* Merge "Updates WebKit's use of cmath to expect isfinite, isinf, isnan and ↵Steve Block2010-02-171-7/+3
|\ | | | | | | signbit to be in the std namespace"
| * Updates WebKit's use of cmath to expect isfinite, isinf, isnan and signbit ↵Steve Block2010-02-171-7/+3
| | | | | | | | | | | | | | | | to be in the std namespace This follows a change to stlport to move these functions to the std namespace to match the simulator build. Change-Id: I7839a857520239610bb6403323fc29adb613d0c2
* | Add UI considerations to layersCary Clark2010-02-171-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | companion fix is in framework/base With fixed layers, parts of the web page are now in motion relative to the document when the page scrolls. Many routines that formerly read static coordinates need to compute locations. In some cases, new computations are cached for speed -- for instance, the current cursor position is cached when it is frequently compared. The cursor rings and other drawing elements like finding text on the page now to be drawn in the correct order so that they appear both under and over layers. There's quite a bit more work to be done. Major pieces are drawing the text selection in the correct order, and computing locations based on nest layers. With this checkin, only the position of the child- most layer is considered when computing bounds. http://b/2369549 JavaScriptCore/wtf/Platform.h - Turn compositing on. All routines that reference LayerAndroid are bracketed by this condition. WebCore/platform/graphics/android/LayerAndroid.h WebCore/platform/graphics/android/LayerAndroid.cpp - Add a unique id to each layer. The unique id is used to associate a layer created when the DOM is parsed in the webkit thread with its copy in the UI thread. - Add: draw the text found on the page, as a call out in the primary draw. The call out must follow the drawing the layers' contents to show the found text correctly. Note that this adds a new slot with identical contents in every child LayerAndroid. In a future optimization, a RootLayerAndroid could hold data common for all child layers. - Add: clipArea(), which returns an array of rectangles describing the clip for this LayerAndroid and its children. Generally, this is the part of the webpage which is covered by one or more fixed layers. - Add: find(FloatPoint) that returns the deepest layer that contains this point. This is used to match taps to the layer that is tapped on. - Add: draw all layer pictures and identify which layer is being drawn. This is used to analyze the picture contents for finding and selecting text. - Add: find the layer that matches a given id; this is used to map cached DOM node data back to the layer that contains it. - Fix up includes, delete unused interfaces WebKit/android/jni/WebViewCore.h WebKit/android/jni/WebViewCore.cpp - Remove local mRootLayer; use the one in WebView.cpp instead (which is in sync with WebView.java) WebKit/Android.mk WebKit/android/nav/CachedLayer.h WebKit/android/nav/CachedLayer.cpp - CacheLayer associates the cached node with the LayerAndroid instance. It contains the index to the node in the cached frame, the LayerAndroid's unique id, and the spacial offset of the node within the layer when the DOM information was captured. It also caches a pointer to the LayerAndroid instance. CacheLayer computes the node's location each time it is called, since the fixed layer may be constantly moving relative to the document's coordinates. WebKit/android/nav/CacheBuilder.h WebKit/android/nav/CacheBuilder.cpp - Track the active layer while building the nav cache. The 'Tracker' structs were refactored to share common code, and a new 'LayerTracker' struct identifies when the node walker is inside a layer. - Added code to dump layer information for debugging. - Note that CachedNode::cursorRingsPtr can only be called during nav data construction - The cache builder can limit or exclude nodes that are clipped out -- but until I have more understanding of layer clipping, treat contained nodes as unclipped. WebKit/android/nav/CachedDebug.h - Add a variant that can dump either to a log file or the console including the function it was dumped from. WebKit/android/nav/CachedFrame.h WebKit/android/nav/CachedFrame.cpp - Add an array of CacheLayer instances. - Protect bounds from direct access since they must always be computed. - Remove misnamed focus parameter from many routines since the cursor node can be read from the root frame. - Add: adjustBounds(), which computes the bounds as the layer moves. - Add: checkRings(), which gets the appropriate picture for the node. - Remove disabled code - Find the layer list for the matching node by using a binary search - Add: resetLayers() to reset the LayerAndroid pointer in CachedLayers when the layer world changes. WebKit/android/nav/CachedHistory.h WebKit/android/nav/CachedHistory.cpp - Update history data to have matching frame and node WebKit/android/nav/CachedNode.h WebKit/android/nav/CachedNode.cpp - Refactor functions that directly read coordinates to compute them. In some cases, pass the frame in so that the layer coordinates can be found. - Add a bit to note that the node belongs to a layer. - Remove duplicate bounds interfaces. - Add methods to get cursor ring data at runtime. - Update debugging info. WebKit/android/nav/CachedRoot.h WebKit/android/nav/CachedRoot.cpp - Isolate direct picture access so that the layer picture can be returned. - Add knowledge of how the base is covered by layers. - Add a pointer to the root LayerAndroid. - delete disabled code. - Move the cursor ring into view if it is obscured by a layer (this isn't totally working) - Before finding the next node to move to, set up 'cursor cache' data, including the visible picture. WebKit/android/nav/FindCanvas.h WebKit/android/nav/FindCanvas.cpp - Move find code here so that it can be called from layers. WebKit/android/nav/WebView.cpp - Add java interface to get viewport metrics on demand. - Pass frame with the node. - Remove the find on page code (now in FindCanvas). - Compute focus rings instead of reading them directly. - Transfer layer id when getting new nav cache. - Set up root LayerAndroid. - Add utility to track if cursor is in a layer. - Simplify drawLayers() to use common view metrics.
* Fix the sim-eng buildSteve Block2010-02-161-0/+6
| | | | Change-Id: Icc67c8786c1a1b98993fb27caf71bd4895118589
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1682-543/+2501
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Fix merge conflictsSteve Block2010-02-151-4/+0
| | | | | | | | | | | | - 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
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1520-91/+1343
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Add code that enables SquirrelFish Extreme (a.k.a JSCX, JSC JIT) in Android.Huahui Wu2010-02-122-1/+18
| | | | | It's disabled by default, but is enabled when the enveronment variable ENABLE_ANDROID_JSC_JIT is set to true.
* Merge webkit.org at r54127 : Fix MakefilesSteve Block2010-02-041-0/+1
| | | | | | | 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
* Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROIDSteve Block2010-02-041-6/+1
| | | | | | See http://trac.webkit.org/changeset/52791 Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
* Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵Steve Block2010-02-044-58/+84
| | | | | | | | | | | addition. The conflict is due to the fact that we cherry-picked a WebKit change http://trac.webkit.org/changeset/51978 to fix a bug. This change updates all files touched by this change to match webkit.org. See https://android-git.corp.google.com/g/#change,36411 Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4
* Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for ↵Steve Block2010-02-041-3/+0
| | | | | | other platforms. Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04269-4487/+11849
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-201-1/+1
| | | | | | | | | | | jni_utility_private to JNIUtility and JNIUtilityPrivate See http://trac.webkit.org/changeset/53497 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. This change required updating headers in Android-specific files in WebCore and WebKit. Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-1/+1
| | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* resolved conflicts for merge of 870689c8Nicolas Roard2010-01-041-0/+4
|
* am dcfdcbd8: am edb4aa51: Merge "Cherry-picks a WebKit change to revert ↵Steve Block2010-01-045-94/+66
|\ | | | | | | | | | | | | | | | | recent changes to String addition for JSC." into eclair-mr2 Merge commit 'dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60' * commit 'dcfdcbd80716c1ccc3ff3d122c96d36b09c46a60': Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
| * Cherry-picks a WebKit change to revert recent changes to String addition for ↵Steve Block2010-01-045-94/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC. WebKit change http://trac.webkit.org/changeset/51975 modified String addition in JSC to use ropes. However, the change was incorrect, so was rolled back in http://trac.webkit.org/changeset/51978. The last WebKit merge was to revision r51976, so picked up the initial, broken change only. This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the original change. Bug: 2336856 Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990
* | Fixes MainThreadAndroid to use AndroidThreading, rather than calling methods ↵Steve Block2009-12-212-10/+41
|/ | | | | | | | | | | | on JavaSharedClient directly. AndroidThreading is defined in WTF and implemented in WebKit. This is the pattern used by Chromium, and avoids the current layering violation due to WTF calling into WebKit. This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32651 Change-Id: Ic58f0270ed134d9f897075cca692718d1c2e9369
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-3/+0
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Fix conflicts in Makefiles.Steve Block2009-12-171-3/+0
| | | | | | | Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858 and http://trac.webkit.org/changeset/51926 Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17148-3520/+7977
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Enable orientation events.Patrick Scott2009-12-091-0/+1
| | | | | | | Remove our old orientation hacks as webkit now supports the orientation event. Call down into webkit when the orientation changes to send the js event. The change to Frame.cpp has been submited to bugs.webkit.org as issue 32321.
* Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.Steve Block2009-11-251-0/+7
| | | | | | | | This default was recently removed but is required to build on Mac. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=2cc706295f906df0bb49f51c9efe92a97c427464#patch1 Change-Id: Ice535a8205d14a0f3c3bfc4f32bc7d71132fbc2a
* Merge change I46e116c9 into eclair-mr2Android (Google) Code Review2009-11-241-4/+4
|\ | | | | | | | | * changes: Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
| * Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.Steve Block2009-11-231-4/+4
| | | | | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=31807 Change-Id: I46e116c933475699cba499e3c27921e00ebab666
* | Removes Android-specific wrapper for std::sort in Profile class.Steve Block2009-11-231-20/+0
|/ | | | | | | | | It appears that previosuly, a wrapper function was required to perform the required type casting when passing a custom comparison function to Android's std::sort. This is no longer required, so the wrapper can be removed. Change-Id: I30add3d6b41eca2558867755a34dda21a180166f
* Merge change Ia4f91efd into eclair-mr2Android (Google) Code Review2009-11-232-24/+0
|\ | | | | | | | | * changes: Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to WebKit/android/Timecounter.
| * Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to ↵Steve Block2009-11-202-24/+0
| | | | | | | | | | | | | | | | | | | | | | WebKit/android/Timecounter. This function is an Android addition to JavaScriptCore::WTF, but is not used anywhere in WebCore or JavaScriptCore. Futhermore, JavaScriptCore/wtf/CurrentTime does not contain any other platform additions. It's used primarily in WebKit/android/TimeCounter, so I've moved it there. I've also updated the name to getThreadMsec to match WebKit style. Change-Id: Ia4f91efd3caaafd1fb079afe6c493aefea402582
* | Updates Threading.h to reflect final version of Android ↵Steve Block2009-11-231-1/+1
|/ | | | | | | | atomicIncrement/Decrement submitted to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=31715 Change-Id: I7f9c0552bd9f3c51e7b869bd1c782ef72d28f1a4
generated by cgit v1.1 at 2025-05-14 15:37:12 +0000