summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLPlugInElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-1/+8
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge Webkit at r66666 : Fix conflicts.Kristian Monsen2010-09-111-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | css/CSSParser.cpp Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery): http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp dom/Document.cpp Removed a function call next to an Android specific change: http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp html/HTMLPlugInElement.cpp Removed a function next to an Android change: http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp page/Settings.h Whitespace change in this CL: http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h svg/SVGFontFaceUriElement.h Small change next to an Android change: http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-0/+3
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-5/+0
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-3/+11
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-8/+9
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-20/+15
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-2/+2
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-0/+6
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Make sure html plugin element supports focus so thatGrace Kloba2010-03-311-0/+7
| | | | | | | | | | plugin can call focus() on it. By default, only nodes can be tabbed through supports focus. We make plugin element like frame element where it always supports focus. In Android, plugin has a focused mode, so it requires this change. Fix http://b/issue?id=2539608
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-1/+0
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-2/+0
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-20/+0
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-3/+4
|
* Get WebKit r44544.Feng Qian2009-06-171-1/+3
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-16/+6
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+210
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-210/+0
|
* auto import from //branches/cupcake/...@127436The Android Open Source Project2009-01-221-5/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-55/+53
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+5
|
* external/webkit r30707Upstream1970-01-121-0/+212