summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-123-216/+0
| | | | | | | | | | | | | This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12241-30673/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Fix conflicts.Ben Murdoch2011-05-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-1028-286/+467
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Fix memory allocation bug in convertV8ObjectToNPVariant() for stringsSteve Block2011-02-181-2/+3
| | | | | | | | This is a cherry-pick of WebKit change 78994 See http://trac.webkit.org/changeset/78994 Change-Id: I1994bbbe89490e68025f9bbaa0606cf9766f2ca3
* Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-161-2/+3
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I72375d9b61a767449086f0c9dc4105b2a6b62ddc
* Use platform bridge to control high usage delta MB.Shimeng (Simon) Wang2011-01-241-2/+1
| | | | | | | This change gives flexibility to change that value in Java side. issue: 3317722 Change-Id: I71a548871783cc604e0daec63e6bbfb26ecc1e1f
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-075-5/+24
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Cherry-pick WebKit change 72948Steve Block2011-01-062-2/+2
| | | | | | | | | | | | | | | This fixes CodeGeneratorV8.pm It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm', which was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/72948 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0611-64/+74
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-2230-743/+554
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Fix CodeGeneratorV8.pmRussell Brenner2010-12-022-2/+2
| | | | | | | | | | Some of the script-generation code puts include statements in source files when they need to be in headers. Cherry-picked from webkit: http://trac.webkit.org/changeset/72948 Change-Id: I07d425bcb97abcdda25b5ff2ea7af887a925f489
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71802 WebCore/bindings/v8/V8Proxy.cpp http://trac.webkit.org/changeset/71735 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71767 http://trac.webkit.org/changeset/72116 (several APIs purged) WebCore/loader/ResourceLoader.cpp http://trac.webkit.org/changeset/71884 WebCore/platform/graphics/MediaPlayer.cpp http://trac.webkit.org/changeset/72117 WebCore/platform/image-decoders/ImageDecoder.cpp http://trac.webkit.org/changeset/72130 WebCore/rendering/RenderBlockLineLayout.cpp http://trac.webkit.org/changeset/72235 WebCore/rendering/RenderView.cpp http://trac.webkit.org/changeset/71851 Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0221-236/+236
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Functions generated from .idl file should be guarded.Teng-Hui Zhu2010-11-171-0/+2
| | | | | | | | | | This is a cherry pick from the webkit fix. http://trac.webkit.org/changeset/72216 The change cause this compile error is http://trac.webkit.org/changeset/71515 Change-Id: Ibf7f689b1463116bb856739af7bbab8457498d05
* 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