| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I685fd143279f92570a1844c847478e0cbe038e1e
|
|
|
|
| |
Change-Id: I9326a117296554c12ff43be0fff90b987a29561e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
webkit.org.
Both the JSC and V8 builds use Android.mk, WebCore/Android.mk and WebCore/Android.derived.mk.
The JSC build also uses WebCore/Android.jscbindings.mk and WebCore/Android.derived.jscbindings.mk.
The V8 build also uses V8Bindings/V8Binding.derived.mk.
Change details ...
Android.mk - Added content from both Android.jsc.mk and Android.v8.mk and removed these files.
Added ifdefs to switch between two builds.
WebCore/Android.mk - Moved JSC bindings code to WebCore/Android.jscbindings.mk.
This file is now functionally identical to WebCore/Android.v8.mk, which was removed.
WebCore/Android.derived.mk - Moved JSC bindings code to WebCore/Android.derived.jscbindings.mk.
This file is now functionally identical to WebCore/Android.v8.derived.mk, which was removed.
Also updates copyright dates, as per WebKit requirements.
Change-Id: I92377b60f6f63c57283c316a2c7c2c64a13dc7de
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: I5b458ac956718d2dd25d4faff503b376cd9e3214
|
|
|
|
| |
Change-Id: Id5b57453ee3cae7c8d765be847a4ccca0e19ce68
|
|
|
|
|
|
| |
Also remove a few other unnnecessary files from the JSC Makefile.
Change-Id: I3788a1e3f60941e9712b4c4345ba09fa0a5ad390
|
|
|
|
|
|
|
| |
We disable INSPECTOR - See http://trac.webkit.org/changeset/48430
We disable EVENT_SOURCE - see http://trac.webkit.org/changeset/47323
Change-Id: Iab25b3bb56582d9df1e693ed7158338e953677b7
|
|
|
|
| |
Change-Id: Iae69d02802dbe3d62e8d36753a8bed0ff9883db8
|
| |
|
|
|
|
| |
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
|
|
|
|
| |
This reverts commit 62983d46fda85f4d912c221e5cbc91a05d4edebf.
|
|
|
|
| |
This reverts commit 76de9f7763de0e4568056a5a26c93030f21e0b90.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
permissions'.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
|
| | |
|
| |
| |
| |
| | |
Not fully complete yet.
|
|/ |
|
|
|
|
|
|
| |
It is easier to work with merge tool. Will add a separate set of Makefiles for V8.
Add Android.v8.mk as a reference.
|
|\ |
|
| | |
|
| |
| |
| |
| | |
Picked up several new files from Chrome port.
|
|/
|
|
| |
Introduce a flag JS_ENGINE, which can be set to 'jsc' or 'v8'. Currently only 'jsc' is working.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
//branches/master/android/external/webkit/WebCore/Android.derived.mk
add exclusion rules for svg
//branches/master/android/external/webkit/WebCore/Android.mk
add exclusion exceptions (e.g., files from /skia/ that we use)
remove the need to have '\' at the end of each file
//branches/master/android/external/webkit/WebKitTools/android/webkitmerge/webkitmerge.cpp
don't delete modified files, but mark them with MANUAL_MERGE_REQUIRED
add --execute option (in progress)
add --perforce, --git options
fix double add of file when it appears in sandbox and new webkit
BUG=1553405
Automated import of CL 146111
|
|
|
|
| |
Automated import of CL 145796
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To enable SVG, edit your buildspec.mk to
ENABLE_SVG:=true
then
make clean-libwebcore && make
Some SVG functionality has been stubbed out in this checkin.
//branches/master/android/build/buildspec.mk.default # edit
- add ENABLE_SVG, commented out by default
- fix up WEBCORE_INSTRUMENTATION define while I was in there
//branches/master/android/external/webkit/Android.mk # edit
- add ENABLE_SVG C define
- add svg paths to C includes
//branches/master/android/external/webkit/WebCore/Android.derived.mk # edit
- update merge tool rules
- add svg to css property names, keywords, generated bindings
- add svg names, element factory, wrappers
- remove obsolete ksvgcssproperties.h
- add XLinkNames, required by SVG
//branches/master/android/external/webkit/WebCore/Android.mk # edit
- update merge tool rules
- add svg bindings, css svg parsing, svg rendering, svg engine
//branches/master/android/external/webkit/WebCore/config.h # edit
- leave ENABLE_SVG alone if it is already defined
//branches/master/android/external/webkit/WebCore/loader/EmptyClients.h # edit
- add some Android extensions as empty virtuals (EmptyClients is only used by SVG)
//branches/master/android/external/webkit/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp # edit
//branches/master/android/external/webkit/WebCore/platform/graphics/android/PathAndroid.cpp # edit
- add SVG graphics porting functions. Note the FIXMEs -- some are unimplemented.
BUG=1474412
Automated import of CL 145053
|
|
|
|
|
|
|
|
| |
don't include chromium files in JavaScriptCore
add a list of generated files to exclude
BUG=1553405
Automated import of CL 144643
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Anticipating another merge with webkit, these changes
update the rules to automatically exclude files we've already removed
manually. A new rule allows including files that are not yet
checked into webkit's makefiles (e.g., Touch).
The exclude rules no longer need to be alphabetized, but the
makefile sources still do -- so fix a couple of entries that
are out of order.
BUG=1553405
Automated import of CL 143486
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|