OSDN Git Service
Andrei Popescu [Wed, 19 Aug 2009 17:23:07 +0000 (18:23 +0100)]
Merge commit 'goog/master' into merge
Andrei Popescu [Wed, 19 Aug 2009 17:07:37 +0000 (18:07 +0100)]
fix JSC support.
Andrei Popescu [Wed, 19 Aug 2009 13:09:30 +0000 (14:09 +0100)]
Revert "Merge WebKit r47420"
This reverts commit
d227fc870c7a697500a3c900c31baf05fb9a8524.
Andrei Popescu [Wed, 19 Aug 2009 13:09:08 +0000 (14:09 +0100)]
Revert "Compilation and link error fixes for new webkit r47420."
This reverts commit
632f4508222c2a617e6820e9388867c0f4821db8.
Andrei Popescu [Wed, 19 Aug 2009 13:08:46 +0000 (14:08 +0100)]
Revert "Start fixing JSC compile errors for new webkit."
This reverts commit
62983d46fda85f4d912c221e5cbc91a05d4edebf.
Andrei Popescu [Wed, 19 Aug 2009 13:08:17 +0000 (14:08 +0100)]
Revert "Continue with JSC errors."
This reverts commit
76de9f7763de0e4568056a5a26c93030f21e0b90.
Ben Murdoch [Wed, 19 Aug 2009 11:15:58 +0000 (12:15 +0100)]
Continue with JSC errors.
Ben Murdoch [Wed, 19 Aug 2009 10:43:56 +0000 (11:43 +0100)]
Start fixing JSC compile errors for new webkit.
Ben Murdoch [Tue, 18 Aug 2009 18:15:12 +0000 (19:15 +0100)]
Compilation and link error fixes for new webkit r47420.
Jack Palevich [Tue, 18 Aug 2009 19:10:08 +0000 (12:10 -0700)]
am
f4c57502: am
d2b4b46e: Merge change 21746 into eclair
Merge commit '
f4c575025539df7a22801394dac8ef1af891a8ff'
* commit '
f4c575025539df7a22801394dac8ef1af891a8ff':
Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4
Jack Palevich [Tue, 18 Aug 2009 18:32:39 +0000 (11:32 -0700)]
am
d2b4b46e: Merge change 21746 into eclair
Merge commit '
d2b4b46e864b9002fee625c0a6c65955e4f4d92c' into eclair-plus-aosp
* commit '
d2b4b46e864b9002fee625c0a6c65955e4f4d92c':
Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4
Android (Google) Code Review [Tue, 18 Aug 2009 18:30:00 +0000 (11:30 -0700)]
Merge change 21746 into eclair
* changes:
Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4
Ben Murdoch [Tue, 18 Aug 2009 14:36:45 +0000 (15:36 +0100)]
Merge WebKit r47420
Jack Palevich [Tue, 18 Aug 2009 18:17:20 +0000 (11:17 -0700)]
Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4
This environment ends up using the C++ version of strrchr rather than the
C version. Apparently older environments use the C version of strrchr.
I'm guessing the change is due to one of the standard C++ header files
changing so that includes the new C++ version of strrchr.
The difference is that the C version of strrchr is:
char* strrchr(const char*, char);
while the C++ version of strrchr is overloaded:
const char* strrchr(const char*, char);
char* strrchr(char*, char);
This code depended on the C version to convert a const char* pointer into
a non-const char* pointer.
The fix is to change the code to work with a const char* result, and if
that is not possible, manually insert a hard cast of the return value.
Grace Kloba [Tue, 18 Aug 2009 17:55:38 +0000 (10:55 -0700)]
am
84bb114b: am
14b66f1b: Merge change 21466 into eclair
Merge commit '
84bb114b9f975a9a4b70a429a3d9b5c008993752'
* commit '
84bb114b9f975a9a4b70a429a3d9b5c008993752':
Need to notify Java side when viewport tag is parsed.
Grace Kloba [Tue, 18 Aug 2009 17:53:52 +0000 (10:53 -0700)]
am
14b66f1b: Merge change 21466 into eclair
Merge commit '
14b66f1be3bd17e6c607bad649e68330489869a7' into eclair-plus-aosp
* commit '
14b66f1be3bd17e6c607bad649e68330489869a7':
Need to notify Java side when viewport tag is parsed.
Android (Google) Code Review [Tue, 18 Aug 2009 17:52:00 +0000 (10:52 -0700)]
Merge change 21466 into eclair
* changes:
Need to notify Java side when viewport tag is parsed.
Feng Qian [Tue, 18 Aug 2009 17:16:58 +0000 (10:16 -0700)]
Feng Qian [Tue, 18 Aug 2009 17:14:46 +0000 (10:14 -0700)]
am
7793e23e: Fix the sim-eng build.
Merge commit '
7793e23e0420919c2970edc4a2ace1aabc3ed385' into eclair-plus-aosp
* commit '
7793e23e0420919c2970edc4a2ace1aabc3ed385':
Fix the sim-eng build.
Feng Qian [Tue, 18 Aug 2009 17:09:36 +0000 (10:09 -0700)]
Fix the sim-eng build.
The same change is been upstreaming to V8.
Grace Kloba [Tue, 18 Aug 2009 17:08:49 +0000 (10:08 -0700)]
Need to notify Java side when viewport tag is parsed.
Andrei Popescu [Tue, 18 Aug 2009 14:54:37 +0000 (15:54 +0100)]
Revert changes to WebCore.exp file
Andrei Popescu [Tue, 18 Aug 2009 14:37:54 +0000 (15:37 +0100)]
Fixes for the OSX build
Ben Murdoch [Tue, 18 Aug 2009 13:59:06 +0000 (14:59 +0100)]
Merge commit 'goog/master' into merge
Conflicts:
WEBKIT_MERGE_REVISION
Feng Qian [Tue, 18 Aug 2009 11:14:32 +0000 (04:14 -0700)]
Feng Qian [Tue, 18 Aug 2009 11:12:54 +0000 (04:12 -0700)]
am
310cbb5f: Update V8 to r2703.
Merge commit '
310cbb5f146406216a2c11a235e7cc4482e282f1' into eclair-plus-aosp
* commit '
310cbb5f146406216a2c11a235e7cc4482e282f1':
Update V8 to r2703.
Ben Murdoch [Tue, 18 Aug 2009 11:11:34 +0000 (12:11 +0100)]
Try to fix JNI startup errors.
Ben Murdoch [Tue, 18 Aug 2009 10:35:14 +0000 (11:35 +0100)]
Merge commit 'goog/master' into merge
Conflicts:
WebCore/bindings/v8/ScriptController.cpp
WebCore/page/Geolocation.cpp
WebCore/platform/android/GeolocationServiceAndroid.cpp
Feng Qian [Tue, 18 Aug 2009 07:57:39 +0000 (00:57 -0700)]
Update V8 to r2703.
New revision has improvement of scanner.
Feng Qian [Tue, 18 Aug 2009 06:32:09 +0000 (23:32 -0700)]
am
1f4c9d43: am
144e6949: Merge change 21673 into eclair
Merge commit '
1f4c9d43aeeef7e66437a86ad0e92ff7b0b7f02f'
* commit '
1f4c9d43aeeef7e66437a86ad0e92ff7b0b7f02f':
Add re-entry count for QemuTracerAuto class.
Grace Kloba [Tue, 18 Aug 2009 06:32:07 +0000 (23:32 -0700)]
am
b9b66602: am
8bba8730: Merge change 21618 into eclair
Merge commit '
b9b66602e5b40cfd3dfac9a0b1c47fb1a0cfc7c6'
* commit '
b9b66602e5b40cfd3dfac9a0b1c47fb1a0cfc7c6':
Fix #
2058833. For mobile sites, add "width=device-width" if viewport width
Feng Qian [Tue, 18 Aug 2009 06:31:03 +0000 (23:31 -0700)]
am
144e6949: Merge change 21673 into eclair
Merge commit '
144e6949fa07509619b72d7319418fe6b40b84ed' into eclair-plus-aosp
* commit '
144e6949fa07509619b72d7319418fe6b40b84ed':
Add re-entry count for QemuTracerAuto class.
Grace Kloba [Tue, 18 Aug 2009 06:31:00 +0000 (23:31 -0700)]
am
8bba8730: Merge change 21618 into eclair
Merge commit '
8bba87309bc6171f066820ce64c7e73b725a94e1' into eclair-plus-aosp
* commit '
8bba87309bc6171f066820ce64c7e73b725a94e1':
Fix #
2058833. For mobile sites, add "width=device-width" if viewport width
Android (Google) Code Review [Tue, 18 Aug 2009 06:29:56 +0000 (23:29 -0700)]
Merge change 21673 into eclair
* changes:
Add re-entry count for QemuTracerAuto class.
Feng Qian [Tue, 18 Aug 2009 06:22:06 +0000 (23:22 -0700)]
Add re-entry count for QemuTracerAuto class.
Android (Google) Code Review [Tue, 18 Aug 2009 01:19:17 +0000 (18:19 -0700)]
Merge change 21618 into eclair
* changes:
Fix #
2058833. For mobile sites, add "width=device-width" if viewport width is not defined as our default viewport width is 800px now.
Grace Kloba [Tue, 18 Aug 2009 01:18:27 +0000 (18:18 -0700)]
am
12501503: am
9f2051ac: As PluginList is removed when we remove Gears, remove code in the native side.
Merge commit '
125015037a30947bd5ebce5b289f392c31d98eae'
* commit '
125015037a30947bd5ebce5b289f392c31d98eae':
As PluginList is removed when we remove Gears, remove code in the native side.
Grace Kloba [Tue, 18 Aug 2009 01:16:54 +0000 (18:16 -0700)]
am
9f2051ac: As PluginList is removed when we remove Gears, remove code in the native side.
Merge commit '
9f2051acd1dd94e6621616a99c50c409c941ad56' into eclair-plus-aosp
* commit '
9f2051acd1dd94e6621616a99c50c409c941ad56':
As PluginList is removed when we remove Gears, remove code in the native side.
Grace Kloba [Tue, 18 Aug 2009 01:12:10 +0000 (18:12 -0700)]
As PluginList is removed when we remove Gears, remove code in the native side.
Grace Kloba [Mon, 17 Aug 2009 23:00:17 +0000 (16:00 -0700)]
Fix #
2058833. For mobile sites, add "width=device-width" if viewport width
is not defined as our default viewport width is 800px now.
Ben Murdoch [Mon, 17 Aug 2009 20:02:23 +0000 (21:02 +0100)]
Fix the last of the linker errors !
Patrick Scott [Mon, 17 Aug 2009 19:44:03 +0000 (12:44 -0700)]
am
5a8e1d54: (-s ours) am
4e3a924f: Do not merge - pulled from master Be more restrictive when expanding iframes.
Merge commit '
5a8e1d54a100b72b47732643ebeba62487be2eb3'
* commit '
5a8e1d54a100b72b47732643ebeba62487be2eb3':
Do not merge - pulled from master
Patrick Scott [Mon, 17 Aug 2009 19:42:20 +0000 (12:42 -0700)]
am
4e3a924f: Do not merge - pulled from master Be more restrictive when expanding iframes.
Merge commit '
4e3a924fd8b5f88ef5e656393e8a0de568c2baa5' into eclair-plus-aosp
* commit '
4e3a924fd8b5f88ef5e656393e8a0de568c2baa5':
Do not merge - pulled from master
Patrick Scott [Fri, 14 Aug 2009 12:21:09 +0000 (08:21 -0400)]
Do not merge - pulled from master
Be more restrictive when expanding iframes.
If an iframe has no scrollbars and a fixed dimension, it serves no purpose to
try and expand the contents. Some sites like to use hidden iframes for
asynchronous loading and showing or expanding those iframes causes layout
problems.
Change the expansion logic slightly to only expand iframes and not contract
them. Also update calcWidth and calcHeight to check for scrollbars or a
non-fixed dimension.
BUG=
2039520,
2004093
Patrick Scott [Mon, 17 Aug 2009 18:58:15 +0000 (11:58 -0700)]
am
d605fe10: am
7df3d98b: Check for a null request in the policy callbacks.
Merge commit '
d605fe10b4d30363d5a1efcec8df4d1b4b730e66'
* commit '
d605fe10b4d30363d5a1efcec8df4d1b4b730e66':
Check for a null request in the policy callbacks.
Patrick Scott [Mon, 17 Aug 2009 18:55:49 +0000 (11:55 -0700)]
am
7df3d98b: Check for a null request in the policy callbacks.
Merge commit '
7df3d98b242a15afb526fe8a7c8b0a5d28415f33' into eclair-plus-aosp
* commit '
7df3d98b242a15afb526fe8a7c8b0a5d28415f33':
Check for a null request in the policy callbacks.
Patrick Scott [Mon, 17 Aug 2009 18:43:53 +0000 (14:43 -0400)]
Check for a null request in the policy callbacks.
The gtk platform also does this check to ensure that the request url is not
empty or null.
Patrick Scott [Fri, 14 Aug 2009 12:21:09 +0000 (08:21 -0400)]
Be more restrictive when expanding iframes.
If an iframe has no scrollbars and a fixed dimension, it serves no purpose to
try and expand the contents. Some sites like to use hidden iframes for
asynchronous loading and showing or expanding those iframes causes layout
problems.
Change the expansion logic slightly to only expand iframes and not contract
them. Also update calcWidth and calcHeight to check for scrollbars or a
non-fixed dimension.
BUG=
2039520,
2004093
Ben Murdoch [Mon, 17 Aug 2009 18:23:22 +0000 (19:23 +0100)]
Linker error fixes.
Andrei Popescu [Mon, 17 Aug 2009 18:22:09 +0000 (19:22 +0100)]
more localized strings
Andrei Popescu [Mon, 17 Aug 2009 18:00:43 +0000 (19:00 +0100)]
sort out inspector linking errors
Ben Murdoch [Mon, 17 Aug 2009 18:00:37 +0000 (19:00 +0100)]
Continue with linker error fixes.
Steve Block [Mon, 17 Aug 2009 17:59:07 +0000 (10:59 -0700)]
am
a33b8f97: am
350d1294: Merge change 21293 into eclair
Merge commit '
a33b8f97b76634d57ffa1c296c3e1fca5726662f'
* commit '
a33b8f97b76634d57ffa1c296c3e1fca5726662f':
Correctly applies Geolocation timeout parameter.
Android (Google) Code Review [Mon, 17 Aug 2009 17:10:35 +0000 (10:10 -0700)]
Merge change 21503 into master-webkit-merge
* changes:
A bunch of linker error fixes
Andrei Popescu [Mon, 17 Aug 2009 16:27:15 +0000 (17:27 +0100)]
A bunch of linker error fixes
Ben Murdoch [Mon, 17 Aug 2009 16:24:43 +0000 (17:24 +0100)]
Fix first set of linker errors.
Ben Murdoch [Mon, 17 Aug 2009 15:31:14 +0000 (16:31 +0100)]
Compilation fixes.
Andrei Popescu [Mon, 17 Aug 2009 14:59:08 +0000 (15:59 +0100)]
WebViewCore fix
Android (Google) Code Review [Mon, 17 Aug 2009 14:11:51 +0000 (07:11 -0700)]
Merge change 21490 into master-webkit-merge
* changes:
Fix WebCoreFrameBridge.cpp
Andrei Popescu [Mon, 17 Aug 2009 14:05:58 +0000 (15:05 +0100)]
Fix WebCoreFrameBridge.cpp
Ben Murdoch [Mon, 17 Aug 2009 14:05:56 +0000 (15:05 +0100)]
Fix some WebKit/ compilation errors.
Android (Google) Code Review [Mon, 17 Aug 2009 13:40:13 +0000 (06:40 -0700)]
Merge change 21488 into master-webkit-merge
* changes:
Fix compilation error inside ImageDecoderSkia.cpp
Ben Murdoch [Mon, 17 Aug 2009 13:35:19 +0000 (14:35 +0100)]
Fix compilation error inside ImageDecoderSkia.cpp
Andrei Popescu [Mon, 17 Aug 2009 12:59:26 +0000 (13:59 +0100)]
PluginView.cpp fix
Andrei Popescu [Mon, 17 Aug 2009 12:41:56 +0000 (13:41 +0100)]
ResourceHandleAndroid fix
Steve Block [Mon, 17 Aug 2009 12:18:09 +0000 (05:18 -0700)]
am
350d1294: Merge change 21293 into eclair
Merge commit '
350d129406ff3ee363c0dc8bb747ce1823ed7c9d' into eclair-plus-aosp
* commit '
350d129406ff3ee363c0dc8bb747ce1823ed7c9d':
Correctly applies Geolocation timeout parameter.
Android (Google) Code Review [Mon, 17 Aug 2009 12:16:49 +0000 (05:16 -0700)]
Merge change 21293 into eclair
* changes:
Correctly applies Geolocation timeout parameter.
Android (Google) Code Review [Mon, 17 Aug 2009 12:14:12 +0000 (05:14 -0700)]
Merge change 21484 into master-webkit-merge
* changes:
Fix FontCustomPlatformData.h as in https://bugs.webkit.org/show_bug.cgi?id=28065
Andrei Popescu [Mon, 17 Aug 2009 12:11:39 +0000 (13:11 +0100)]
Fix FontCustomPlatformData.h as in https://bugs.webkit.org/show_bug.cgi?id=28065
Ben Murdoch [Mon, 17 Aug 2009 12:10:43 +0000 (13:10 +0100)]
More build fixes.
Steve Block [Fri, 14 Aug 2009 16:18:35 +0000 (17:18 +0100)]
Correctly applies Geolocation timeout parameter.
Currently, the timeout is started when permissions are granted and stopped
when the success callback is made, thus rendering the timeout useless. The
correct behavior is to start the timeout when the request is started, and
to stop it as soon as a position fix is obtained.
Also, the timeout should always be applied, even if no error callback is present
and the request should be stopped on timeout.
This will be upstreamed to WebKit in bug 27256.
Android (Google) Code Review [Mon, 17 Aug 2009 11:15:07 +0000 (04:15 -0700)]
Merge change 21481 into master-webkit-merge
* changes:
Fix some errors in platform/graphics/android.
Andrei Popescu [Mon, 17 Aug 2009 11:07:12 +0000 (12:07 +0100)]
Fix RenderThemeAndroid following the changes in trac.webkit.org/changeset/43367/trunk/WebCore/dom/Element.h
Ben Murdoch [Mon, 17 Aug 2009 11:07:22 +0000 (12:07 +0100)]
Fix some errors in platform/graphics/android.
Cary Clark [Fri, 14 Aug 2009 22:13:22 +0000 (15:13 -0700)]
am
e88026d6: am
5207ee53: rebuild nav cache if cursor is moved to invisible node
Merge commit '
e88026d63cb26e91319e7e41fa61a0f16fc5b211'
* commit '
e88026d63cb26e91319e7e41fa61a0f16fc5b211':
rebuild nav cache if cursor is moved to invisible node
Cary Clark [Fri, 14 Aug 2009 22:09:44 +0000 (15:09 -0700)]
am
5207ee53: rebuild nav cache if cursor is moved to invisible node
Merge commit '
5207ee5379660814c62bf3cb3f1c70051e152a86' into eclair-plus-aosp
* commit '
5207ee5379660814c62bf3cb3f1c70051e152a86':
rebuild nav cache if cursor is moved to invisible node
Cary Clark [Fri, 14 Aug 2009 15:44:05 +0000 (11:44 -0400)]
rebuild nav cache if cursor is moved to invisible node
http://b/issue?id=
2023504
moving the trackball to a node that used to be visible
but is no longer visible now triggers a rebuild of
the nav cache
Steve Block [Fri, 14 Aug 2009 17:36:12 +0000 (10:36 -0700)]
Steve Block [Wed, 12 Aug 2009 16:26:45 +0000 (17:26 +0100)]
do not merge: cherry-picked
360742dd52ce2e67f08b219c5148577ce2e2b741 from master branch
When Geolocation permissions are denied, terminate all watchers as well as one-shots.
Steve Block [Fri, 14 Aug 2009 16:38:00 +0000 (09:38 -0700)]
am
c51ae63b: am
b12a0167: Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
Merge commit '
c51ae63bd00ca9367921f76a01122e56e2d11cdf'
* commit '
c51ae63bd00ca9367921f76a01122e56e2d11cdf':
Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
Steve Block [Fri, 14 Aug 2009 16:36:53 +0000 (09:36 -0700)]
am
b12a0167: Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
Merge commit '
b12a01676d083061bfcdc9efe98ac9d03dd59802' into eclair-plus-aosp
* commit '
b12a01676d083061bfcdc9efe98ac9d03dd59802':
Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
Steve Block [Fri, 14 Aug 2009 15:55:34 +0000 (08:55 -0700)]
Android (Google) Code Review [Fri, 14 Aug 2009 15:55:00 +0000 (08:55 -0700)]
Merge change 21276 into master-webkit-merge
* changes:
InspectorController fix
Steve Block [Fri, 14 Aug 2009 15:53:12 +0000 (08:53 -0700)]
Ben Murdoch [Fri, 14 Aug 2009 15:52:20 +0000 (16:52 +0100)]
Fixes for Clipboard and IconDatabase
Steve Block [Fri, 14 Aug 2009 11:29:38 +0000 (12:29 +0100)]
Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
Andrei Popescu [Fri, 14 Aug 2009 15:46:58 +0000 (16:46 +0100)]
InspectorController fix
Steve Block [Wed, 12 Aug 2009 16:26:45 +0000 (17:26 +0100)]
do not merge: cherry-picked
360742dd52ce2e67f08b219c5148577ce2e2b741 from master branch
When Geolocation permissions are denied, terminate all watchers as well as one-shots.
Android (Google) Code Review [Fri, 14 Aug 2009 15:21:24 +0000 (08:21 -0700)]
Merge change 21272 into master-webkit-merge
* changes:
Fix ClipboardAndroid.
Ben Murdoch [Fri, 14 Aug 2009 15:14:43 +0000 (16:14 +0100)]
Fix ClipboardAndroid.
Andrei Popescu [Fri, 14 Aug 2009 15:15:18 +0000 (16:15 +0100)]
Fixes to Android.v8.mk
Android (Google) Code Review [Fri, 14 Aug 2009 14:55:44 +0000 (07:55 -0700)]
Merge change 21269 into master-webkit-merge
* changes:
Rename functions in TouchList binding.
Ben Murdoch [Fri, 14 Aug 2009 14:53:19 +0000 (15:53 +0100)]
Rename functions in TouchList binding.
Andrei Popescu [Fri, 14 Aug 2009 14:52:56 +0000 (15:52 +0100)]
Fix ReadWriteLock class problem. Will upstream this asap
Android (Google) Code Review [Fri, 14 Aug 2009 14:51:53 +0000 (07:51 -0700)]
Merge change 21257
* changes:
When Geolocation permissions are denied, terminate all watchers as well as one-shots.
Steve Block [Wed, 12 Aug 2009 16:26:45 +0000 (17:26 +0100)]
When Geolocation permissions are denied, terminate all watchers as well as one-shots.
Andrei Popescu [Fri, 14 Aug 2009 12:42:15 +0000 (13:42 +0100)]
Fix V8DOMWrapper.cpp
Android (Google) Code Review [Fri, 14 Aug 2009 12:37:30 +0000 (05:37 -0700)]
Merge change 21263 into master-webkit-merge
* changes:
And some more bindings fixes.
Andrei Popescu [Fri, 14 Aug 2009 12:27:04 +0000 (13:27 +0100)]
More V8 compliation fixes
Ben Murdoch [Fri, 14 Aug 2009 12:26:45 +0000 (13:26 +0100)]
And some more bindings fixes.