summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8/ScriptController.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-2/+2
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-1/+3
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-0/+4
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-5/+14
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-2/+8
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-5/+11
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-26/+17
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-2/+12
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-0/+2
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-0/+8
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-3/+8
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-1/+1
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-0/+1
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-9/+15
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-1/+1
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* If "widget" is already existed in the HashMap whenGrace Kloba2010-04-011-0/+13
| | | | | | | | | | | | | | createScriptInstanceForWidget(widget) is called, we need to release the reference of the matching npObject to avoid leak. HTMLPlugInElement::getInstance() only calls createScriptInstanceForWidget(widget) once. But HTMLEmbedElement is using its closest ancestor who has objectTag to get the widget. So the same widget can exist in the HashMap if both <object> and its child <embed>'s getInstance() are called. Fix http://b/issue?id=2553266
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-4/+15
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-27/+17
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Update Android to reflect final version submitted to webkit.org for ↵Steve Block2010-01-271-1/+0
| | | | | | | | | ScriptController See https://android-git.corp.google.com/g/#change,37366 and http://trac.webkit.org/changeset/53673 Change-Id: I0ab68eac66a29b14ad3c169611843ae83bab8a45
* Prepare ScriptController class for upstreaming.Andrei Popescu2010-01-221-16/+2
| | | | | | | | | | Move the code to obtain the NPObject ptr associated with a PluginView to the PlatformBridge. This change will be submitted as soon as the patch in https://bugs.webkit.org/show_bug.cgi?id=33673 lands upstream.
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-10/+20
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Removes LOCK_V8 calls, which are incomplete having been abandonned prior to ↵Steve Block2009-11-111-6/+2
| | | | | | previous WebKit merges. Change-Id: Iee5a3a8d4eb1087ef196f193efb93d1e0dbcf77b
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-0/+10
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵Steve Block2009-10-271-0/+9
| | | | | | | | | | 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 : Automatic merge by git.Steve Block2009-10-201-11/+9
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Use v8::V8::LowMemoryNotification() instead of the non-really-existibg ↵Andrei Popescu2009-08-271-4/+5
| | | | v8::V8::CollectAllGarbage()
* Try to fix JNI startup errors.Ben Murdoch2009-08-181-1/+1
|
* Merge commit 'goog/master' into mergeBen Murdoch2009-08-181-2/+5
|\ | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp
| * Add GC support in V8 and calling GC in WebCoreFrameBridge::clearCache.Feng Qian2009-08-131-1/+4
| | | | | | | | This is experimental, we'd like to see the impact on page cycler intl1 and intl2.
* | Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings.Ben Murdoch2009-08-121-3/+0
| |
* | Merge in WebKit r47029.Ben Murdoch2009-08-111-35/+58
|/
* Add more LOCK_V8 macros: the custom V8 bindings are used to invoke JS ↵Andrei Popescu2009-08-061-1/+3
| | | | callbacks to let the JS application know when something interesting happens. These entry points into V8 are denoted by "handleEvent" methods and need to be protected as well.
* Add V8 locks at the v8 entry points for use with workers.Andrei Popescu2009-08-051-0/+3
|
* Fix V8 build.Feng Qian2009-06-221-0/+16
|
* Get WebKit r44544.Feng Qian2009-06-171-0/+391