OSDN Git Service

android-x86/external-webkit.git
14 years agoam d1368d75: Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.
Steve Block [Tue, 20 Oct 2009 09:41:51 +0000 (02:41 -0700)]
am d1368d75: Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.

Merge commit 'd1368d759438630fc877114bcab860030748cfee'

* commit 'd1368d759438630fc877114bcab860030748cfee':
  Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.

14 years agoam 86cfdd09: Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on...
Steve Block [Tue, 20 Oct 2009 09:41:47 +0000 (02:41 -0700)]
am 86cfdd09: Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.

Merge commit '86cfdd09c85781ba25861c20984629b3b5fefa0d'

* commit '86cfdd09c85781ba25861c20984629b3b5fefa0d':
  Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.

14 years agoam e2bca94a: Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.
Steve Block [Tue, 20 Oct 2009 09:41:43 +0000 (02:41 -0700)]
am e2bca94a: Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.

Merge commit 'e2bca94a6deb58613400a85282dea37566fff097'

* commit 'e2bca94a6deb58613400a85282dea37566fff097':
  Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.

14 years agoam 36a520dd: Merge webkit.org at R49305 : Remove superfluous call to FrameView::initS...
Steve Block [Tue, 20 Oct 2009 09:41:39 +0000 (02:41 -0700)]
am 36a520dd: Merge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.

Merge commit '36a520dd28b417e349eadd5404c4fac245e2d6b8'

* commit '36a520dd28b417e349eadd5404c4fac245e2d6b8':
  Merge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.

14 years agoam b20ad8a2: Merge webkit.org at R49305 : Stub out methods for mixed content in Frame...
Steve Block [Tue, 20 Oct 2009 09:41:35 +0000 (02:41 -0700)]
am b20ad8a2: Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.

Merge commit 'b20ad8a215a2ab055647d0a026a8141b4bde7ca2'

* commit 'b20ad8a215a2ab055647d0a026a8141b4bde7ca2':
  Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.

14 years agoam 8e465e3d: Merge webkit.org at R49305 : Update Geolocation to use new EventListener...
Steve Block [Tue, 20 Oct 2009 09:41:31 +0000 (02:41 -0700)]
am 8e465e3d: Merge webkit.org at R49305 : Update Geolocation to use new EventListener methods.

Merge commit '8e465e3d03d149943a3e592c3d2af395d50917eb'

* commit '8e465e3d03d149943a3e592c3d2af395d50917eb':
  Merge webkit.org at R49305 : Update Geolocation to use new EventListener methods.

14 years agoam 74e159b4: Merge webkit.org at R49305 : Use new macros to define Android touch...
Steve Block [Tue, 20 Oct 2009 09:41:27 +0000 (02:41 -0700)]
am 74e159b4: Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.

Merge commit '74e159b4f10c313c2347259bd2af0a9f81eb40c6'

* commit '74e159b4f10c313c2347259bd2af0a9f81eb40c6':
  Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.

14 years agoam 3fc3c966: Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElemen...
Steve Block [Tue, 20 Oct 2009 09:41:23 +0000 (02:41 -0700)]
am 3fc3c966: Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.

Merge commit '3fc3c9665962d7fc405432fd04e5851516dd4cbe'

* commit '3fc3c9665962d7fc405432fd04e5851516dd4cbe':
  Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.

14 years agoam 8c231380: Merge webkit.org at R49305 : Pull WebKit change http://trac.webkit.org...
Steve Block [Tue, 20 Oct 2009 09:41:19 +0000 (02:41 -0700)]
am 8c231380: Merge webkit.org at R49305 : Pull WebKit change trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0.

Merge commit '8c23138040b78914b1f9e2c4ea9a7765c258ec65'

* commit '8c23138040b78914b1f9e2c4ea9a7765c258ec65':
  Merge webkit.org at R49305 : Pull WebKit change http://trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0.

14 years agoam 72b26ecc: Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from...
Steve Block [Tue, 20 Oct 2009 09:41:15 +0000 (02:41 -0700)]
am 72b26ecc: Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.

Merge commit '72b26ecc49ccddf57e24b719c1f2a7fedae538c3'

* commit '72b26ecc49ccddf57e24b719c1f2a7fedae538c3':
  Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.

14 years agoam 10170b70: Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed...
Steve Block [Tue, 20 Oct 2009 09:41:11 +0000 (02:41 -0700)]
am 10170b70: Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.

Merge commit '10170b704c29772ec6c3fd4d7d19bdbae694dd4f'

* commit '10170b704c29772ec6c3fd4d7d19bdbae694dd4f':
  Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.

14 years agoam bd6026bd: Merge webkit.org at R49305 : Text::string renamed to dataImpl.
Steve Block [Tue, 20 Oct 2009 09:41:07 +0000 (02:41 -0700)]
am bd6026bd: Merge webkit.org at R49305 : Text::string renamed to dataImpl.

Merge commit 'bd6026bd45e3421253a3bcdbaf61a4f7c08476ea'

* commit 'bd6026bd45e3421253a3bcdbaf61a4f7c08476ea':
  Merge webkit.org at R49305 : Text::string renamed to dataImpl.

14 years agoam d060767c: Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to...
Steve Block [Tue, 20 Oct 2009 09:41:03 +0000 (02:41 -0700)]
am d060767c: Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.

Merge commit 'd060767c4de6a275194ee9a58f151b82b17013bf'

* commit 'd060767c4de6a275194ee9a58f151b82b17013bf':
  Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.

14 years agoam f08b6f61: Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidCha...
Steve Block [Tue, 20 Oct 2009 09:40:59 +0000 (02:40 -0700)]
am f08b6f61: Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.

Merge commit 'f08b6f6172b9dd1defce51b868f951bcbf6c61c7'

* commit 'f08b6f6172b9dd1defce51b868f951bcbf6c61c7':
  Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.

14 years agoam 80754947: Merge webkit.org at R49305 : Page constructor now takes a PluginHalterCl...
Steve Block [Tue, 20 Oct 2009 09:40:55 +0000 (02:40 -0700)]
am 80754947: Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.

Merge commit '80754947fdaad5fb6800b937f01f8d9ad53b4559'

* commit '80754947fdaad5fb6800b937f01f8d9ad53b4559':
  Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.

14 years agoam 5f26944c: Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.
Steve Block [Tue, 20 Oct 2009 09:40:50 +0000 (02:40 -0700)]
am 5f26944c: Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.

Merge commit '5f26944ca7d695d502778deeef7b20565bc3fa2e'

* commit '5f26944ca7d695d502778deeef7b20565bc3fa2e':
  Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.

14 years agoam 059ea049: Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of Secur...
Steve Block [Tue, 20 Oct 2009 09:40:46 +0000 (02:40 -0700)]
am 059ea049: Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.

Merge commit '059ea0497a87479c013371fb9f866f9f2677b529'

* commit '059ea0497a87479c013371fb9f866f9f2677b529':
  Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.

14 years agoam d867a0e9: Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.
Steve Block [Tue, 20 Oct 2009 09:40:42 +0000 (02:40 -0700)]
am d867a0e9: Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.

Merge commit 'd867a0e9b483e848580a3a98f73a8352884eac2b'

* commit 'd867a0e9b483e848580a3a98f73a8352884eac2b':
  Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.

14 years agoam 035acba0: Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameL...
Steve Block [Tue, 20 Oct 2009 09:40:37 +0000 (02:40 -0700)]
am 035acba0: Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.

Merge commit '035acba057f2c7a0f9dbdf27af5c67f80f1614f2'

* commit '035acba057f2c7a0f9dbdf27af5c67f80f1614f2':
  Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.

14 years agoam 8667eaf1: Merge webkit.org at R49305 : PluginView::init and destructor have been...
Steve Block [Tue, 20 Oct 2009 09:40:33 +0000 (02:40 -0700)]
am 8667eaf1: Merge webkit.org at R49305 : PluginView::init and destructor have been moved to common code.

Merge commit '8667eaf175b0748a1d8783beeeecedfaa983a074'

* commit '8667eaf175b0748a1d8783beeeecedfaa983a074':
  Merge webkit.org at R49305 : PluginView::init and destructor have been moved to common code.

14 years agoam 8e1c14d2: Merge webkit.org at R49305 : Update String::copy call sites to use new...
Steve Block [Tue, 20 Oct 2009 09:40:29 +0000 (02:40 -0700)]
am 8e1c14d2: Merge webkit.org at R49305 : Update String::copy call sites to use new copy method.

Merge commit '8e1c14d2cd6633dac941b17af2bea9c045ee0140'

* commit '8e1c14d2cd6633dac941b17af2bea9c045ee0140':
  Merge webkit.org at R49305 : Update String::copy call sites to use new copy method.

14 years agoam e372b0aa: Merge webkit.org at R49305 : Update KURL constructor call sites to new...
Steve Block [Tue, 20 Oct 2009 09:40:25 +0000 (02:40 -0700)]
am e372b0aa: Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.

Merge commit 'e372b0aa0721bf108058f04c43ad1365058369b2'

* commit 'e372b0aa0721bf108058f04c43ad1365058369b2':
  Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.

14 years agoam d9f79b2d: Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.
Steve Block [Tue, 20 Oct 2009 09:40:21 +0000 (02:40 -0700)]
am d9f79b2d: Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.

Merge commit 'd9f79b2db2f5875a4c7d02da14a36205b205b4a7'

* commit 'd9f79b2db2f5875a4c7d02da14a36205b205b4a7':
  Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.

14 years agoam 3f252f84: Merge webkit.org at R49305 : Fix merge conflicts.
Steve Block [Tue, 20 Oct 2009 09:40:16 +0000 (02:40 -0700)]
am 3f252f84: Merge webkit.org at R49305 : Fix merge conflicts.

Merge commit '3f252f84468859d129a8c6a9302412d2e6e5a3fa'

* commit '3f252f84468859d129a8c6a9302412d2e6e5a3fa':
  Merge webkit.org at R49305 : Fix merge conflicts.

14 years agoam 231d4e31: Merge webkit.org at R49305 : Automatic merge by git.
Steve Block [Tue, 20 Oct 2009 09:40:10 +0000 (02:40 -0700)]
am 231d4e31: Merge webkit.org at R49305 : Automatic merge by git.

Merge commit '231d4e3152a9c27a73b6ac7badbe6be673aa3ddf'

* commit '231d4e3152a9c27a73b6ac7badbe6be673aa3ddf':
  Merge webkit.org at R49305 : Automatic merge by git.

14 years agoMerge webkit.org at R49305 : Remove new file ImageSource.cpp from build.
Steve Block [Sun, 11 Oct 2009 22:16:05 +0000 (23:16 +0100)]
Merge webkit.org at R49305 : Remove new file ImageSource.cpp from build.

This file was added in http://trac.webkit.org/changeset/47073 to contain common ImageSource code.
We should refactor Android's ImageSource implementation to make use of this.

Change-Id: Ic9cde960ca96be697983d6b475156b592d82cfaa

14 years agoMerge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.
Steve Block [Tue, 13 Oct 2009 21:43:52 +0000 (22:43 +0100)]
Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.

Change-Id: Ia05aafa843b1f9aaf3d4f43cad7d664bf9d497e6

14 years agoMerge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.
Steve Block [Tue, 13 Oct 2009 21:40:55 +0000 (22:40 +0100)]
Merge webkit.org at R49305 : Add includes for UNUSED_PARAM for V8.

Change-Id: I7f3eb908f20782ef8fa07242b674648515c200f2

14 years agoMerge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.
Steve Block [Mon, 12 Oct 2009 11:23:35 +0000 (12:23 +0100)]
Merge webkit.org at R49305 : Remove superfluous call to FrameView::initScrollbars.

See http://trac.webkit.org/changeset/48064

Change-Id: Ib71ad99fb66f3c4346aef06ec7d73286488e1195

14 years agoMerge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientA...
Steve Block [Mon, 12 Oct 2009 11:23:49 +0000 (12:23 +0100)]
Merge webkit.org at R49305 : Stub out methods for mixed content in FrameLoaderClientAndroid.

See http://trac.webkit.org/changeset/48032

Change-Id: I2b4182ff87857d3dd374b34ffd1c9b46ca84db90

14 years agoMerge webkit.org at R49305 : Update Geolocation to use new EventListener methods.
Steve Block [Tue, 13 Oct 2009 10:46:22 +0000 (11:46 +0100)]
Merge webkit.org at R49305 : Update Geolocation to use new EventListener methods.

See http://trac.webkit.org/changeset/48402, http://trac.webkit.org/changeset/48701 and http://trac.webkit.org/changeset/48767

Change-Id: Id32d80c62f71c98c6677d7cbe11ee2ffbdaeeff1

14 years agoMerge webkit.org at R49305 : Use new macros to define Android touch event listeners...
Steve Block [Fri, 9 Oct 2009 15:32:56 +0000 (16:32 +0100)]
Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.

See http://trac.webkit.org/changeset/48701

Change-Id: I160099dd16b222e016c3414f2ce06adf5cf52573

14 years agoMerge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.
Steve Block [Mon, 12 Oct 2009 14:30:04 +0000 (15:30 +0100)]
Merge webkit.org at R49305 : Remove stray definition of HTMLAnchorElement::isFocusable.

This method has been removed in the new version of WebKit. However, the automatic merge did not remove the definition as it had been moved within Android's HTMLAnchorElement.h to make it public rather than private.

Change-Id: I5956ba997d78dfa75729aa2836dc8d579b3eacb3

14 years agoMerge webkit.org at R49305 : Pull WebKit change http://trac.webkit.org/changeset...
Steve Block [Mon, 12 Oct 2009 13:44:26 +0000 (14:44 +0100)]
Merge webkit.org at R49305 : Pull WebKit change trac.webkit.org/changeset/49428 to fix build with ENABLE_INSPECTOR = 0.

Change-Id: Id5cf30ed4a1753dc0659f405286fc66a76cae3c8

14 years agoMerge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorContr...
Steve Block [Fri, 9 Oct 2009 15:57:47 +0000 (16:57 +0100)]
Merge webkit.org at R49305 : Include new InspectorTimelineAgent.h from InspectorControllerAndroid.

See http://trac.webkit.org/changeset/48167

Change-Id: I4488eeeb081e999acdfb70e5230f78fd5059ba19

14 years agoMerge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.
Steve Block [Mon, 12 Oct 2009 12:15:31 +0000 (13:15 +0100)]
Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.

See http://trac.webkit.org/changeset/48267

Change-Id: I29156a62ece53de135a730a21e0337e4e4b57bed

14 years agoMerge webkit.org at R49305 : Text::string renamed to dataImpl.
Steve Block [Mon, 12 Oct 2009 11:21:45 +0000 (12:21 +0100)]
Merge webkit.org at R49305 : Text::string renamed to dataImpl.

See http://trac.webkit.org/changeset/47313

Change-Id: Ic33083eedfc8468c171cd7af6f112aca0eeef615

14 years agoMerge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.
Steve Block [Mon, 12 Oct 2009 10:52:54 +0000 (11:52 +0100)]
Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.

See http://trac.webkit.org/changeset/48511

Change-Id: I18ba9b6baa000209a28b8f1d01046c1c0e86c026

14 years agoMerge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.
Steve Block [Mon, 12 Oct 2009 10:48:48 +0000 (11:48 +0100)]
Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.

See http://trac.webkit.org/changeset/47866

Change-Id: I28b535b2c0202db2ec6d36791f67de4bbf24c3b4

14 years agoMerge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.
Steve Block [Mon, 12 Oct 2009 10:38:23 +0000 (11:38 +0100)]
Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.

See http://trac.webkit.org/changeset/48748

Change-Id: I2dd80bcda65ad309fe9d3cd4d73e832d7d17467f

14 years agoMerge webkit.org at R49305 : goBackOrForwards is now a member of Page.
Steve Block [Mon, 12 Oct 2009 10:32:45 +0000 (11:32 +0100)]
Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.

http://trac.webkit.org/changeset/49067

Change-Id: Ie15f56d2fa33f1d535ed5d048f0ac97c9d054271

14 years agoMerge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.
Steve Block [Mon, 12 Oct 2009 10:29:26 +0000 (11:29 +0100)]
Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.

See http://trac.webkit.org/changeset/49211

Change-Id: I2386a1089f9212f523b5525e2c98b081fb7bf297

14 years agoMerge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.
Steve Block [Mon, 12 Oct 2009 10:21:24 +0000 (11:21 +0100)]
Merge webkit.org at R49305 : FrameLoader::stopLoading now uses an enum.

See http://trac.webkit.org/changeset/48001

Change-Id: I11d6bae61de1f528ed8ee117c0260c78dccbd502

14 years agoMerge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.
Steve Block [Mon, 12 Oct 2009 10:13:15 +0000 (11:13 +0100)]
Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.

See http://trac.webkit.org/changeset/49284

Change-Id: I2aafe6f747f22b9c51c0db60f13fb3352d373809

14 years agoMerge webkit.org at R49305 : PluginView::init and destructor have been moved to commo...
Steve Block [Sun, 11 Oct 2009 22:28:11 +0000 (23:28 +0100)]
Merge webkit.org at R49305 : PluginView::init and destructor have been moved to common code.

See http://trac.webkit.org/changeset/47966 and http://trac.webkit.org/changeset/47967

Change-Id: If5b9594b032d5a7d456fe3bb6092eafef3655c34

14 years agoMerge webkit.org at R49305 : Update String::copy call sites to use new copy method.
Steve Block [Fri, 9 Oct 2009 16:07:41 +0000 (17:07 +0100)]
Merge webkit.org at R49305 : Update String::copy call sites to use new copy method.

See http://trac.webkit.org/changeset/49160

Change-Id: I75e1d6701f4d16fab7513f5924abf00e958e865c

14 years agoMerge webkit.org at R49305 : Update KURL constructor call sites to new signature.
Steve Block [Fri, 9 Oct 2009 14:48:35 +0000 (15:48 +0100)]
Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.

See http://trac.webkit.org/changeset/47907

Change-Id: I0d2f17fb161254e62e835d52fe7ab482b11b054d

14 years agoMerge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.
Steve Block [Fri, 9 Oct 2009 14:17:53 +0000 (15:17 +0100)]
Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.

We disable INSPECTOR - See http://trac.webkit.org/changeset/48430
We disable EVENT_SOURCE - see http://trac.webkit.org/changeset/47323

Change-Id: Iab25b3bb56582d9df1e693ed7158338e953677b7

14 years agoMerge webkit.org at R49305 : Fix merge conflicts.
Steve Block [Fri, 9 Oct 2009 12:27:03 +0000 (13:27 +0100)]
Merge webkit.org at R49305 : Fix merge conflicts.

Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a

14 years agoMerge webkit.org at R49305 : Automatic merge by git.
Steve Block [Thu, 8 Oct 2009 16:19:54 +0000 (17:19 +0100)]
Merge webkit.org at R49305 : Automatic merge by git.

Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7

14 years agoam e1967326: Merge change I5536af7a into eclair-mr2
Derek Sollenberger [Mon, 19 Oct 2009 18:33:29 +0000 (11:33 -0700)]
am e1967326: Merge change I5536af7a into eclair-mr2

Merge commit 'e196732677050bd463301566a68a643b6d14b907'

* commit 'e196732677050bd463301566a68a643b6d14b907':
  Updating the documentation for plugins.

14 years agoam 1fa15570: Merge change I112445f3 into eclair-mr2
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

14 years agoMerge change I5536af7a into eclair-mr2
Android (Google) Code Review [Mon, 19 Oct 2009 18:25:02 +0000 (14:25 -0400)]
Merge change I5536af7a into eclair-mr2

* changes:
  Updating the documentation for plugins.

14 years agoMerge change I112445f3 into eclair-mr2
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

14 years agoam 1bb8ca54: Removes some commented out files from the V8 derived Makefile.
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.

14 years agoRemoves 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

14 years agoam a9ae4cc0: Remove ARMAssembler.cpp from WebKit build, as it is not required on...
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.

14 years agoUpdating the documentation for plugins.
Derek Sollenberger [Mon, 19 Oct 2009 15:50:55 +0000 (11:50 -0400)]
Updating the documentation for plugins.

14 years agoreturn default 1.0 for scaleFactor(), since android doesn't record at the same res...
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

14 years agoRemove ARMAssembler.cpp from WebKit build, as it is not required on Android.
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

14 years agoam eeec5539: Merge change I4419d5c4 into eclair-mr2
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.

14 years agoMerge change I4419d5c4 into eclair-mr2
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.

14 years agoOnly 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

14 years agoam 9104ab4d: Merge change I6623a2fa into eclair-mr2
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.

14 years agoMerge change I6623a2fa into eclair-mr2
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.

14 years agodon'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.

14 years agoam 137af63d: (-s ours) Fixes a couple of style problems and a minor TODO in WebKit...
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.

14 years agoFixes 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.

14 years agoam 8601da30: Do not bring up the soft keyboard for readonly input fields.
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.

14 years agoam 31f7153b: fix copy/paste using trackball on passion
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

14 years agoDo not bring up the soft keyboard for readonly input fields.
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).

14 years agofix copy/paste using trackball on passion
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

14 years agoam 734b5134: (-s ours) Bring Geolocation V8 bindings in line with those for JSC....
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.

14 years agoam 6c2d6953: (-s ours) Brings JSC Geolocation bindings up-to-date with latest submiss...
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.

14 years agoBring Geolocation V8 bindings in line with those for JSC. 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.

14 years agoBrings JSC Geolocation bindings up-to-date with latest submission to webkit.org....
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.

14 years agoam 7da6c11f: (-s ours) Remove the Android guards added to the <video> implementation...
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.

14 years agoam 25323377: (-s ours) Fixes an accidental change made to WebKit GTK code. Do not...
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.

14 years agoam d19c83b2: (-s ours) Fixes a bunch of WebKit whitespace discrepancies between Andro...
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.

14 years agoRemove the Android guards added to the <video> implementation in WebCore. Do not...
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.

14 years agoFixes an accidental change made to WebKit GTK code. Do not merge.
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.

14 years agoFixes a bunch of WebKit whitespace discrepancies between Android and 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. 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.

14 years agoam a5f64bb2: Update V8 to revision 3018.
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.

14 years agoUpdate 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

14 years agoam af7015ae: Remove more superfluous WebKit files from build.
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.

14 years agoam b86ce2d8: Remove superfluous files from JSC build. Note that these files are not...
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.

14 years agoam f7420930: (-s ours) Removes superfluous unload event getter and setter methods...
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.

14 years agoRemove more superfluous WebKit files from build.
Steve Block [Wed, 14 Oct 2009 09:26:48 +0000 (10:26 +0100)]
Remove more superfluous WebKit files from build.

14 years agoRemove superfluous files from JSC build. Note that these files are not in the V8...
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.

14 years agoam e8d10d82: Merge change Ibf761b97 into eclair-mr2
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.

14 years agoam 1cad9175: Enabling plugins to stay in sync with UI when the DOM changes.
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.

14 years agoam 49e856e5: add debugging, tweak data for flash work in progress
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

14 years agoam b361e583: Allow <select> boxes to draw larger.
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.

14 years agoam c312eb90: Fix the V8 build.
Leon Scroggins [Tue, 13 Oct 2009 23:52:06 +0000 (16:52 -0700)]
am c312eb90: Fix the V8 build.

Merge commit 'c312eb9024855284dd6ff7f99f0462d345f089bb'

* commit 'c312eb9024855284dd6ff7f99f0462d345f089bb':
  Fix the V8 build.

14 years agoam bf280393: File upload.
Leon Scroggins [Tue, 13 Oct 2009 23:51:06 +0000 (16:51 -0700)]
am bf280393: File upload.

Merge commit 'bf280393189a33efa29a33c0d96c84710484f2f7'

* commit 'bf280393189a33efa29a33c0d96c84710484f2f7':
  File upload.

14 years agoam b7460af0: Fix sim build
Leon Clarke [Tue, 13 Oct 2009 21:28:50 +0000 (14:28 -0700)]
am b7460af0: Fix sim build

Merge commit 'b7460af0ad232b4bea4893febafe08895a3ef35b'

* commit 'b7460af0ad232b4bea4893febafe08895a3ef35b':
  Fix sim build

14 years agoam 71680282: Draw a background color under the combo box
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

14 years agoam cb964215: Merge change I6b640373 into eclair-mr2
Patrick Scott [Tue, 13 Oct 2009 21:28:09 +0000 (14:28 -0700)]
am cb964215: Merge change I6b640373 into eclair-mr2

Merge commit 'cb964215003240df4826e49f411f9a84ac582725'

* commit 'cb964215003240df4826e49f411f9a84ac582725':
  Fix bug 2132969

14 years agoRemoves superfluous unload event getter and setter methods from Node. Do not merge.
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.

14 years agoMerge change Ibf761b97 into eclair-mr2
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.