summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins/android/PluginDataAndroid.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-121-69/+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 r61871: Refactoring of MimeClassInfo class.Kristian Monsen2010-07-021-10/+1
| | | | | | | http://trac.webkit.org/changeset/61168 String suffixes changed to Vector<String> extensions http://trac.webkit.org/changeset/61150 pluginIndex removed Change-Id: I8e81d95da1a6795beb94247102317cf9b449979f
* Merge webkit.org at r60469 : Update our plugin code following refactor @60258Leon Clarke2010-06-081-13/+12
| | | | | | http://trac.webkit.org/changeset/60258 Change-Id: I7b1540d54286d6201f643eb729dbb5d66ff3226f
* Fixes license headers for all Android-specific JavaScriptCore and WebCore ↵Steve Block2009-11-131-18/+24
| | | | | | | | | | | | | | | | | | | | | | files not yet upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. - For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS' and cleaned up formatting in the existing BSD-style license. - For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an Apache 2.0 license to the BSD-style license. - WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp - WebCore/platform/graphics/android/BitmapAllocatorAndroid.h - WebCore/platform/graphics/android/SharedBufferStream.cpp - WebCore/platform/graphics/android/SharedBufferStream.h - For the following files, I've changed from an LGPL licese to the BSD-style license. - WebCore/platform/graphics/android/FontPlatformData.h - WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp - WebCore/plugins/android/PluginDataAndroid.cpp Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+73
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-73/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-0/+73