summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2712-41/+158
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2014-50/+51
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0915-50/+321
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0255-2145/+399
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1672-679/+605
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Fix JSC build breakLeon Clarke2010-06-081-5/+5
| | | | | | | | Custom bindings signatures have changed in JSC following this change http://trac.webkit.org/changeset/60392 so isApplicationInstalled (which isn't upstreamed) needs to be updated to match the new style. Change-Id: I7e837d61cdc7d4e5a4cd294c11e6ad4d827d5a2a
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0864-734/+704
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2727-166/+227
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2560-995/+1361
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1444-1175/+119
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Use ustringToString()Steve Block2010-05-111-1/+1
| | | | | | See http://trac.webkit.org/changeset/57738 Change-Id: I1d10e7858488f40013bffa3e8f8339db7fff7de0
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11135-1338/+2912
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2714-73/+580
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1634-125/+372
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1511-55/+182
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-121-1/+2
| | | | | | This CL contains the wiring between the API and the Java side. Fix b: 2371005
* Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-093-0/+149
| | | | | | This CL contains the JSC DOM bindings. Fix b: 2371005
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0473-1812/+1290
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry pick of WebKit revision r54138 ↵Ben Murdoch2010-02-021-2/+3
| | | | | | | | (http://trac.webkit.org/changeset/54138) to add source and line number information to ScriptCallFrames when the caller is unknown. BUG=2376873 Change-Id: I91346705b9c24cf7862070685bf3830d2a18f12e
* resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-209-12/+11
|\ | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-199-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | WebCore/bridge/Bridge See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
* | Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-202-3/+3
|/ | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-191-1/+1
| | | | | | | | See http://trac.webkit.org/changeset/53412 Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick. Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-174-86/+6
| | | | | | | | | | | | | | | 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 : Initial merge by git.Steve Block2009-12-1790-1464/+2176
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Fixes license headers for all Android-specific JavaScriptCore and WebCore ↵Steve Block2009-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | files not yet upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. - For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS' and cleaned up formatting in the existing BSD-style license. - For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an Apache 2.0 license to the BSD-style license. - WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp - WebCore/platform/graphics/android/BitmapAllocatorAndroid.h - WebCore/platform/graphics/android/SharedBufferStream.cpp - WebCore/platform/graphics/android/SharedBufferStream.h - For the following files, I've changed from an LGPL licese to the BSD-style license. - WebCore/platform/graphics/android/FontPlatformData.h - WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp - WebCore/plugins/android/PluginDataAndroid.cpp Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1
* Merge change I43c48f76 into eclair-mr2Android (Google) Code Review2009-11-111-1/+0
|\ | | | | | | | | * changes: Remove duplicate include of config.h
| * Remove duplicate include of config.hSteve Block2009-11-121-1/+0
| | | | | | | | Change-Id: I43c48f7641c8ad844193a48f2cd452ac4ad553ef
* | Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also ↵Ben Murdoch2009-11-111-5/+3
|/ | | | | | | | guard the inspector header. This change needs to be upstreamed. Change-Id: I42d5994dc975206cbb376189613dc23426a4a9a8
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-3/+0
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1057-516/+1059
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵Steve Block2009-10-272-0/+10
| | | | | | | | | | to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-204-67/+1
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-20140-1060/+5171
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Brings JSC Geolocation bindings up-to-date with latest submission to ↵Steve Block2009-10-141-5/+6
| | | | | | | | webkit.org. Do not merge. See https://bugs.webkit.org/show_bug.cgi?id=29099 This has already been submitted to master branch.
* Fixes Geolocation to correctly handle infinite values for PositionOptions ↵Steve Block2009-09-041-4/+18
| | | | | | | | properties. This fixes http://b/issue?id=2094429. Change-Id: I01cc5107d4a96840e35cc403161d50dbdf6a1ca2
* Add functionality to V8 bindings for SQLTransaction to allow array-like ↵Ben Murdoch2009-09-021-0/+5
| | | | objects to be passed as the second parameter to executeSql(), and ensure exceptions are thrown in the right places.
* fix JSC support.Andrei Popescu2009-08-191-1/+1
|
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1938-779/+41
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Revert "Continue with JSC errors."Andrei Popescu2009-08-192-5/+2
| | | | This reverts commit 76de9f7763de0e4568056a5a26c93030f21e0b90.
* Continue with JSC errors.Ben Murdoch2009-08-192-2/+5
|
* Merge WebKit r47420Ben Murdoch2009-08-1838-41/+779
|
* Merge commit 'goog/master' into mergeBen Murdoch2009-08-181-67/+84
|\ | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp
| * Final part of fix to set default values of Geolocation PositionOptions.Steve Block2009-08-131-20/+31
| | | | | | | | Updates to final version submitted to WebKit for bug 27254.
| * Correctly sets default values for Geolocation PositionOptions.Steve Block2009-08-111-72/+78
| | | | | | | | | | | | | | This will be submitted to WebKit in bug 27254. This was first commited in change 20268, but this caused problems in the automated build and was subsequently rolled back in change 20415. This change includes the latest comments from the WebKit review.
* | Fix left over maunal mergesAndrei Popescu2009-08-131-1/+0
| |
* | Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings.Ben Murdoch2009-08-121-9/+2
| |
* | Merge in WebKit r47029.Ben Murdoch2009-08-11131-1200/+2358
|/
* Revert "Correctly sets default values for Geolocation PositionOptions."Steve Block2009-08-071-102/+71
| | | | | This reverts commit 0c9108c0f832d34e6468bf1b3ed4132053c6a0f3. This broke the automated build. Not sure why, as it builds fine on my machine. Rolling back while I investigate.
* Correctly sets default values for Geolocation PositionOptions.Steve Block2009-08-071-71/+102
| | | | This will be submitted to WebKit in bug 27254.