summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/c
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1210-1066/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Fix for bug 3324285 jsc::bindings::convertValueToNPVariant fails to ↵Kristian Monsen2011-03-081-0/+6
| | | | | | | | | | | | | | | | findroot() and passes objects as npvariant_void Also trying lexicalGlobalObject as root object, the comment for lexicalGlobalObject says: // Global object in which the currently executing code was defined. // Differs from dynamicGlobalObject() during function calls across web browser frames. I'm guessing that is the case here. Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=55216 Change-Id: I61b3df93261e3688f022cde058845b1e3dfedb38
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-092-4/+4
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-3/+3
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-232-7/+7
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-122-9/+5
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-5/+5
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-082-8/+8
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-273-7/+7
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-117-12/+160
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-162-1/+3
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/BridgeSteve Block2010-01-201-3/+3
| | | | | | | See http://trac.webkit.org/changeset/53541 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ifa112a8700149b21a1a1bbdf8366844adb3a9ae6
* Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-193-4/+4
| | | | | | | | | | | | 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
* Remove android-specific plugin exception mechanismNicolas Roard2009-11-123-65/+0
|
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-6/+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-101-3/+21
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge in WebKit r47029.Ben Murdoch2009-08-114-12/+12
|
* Get WebKit r44544.Feng Qian2009-06-176-32/+32
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-103-23/+8
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-058-74/+94
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-038-0/+962
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-038-962/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-178-0/+962