summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-1713-261/+166
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-097-13/+108
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Cherry pick build fixBen Murdoch2010-10-261-1/+1
| | | | | | See https://bugs.webkit.org/show_bug.cgi?id=48243 for details. Change-Id: Idf1bf291f2370e611ebb2595f820598f68925336
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2640-306/+321
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0717-103/+291
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2919-14/+605
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Cherry-pick fix for V8DOMWrapper.Iain Merrick2010-09-162-9/+14
| | | | | | | | Copying http://trac.webkit.org/changeset/67324, which fixes a circular header file inclusion when compiling with both XPATH and V8 enabled (which is our default build config). Change-Id: I244870c2b612314ac2c6248eeeb1c8dc5e5b362b
* Merge WebKit at r67178 : Fix conflicts.Iain Merrick2010-09-161-3/+1
| | | | | | | | | | | V8DOMWindowShell::initContextIfNeeded now has a return value: http://trac.webkit.org/changeset/66840 DocLoader renamed to CachedResourceLoader. This affects loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp http://trac.webkit.org/changeset/66963 Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1611-37/+55
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Fix prototype for V8Proxy::compileScriptInternalIain Merrick2010-09-142-2/+2
| | | | | | | Looks like this was broken in the last WebKit merge. It's only used when compiling with #define ANDROID_INSTRUMENT. Change-Id: Idc6d879cf733f84122c3b3f0608d8df1598eff36
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1114-60/+405
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing ↵Steve Block2010-09-021-0/+2
| | | | | | | | IndexedDB guards See http://trac.webkit.org/changeset/66211 Change-Id: I61a04cf700bc84dd5ff173cc79befc28497fddd2
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0212-43/+186
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2323-151/+261
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1239-877/+323
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-6/+6
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Compile fix: Inspector guards in V8Kristian Monsen2010-08-041-0/+2
| | | | | | | | | | | | Introduced here: http://trac.webkit.org/changeset/63891/trunk/WebCore/bindings/v8/ScriptValue.cpp The JSC version is guarded. This change has been upstreamed, and this is the bug: https://bugs.webkit.org/show_bug.cgi?id=43345 And the webkit CL: http://trac.webkit.org/changeset/64464/trunk/WebCore/bindings/v8/ScriptValue.cpp Change-Id: Ic1e5b7a7352a9f290210776f2f1ce220952c6725
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0410-18/+72
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2723-219/+380
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector ↵Leon Clarke2010-07-201-0/+4
| | | | | | case doesn't seem to compile Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2022-78/+133
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0922-93/+244
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-021-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | V8Proxy.cpp http://trac.webkit.org/changeset/61499 npapi.h: http://trac.webkit.org/changeset/61277 Document.cpp http://trac.webkit.org/changeset/61787 XMLDocumentParser.h: http://trac.webkit.org/changeset/61663 HTMLLinkElement.*: http://trac.webkit.org/changeset/61424 HTMLTableCellElement.cpp http://trac.webkit.org/changeset/61630 ResourceHandleAndroid.cpp: http://trac.webkit.org/changeset/61768 Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0228-85/+195
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Build fix for break introduced by r57505.Ben Murdoch2010-06-181-0/+2
| | | | | | | | | r60568 means we now need to build V8ConsoleCustom.cpp. This should be upstreamed. See http://trac.webkit.org/changeset/57505 and http://trac.webkit.org/changeset/60568 Upstreaming being tracked in https://bugs.webkit.org/show_bug.cgi?id=40825 Change-Id: I354138014179b405ffb269adc012952e2d9cbb5e
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1637-198/+326
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge "Remove a temporary Android-specific hack added to avoid a problem ↵Steve Block2010-06-111-4/+0
|\ | | | | | | with ScriptDebugServer::topStackFrame()"
| * Remove a temporary Android-specific hack added to avoid a problem with ↵Steve Block2010-06-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptDebugServer::topStackFrame() Change https://android-git.corp.google.com/g/50673 introduced a temporary fix to avoid calling ScriptDebugServer::topStackFrame(). This was required while WebKit Bug https://bugs.webkit.org/show_bug.cgi?id=37502 was being fixed. The fix for this bug was committed in WebKit r60083 so we can now remove the hack. See also https://bugs.webkit.org/show_bug.cgi?id=38531 Change-Id: I1e26e71637faeec5c5806b7792a89a7fa63737d3
* | Cherry-pick WebKit change 40290 to fix V8 bindings generatorLeon Clarke2010-06-101-5/+0
|/ | | | | | | https://bugs.webkit.org/show_bug.cgi?id=40290 and remove the hack of including V8Proxy.h via V8CustomVoidCallback.h Change-Id: I5e3a2aca573d4fa196e5db68514adf5dddfa39b5
* Merge webkit.org at r60469 : Make generated bindings code compileLeon Clarke2010-06-081-0/+5
| | | | Change-Id: Ib2ec92fa65ee46f3c76093d9ff6b6eb18f863736
* Merge webkit.org at r60469 : invokeCallback takes a ScriptExecutionContext ↵Leon Clarke2010-06-081-1/+1
| | | | | | | | following @60330 http://trac.webkit.org/changeset/60330 Change-Id: I92e05b09e6cfc1703759b2c351e341a44b5eab0c
* Merge webkit.org at r60469 : Fix conflicts.Leon Clarke2010-06-082-13/+0
| | | | | | | The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView http://trac.webkit.org/changeset/60104 Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0821-314/+256
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge "Fix popup window default size."Grace Kloba2010-05-271-1/+9
|\
| * Fix popup window default size.Grace Kloba2010-05-271-1/+9
| | | | | | | | The change has been submitted to WebKit. https://bugs.webkit.org/show_bug.cgi?id=39835
* | Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2714-211/+142
|/ | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2531-650/+807
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Fix a binding big in WebKit which prevents urlGrace Kloba2010-05-241-1/+1
| | | | | | | | | hijacking for mobile adsense. Fix http://b/issue?id=2695688 cherry-pick the change from WebKit https://bugs.webkit.org/show_bug.cgi?id=39452
* 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-1439-2147/+260
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Remove call to ↵Steve Block2010-05-111-0/+4
| | | | | | | | | | | | | | | | ScriptDebugServer::topStackFrame() on Android ScriptDebugServer is guarded with (JAVASCRIPT_DEBUGGER), which is not defined on Android. An attempt was made in https://bugs.webkit.org/show_bug.cgi?id=38531 to move ScriptDebugServer::topStackFrame() to ScriptCallStack to avoid the linker error. However, this causes crashes on Android as our version of the V8 snapshot is not consistent with this. This fix is a temporary work-around to avoid the problem by simply not calling ScriptDebugServer::topStackFrame(). The problem will be fixed properly upstream when this code is refactored, as described in the WebKit bug. Change-Id: I3952eed2e56dbb5a6f6204276bd499e79bba2227
* Merge webkit.org at r58033 : Resolve conflicts due to navigator.connectionSteve Block2010-05-114-1925/+0
| | | | | | | | | Some V8 bindings files have been removed now that more of the bindings are auto-generated. Android has some modifications due to the addition of navigator.connection, which causes conflicts. However, we can safely delete these files. Change-Id: I7188894a3d1dbe380eae7e2cc18409836ce8cafc
* Merge webkit.org at r58033 : Fix conflicts in V8NavigatorCustom.cppSteve Block2010-05-111-22/+4
| | | | | | | This file has been deleted upstream now that more V8 bindings are auto-generated, but we have local modifications, so we must keep these parts. Change-Id: I0d1497bf3f54f977ef4753800b127a32f38a30ea
* Merge webkit.org at r58033 : Update location of CString.hSteve Block2010-05-111-1/+1
| | | | | | See http://trac.webkit.org/changeset/56825 Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-112-91/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11145-2582/+4276
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Fix merge conflictsSteve Block2010-04-272-25/+1
| | | | | | | | | | - Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp - V8Index.h - Keep ours, conflict due to upstreaming of touch events - GeolocationService.h - Take both, conflict due to Android-specific change for pausing service - PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers - V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2711-51/+96
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Cherry pick http://src.chromium.org/viewvc/chrome?view=rev&revision=43874Andrei Popescu2010-04-121-0/+4
| | | | | | Fix bug: 2588887 Change-Id: I06d64e58a95d9dd8d7e4308e1601c55d6d33663f
* Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150Andrei Popescu2010-04-061-1/+8
| | | | | | | | Check the frame's context at PageCache save and restore time to avoid crashing when it's null. Fix bug: 2564844 Change-Id: Ifef3fcf271b1366d4f63c42da1a9ac08bb8b78ed
generated by cgit v1.1 at 2024-09-16 05:53:50 +0000