summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android/FileSystemAndroid.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-126/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-4/+2
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-0/+4
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Enable File Reader and blob.slice APIs.Ben Murdoch2010-06-021-5/+13
| | | | | | | | | Notes: - the change to WebCore/html/FileStream.cpp is a cherry pick of http://trac.webkit.org/changeset/60325 - the change to WebCore/platform/posix/FileSystemPOSIX.cpp is a cherry pick of http://trac.webkit.org/changeset/60374 - this needs a corresponding frameworks/base change Change-Id: I05d1496e1e95adf1c6a61c6f07bbf62e9bc92820
* Add a method to the PlatformBridge to resolve the filename of a fileBen Murdoch2010-05-211-0/+11
| | | | | | | | | given its representation as a content:// URI, and the associated JNI plumbing. Requires a frameworks/base change. Change-Id: I9b8b8bb3fbfa31c86f4212f91c140fe62c6c6682
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-0/+17
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()Steve Block2010-05-121-14/+0
| | | | | | | | | | | The Android version of writeToFile() tries to support interrupted writes, but has a bug as the data pointer is not updated. So instead we take the standard POSIX version. See https://mondrian.corp.google.com/changelist/75998-p9 and https://bugs.webkit.org/show_bug.cgi?id=38908 Change-Id: I011671211017005a06727e436f92e8458902a7db
* Merge webkit.org at r58033 : Cherry-pick WebKit change 58774 to avoid ↵Steve Block2010-05-111-8/+0
| | | | | | | | conflicts with FileSystemPOSIX.cpp See http://trac.webkit.org/changeset/58774 Change-Id: I646d82752feaafaf0ece6e1cdd099ae2a200995e
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-1/+1
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-5/+5
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Cleanup for upstreaming to webkit.orgFeng Qian2009-06-091-21/+20
| | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=26264 https://bugs.webkit.org/show_bug.cgi?id=26265 https://bugs.webkit.org/show_bug.cgi?id=26280
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-0/+31
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+101
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-101/+0
|
* auto import from //branches/cupcake/...@127101The Android Open Source Project2009-01-201-3/+2
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-0/+1
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+62
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+39
generated by cgit v1.1 at 2024-07-12 08:28:28 +0000