OSDN Git Service
Patrick Scott [Fri, 4 Dec 2009 19:12:59 +0000 (11:12 -0800)]
am
2a2524d2: Merge change If686b999 into eclair-mr2
Merge commit '
2a2524d2c288155a0e88d67257f6428b79efda7f' into eclair-mr2-plus-aosp
* commit '
2a2524d2c288155a0e88d67257f6428b79efda7f':
Pass up flags for the main resource and user gesture.
Android (Google) Code Review [Fri, 4 Dec 2009 19:08:35 +0000 (11:08 -0800)]
Merge change If686b999 into eclair-mr2
* changes:
Pass up flags for the main resource and user gesture.
Grace Kloba [Fri, 4 Dec 2009 18:56:05 +0000 (10:56 -0800)]
am
9401c651: Merge change I49b2fbe0 into eclair-mr2
Merge commit '
9401c651f24855ce1db6a286789c55f796221e35' into eclair-mr2-plus-aosp
* commit '
9401c651f24855ce1db6a286789c55f796221e35':
Only re-center the page if it is zoom change or
Android (Google) Code Review [Fri, 4 Dec 2009 18:53:31 +0000 (10:53 -0800)]
Merge change I49b2fbe0 into eclair-mr2
* changes:
Only re-center the page if it is zoom change or orientation change. Do not re-center the page if it is caused by show/hide soft keyboard.
Cary Clark [Fri, 4 Dec 2009 18:51:29 +0000 (10:51 -0800)]
am
f4b04b8d: fix nav cache debugging
Merge commit '
f4b04b8d9c8b8aeb33ca4641594f7f0f7dc06505' into eclair-mr2-plus-aosp
* commit '
f4b04b8d9c8b8aeb33ca4641594f7f0f7dc06505':
fix nav cache debugging
Cary Clark [Fri, 4 Dec 2009 18:33:04 +0000 (13:33 -0500)]
fix nav cache debugging
last change broke debugging code outside of the build
Cary Clark [Fri, 4 Dec 2009 18:29:57 +0000 (10:29 -0800)]
am
1d330120: move input-related fields out of CachedNode to expand
Merge commit '
1d330120b6c2ee2d3f1c25300d0e3d446ef8c640' into eclair-mr2-plus-aosp
* commit '
1d330120b6c2ee2d3f1c25300d0e3d446ef8c640':
move input-related fields out of CachedNode to expand
Patrick Scott [Fri, 4 Dec 2009 18:18:31 +0000 (13:18 -0500)]
Pass up flags for the main resource and user gesture.
This requires a change to the framework.
Cary Clark [Thu, 3 Dec 2009 16:02:54 +0000 (11:02 -0500)]
move input-related fields out of CachedNode to expand
Some of the fields in CachedNode are relevant only to input
fields and text areas. Move these into their own vector
so that we can add more data without making all CacheNodes
bigger.
Remove CacheNode entries that are no longer used, or can
be consolidated into the node type. Alphabetize some interfaces
and implementations. Update the debugging output.
part of http://b/
2299660
Grace Kloba [Fri, 4 Dec 2009 08:32:52 +0000 (00:32 -0800)]
Only re-center the page if it is zoom change or
orientation change. Do not re-center the page if
it is caused by show/hide soft keyboard.
Fix http://b/issue?id=
2303918
Grace Kloba [Fri, 4 Dec 2009 00:43:14 +0000 (16:43 -0800)]
am
472affe3: Merge change Iceb63592 into eclair-mr2
Merge commit '
472affe311f3854aaac7cca73d398d36a9eefaf3' into eclair-mr2-plus-aosp
* commit '
472affe311f3854aaac7cca73d398d36a9eefaf3':
Experimental change. Cache pages with unload event
Grace Kloba [Fri, 4 Dec 2009 00:34:42 +0000 (16:34 -0800)]
am
d262e1f9: Rework CL, https://android-git.corp.google.com/g/#change,34511 due to the history unfork change.
Merge commit '
d262e1f9241778a6d0483945a3e125636cedfb70' into eclair-mr2-plus-aosp
* commit '
d262e1f9241778a6d0483945a3e125636cedfb70':
Rework CL, https://android-git.corp.google.com/g/#change,34511
Grace Kloba [Fri, 4 Dec 2009 00:32:11 +0000 (16:32 -0800)]
am
ab87fa9e: another file to fix the build
Merge commit '
ab87fa9e3781b4b32b4c1014acd9079ea145e2d6' into eclair-mr2-plus-aosp
* commit '
ab87fa9e3781b4b32b4c1014acd9079ea145e2d6':
another file to fix the build
Grace Kloba [Fri, 4 Dec 2009 00:32:06 +0000 (16:32 -0800)]
am
4f016e5e: Fix the build due to auto merge
Merge commit '
4f016e5ec4ca26ad35c960dd81c2f631e385cdce' into eclair-mr2-plus-aosp
* commit '
4f016e5ec4ca26ad35c960dd81c2f631e385cdce':
Fix the build due to auto merge
Grace Kloba [Fri, 4 Dec 2009 00:27:53 +0000 (16:27 -0800)]
am
fdd2ae40: After turning on page cache, the parent HistoryItem can be destroyed before the child HistoryItem, add an extra checking to avoid crash.
Merge commit '
fdd2ae400181744b916fcc8319e68f1cec57c981' into eclair-mr2-plus-aosp
* commit '
fdd2ae400181744b916fcc8319e68f1cec57c981':
After turning on page cache, the parent HistoryItem
Android (Google) Code Review [Thu, 3 Dec 2009 23:47:48 +0000 (15:47 -0800)]
Merge change Iceb63592 into eclair-mr2
* changes:
Experimental change. Cache pages with unload event for back/forward. This will improve the history navigation. But it may break some sites. See discussion in https://bugs.webkit.org/show_bug.cgi?id=29021.
Grace Kloba [Thu, 3 Dec 2009 17:53:55 +0000 (09:53 -0800)]
Experimental change. Cache pages with unload event
for back/forward. This will improve the history
navigation. But it may break some sites. See discussion
in https://bugs.webkit.org/show_bug.cgi?id=29021.
Grace Kloba [Thu, 3 Dec 2009 19:39:15 +0000 (11:39 -0800)]
Rework CL, https://android-git.corp.google.com/g/#change,34511
due to the history unfork change.
Grace Kloba [Thu, 3 Dec 2009 19:01:07 +0000 (11:01 -0800)]
another file to fix the build
Grace Kloba [Thu, 3 Dec 2009 18:56:34 +0000 (10:56 -0800)]
Fix the build due to auto merge
Grace Kloba [Wed, 2 Dec 2009 20:37:26 +0000 (12:37 -0800)]
After turning on page cache, the parent HistoryItem
can be destroyed before the child HistoryItem, add
an extra checking to avoid crash.
Steve Block [Thu, 3 Dec 2009 12:59:35 +0000 (04:59 -0800)]
am
f587615e: Merge change I70c3076b into eclair-mr2
Merge commit '
f587615e225cc1d172fe35e0dc744c00e929168d' into eclair-mr2-plus-aosp
* commit '
f587615e225cc1d172fe35e0dc744c00e929168d':
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
Android (Google) Code Review [Thu, 3 Dec 2009 12:56:02 +0000 (04:56 -0800)]
Merge change I70c3076b into eclair-mr2
* changes:
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
Ben Murdoch [Thu, 3 Dec 2009 12:35:17 +0000 (04:35 -0800)]
am
be33b78f: Android History unforking pt4: Android specific changes to makefiles and other code that has not been upstreamed yet (i.e. WebKit/android).
Merge commit '
be33b78f63b17f1b6f5a36a503d797d5f9b941ee' into eclair-mr2-plus-aosp
* commit '
be33b78f63b17f1b6f5a36a503d797d5f9b941ee':
Android History unforking pt4: Android specific changes to makefiles and other code that has not been upstreamed yet (i.e. WebKit/android).
Ben Murdoch [Thu, 3 Dec 2009 12:35:13 +0000 (04:35 -0800)]
am
970b5d95: Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
Merge commit '
970b5d950cbc4b5089ff8bb091d896ddf58ad83a' into eclair-mr2-plus-aosp
* commit '
970b5d950cbc4b5089ff8bb091d896ddf58ad83a':
Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
Ben Murdoch [Thu, 3 Dec 2009 12:35:08 +0000 (04:35 -0800)]
am
ed3dcbaa: Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
Merge commit '
ed3dcbaa89ede50bb054f63aa1847ae6240fa70d' into eclair-mr2-plus-aosp
* commit '
ed3dcbaa89ede50bb054f63aa1847ae6240fa70d':
Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
Ben Murdoch [Thu, 3 Dec 2009 12:16:52 +0000 (04:16 -0800)]
am
5c7b027a: Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp This should be upstreamed to webkit.org
Merge commit '
5c7b027ae1636ed27f6917385c2b3ec37af33237' into eclair-mr2-plus-aosp
* commit '
5c7b027ae1636ed27f6917385c2b3ec37af33237':
Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp
Ben Murdoch [Thu, 26 Nov 2009 14:58:02 +0000 (14:58 +0000)]
Android History unforking pt4: Android specific changes to makefiles and other code that has not been upstreamed yet (i.e. WebKit/android).
This does NOT need to be upstreamed to WebKit (yet).
Change-Id: I821fb90c3e463ef5fc4fa001ee5b8d967f9f7e48
Ben Murdoch [Thu, 26 Nov 2009 14:53:09 +0000 (14:53 +0000)]
Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
This needs to be upstreamed to webkit.org.
Change-Id: I5dc4e40939448e0b1dfcd6393082036fc8174aa9
Ben Murdoch [Thu, 26 Nov 2009 14:49:53 +0000 (14:49 +0000)]
Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
This needs to be upstreamed to webkit.org.
Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72
Ben Murdoch [Thu, 26 Nov 2009 14:11:05 +0000 (14:11 +0000)]
Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp
This should be upstreamed to webkit.org
Change-Id: I3f822d5a6579080658242f846214e1c3fe31fa01
Steve Block [Thu, 3 Dec 2009 11:11:15 +0000 (11:11 +0000)]
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
BUG: http://b/
2297475
This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32111
Change-Id: I70c3076b1a85c89bc4c587ea9fedaa84bd7b0575
Leon Scroggins [Wed, 2 Dec 2009 20:46:36 +0000 (12:46 -0800)]
am
4e95824e: Save form data for elements other than type "text".
Merge commit '
4e95824e8ae0b33b964420c5cd6dc13580adeafd' into eclair-mr2-plus-aosp
* commit '
4e95824e8ae0b33b964420c5cd6dc13580adeafd':
Save form data for elements other than type "text".
Leon Scroggins [Wed, 2 Dec 2009 19:47:32 +0000 (14:47 -0500)]
Save form data for elements other than type "text".
Partial fix for http://b/issue?id=
2232001
When returning the form data for a page, check other types of textfields
besides "text" input elements. Also consider "email", "number", etc.
Grace Kloba [Wed, 2 Dec 2009 19:48:51 +0000 (11:48 -0800)]
am
8ec42170: Enable WebKit page cache through WebSettings.
Merge commit '
8ec4217018562da37ecf4144e582fa848b807263' into eclair-mr2-plus-aosp
* commit '
8ec4217018562da37ecf4144e582fa848b807263':
Enable WebKit page cache through WebSettings.
Grace Kloba [Tue, 24 Nov 2009 22:22:22 +0000 (14:22 -0800)]
Enable WebKit page cache through WebSettings.
Add setXX() for the meta data in Settings.
Add CachedFramePlatformDataAndroid to preserve the
state for the cachedFrame.
http://b/issue?id=
2284168
Grace Kloba [Wed, 2 Dec 2009 17:57:56 +0000 (09:57 -0800)]
am
73b03f71: Merge change Ie0a2c0d4 into eclair-mr2
Merge commit '
73b03f71b87666e532e997c6bcd3eb6a4fc3228d' into eclair-mr2-plus-aosp
* commit '
73b03f71b87666e532e997c6bcd3eb6a4fc3228d':
Move dump display tree to sdcard as dom and render tree.
Android (Google) Code Review [Wed, 2 Dec 2009 17:51:27 +0000 (09:51 -0800)]
Merge change Ie0a2c0d4 into eclair-mr2
* changes:
Move dump display tree to sdcard as dom and render tree.
Cary Clark [Wed, 2 Dec 2009 17:50:59 +0000 (09:50 -0800)]
am
5f1379c6: Merge change I3aa3fc5b into eclair-mr2
Merge commit '
5f1379c6c79e49753999830866c2809a920cc3e4' into eclair-mr2-plus-aosp
* commit '
5f1379c6c79e49753999830866c2809a920cc3e4':
skip nodes when building nav cache if parents are clipped out
Android (Google) Code Review [Wed, 2 Dec 2009 17:41:07 +0000 (09:41 -0800)]
Merge change I3aa3fc5b into eclair-mr2
* changes:
skip nodes when building nav cache if parents are clipped out
Cary Clark [Wed, 2 Dec 2009 17:12:19 +0000 (12:12 -0500)]
skip nodes when building nav cache if parents are clipped out
This is a fairly conservative fix, since it actually checks to
see if a parent element is clipped out, rather than the bounds
of the element itself.
fixes http://b/
2291936
Cary Clark [Wed, 2 Dec 2009 14:25:21 +0000 (06:25 -0800)]
am
96070103: nav to container if it wants key events
Merge commit '
960701032df6956d9fb640a26d315122f7b2c4be' into eclair-mr2-plus-aosp
* commit '
960701032df6956d9fb640a26d315122f7b2c4be':
nav to container if it wants key events
Cary Clark [Wed, 2 Dec 2009 13:59:01 +0000 (08:59 -0500)]
nav to container if it wants key events
When a text field or text area (or plugin) has another navable
element completely overlaying it, allow the trackball to move
from that inner element to the outer one.
Also, allow this to get a 'second chance' -- treat the case
when one element overlays another as a spacial nav and allow
it to retry in nav find algorithms.
fixes http://b/
2266756
Steve Block [Wed, 2 Dec 2009 12:20:35 +0000 (04:20 -0800)]
am
fb77ce99: Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Merge commit '
fb77ce99397e423500cc148c206ffe89796091fb' into eclair-mr2-plus-aosp
* commit '
fb77ce99397e423500cc148c206ffe89796091fb':
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Steve Block [Thu, 26 Nov 2009 11:24:22 +0000 (11:24 +0000)]
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
See http://trac.webkit.org/changeset/51540
Change-Id: If60a5650750b1dc48353773947d451f4e8a3ec52
Grace Kloba [Mon, 23 Nov 2009 23:40:48 +0000 (15:40 -0800)]
Move dump display tree to sdcard as dom and render tree.
Fix dump render tree code.
Derek Sollenberger [Tue, 1 Dec 2009 16:08:45 +0000 (08:08 -0800)]
am
c1cf958c: cleaning up local JNI references for plugins and caching appropriate JNI ids.
Merge commit '
c1cf958cf053d63e0f2a09d2af1ec2fafdd32cd9' into eclair-mr2-plus-aosp
* commit '
c1cf958cf053d63e0f2a09d2af1ec2fafdd32cd9':
cleaning up local JNI references for plugins and caching appropriate JNI ids.
Derek Sollenberger [Tue, 1 Dec 2009 15:53:06 +0000 (10:53 -0500)]
cleaning up local JNI references for plugins and caching appropriate JNI ids.
Derek Sollenberger [Tue, 1 Dec 2009 14:46:12 +0000 (06:46 -0800)]
am
ec48e7e1: Adding native portion of the PluginActivity class.
Merge commit '
ec48e7e106a9287efddd3a1f5a72431d51b6ca38' into eclair-mr2-plus-aosp
* commit '
ec48e7e106a9287efddd3a1f5a72431d51b6ca38':
Adding native portion of the PluginActivity class.
Derek Sollenberger [Tue, 1 Dec 2009 14:36:06 +0000 (09:36 -0500)]
Adding native portion of the PluginActivity class.
Steve Block [Tue, 1 Dec 2009 14:18:11 +0000 (06:18 -0800)]
am
feb18091: Merge change I783ff698 into eclair-mr2
Merge commit '
feb18091fcb31a80be16e4c41cdbcb0864358e0f' into eclair-mr2-plus-aosp
* commit '
feb18091fcb31a80be16e4c41cdbcb0864358e0f':
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
Android (Google) Code Review [Tue, 1 Dec 2009 14:15:31 +0000 (06:15 -0800)]
Merge change I783ff698 into eclair-mr2
* changes:
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
Derek Sollenberger [Tue, 1 Dec 2009 14:14:38 +0000 (06:14 -0800)]
am
bf0f70e4: Cleanup how a plugin requests to go full-screen.
Merge commit '
bf0f70e47055eb2d5ab1ca78f459e2a25e36dc10' into eclair-mr2-plus-aosp
* commit '
bf0f70e47055eb2d5ab1ca78f459e2a25e36dc10':
Cleanup how a plugin requests to go full-screen.
Derek Sollenberger [Tue, 1 Dec 2009 13:43:57 +0000 (08:43 -0500)]
Cleanup how a plugin requests to go full-screen.
Derek Sollenberger [Tue, 1 Dec 2009 13:20:39 +0000 (05:20 -0800)]
am
1305ed10: Merge change I24ba66f9 into eclair-mr2
Merge commit '
1305ed10ce1551e77289a8cc90d42275aa1359a6' into eclair-mr2-plus-aosp
* commit '
1305ed10ce1551e77289a8cc90d42275aa1359a6':
Cleaning up android_npapi by removing implemented functions and unused parameters.
Steve Block [Tue, 1 Dec 2009 13:20:34 +0000 (05:20 -0800)]
am
57751861: Merge change Iae9809cb into eclair-mr2
Merge commit '
57751861baa18ede66f3cf3a0c41383735c964fd' into eclair-mr2-plus-aosp
* commit '
57751861baa18ede66f3cf3a0c41383735c964fd':
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Android (Google) Code Review [Tue, 1 Dec 2009 13:17:57 +0000 (05:17 -0800)]
Merge change I24ba66f9 into eclair-mr2
* changes:
Cleaning up android_npapi by removing implemented functions and unused parameters.
Android (Google) Code Review [Tue, 1 Dec 2009 13:15:06 +0000 (05:15 -0800)]
Merge change Iae9809cb into eclair-mr2
* changes:
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Steve Block [Mon, 30 Nov 2009 14:56:15 +0000 (14:56 +0000)]
Removes superfluous file V8 DerivedSourcesAllInOne.cpp from Android build.
This was added in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
6d62749f698529d29ec7cf61f6c8ec323ae52b83#patch1
Also revert Android-specific changes to DerivedSourcesAllInOne.cpp, to avoid future conflicts in WebKit merge.
Change-Id: I783ff698af8212c02c48012f97bd1bc3d90b7ea2
Steve Block [Tue, 1 Dec 2009 11:55:51 +0000 (11:55 +0000)]
Fixes Makefiles to have proper dependency on HTMLTagNames.in and HTMLAttributeNames.in.
Previously, the path to these files was expanded prior to execution of the rule,
thus breaking the dependency.
Change-Id: Iae9809cb925dfc26606f02a47a4dd930c99a3106
Cary Clark [Mon, 30 Nov 2009 21:20:45 +0000 (13:20 -0800)]
am
a0428a86: navigate preferably between children of the same parent
Merge commit '
a0428a863bd79d20e416d6d981d0120bd1569edf' into eclair-mr2-plus-aosp
* commit '
a0428a863bd79d20e416d6d981d0120bd1569edf':
navigate preferably between children of the same parent
Cary Clark [Mon, 30 Nov 2009 20:46:06 +0000 (15:46 -0500)]
navigate preferably between children of the same parent
The nav cache attempts to take advantage of the order that
the dom is walked to know when multiple nodes have the same
parent. The old implementation doesn't always work, and a
simpler non-cached version makes more sense.
The algorithm now walks nodes until the parent has more than
one child, and assigns that parent as the 'parent group'. On
the other end, nodes with no parent group are never allowed
to get preferential matching treatment.
Cary Clark [Mon, 30 Nov 2009 20:44:27 +0000 (12:44 -0800)]
am
39e2da62: Merge change Ib72d8281 into eclair-mr2
Merge commit '
39e2da62da0cbe8b66815b72ea0a2a3e13bda40b' into eclair-mr2-plus-aosp
* commit '
39e2da62da0cbe8b66815b72ea0a2a3e13bda40b':
fix bugs in nav cache dump
Android (Google) Code Review [Mon, 30 Nov 2009 20:39:07 +0000 (12:39 -0800)]
Merge change Ib72d8281 into eclair-mr2
* changes:
fix bugs in nav cache dump
Cary Clark [Mon, 30 Nov 2009 20:15:04 +0000 (15:15 -0500)]
fix bugs in nav cache dump
Fix errors in empty frames, escape character sequences,
and characters outside the ascii range. These fixes are
specific to dumping the nav cache and are commented out
in all builds.
Mike Reed [Mon, 30 Nov 2009 19:34:04 +0000 (11:34 -0800)]
am
df52d119: Merge change I11fe1a14 into eclair-mr2
Merge commit '
df52d1194a5c266d0d20b5f65e24fd93edd34618' into eclair-mr2-plus-aosp
* commit '
df52d1194a5c266d0d20b5f65e24fd93edd34618':
add ANDROID to the list of platforms that support font-face
Android (Google) Code Review [Mon, 30 Nov 2009 19:29:39 +0000 (11:29 -0800)]
Merge change I11fe1a14 into eclair-mr2
* changes:
add ANDROID to the list of platforms that support font-face
Mike Reed [Mon, 30 Nov 2009 18:18:08 +0000 (13:18 -0500)]
add ANDROID to the list of platforms that support font-face
Derek Sollenberger [Mon, 30 Nov 2009 16:53:41 +0000 (11:53 -0500)]
Cleaning up android_npapi by removing implemented functions and unused parameters.
Patrick Scott [Mon, 30 Nov 2009 16:42:51 +0000 (08:42 -0800)]
am
db239ca3: Fix a crash when closing the native history.
Merge commit '
db239ca3504af9998d5717708fdef4676e286602' into eclair-mr2-plus-aosp
* commit '
db239ca3504af9998d5717708fdef4676e286602':
Fix a crash when closing the native history.
Patrick Scott [Mon, 30 Nov 2009 15:42:28 +0000 (10:42 -0500)]
Fix a crash when closing the native history.
The item for a given frame can be null when closing the history while reusing
the same WebView. If the item is null, no need to visit the children since they
will also not have a history item.
Steve Block [Mon, 30 Nov 2009 16:09:03 +0000 (08:09 -0800)]
am
a8aa6b7d: Merge change Ie9bc2064 into eclair-mr2
Merge commit '
a8aa6b7d72075facc6ca0672894b0f936669f341' into eclair-mr2-plus-aosp
* commit '
a8aa6b7d72075facc6ca0672894b0f936669f341':
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Android (Google) Code Review [Mon, 30 Nov 2009 16:06:41 +0000 (08:06 -0800)]
Merge change Ie9bc2064 into eclair-mr2
* changes:
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Derek Sollenberger [Mon, 30 Nov 2009 15:56:04 +0000 (07:56 -0800)]
am
1a15528b: Refactoring plugins to use new java interfaces.
Merge commit '
1a15528b92bc6af8faeaad983c380fcca4d1de44' into eclair-mr2-plus-aosp
* commit '
1a15528b92bc6af8faeaad983c380fcca4d1de44':
Refactoring plugins to use new java interfaces.
Derek Sollenberger [Tue, 24 Nov 2009 20:05:24 +0000 (15:05 -0500)]
Refactoring plugins to use new java interfaces.
This change contains extensive cleanup as we now keep track of a pointer
to the plugin's java entry point (WebkitPlugin.class). Also given that we
track this object and changes to plugin packaging we nolonger need to pass
additional parameters in quite a few methods.
Steve Block [Fri, 27 Nov 2009 12:14:50 +0000 (04:14 -0800)]
am
ff2e3e9f: Merge change I49a4a258 into eclair-mr2
Merge commit '
ff2e3e9f1bdd1f49652c92473824e3a46c46e575' into eclair-mr2-plus-aosp
* commit '
ff2e3e9f1bdd1f49652c92473824e3a46c46e575':
Removes superfluous code from Android implementation of AuthenticationChallenge.
Android (Google) Code Review [Fri, 27 Nov 2009 12:11:33 +0000 (04:11 -0800)]
Merge change I49a4a258 into eclair-mr2
* changes:
Removes superfluous code from Android implementation of AuthenticationChallenge.
Steve Block [Thu, 26 Nov 2009 12:54:29 +0000 (12:54 +0000)]
Removes superfluous code from Android implementation of AuthenticationChallenge.
- On Android, we use only the default constructor.
See WebCore/platform/network/ResourceHandleInternal.h.
- AuthenticationChallenge::sourceHandle is only required for CF.
See WebCore/platform/network/cf/AuthenticationCF.cpp.
The method was originally added only for CF in http://trac.webkit.org/changeset/18880
but has since been copied to other platforms, despite not being required.
Change-Id: I49a4a2587a9551107a105573bd9da2e56ee0f52e
Steve Block [Thu, 26 Nov 2009 15:50:24 +0000 (15:50 +0000)]
Remove the Android-specific setCMYKXXXColor methods, which are not used.
Change-Id: Ie9bc2064b10c01579d60e31f62ea6996974f8f4a
Steve Block [Thu, 26 Nov 2009 10:24:53 +0000 (02:24 -0800)]
am
89d209fb: Merge change Ice535a82 into eclair-mr2
Merge commit '
89d209fb97856ae61773dd203dbb5dd12c9f5a6c' into eclair-mr2-plus-aosp
* commit '
89d209fb97856ae61773dd203dbb5dd12c9f5a6c':
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
Android (Google) Code Review [Thu, 26 Nov 2009 10:21:19 +0000 (02:21 -0800)]
Merge change Ice535a82 into eclair-mr2
* changes:
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
Andrei Popescu [Wed, 25 Nov 2009 16:46:31 +0000 (08:46 -0800)]
am
3dd6957f: Merge change Ie4e91d61 into eclair-mr2
Merge commit '
3dd6957f3a954583cb88b92ecc780f6a6df0e21e' into eclair-mr2-plus-aosp
* commit '
3dd6957f3a954583cb88b92ecc780f6a6df0e21e':
Bring Android files in line with what landed at webkit.org.
Android (Google) Code Review [Wed, 25 Nov 2009 16:43:40 +0000 (08:43 -0800)]
Merge change Ie4e91d61 into eclair-mr2
* changes:
Bring Android files in line with what landed at webkit.org.
Steve Block [Wed, 25 Nov 2009 16:38:26 +0000 (08:38 -0800)]
am
d789cf5e: Merge change I4b0151ad into eclair-mr2
Merge commit '
d789cf5eaa873bbf5b3e643fb26747ac441ee682' into eclair-mr2-plus-aosp
* commit '
d789cf5eaa873bbf5b3e643fb26747ac441ee682':
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
Android (Google) Code Review [Wed, 25 Nov 2009 16:34:23 +0000 (08:34 -0800)]
Merge change I4b0151ad into eclair-mr2
* changes:
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
Andrei Popescu [Wed, 25 Nov 2009 16:31:31 +0000 (08:31 -0800)]
am
3c1ede04: Merge change I1890130f into eclair-mr2
Merge commit '
3c1ede0435c25d0d2138cfc0211708c01266430e' into eclair-mr2-plus-aosp
* commit '
3c1ede0435c25d0d2138cfc0211708c01266430e':
Update files in platform/android to match what was upstreamed in
Andrei Popescu [Wed, 25 Nov 2009 16:20:53 +0000 (16:20 +0000)]
Bring Android files in line with what landed at webkit.org.
Picks up changes made by Apple in
http://trac.webkit.org/changeset/51191/trunk/WebCore/platform/android/LocalizedStringsAndroid.cpp
Android (Google) Code Review [Wed, 25 Nov 2009 16:27:02 +0000 (08:27 -0800)]
Merge change I1890130f into eclair-mr2
* changes:
Update files in platform/android to match what was upstreamed in
Andrei Popescu [Tue, 24 Nov 2009 12:04:22 +0000 (12:04 +0000)]
Update files in platform/android to match what was upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=31825
https://bugs.webkit.org/show_bug.cgi?id=31831
Leon Scroggins [Wed, 25 Nov 2009 15:50:57 +0000 (07:50 -0800)]
am
6e752dd8: Remove nativeTextInputMotionUp.
Merge commit '
6e752dd8042aae87f4827210909b1bfdaa58fbb7' into eclair-mr2-plus-aosp
* commit '
6e752dd8042aae87f4827210909b1bfdaa58fbb7':
Remove nativeTextInputMotionUp.
Steve Block [Wed, 25 Nov 2009 15:13:50 +0000 (15:13 +0000)]
Restores the default value for ENABLE(ARCHIVE) in wtf/Platform.h.
This default was recently removed but is required to build on Mac.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
2cc706295f906df0bb49f51c9efe92a97c427464#patch1
Change-Id: Ice535a8205d14a0f3c3bfc4f32bc7d71132fbc2a
Leon Scroggins [Tue, 24 Nov 2009 19:55:38 +0000 (14:55 -0500)]
Remove nativeTextInputMotionUp.
Function is not needed. Requires a change to frameworks/base
Steve Block [Wed, 25 Nov 2009 15:02:57 +0000 (15:02 +0000)]
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
This code was modified recently to aid upstreaming by wrapping all Android changes in PLATFORM(ANDROID).
To allow the build to succeed on other paltforms, we need to be more careful with our use of the guards.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
bc7b84de3fd863c500a8169fd00dca3811cadbb3#patch28
Change-Id: I4b0151ad62023821171742c5dfbba1dd7b39d8ed
Steve Block [Wed, 25 Nov 2009 14:12:54 +0000 (06:12 -0800)]
am
5b4f8170: Fixes use of statics of non-built-in types in Geolocation.
Merge commit '
5b4f81709e8df8d953e2ad8496996fb0112b6186' into eclair-mr2-plus-aosp
* commit '
5b4f81709e8df8d953e2ad8496996fb0112b6186':
Fixes use of statics of non-built-in types in Geolocation.
Steve Block [Wed, 25 Nov 2009 11:14:04 +0000 (11:14 +0000)]
Fixes use of statics of non-built-in types in Geolocation.
The Mac build requires that only built-in types are used as statics.
Change-Id: I69a3f063c5728d76a13f73b8b056187d5678e0ab
Steve Block [Wed, 25 Nov 2009 13:52:51 +0000 (05:52 -0800)]
am
c3d01e35: Merge change I6d6312e9 into eclair-mr2
Merge commit '
c3d01e3597b510384b488d7d222e80a3876286b9' into eclair-mr2-plus-aosp
* commit '
c3d01e3597b510384b488d7d222e80a3876286b9':
Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
Android (Google) Code Review [Wed, 25 Nov 2009 13:49:08 +0000 (05:49 -0800)]
Merge change I6d6312e9 into eclair-mr2
* changes:
Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.
Ben Murdoch [Wed, 25 Nov 2009 11:30:51 +0000 (03:30 -0800)]
am
8d4e6f47: Merge change I973e6b03 into eclair-mr2
Merge commit '
8d4e6f47fe31b9b3990faefd42269e85cab05fc9' into eclair-mr2-plus-aosp
* commit '
8d4e6f47fe31b9b3990faefd42269e85cab05fc9':
Unfork WebCore/bridge/jni.
Android (Google) Code Review [Wed, 25 Nov 2009 11:26:54 +0000 (03:26 -0800)]
Merge change I973e6b03 into eclair-mr2
* changes:
Unfork WebCore/bridge/jni.
Steve Block [Wed, 25 Nov 2009 10:44:36 +0000 (02:44 -0800)]
am
42fa9723: Merge change I685fd143 into eclair-mr2
Merge commit '
42fa9723e35d0015387952766c19355098122551' into eclair-mr2-plus-aosp
* commit '
42fa9723e35d0015387952766c19355098122551':
Removes superfluous use of LOCAL_SRC_FILES in derived Makefiles.