OSDN Git Service
Steve Block [Tue, 17 Nov 2009 23:09:00 +0000 (15:09 -0800)]
am
69145150: am
1865b306: Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.
Merge commit '
69145150c9b4d4784e20fdca95417bcc77ab5ddd'
* commit '
69145150c9b4d4784e20fdca95417bcc77ab5ddd':
Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.
Andrei Popescu [Tue, 17 Nov 2009 23:08:56 +0000 (15:08 -0800)]
am
a6a1be48: am
7a91213b: Merge change I4465d348 into eclair-mr2
Merge commit '
a6a1be48ca7d34799bf17214e4ab66b5e47bd3cf'
* commit '
a6a1be48ca7d34799bf17214e4ab66b5e47bd3cf':
Update style after
Steve Block [Tue, 17 Nov 2009 23:08:51 +0000 (15:08 -0800)]
am
9e4bad85: am
c1d88f70: Removes some more superfluous code from the Makefiles.
Merge commit '
9e4bad858de8663aa91b892faf348c804fbcd28e'
* commit '
9e4bad858de8663aa91b892faf348c804fbcd28e':
Removes some more superfluous code from the Makefiles.
Steve Block [Tue, 17 Nov 2009 23:08:46 +0000 (15:08 -0800)]
am
97167fb0: am
2a350060: Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.
Merge commit '
97167fb0649aa41fdc572b4551ce4d9e045bc0af'
* commit '
97167fb0649aa41fdc572b4551ce4d9e045bc0af':
Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.
Andrei Popescu [Tue, 17 Nov 2009 23:08:28 +0000 (15:08 -0800)]
am
59f76c86: am
3545b177: Merge change If5d1fa4f into eclair-mr2
Merge commit '
59f76c86d5a92162d06af940d3efc04167dd01e1'
* commit '
59f76c86d5a92162d06af940d3efc04167dd01e1':
Split the GeolocationService implementation. This is a result of
Grace Kloba [Tue, 17 Nov 2009 15:34:32 +0000 (07:34 -0800)]
am
1947df7b: am
2278eb4c: Revert https://android-git.corp.google.com/g/#change,31178 as b/issue?id=
2183371 is finally fixed.
Merge commit '
1947df7b7e4c41f26ccc3f713e191aa5c4076fca'
* commit '
1947df7b7e4c41f26ccc3f713e191aa5c4076fca':
Revert https://android-git.corp.google.com/g/#change,31178
Nicolas Roard [Tue, 17 Nov 2009 15:31:27 +0000 (07:31 -0800)]
am
561e5d5c: am
17a4c1d7: Merge change Ibac5ab03 into eclair-mr2
Merge commit '
561e5d5c1c9c8884271d36b09ab2540dd7356828'
* commit '
561e5d5c1c9c8884271d36b09ab2540dd7356828':
Add a guard on InspectorTimelineAgent, and remove unnecessary guards...
Andrei Popescu [Tue, 17 Nov 2009 15:31:21 +0000 (07:31 -0800)]
am
edf1a498: am
e650560b: Merge change Iad124f6d into eclair-mr2
Merge commit '
edf1a498ebcaab1fabaea0bbc998806125ad0b38'
* commit '
edf1a498ebcaab1fabaea0bbc998806125ad0b38':
Update Android tree with what was upstreamed in
Steve Block [Tue, 17 Nov 2009 13:51:15 +0000 (05:51 -0800)]
am
1865b306: Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.
Merge commit '
1865b30642c7bb27315677df124eb2c4f14daea6' into eclair-mr2-plus-aosp
* commit '
1865b30642c7bb27315677df124eb2c4f14daea6':
Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.
Steve Block [Tue, 17 Nov 2009 12:30:38 +0000 (12:30 +0000)]
Move V8 Makefiles to from V8Binding directory to WebCore directory, to match JSC Makefiles.
Also move binding include paths to Android.*bindings.mk and clean up some comments.
Change-Id: I6d1475cdfcc330ec3e271cab1c3aa25a414f0448
Andrei Popescu [Tue, 17 Nov 2009 13:32:27 +0000 (05:32 -0800)]
am
7a91213b: Merge change I4465d348 into eclair-mr2
Merge commit '
7a91213b05e33e75b6005212a655e1d36e89eb7b' into eclair-mr2-plus-aosp
* commit '
7a91213b05e33e75b6005212a655e1d36e89eb7b':
Update style after
Android (Google) Code Review [Tue, 17 Nov 2009 13:28:48 +0000 (05:28 -0800)]
Merge change I4465d348 into eclair-mr2
* changes:
Update style after
Steve Block [Tue, 17 Nov 2009 12:36:15 +0000 (04:36 -0800)]
am
c1d88f70: Removes some more superfluous code from the Makefiles.
Merge commit '
c1d88f70b95482a9ec4081573e739052f60a5c58' into eclair-mr2-plus-aosp
* commit '
c1d88f70b95482a9ec4081573e739052f60a5c58':
Removes some more superfluous code from the Makefiles.
Andrei Popescu [Tue, 17 Nov 2009 12:31:18 +0000 (12:31 +0000)]
Update style after
https://bugs.webkit.org/show_bug.cgi?id=31423
landed.
Steve Block [Tue, 17 Nov 2009 12:11:25 +0000 (04:11 -0800)]
am
2a350060: Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.
Merge commit '
2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1' into eclair-mr2-plus-aosp
* commit '
2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1':
Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org.
Steve Block [Mon, 16 Nov 2009 16:35:50 +0000 (16:35 +0000)]
Removes some more superfluous code from the Makefiles.
Change-Id: I9326a117296554c12ff43be0fff90b987a29561e
Steve Block [Fri, 13 Nov 2009 20:36:38 +0000 (20:36 +0000)]
Factors out common code from JSC and V8 Makefiles, ready for upstreaming to 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
Andrei Popescu [Tue, 17 Nov 2009 10:57:19 +0000 (02:57 -0800)]
am
3545b177: Merge change If5d1fa4f into eclair-mr2
Merge commit '
3545b177817f5f82c51ac218adf40b7d4baa9753' into eclair-mr2-plus-aosp
* commit '
3545b177817f5f82c51ac218adf40b7d4baa9753':
Split the GeolocationService implementation. This is a result of
Android (Google) Code Review [Tue, 17 Nov 2009 10:54:25 +0000 (02:54 -0800)]
Merge change If5d1fa4f into eclair-mr2
* changes:
Split the GeolocationService implementation. This is a result of https://bugs.webkit.org/show_bug.cgi?id=31554
Grace Kloba [Tue, 17 Nov 2009 01:49:34 +0000 (17:49 -0800)]
am
2278eb4c: Revert https://android-git.corp.google.com/g/#change,31178 as b/issue?id=
2183371 is finally fixed.
Merge commit '
2278eb4c5b402fda7021652c38f6ff5ee588c2ba' into eclair-mr2-plus-aosp
* commit '
2278eb4c5b402fda7021652c38f6ff5ee588c2ba':
Revert https://android-git.corp.google.com/g/#change,31178
Grace Kloba [Tue, 17 Nov 2009 00:10:23 +0000 (16:10 -0800)]
Revert https://android-git.corp.google.com/g/#change,31178
as http://b/issue?id=
2183371 is finally fixed.
Nicolas Roard [Mon, 16 Nov 2009 22:37:32 +0000 (14:37 -0800)]
am
17a4c1d7: Merge change Ibac5ab03 into eclair-mr2
Merge commit '
17a4c1d7f751a096335f214d1e01058fe1fb8b6b' into eclair-mr2-plus-aosp
* commit '
17a4c1d7f751a096335f214d1e01058fe1fb8b6b':
Add a guard on InspectorTimelineAgent, and remove unnecessary guards...
Andrei Popescu [Mon, 16 Nov 2009 22:37:27 +0000 (14:37 -0800)]
am
e650560b: Merge change Iad124f6d into eclair-mr2
Merge commit '
e650560b8bd25f0284dbecb3a834acc2c405c9fa' into eclair-mr2-plus-aosp
* commit '
e650560b8bd25f0284dbecb3a834acc2c405c9fa':
Update Android tree with what was upstreamed in
Andrei Popescu [Mon, 16 Nov 2009 19:00:25 +0000 (19:00 +0000)]
Split the GeolocationService implementation. This is a result of
https://bugs.webkit.org/show_bug.cgi?id=31554
Android (Google) Code Review [Mon, 16 Nov 2009 14:26:35 +0000 (06:26 -0800)]
Merge change Ibac5ab03 into eclair-mr2
* changes:
Add a guard on InspectorTimelineAgent, and remove unnecessary guards...
Android (Google) Code Review [Mon, 16 Nov 2009 12:25:12 +0000 (04:25 -0800)]
Merge change Iad124f6d into eclair-mr2
* changes:
Update Android tree with what was upstreamed in https://bugs.webkit.org/show_bug.cgi?id=31423
Andrei Popescu [Sat, 14 Nov 2009 01:38:01 +0000 (01:38 +0000)]
Update Android tree with what was upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=31423
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:09:35 +0000 (15:09 -0800)]
am
f92aca85: merge from open-source master
Merge commit '
f92aca858888c582d2705106b86343424edf4f47'
* commit '
f92aca858888c582d2705106b86343424edf4f47':
Fix spurious build breaks.
eclair snapshot
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:19 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:14 +0000 (14:03 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:13 +0000 (14:03 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
Patrick Scott [Tue, 20 Oct 2009 15:30:21 +0000 (11:30 -0400)]
Fix spurious build breaks.
Split libwebcore.a into libwebcore.a and libjs.a and then link them together.
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:13 +0000 (12:06 -0800)]
merge from eclair
Nicolas Roard [Sat, 14 Nov 2009 04:18:29 +0000 (20:18 -0800)]
Add a guard on InspectorTimelineAgent, and remove unnecessary guards...
Ben Murdoch [Fri, 13 Nov 2009 23:51:35 +0000 (15:51 -0800)]
am
8ddaca01: Remove unused #defines from config.h
Merge commit '
8ddaca01d7de97d5a9ed5b26c3f8124c50c14511'
* commit '
8ddaca01d7de97d5a9ed5b26c3f8124c50c14511':
Remove unused #defines from config.h
Ben Murdoch [Fri, 13 Nov 2009 17:50:33 +0000 (09:50 -0800)]
Remove unused #defines from config.h
Change-Id: I9e12f9344db4e4e84399ef0c58db9a3acad0ff93
Steve Block [Fri, 13 Nov 2009 22:29:43 +0000 (14:29 -0800)]
am
dde889a3: Merge change I1878e4cc into eclair-mr2
Merge commit '
dde889a3474481cdba466b2596c16429b54d47d2'
* commit '
dde889a3474481cdba466b2596c16429b54d47d2':
Removes some superfluous files from the JSC build.
Android (Google) Code Review [Fri, 13 Nov 2009 22:23:11 +0000 (14:23 -0800)]
Merge change I1878e4cc into eclair-mr2
* changes:
Removes some superfluous files from the JSC build.
Steve Block [Fri, 13 Nov 2009 20:08:20 +0000 (20:08 +0000)]
Removes some superfluous files from the JSC build.
Note that these files are not built for V8.
Change-Id: I1878e4cc178cf89c103a7e88367eb84f08429f69
Patrick Scott [Fri, 13 Nov 2009 19:52:58 +0000 (11:52 -0800)]
am
5d2ea67f: Bring webcore_test up-to-date.
Merge commit '
5d2ea67f1f475f5428b8591101235d7211ea43a0'
* commit '
5d2ea67f1f475f5428b8591101235d7211ea43a0':
Bring webcore_test up-to-date.
Patrick Scott [Fri, 13 Nov 2009 19:37:59 +0000 (14:37 -0500)]
Bring webcore_test up-to-date.
startLoadingResource changed its signature. Some reference stuff changed and
SecurityOrigin got the local load policy stuff. Change the makefile to link
against the shared lib instead of the static lib.
Nicolas Roard [Fri, 13 Nov 2009 19:12:48 +0000 (11:12 -0800)]
am
3bdf647f: Merge change Idfc1eb92 into eclair-mr2
Merge commit '
3bdf647f4f3192299d896eab3032efa6bceb7577'
* commit '
3bdf647f4f3192299d896eab3032efa6bceb7577':
Remove android-specific plugin exception mechanism
Patrick Scott [Fri, 13 Nov 2009 19:12:44 +0000 (11:12 -0800)]
Steve Block [Fri, 13 Nov 2009 19:12:40 +0000 (11:12 -0800)]
am
7063c3ef: Merge change I67ad4b89 into eclair-mr2
Merge commit '
7063c3efe30d0ec965ac48439917030f62f50489'
* commit '
7063c3efe30d0ec965ac48439917030f62f50489':
Fixes license headers for all files in WebKit/android, other than those in stl/.
Ben Murdoch [Fri, 13 Nov 2009 19:12:34 +0000 (11:12 -0800)]
am
5739b309: Merge change I219a7aa4 into eclair-mr2
Merge commit '
5739b309312687b293aa0baeb291f7ead991b6cd'
* commit '
5739b309312687b293aa0baeb291f7ead991b6cd':
Bring page/android in line with the versions on WebKit.org.
Android (Google) Code Review [Fri, 13 Nov 2009 18:27:07 +0000 (10:27 -0800)]
Merge change Idfc1eb92 into eclair-mr2
* changes:
Remove android-specific plugin exception mechanism
Patrick Scott [Fri, 13 Nov 2009 18:15:10 +0000 (13:15 -0500)]
Fix the sim build.
Android (Google) Code Review [Fri, 13 Nov 2009 18:18:19 +0000 (10:18 -0800)]
Merge change I67ad4b89 into eclair-mr2
* changes:
Fixes license headers for all files in WebKit/android, other than those in stl/.
Android (Google) Code Review [Fri, 13 Nov 2009 17:55:40 +0000 (09:55 -0800)]
Merge change I219a7aa4 into eclair-mr2
* changes:
Bring page/android in line with the versions on WebKit.org.
Steve Block [Fri, 13 Nov 2009 03:45:16 +0000 (19:45 -0800)]
am
e03118fd: Fixes license headers for all Android-specific JavaScriptCore and WebCore files not yet upstreamed to webkit.org.
Merge commit '
e03118fd5d9b776df29de3f96232ed6b5395c845'
* commit '
e03118fd5d9b776df29de3f96232ed6b5395c845':
Fixes license headers for all Android-specific JavaScriptCore and WebCore files not yet upstreamed to webkit.org.
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:45:42 +0000 (18:45 -0800)]
eclair snapshot
Steve Block [Fri, 13 Nov 2009 00:33:34 +0000 (00:33 +0000)]
Fixes license headers for all files in WebKit/android, other than those in stl/.
These files have not yet been 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.
This change adds licenses where absent or simply fixes the names of copyright holders in the license
text to 'THE COPYRIGHT OWNER' and cleans up formatting.
Files in stl/ currently use licenses other than BSD-style and will require more careful treatment.
Change-Id: I67ad4b8932e432d3eaaeecdfeb0d09418496228d
Steve Block [Thu, 12 Nov 2009 23:26:11 +0000 (23:26 +0000)]
Fixes license headers for all Android-specific JavaScriptCore and WebCore 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
Nicolas Roard [Thu, 12 Nov 2009 22:57:10 +0000 (14:57 -0800)]
Remove android-specific plugin exception mechanism
Steve Block [Thu, 12 Nov 2009 19:29:15 +0000 (11:29 -0800)]
am
7f9b227f: Merge change I8eba4d0a into eclair-mr2
Merge commit '
7f9b227f4bbeb58184a4fd914ab15e384a603e8d'
* commit '
7f9b227f4bbeb58184a4fd914ab15e384a603e8d':
Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.
Android (Google) Code Review [Thu, 12 Nov 2009 19:21:47 +0000 (11:21 -0800)]
Merge change I8eba4d0a into eclair-mr2
* changes:
Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.
Andrei Popescu [Thu, 12 Nov 2009 19:03:48 +0000 (11:03 -0800)]
am
7576971d: Fix style in platform/android to match WebKit style
Merge commit '
7576971da15c4fb3eac2800cc74d635beac50e07'
* commit '
7576971da15c4fb3eac2800cc74d635beac50e07':
Fix style in platform/android to match WebKit style
Andrei Popescu [Thu, 12 Nov 2009 18:39:45 +0000 (10:39 -0800)]
Fix style in platform/android to match WebKit style
Steve Block [Wed, 11 Nov 2009 23:16:52 +0000 (23:16 +0000)]
Removes WebCorePrefixAndroid.h to aid WebKit upstreaming.
Content from WebCorePrefixAndroid.h has been moved to WebCorePrefix.h and the Android Makefiles modified to use that file.
- Enabler flags have been moved to WebCore/config.h.
- flex_XXX_T types are defined in WebCore/css/maketokenizer
- Most system includes are alreay present in WebCorePrefix.h
- Some includes have been moved directly to the source files that require them.
- The following includes seem not to be required so have been dropped.
- #include <limits.h>
- #include <math.h>
- #include <stdint.h>
- #include <unistd.h>
Change-Id: I8eba4d0a606463503554955e113d57bdf76a7136
Ben Murdoch [Thu, 12 Nov 2009 02:22:33 +0000 (18:22 -0800)]
Bring page/android in line with the versions on WebKit.org.
Changes in this CL that require upstreaming:
The deletion of InspectorControllerAndroid
DragController::cleanupAfterSystemDrag
Change-Id: I219a7aa49e3fc3d4193157593b90b11705d98fde
Steve Block [Thu, 12 Nov 2009 02:14:57 +0000 (18:14 -0800)]
am
a2bbe04f: Merge change I43c48f76 into eclair-mr2
Merge commit '
a2bbe04f16fb11132b3318fb0aecb290f232c563'
* commit '
a2bbe04f16fb11132b3318fb0aecb290f232c563':
Remove duplicate include of config.h
Android (Google) Code Review [Thu, 12 Nov 2009 02:06:27 +0000 (18:06 -0800)]
Merge change I43c48f76 into eclair-mr2
* changes:
Remove duplicate include of config.h
Steve Block [Thu, 12 Nov 2009 02:06:02 +0000 (18:06 -0800)]
am
742f64ae: Merge change I1e5d3868 into eclair-mr2
Merge commit '
742f64ae3bde06c9106f76a6b08ccf1e3142f0a6'
* commit '
742f64ae3bde06c9106f76a6b08ccf1e3142f0a6':
Remove DerivedSources.make.
Android (Google) Code Review [Thu, 12 Nov 2009 01:52:58 +0000 (17:52 -0800)]
Merge change I1e5d3868 into eclair-mr2
* changes:
Remove DerivedSources.make.
Steve Block [Thu, 12 Nov 2009 01:31:14 +0000 (01:31 +0000)]
Remove duplicate include of config.h
Change-Id: I43c48f7641c8ad844193a48f2cd452ac4ad553ef
Grace Kloba [Thu, 12 Nov 2009 01:39:47 +0000 (17:39 -0800)]
am
dc15689b: am
a5605499: Changing fit column to screen to exclude the padding.
Merge commit '
dc15689bee9b47fbe177511e969153f247bf3670'
* commit '
dc15689bee9b47fbe177511e969153f247bf3670':
Changing fit column to screen to exclude the padding.
Ben Murdoch [Thu, 12 Nov 2009 01:10:29 +0000 (17:10 -0800)]
am
46c1ee20: Merge change I42d5994d into eclair-mr2
Merge commit '
46c1ee2072ee97ac3f59e265676f03e2229a4ad1'
* commit '
46c1ee2072ee97ac3f59e265676f03e2229a4ad1':
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
Grace Kloba [Thu, 12 Nov 2009 01:09:10 +0000 (17:09 -0800)]
am
a5605499: Changing fit column to screen to exclude the padding.
Merge commit '
a56054997e46fcd04621cc67d650b6daf85f7b59' into eclair-mr2
* commit '
a56054997e46fcd04621cc67d650b6daf85f7b59':
Changing fit column to screen to exclude the padding.
Android (Google) Code Review [Thu, 12 Nov 2009 01:00:40 +0000 (17:00 -0800)]
Merge change I42d5994d into eclair-mr2
* changes:
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
Ben Murdoch [Wed, 11 Nov 2009 23:32:22 +0000 (15:32 -0800)]
am
87ddfee6: Merge change I7b6fdc2d into eclair-mr2
Merge commit '
87ddfee675a35a132cad188268a46f96ca9d479e'
* commit '
87ddfee675a35a132cad188268a46f96ca9d479e':
Fix a diff between our tree and the upstream WX port.
Android (Google) Code Review [Wed, 11 Nov 2009 23:24:06 +0000 (15:24 -0800)]
Merge change I7b6fdc2d into eclair-mr2
* changes:
Fix a diff between our tree and the upstream WX port.
Ben Murdoch [Wed, 11 Nov 2009 23:09:18 +0000 (15:09 -0800)]
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
This change needs to be upstreamed.
Change-Id: I42d5994dc975206cbb376189613dc23426a4a9a8
Ben Murdoch [Wed, 11 Nov 2009 23:06:47 +0000 (15:06 -0800)]
Fix a diff between our tree and the upstream WX port.
Change-Id: I7b6fdc2d1b00768f10f18520a11d20f267c42de3
Steve Block [Wed, 11 Nov 2009 22:57:03 +0000 (14:57 -0800)]
am
61e871fe: Removes extra define of HAVE_PTHREAD_RW_LOCK.
Merge commit '
61e871fe7ec093f258fee3cd3b304592f5d6c2f7'
* commit '
61e871fe7ec093f258fee3cd3b304592f5d6c2f7':
Removes extra define of HAVE_PTHREAD_RW_LOCK.
Steve Block [Wed, 11 Nov 2009 22:56:59 +0000 (14:56 -0800)]
am
ba51ea61: Removes LOCK_V8 calls, which are incomplete having been abandonned prior to previous WebKit merges.
Merge commit '
ba51ea61f184429a046b2a212fcc905083a360fe'
* commit '
ba51ea61f184429a046b2a212fcc905083a360fe':
Removes LOCK_V8 calls, which are incomplete having been abandonned prior to previous WebKit merges.
Grace Kloba [Wed, 11 Nov 2009 04:51:23 +0000 (20:51 -0800)]
Changing fit column to screen to exclude the padding.
Fix http://b/issue?id=
2253222
Steve Block [Wed, 11 Nov 2009 00:05:54 +0000 (00:05 +0000)]
Removes extra define of HAVE_PTHREAD_RW_LOCK.
This define was added to Android and later upstreamed to webkit.org at a slightly different location.
The latest WebKit merge caused both defines to be used.
See https://bugs.webkit.org/show_bug.cgi?id=30713
Change-Id: Ib68ceddb57868903661a1d2e3fedf9e092222091
Steve Block [Fri, 6 Nov 2009 21:08:07 +0000 (21:08 +0000)]
Removes LOCK_V8 calls, which are incomplete having been abandonned prior to previous WebKit merges.
Change-Id: Iee5a3a8d4eb1087ef196f193efb93d1e0dbcf77b
Steve Block [Wed, 11 Nov 2009 00:24:28 +0000 (16:24 -0800)]
am
2c386559: Update Android build to remove websockets include and to keep in line with latest WebKit.
Merge commit '
2c386559c2b67b9921be326a44676937b61b08f4'
* commit '
2c386559c2b67b9921be326a44676937b61b08f4':
Update Android build to remove websockets include and to keep in line with latest WebKit.
Steve Block [Fri, 6 Nov 2009 08:36:18 +0000 (08:36 +0000)]
Update Android build to remove websockets include and to keep in line with latest WebKit.
See https://bugs.webkit.org/show_bug.cgi?id=31209
Change-Id: Ie79b5599ee9d6a87f02eea7148f2660b0aaafd9d
Steve Block [Fri, 6 Nov 2009 23:17:50 +0000 (23:17 +0000)]
Remove DerivedSources.make.
This is not used by Android. It has been here since the initial import from Chromium.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=history;f=V8Binding/DerivedSources.make;h=
227aa5ec8907cb1657c495771821ce2edc05f0d4;hb=eclair-mr2.
Change-Id: I1e5d38682e519045fe67bb7b78fe13cc3c709a9a
Steve Block [Tue, 10 Nov 2009 23:24:40 +0000 (15:24 -0800)]
am
70c8e1be: Merge webkit.org at r50258 : Update WebKit revision number.
Merge commit '
70c8e1be70c9509280aa52daa293153cb033df13'
* commit '
70c8e1be70c9509280aa52daa293153cb033df13':
Merge webkit.org at r50258 : Update WebKit revision number.
Steve Block [Tue, 10 Nov 2009 23:24:34 +0000 (15:24 -0800)]
am
20626c19: Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
Merge commit '
20626c197f988d4bae39e99e4699173602b0aaaa'
* commit '
20626c197f988d4bae39e99e4699173602b0aaaa':
Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
Steve Block [Tue, 10 Nov 2009 23:24:26 +0000 (15:24 -0800)]
am
9fe74483: Merge webkit.org at r50258 : PluginPackage::compareFileVersion is now provided in PluginPackage.cpp.
Merge commit '
9fe744833c6f1531bc730abafe6d35fc5c9d653d'
* commit '
9fe744833c6f1531bc730abafe6d35fc5c9d653d':
Merge webkit.org at r50258 : PluginPackage::compareFileVersion is now provided in PluginPackage.cpp.
Steve Block [Tue, 10 Nov 2009 23:24:21 +0000 (15:24 -0800)]
am
7e782692: Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
Merge commit '
7e78269225e9e9cee2d8ba12488fb907c2c1db59'
* commit '
7e78269225e9e9cee2d8ba12488fb907c2c1db59':
Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
Steve Block [Tue, 10 Nov 2009 23:24:16 +0000 (15:24 -0800)]
am
c05f32f6: Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
Merge commit '
c05f32f6ac83a4d9467153745a217b636e8c8a60'
* commit '
c05f32f6ac83a4d9467153745a217b636e8c8a60':
Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
Steve Block [Tue, 10 Nov 2009 23:24:10 +0000 (15:24 -0800)]
am
5995cab4: Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
Merge commit '
5995cab44737fd5374956941260caf2e2e8290b3'
* commit '
5995cab44737fd5374956941260caf2e2e8290b3':
Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
Steve Block [Tue, 10 Nov 2009 23:24:04 +0000 (15:24 -0800)]
am
67ed0ede: Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
Merge commit '
67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a'
* commit '
67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a':
Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
Steve Block [Tue, 10 Nov 2009 23:23:57 +0000 (15:23 -0800)]
am
5fa903cc: Merge webkit.org at r50258 : Fix header include order for Log.h.
Merge commit '
5fa903cc3950d366e347a4495de32a0a397b1d47'
* commit '
5fa903cc3950d366e347a4495de32a0a397b1d47':
Merge webkit.org at r50258 : Fix header include order for Log.h.
Steve Block [Tue, 10 Nov 2009 23:23:50 +0000 (15:23 -0800)]
am
8a2d94ee: Merge webkit.org at r50258 : Add guards for Document::inspectorTimelineAgent().
Merge commit '
8a2d94ee2b678e40f2c6874fda176178863ee107'
* commit '
8a2d94ee2b678e40f2c6874fda176178863ee107':
Merge webkit.org at r50258 : Add guards for Document::inspectorTimelineAgent().
Steve Block [Tue, 10 Nov 2009 23:23:43 +0000 (15:23 -0800)]
am
b2e37e91: Merge webkit.org at r50258 : Fix Makefiles.
Merge commit '
b2e37e910dfa6b85db496d6d8107ccbee539a3c8'
* commit '
b2e37e910dfa6b85db496d6d8107ccbee539a3c8':
Merge webkit.org at r50258 : Fix Makefiles.
Steve Block [Tue, 10 Nov 2009 23:23:35 +0000 (15:23 -0800)]
am
3f60c26c: Merge webkit.org at r50258 : Fix conflicts.
Merge commit '
3f60c26c3fa9dc89d57ef4db083a4f13ef86c103'
* commit '
3f60c26c3fa9dc89d57ef4db083a4f13ef86c103':
Merge webkit.org at r50258 : Fix conflicts.
Steve Block [Tue, 10 Nov 2009 23:23:25 +0000 (15:23 -0800)]
am
cac0f67c: Merge webkit.org at r50258 : Initial merge by git.
Merge commit '
cac0f67c402d107cdb10971b95719e2ff9c7c76b'
* commit '
cac0f67c402d107cdb10971b95719e2ff9c7c76b':
Merge webkit.org at r50258 : Initial merge by git.
Steve Block [Thu, 5 Nov 2009 18:44:14 +0000 (18:44 +0000)]
Merge webkit.org at r50258 : Update WebKit revision number.
Change-Id: If63324be97f04e715aa12b278a1c46d8845690f4
Steve Block [Thu, 29 Oct 2009 16:35:41 +0000 (16:35 +0000)]
Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
See http://trac.webkit.org/changeset/49963 and http://trac.webkit.org/changeset/49978
Change-Id: Ic788827d54ccf48a3eb54863d2708ebad1d67ae1
Steve Block [Thu, 29 Oct 2009 12:12:32 +0000 (12:12 +0000)]
Merge webkit.org at r50258 : PluginPackage::compareFileVersion is now provided in PluginPackage.cpp.
See http://trac.webkit.org/changeset/50138
Change-Id: Ifbb9bbf4fab660148e4e9afe1bedcda0e1b40058
Steve Block [Tue, 20 Oct 2009 15:28:30 +0000 (16:28 +0100)]
Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
See http://trac.webkit.org/changeset/49641
Change-Id: I8b1a274623a62f73563988eb1ed120f43e0e4c70
Steve Block [Tue, 20 Oct 2009 14:51:43 +0000 (15:51 +0100)]
Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
See http://trac.webkit.org/changeset/49809
Change-Id: I5db6d1d821cc6e7b57dfa665ea9018b4833864d5
Steve Block [Tue, 20 Oct 2009 14:57:41 +0000 (15:57 +0100)]
Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
See http://trac.webkit.org/changeset/49372
Change-Id: Iecc49a2185681eb2f37b5ecc9364fa8946493f69
Steve Block [Tue, 20 Oct 2009 14:07:10 +0000 (15:07 +0100)]
Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
See http://trac.webkit.org/changeset/49413
Change-Id: I1e584a6a50e1a20e40c76471651c0561df496c47