OSDN Git Service
Mike Reed [Mon, 19 Oct 2009 18:33:25 +0000 (11:33 -0700)]
am
1fa15570: Merge change I112445f3 into eclair-mr2
Merge commit '
1fa155707e525d53454f13bd7e91d2fee26de221'
* commit '
1fa155707e525d53454f13bd7e91d2fee26de221':
return default 1.0 for scaleFactor(), since android doesn't record at the same res as it draws
Android (Google) Code Review [Mon, 19 Oct 2009 18:18:32 +0000 (14:18 -0400)]
Merge change I112445f3 into eclair-mr2
* changes:
return default 1.0 for scaleFactor(), since android doesn't record at the same res as it draws
Steve Block [Mon, 19 Oct 2009 16:47:10 +0000 (09:47 -0700)]
am
1bb8ca54: Removes some commented out files from the V8 derived Makefile.
Merge commit '
1bb8ca54f0da22a55859c933898e81c3638f18d0'
* commit '
1bb8ca54f0da22a55859c933898e81c3638f18d0':
Removes some commented out files from the V8 derived Makefile.
Steve Block [Mon, 19 Oct 2009 16:25:42 +0000 (17:25 +0100)]
Removes some commented out files from the V8 derived Makefile.
Change-Id: I27567e104f8953b6858597a7f7a5f522b6203ac8
Steve Block [Mon, 19 Oct 2009 16:13:00 +0000 (09:13 -0700)]
am
a9ae4cc0: Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.
Merge commit '
a9ae4cc01ffb86c3b64c670673ddfef90f073367'
* commit '
a9ae4cc01ffb86c3b64c670673ddfef90f073367':
Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.
Mike Reed [Mon, 19 Oct 2009 14:50:14 +0000 (10:50 -0400)]
return default 1.0 for scaleFactor(), since android doesn't record at the same res as it draws
Steve Block [Mon, 19 Oct 2009 12:40:54 +0000 (13:40 +0100)]
Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.
Change-Id: Ic5a299518e5ca51b6833e4c236b97c7ea7dbe4a7
Steve Block [Fri, 16 Oct 2009 17:21:02 +0000 (10:21 -0700)]
am
eeec5539: Merge change I4419d5c4 into eclair-mr2
Merge commit '
eeec55391a8e299db3f90be9bd2c07e8c2a68525'
* commit '
eeec55391a8e299db3f90be9bd2c07e8c2a68525':
Only write Geolocation permissions to the DB when required.
Android (Google) Code Review [Fri, 16 Oct 2009 17:05:24 +0000 (13:05 -0400)]
Merge change I4419d5c4 into eclair-mr2
* changes:
Only write Geolocation permissions to the DB when required.
Steve Block [Fri, 16 Oct 2009 16:07:37 +0000 (17:07 +0100)]
Only write Geolocation permissions to the DB when required.
This fixes http://b/issue?id=
2167364
Mike Reed [Fri, 16 Oct 2009 15:11:33 +0000 (08:11 -0700)]
am
9104ab4d: Merge change I6623a2fa into eclair-mr2
Merge commit '
9104ab4da69bc2d57dd2fa47c9d6f5b05b303f6e'
* commit '
9104ab4da69bc2d57dd2fa47c9d6f5b05b303f6e':
don't pre-round rects, since we will zoom (arbitrarily) after we record the geometry.
Android (Google) Code Review [Fri, 16 Oct 2009 14:51:57 +0000 (10:51 -0400)]
Merge change I6623a2fa into eclair-mr2
* changes:
don't pre-round rects, since we will zoom (arbitrarily) after we record the geometry.
Mike Reed [Fri, 16 Oct 2009 14:29:45 +0000 (10:29 -0400)]
don't pre-round rects, since we will zoom (arbitrarily) after we record the geometry.
This fixes the funny case of <canvas> elements being scaled twice: once by our scaleFactor() and
then again by this roundToDevicePixels method.
Steve Block [Fri, 16 Oct 2009 13:57:57 +0000 (06:57 -0700)]
am
137af63d: (-s ours) Fixes a couple of style problems and a minor TODO in WebKit Geolocation. Do not merge.
Merge commit '
137af63dd6c9f4f2d009977bc4828a2d7935cafd'
* commit '
137af63dd6c9f4f2d009977bc4828a2d7935cafd':
Fixes a couple of style problems and a minor TODO in WebKit Geolocation. Do not merge.
Steve Block [Tue, 6 Oct 2009 11:52:52 +0000 (12:52 +0100)]
Fixes a couple of style problems and a minor TODO in WebKit Geolocation. Do not merge.
This has already been submitted to master branch.
Leon Scroggins [Thu, 15 Oct 2009 20:17:23 +0000 (13:17 -0700)]
am
8601da30: Do not bring up the soft keyboard for readonly input fields.
Merge commit '
8601da30c7a307f6ca8a2b15688480cc1e8251c9'
* commit '
8601da30c7a307f6ca8a2b15688480cc1e8251c9':
Do not bring up the soft keyboard for readonly input fields.
Cary Clark [Thu, 15 Oct 2009 18:13:01 +0000 (11:13 -0700)]
am
31f7153b: fix copy/paste using trackball on passion
Merge commit '
31f7153b80559d0b0580ce91bd1465aea7588aa2'
* commit '
31f7153b80559d0b0580ce91bd1465aea7588aa2':
fix copy/paste using trackball on passion
Leon Scroggins [Thu, 15 Oct 2009 17:33:58 +0000 (13:33 -0400)]
Do not bring up the soft keyboard for readonly input fields.
Partial fix for http://b/issue?id=
2159869. Add a field to CachedNode
for readonly. In WebView.cpp, only call displaySoftKeyboard if the
node is not readonly. Also call displaySoftKeyboard in nativeTextMotionUp
to replace a call being removed in WebView.touchUpOnTextField(java).
Cary Clark [Thu, 15 Oct 2009 17:22:12 +0000 (13:22 -0400)]
fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.
The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.
Also, simply call to CopyPaste::findClosest, and remove
logic to attempt to pin the arrow to the current cursor.
Requires a companion fix in framework/base
Fixes http://b/issue?id=
2187591
Steve Block [Wed, 14 Oct 2009 19:36:55 +0000 (12:36 -0700)]
am
734b5134: (-s ours) Bring Geolocation V8 bindings in line with those for JSC. Do not merge.
Merge commit '
734b5134dfb8de1717b5772d41dd8fdcc093980e'
* commit '
734b5134dfb8de1717b5772d41dd8fdcc093980e':
Bring Geolocation V8 bindings in line with those for JSC. Do not merge.
Steve Block [Wed, 14 Oct 2009 19:36:51 +0000 (12:36 -0700)]
am
6c2d6953: (-s ours) Brings JSC Geolocation bindings up-to-date with latest submission to webkit.org. Do not merge.
Merge commit '
6c2d6953902b07e2368913f8314bf2ba9062210c'
* commit '
6c2d6953902b07e2368913f8314bf2ba9062210c':
Brings JSC Geolocation bindings up-to-date with latest submission to webkit.org. Do not merge.
Steve Block [Thu, 8 Oct 2009 14:29:34 +0000 (15:29 +0100)]
Bring Geolocation V8 bindings in line with those for JSC. Do not merge.
This has already been submitted to master branch.
Steve Block [Thu, 8 Oct 2009 14:18:46 +0000 (15:18 +0100)]
Brings JSC Geolocation bindings up-to-date with latest submission to webkit.org. Do not merge.
See https://bugs.webkit.org/show_bug.cgi?id=29099
This has already been submitted to master branch.
Andrei Popescu [Wed, 14 Oct 2009 18:11:11 +0000 (11:11 -0700)]
am
7da6c11f: (-s ours) Remove the Android guards added to the <video> implementation in WebCore. Do not merge.
Merge commit '
7da6c11f9b0356ea2b070f6114d2005cbc2c43bb'
* commit '
7da6c11f9b0356ea2b070f6114d2005cbc2c43bb':
Remove the Android guards added to the <video> implementation in WebCore. Do not merge.
Steve Block [Wed, 14 Oct 2009 16:38:19 +0000 (09:38 -0700)]
am
25323377: (-s ours) Fixes an accidental change made to WebKit GTK code. Do not merge.
Merge commit '
25323377ad937254493c5d3d3454a655e508fcec'
* commit '
25323377ad937254493c5d3d3454a655e508fcec':
Fixes an accidental change made to WebKit GTK code. Do not merge.
Steve Block [Wed, 14 Oct 2009 16:38:15 +0000 (09:38 -0700)]
am
d19c83b2: (-s ours) Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.
Merge commit '
d19c83b203e72c34b78a731c61d73c77ad99794e'
* commit '
d19c83b203e72c34b78a731c61d73c77ad99794e':
Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.
Andrei Popescu [Tue, 6 Oct 2009 13:44:10 +0000 (14:44 +0100)]
Remove the Android guards added to the <video> implementation in WebCore. Do not merge.
The patch in https://bugs.webkit.org/show_bug.cgi?id=29133 landed.
This has already been submitted to master branch.
Steve Block [Thu, 8 Oct 2009 11:05:14 +0000 (12:05 +0100)]
Fixes an accidental change made to WebKit GTK code. Do not merge.
This was made in change
95e3d862bbab761f8caaf1d1b54065f67b9a5148.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
95e3d862bbab761f8caaf1d1b54065f67b9a5148#patch1
This will help avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.
This has already been submitted to master branch.
Steve Block [Thu, 8 Oct 2009 10:13:05 +0000 (11:13 +0100)]
Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge.
This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.
This has already been submitted to master branch.
Steve Block [Wed, 14 Oct 2009 15:06:42 +0000 (08:06 -0700)]
am
a5f64bb2: Update V8 to revision 3018.
Merge commit '
a5f64bb29c5e0a6a5d59257da60d3bffba7819e7'
* commit '
a5f64bb29c5e0a6a5d59257da60d3bffba7819e7':
Update V8 to revision 3018.
Steve Block [Wed, 14 Oct 2009 13:09:10 +0000 (14:09 +0100)]
Update V8 to revision 3018.
Note that the latest version of WebKit requires V8 change http://code.google.com/p/v8/source/detail?r=2969 See http://trac.webkit.org/changeset/49248
Steve Block [Wed, 14 Oct 2009 11:54:36 +0000 (04:54 -0700)]
am
af7015ae: Remove more superfluous WebKit files from build.
Merge commit '
af7015ae3148a20ea3935be7d2ff24beb9b3e5e1'
* commit '
af7015ae3148a20ea3935be7d2ff24beb9b3e5e1':
Remove more superfluous WebKit files from build.
Steve Block [Wed, 14 Oct 2009 10:47:59 +0000 (03:47 -0700)]
am
b86ce2d8: Remove superfluous files from JSC build. Note that these files are not in the V8 build.
Merge commit '
b86ce2d8f45ce9d45a301504eeaf17baff0d9708'
* commit '
b86ce2d8f45ce9d45a301504eeaf17baff0d9708':
Remove superfluous files from JSC build. Note that these files are not in the V8 build.
Steve Block [Wed, 14 Oct 2009 09:49:38 +0000 (02:49 -0700)]
am
f7420930: (-s ours) Removes superfluous unload event getter and setter methods from Node. Do not merge.
Merge commit '
f74209305ea9b6bb10e1c183c37096f0764118b2'
* commit '
f74209305ea9b6bb10e1c183c37096f0764118b2':
Removes superfluous unload event getter and setter methods from Node. Do not merge.
Steve Block [Wed, 14 Oct 2009 09:26:48 +0000 (10:26 +0100)]
Remove more superfluous WebKit files from build.
Steve Block [Tue, 13 Oct 2009 22:34:42 +0000 (23:34 +0100)]
Remove superfluous files from JSC build. Note that these files are not in the V8 build.
Leon Scroggins [Wed, 14 Oct 2009 00:09:14 +0000 (17:09 -0700)]
am
e8d10d82: Merge change Ibf761b97 into eclair-mr2
Merge commit '
e8d10d8203b1556f369bf9179f049a03df1f9c3a'
* commit '
e8d10d8203b1556f369bf9179f049a03df1f9c3a':
Prevent getFile from copying when the file is too large.
Derek Sollenberger [Wed, 14 Oct 2009 00:08:31 +0000 (17:08 -0700)]
am
1cad9175: Enabling plugins to stay in sync with UI when the DOM changes.
Merge commit '
1cad91756cbfe2f7d224345e615f14639a9b6499'
* commit '
1cad91756cbfe2f7d224345e615f14639a9b6499':
Enabling plugins to stay in sync with UI when the DOM changes.
Cary Clark [Wed, 14 Oct 2009 00:00:02 +0000 (17:00 -0700)]
am
49e856e5: add debugging, tweak data for flash work in progress
Merge commit '
49e856e5d5e86855d12326294cb6b57235a2e9a1'
* commit '
49e856e5d5e86855d12326294cb6b57235a2e9a1':
add debugging, tweak data for flash work in progress
Leon Scroggins [Tue, 13 Oct 2009 23:54:47 +0000 (16:54 -0700)]
am
b361e583: Allow <select> boxes to draw larger.
Merge commit '
b361e5832299c8a9443a4752f3d0a0c445f85f5c'
* commit '
b361e5832299c8a9443a4752f3d0a0c445f85f5c':
Allow <select> boxes to draw larger.
Leon Scroggins [Tue, 13 Oct 2009 23:52:06 +0000 (16:52 -0700)]
Leon Scroggins [Tue, 13 Oct 2009 23:51:06 +0000 (16:51 -0700)]
Leon Clarke [Tue, 13 Oct 2009 21:28:50 +0000 (14:28 -0700)]
Leon Clarke [Tue, 13 Oct 2009 21:28:13 +0000 (14:28 -0700)]
am
71680282: Draw a background color under the combo box
Merge commit '
71680282c782ad9c007fed7b54ce6f2e51b764de'
* commit '
71680282c782ad9c007fed7b54ce6f2e51b764de':
Draw a background color under the combo box
Patrick Scott [Tue, 13 Oct 2009 21:28:09 +0000 (14:28 -0700)]
Steve Block [Tue, 13 Oct 2009 09:44:54 +0000 (10:44 +0100)]
Removes superfluous unload event getter and setter methods from Node. Do not merge.
These were removed from webkit.org in http://trac.webkit.org/changeset/44944.
This should have been picked up in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
d227fc870c7a697500a3c900c31baf05fb9a8524, which syncs to webkit.org R47420.
This has already been submitted to master branch.
Android (Google) Code Review [Tue, 13 Oct 2009 19:09:28 +0000 (15:09 -0400)]
Merge change Ibf761b97 into eclair-mr2
* changes:
Prevent getFile from copying when the file is too large.
Ben Murdoch [Tue, 13 Oct 2009 18:58:05 +0000 (11:58 -0700)]
am
c58bba37: Set the navigator.vendor property to be "Google Inc." rather than defaulting to "Apple Computer, Inc."
Merge commit '
c58bba378aa071d21ea37958f715cdd23f956924'
* commit '
c58bba378aa071d21ea37958f715cdd23f956924':
Set the navigator.vendor property to be "Google Inc." rather than defaulting to "Apple Computer, Inc."
Leon Scroggins [Tue, 13 Oct 2009 18:28:59 +0000 (14:28 -0400)]
Prevent getFile from copying when the file is too large.
Since the caller expects the data to fit within a certain amount of
space, do not copy into the buffer if the data exceeds that space.
On the webkit side of things, keep track of the URI and the size,
so we can pass them up to BrowserFrame
Requires a change to frameworks/base
Derek Sollenberger [Tue, 13 Oct 2009 15:40:13 +0000 (11:40 -0400)]
Enabling plugins to stay in sync with UI when the DOM changes.
Steve Block [Tue, 13 Oct 2009 09:44:54 +0000 (10:44 +0100)]
Removes superfluous unload event getter and setter methods from Node.
These were removed from webkit.org in http://trac.webkit.org/changeset/44944.
This should have been picked up in https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
d227fc870c7a697500a3c900c31baf05fb9a8524, which syncs to webkit.org R47420.
Steve Block [Mon, 12 Oct 2009 19:31:14 +0000 (12:31 -0700)]
am
1d57ff1d: am
e7430864: Makes sure that Geolocation permissions are saved before the browser is killed.
Merge commit '
1d57ff1d97b50eacef179662ea798ac776552f34'
* commit '
1d57ff1d97b50eacef179662ea798ac776552f34':
Makes sure that Geolocation permissions are saved before the browser is killed.
Cary Clark [Mon, 12 Oct 2009 19:29:41 +0000 (12:29 -0700)]
am
5bbc5371: reset webTextView size if focus bounds changes
Merge commit '
5bbc5371dd0c031e354bc4d93218e5a1f45d8278'
* commit '
5bbc5371dd0c031e354bc4d93218e5a1f45d8278':
reset webTextView size if focus bounds changes
Cary Clark [Mon, 12 Oct 2009 18:41:51 +0000 (11:41 -0700)]
am
085ec3f4: Merge change Ibbab1c84 into eclair-mr2
Merge commit '
085ec3f40ccef7296f29b6b30f2e798e25624285'
* commit '
085ec3f40ccef7296f29b6b30f2e798e25624285':
address detection may look at uninitialized memory
Steve Block [Mon, 12 Oct 2009 18:39:07 +0000 (11:39 -0700)]
am
618e6eda: am
a7280594: Fixes build bustage due to missing include in Geolocation.
Merge commit '
618e6eda024886e06ca03a2b4c4eb581284c3b13'
* commit '
618e6eda024886e06ca03a2b4c4eb581284c3b13':
Fixes build bustage due to missing include in Geolocation.
Steve Block [Mon, 12 Oct 2009 18:38:58 +0000 (11:38 -0700)]
am
9fffbb84: am
0c7394a4: Fixes a WebKit bug where ongoing Geolocation requests are not stopped when the page is unloaded.
Merge commit '
9fffbb84c4b1c3b4632e0b68fd26f1720643d008'
* commit '
9fffbb84c4b1c3b4632e0b68fd26f1720643d008':
Fixes a WebKit bug where ongoing Geolocation requests are not stopped when the page is unloaded.
Ben Murdoch [Mon, 12 Oct 2009 18:38:22 +0000 (11:38 -0700)]
am
124602fa: Cherry pick of WebKit commit r49018, fix for b/
2067397. Enable Database.changVersion().
Merge commit '
124602fa9325bb5b26a8305777dcbdef15762f6d'
* commit '
124602fa9325bb5b26a8305777dcbdef15762f6d':
Cherry pick of WebKit commit r49018, fix for b/
2067397. Enable Database.changVersion().
Cary Clark [Mon, 12 Oct 2009 18:29:45 +0000 (11:29 -0700)]
am
fe996bf0: fix select text if multiple lines are the same width
Merge commit '
fe996bf0a6c5c16a852ae7484bd74421d2492e15'
* commit '
fe996bf0a6c5c16a852ae7484bd74421d2492e15':
fix select text if multiple lines are the same width
Grace Kloba [Mon, 12 Oct 2009 18:27:45 +0000 (11:27 -0700)]
am
62575aed: Merge change Ib47ea2b1 into eclair-mr2
Merge commit '
62575aed26064570189ef0852283c3fc6bb4e960'
* commit '
62575aed26064570189ef0852283c3fc6bb4e960':
Add check null of getRealObject(). When a WebView is
Leon Clarke [Mon, 12 Oct 2009 18:27:41 +0000 (11:27 -0700)]
am
4687a001: Re-enable using the right foreground color now we use the right background color.
Merge commit '
4687a0014966efd7c5539ad54f47aa49ad828f16'
* commit '
4687a0014966efd7c5539ad54f47aa49ad828f16':
Re-enable using the right foreground color now we use the right background
Leon Scroggins [Mon, 12 Oct 2009 18:21:40 +0000 (11:21 -0700)]
am
026fe6d5: am
2097884b: Revert "Don\'t extend the arrow asset of the combo box over the text, so that the real background"
Merge commit '
026fe6d5a004207846034c539bfd5924629adefa'
* commit '
026fe6d5a004207846034c539bfd5924629adefa':
Revert "Don't extend the arrow asset of the combo box over the text, so that the real background"
Mike Reed [Mon, 12 Oct 2009 18:21:35 +0000 (11:21 -0700)]
am
69b9ab68: only look at globalAlpha when we draw images (not the alpha in fill-color)
Merge commit '
69b9ab686ccfadd429ac9d67474ae44da9df1113'
* commit '
69b9ab686ccfadd429ac9d67474ae44da9df1113':
only look at globalAlpha when we draw images (not the alpha in fill-color)
Mike Reed [Mon, 12 Oct 2009 18:07:16 +0000 (11:07 -0700)]
am
123b7cb2: remove unneeded ANDROID_ALLOW_TRANSPARENT_BACKGROUNDS
Merge commit '
123b7cb28d165aae5c8defbb22c5ad428fc6275c'
* commit '
123b7cb28d165aae5c8defbb22c5ad428fc6275c':
remove unneeded ANDROID_ALLOW_TRANSPARENT_BACKGROUNDS
android-build SharedAccount [Mon, 12 Oct 2009 18:07:11 +0000 (11:07 -0700)]
The Android Open Source Project [Mon, 12 Oct 2009 18:07:06 +0000 (11:07 -0700)]
am
0fade321: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
0fade321435f38382c614ade7b64e6b68440d747'
* commit '
0fade321435f38382c614ade7b64e6b68440d747':
The Android Open Source Project [Mon, 12 Oct 2009 18:07:02 +0000 (11:07 -0700)]
am
8ce618ea: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
8ce618ea67480ae663d52350339a95fff3d6f1f5'
* commit '
8ce618ea67480ae663d52350339a95fff3d6f1f5':
The Android Open Source Project [Mon, 12 Oct 2009 18:06:57 +0000 (11:06 -0700)]
am
491386c1: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
491386c10ae5d1e11f6262909cdbfdc2ce8d1ebe'
* commit '
491386c10ae5d1e11f6262909cdbfdc2ce8d1ebe':
android-build SharedAccount [Mon, 12 Oct 2009 17:57:45 +0000 (10:57 -0700)]
Steve Block [Fri, 9 Oct 2009 14:22:25 +0000 (15:22 +0100)]
Remove CachedXBLDocument.cpp and CachedXSLDocument.cpp from the Android build, as they are not required.
These were added to the build in https://android-git.corp.google.com/g/#change,20732, as part of the last WebKit merge.
Cary Clark [Thu, 8 Oct 2009 19:03:22 +0000 (15:03 -0400)]
add debugging, tweak data for flash work in progress
Attempts to get the plugin to scroll when the ime
appears. Add debugging strings to help track events
to show plugin object. Add focusCandidate interfaces.
Tweak rectangles from plugin so they don't disappear.
Prefer found matches in nav cache that are later in
the document.
Leon Scroggins [Fri, 9 Oct 2009 20:29:07 +0000 (16:29 -0400)]
Allow <select> boxes to draw larger.
Fix http://b/issue?id=
2159794
Leon Scroggins [Fri, 9 Oct 2009 18:24:51 +0000 (14:24 -0400)]
Fix the V8 build.
Leon Scroggins [Fri, 2 Oct 2009 19:55:01 +0000 (15:55 -0400)]
File upload.
Webkit implementation for passing in the data for file uploads.
Requires a change to frameworks/base to not break things; also
requires a change to packages/apps/Browser to work.
Fixes http://b/issue?id=675743
Leon Clarke [Fri, 9 Oct 2009 16:03:36 +0000 (17:03 +0100)]
Fix sim build
Leon Clarke [Wed, 7 Oct 2009 16:03:05 +0000 (17:03 +0100)]
Draw a background color under the combo box
Android (Google) Code Review [Thu, 8 Oct 2009 18:51:42 +0000 (14:51 -0400)]
Merge change I6b640373 into eclair-mr2
* changes:
Fix bug
2132969
Patrick Scott [Thu, 8 Oct 2009 18:18:16 +0000 (14:18 -0400)]
Fix bug
2132969
Check for a user gesture before adding the history item during a fragment
scroll. The bug has been reported to webkit.org with the suggested fix. Although
upstream webkit does not have the user gesture additions defined by
ANDROID_USER_GESTURE.
Bug:
2132969
Ben Murdoch [Thu, 8 Oct 2009 15:51:44 +0000 (16:51 +0100)]
Set the navigator.vendor property to be "Google Inc." rather than defaulting to "Apple Computer, Inc."
Steve Block [Thu, 8 Oct 2009 14:29:34 +0000 (15:29 +0100)]
Bring Geolocation V8 bindings in line with those for JSC.
Steve Block [Thu, 8 Oct 2009 14:18:46 +0000 (15:18 +0100)]
Brings JSC Geolocation bindings up-to-date with latest submission to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=29099
Steve Block [Thu, 8 Oct 2009 11:05:14 +0000 (12:05 +0100)]
Fixes an accidental change made to WebKit GTK code.
This was made in change
95e3d862bbab761f8caaf1d1b54065f67b9a5148.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=
95e3d862bbab761f8caaf1d1b54065f67b9a5148#patch1
This will help avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.
Steve Block [Thu, 8 Oct 2009 10:13:05 +0000 (11:13 +0100)]
Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org.
This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org.
Steve Block [Wed, 7 Oct 2009 18:37:46 +0000 (11:37 -0700)]
am
e7430864: Makes sure that Geolocation permissions are saved before the browser is killed.
Merge commit '
e7430864058b3c222b4b0468cf8812a9a733818b' into eclair-mr2
* commit '
e7430864058b3c222b4b0468cf8812a9a733818b':
Makes sure that Geolocation permissions are saved before the browser is killed.
Steve Block [Wed, 7 Oct 2009 12:22:07 +0000 (13:22 +0100)]
Makes sure that Geolocation permissions are saved before the browser is killed.
This is a fix for http://b/issue?id=
2167364
Change-Id: I92a1a6831eb254b62593beaf7cb77c8e1f41945c
Cary Clark [Tue, 6 Oct 2009 21:41:56 +0000 (17:41 -0400)]
reset webTextView size if focus bounds changes
Keep track of changes in the current focus bounds, and provide
a way for the java side to access the change.
companion change in frameworks/base
fixes http://b/issue?id=
2118781
Android (Google) Code Review [Tue, 6 Oct 2009 18:00:51 +0000 (14:00 -0400)]
Merge change Ibbab1c84 into eclair-mr2
* changes:
address detection may look at uninitialized memory
Cary Clark [Tue, 6 Oct 2009 17:34:21 +0000 (13:34 -0400)]
address detection may look at uninitialized memory
Address detection on web pages creates arrays of pointers to
words, and compares them against a set of permitted street types.
This change adds the array of end pointers so that the check
does not look past the end of the word.
Fixes http://b/issue?id=
2166591
Steve Block [Tue, 6 Oct 2009 15:30:29 +0000 (08:30 -0700)]
am
a7280594: Fixes build bustage due to missing include in Geolocation.
Merge commit '
a7280594a8eac3503fe491d2ea02ce684fdf8744' into eclair-mr2
* commit '
a7280594a8eac3503fe491d2ea02ce684fdf8744':
Fixes build bustage due to missing include in Geolocation.
Steve Block [Tue, 6 Oct 2009 15:21:49 +0000 (16:21 +0100)]
Fixes build bustage due to missing include in Geolocation.
Change-Id: Iea9209faba25a9b4ea4e351218c8c1eecf36d07f
Steve Block [Tue, 6 Oct 2009 15:04:56 +0000 (08:04 -0700)]
am
0c7394a4: Fixes a WebKit bug where ongoing Geolocation requests are not stopped when the page is unloaded.
Merge commit '
0c7394a4459ba850766d303b4307add7189cf5f3' into eclair-mr2
* commit '
0c7394a4459ba850766d303b4307add7189cf5f3':
Fixes a WebKit bug where ongoing Geolocation requests are not stopped when the page is unloaded.
Andrei Popescu [Tue, 6 Oct 2009 13:44:10 +0000 (14:44 +0100)]
Remove the Android guards added to the <video> implementation in WebCore.
The patch in https://bugs.webkit.org/show_bug.cgi?id=29133 landed.
Steve Block [Tue, 6 Oct 2009 11:52:52 +0000 (12:52 +0100)]
Fixes a couple of style problems and a minor TODO in WebKit Geolocation.
Ben Murdoch [Tue, 6 Oct 2009 11:05:22 +0000 (12:05 +0100)]
Cherry pick of WebKit commit r49018, fix for b/
2067397. Enable Database.changVersion().
Steve Block [Tue, 6 Oct 2009 09:57:53 +0000 (10:57 +0100)]
Fixes a WebKit bug where ongoing Geolocation requests are not stopped when the page is unloaded.
This fixes bug http://b/issue?id=
2164673
Change-Id: I68a615c0b82bcee2a4a61dc0433a4f9321780ad1
Cary Clark [Mon, 5 Oct 2009 18:22:59 +0000 (14:22 -0400)]
fix select text if multiple lines are the same width
Text selection works by building a region on the UI side, then
finding the text that matches the rectangles making up the
decomposed region on the webkit side.
If multiple consecutive lines of text are the same width, the
region will combine them into a single rectangle instead of
one rectangle per line.
If the rectangle chooses a single line, it's safe to pick the
center of the line in Y, and that's what the old code does. The
new code also tries the top and bottom of the rectangle, in
case the rectangle spans multiple lines of text, but falls
back to the old behavior so not to regress.
fixes http://b/issue?id=
2166748
Android (Google) Code Review [Mon, 5 Oct 2009 16:28:14 +0000 (12:28 -0400)]
Merge change Ib47ea2b1 into eclair-mr2
* changes:
Add check null of getRealObject(). When a WebView is removed, there is a slight chance that getRealObject() for WebView's JavaObject be null.
Leon Clarke [Mon, 5 Oct 2009 14:32:12 +0000 (15:32 +0100)]
Re-enable using the right foreground color now we use the right background
color.
Leon Scroggins [Sun, 4 Oct 2009 22:12:49 +0000 (15:12 -0700)]
am
2097884b: Revert "Don\'t extend the arrow asset of the combo box over the text, so that the real background"
Merge commit '
2097884b9e1630c3855a8580f84a308163e085e7' into eclair-mr2
* commit '
2097884b9e1630c3855a8580f84a308163e085e7':
Revert "Don't extend the arrow asset of the combo box over the text, so that the real background"
Grace Kloba [Sat, 3 Oct 2009 00:38:57 +0000 (17:38 -0700)]
Add check null of getRealObject(). When a WebView is
removed, there is a slight chance that getRealObject()
for WebView's JavaObject be null.
Fix http://b/issue?id=
2159815
Mike Reed [Fri, 2 Oct 2009 19:04:50 +0000 (15:04 -0400)]
only look at globalAlpha when we draw images (not the alpha in fill-color)
http://b/issue?id=
1817561