OSDN Git Service
Cary Clark [Tue, 6 Apr 2010 21:38:28 +0000 (14:38 -0700)]
am
4c249c54: am
213f1345: Merge "suppress compiler warnings in plugin code" into froyo
Cary Clark [Tue, 6 Apr 2010 21:29:54 +0000 (14:29 -0700)]
am
213f1345: Merge "suppress compiler warnings in plugin code" into froyo
Merge commit '
213f1345619560709150e9510a9a22c3cb36eb23' into froyo-plus-aosp
* commit '
213f1345619560709150e9510a9a22c3cb36eb23':
suppress compiler warnings in plugin code
Cary Clark [Tue, 6 Apr 2010 21:27:40 +0000 (14:27 -0700)]
Merge "suppress compiler warnings in plugin code" into froyo
Cary Clark [Tue, 6 Apr 2010 21:21:29 +0000 (17:21 -0400)]
suppress compiler warnings in plugin code
Change-Id: I0cadbf8946193ed7a4a7fe0cdeff82a2495d9ef9
Grace Kloba [Tue, 6 Apr 2010 20:52:28 +0000 (13:52 -0700)]
am
02069cf9: am
5e9b4f88: Merge "When handling Fixed position, always relative to the top document." into froyo
Grace Kloba [Tue, 6 Apr 2010 20:45:16 +0000 (13:45 -0700)]
am
5e9b4f88: Merge "When handling Fixed position, always relative to the top document." into froyo
Merge commit '
5e9b4f88ec0abb578823e8225ad9614c1ba58c6b' into froyo-plus-aosp
* commit '
5e9b4f88ec0abb578823e8225ad9614c1ba58c6b':
When handling Fixed position, always relative to
Grace Kloba [Tue, 6 Apr 2010 20:43:16 +0000 (13:43 -0700)]
Merge "When handling Fixed position, always relative to the top document." into froyo
Cary Clark [Tue, 6 Apr 2010 20:33:32 +0000 (13:33 -0700)]
am
c8780353: am
e5b1750d: Merge "keep frames associated with regular hits and direct hits" into froyo
Cary Clark [Tue, 6 Apr 2010 20:19:47 +0000 (13:19 -0700)]
am
e5b1750d: Merge "keep frames associated with regular hits and direct hits" into froyo
Merge commit '
e5b1750d38ff2208c180fe357355bf7e23e1d97d' into froyo-plus-aosp
* commit '
e5b1750d38ff2208c180fe357355bf7e23e1d97d':
keep frames associated with regular hits and direct hits
Cary Clark [Tue, 6 Apr 2010 20:17:25 +0000 (13:17 -0700)]
Merge "keep frames associated with regular hits and direct hits" into froyo
Cary Clark [Tue, 6 Apr 2010 20:07:01 +0000 (16:07 -0400)]
keep frames associated with regular hits and direct hits
The hit test on the nav cache returns a node/frame pair.
It looks for the closest hit, but gives priority to a direct
hit. Track the frame associated with the direct hit
separately, so that the correct node/frame pair is returned.
Change-Id: Icb1e3de4a0aad3c6dd9b2b81669f9c7bbb260282
http://b/
2316138
Andrei Popescu [Tue, 6 Apr 2010 19:47:26 +0000 (12:47 -0700)]
am
5837d193: am
3dc27326: Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
Grace Kloba [Tue, 6 Apr 2010 04:59:09 +0000 (21:59 -0700)]
When handling Fixed position, always relative to
the top document.
Fix http://b/issue?id=
2281574
Andrei Popescu [Tue, 6 Apr 2010 17:59:40 +0000 (10:59 -0700)]
am
3dc27326: Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
Merge commit '
3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0' into froyo-plus-aosp
* commit '
3dc27326d844c3fb48cdd88fd22b1c85e0abd0c0':
Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
Andrei Popescu [Tue, 6 Apr 2010 15:34:40 +0000 (16:34 +0100)]
Cherry-pick https://bugs.webkit.org/show_bug.cgi?id=37150
Check the frame's context at PageCache save and restore time to avoid crashing when it's null.
Fix bug:
2564844
Change-Id: Ifef3fcf271b1366d4f63c42da1a9ac08bb8b78ed
Cary Clark [Mon, 5 Apr 2010 18:51:36 +0000 (11:51 -0700)]
am
088017be: am
c0cc84d6: Merge "Create a method to check to see if the focus has a following textfield." into froyo
Cary Clark [Mon, 5 Apr 2010 18:35:32 +0000 (11:35 -0700)]
am
c0cc84d6: Merge "Create a method to check to see if the focus has a following textfield." into froyo
Merge commit '
c0cc84d6a4d0db0b39a9036bdbeb67f6c7e9e56e' into froyo-plus-aosp
* commit '
c0cc84d6a4d0db0b39a9036bdbeb67f6c7e9e56e':
Create a method to check to see if the focus has a following textfield.
Cary Clark [Mon, 5 Apr 2010 18:29:47 +0000 (11:29 -0700)]
Merge "Create a method to check to see if the focus has a following textfield." into froyo
Grace Kloba [Fri, 2 Apr 2010 23:25:42 +0000 (16:25 -0700)]
am
4f87c989: am
b721be96: Merge "When we stopUpdating(), we should cancel the outstanding timer." into froyo
Grace Kloba [Fri, 2 Apr 2010 23:14:15 +0000 (16:14 -0700)]
am
b721be96: Merge "When we stopUpdating(), we should cancel the outstanding timer." into froyo
Merge commit '
b721be96061253a7a8e35313bb5ee794d03d9af8' into froyo-plus-aosp
* commit '
b721be96061253a7a8e35313bb5ee794d03d9af8':
When we stopUpdating(), we should cancel the outstanding
Grace Kloba [Fri, 2 Apr 2010 23:09:33 +0000 (16:09 -0700)]
Merge "When we stopUpdating(), we should cancel the outstanding timer." into froyo
Grace Kloba [Fri, 2 Apr 2010 22:26:11 +0000 (15:26 -0700)]
When we stopUpdating(), we should cancel the outstanding
timer.
When timer fired, we should check m_lastError before
calling errorOccurred().
Fix http://b/issue?id=
2560897
Grace Kloba [Fri, 2 Apr 2010 20:25:34 +0000 (13:25 -0700)]
am
0eb692b9: am
726a2501: Fix pluginstream delay timer as it is expecting seconds instead of milliseconds.
Grace Kloba [Fri, 2 Apr 2010 20:13:44 +0000 (13:13 -0700)]
am
726a2501: Fix pluginstream delay timer as it is expecting seconds instead of milliseconds.
Merge commit '
726a250195dce8f58044e80342e99ec8c0fa98df' into froyo-plus-aosp
* commit '
726a250195dce8f58044e80342e99ec8c0fa98df':
Fix pluginstream delay timer as it is expecting seconds
The Android Open Source Project [Fri, 2 Apr 2010 18:24:03 +0000 (11:24 -0700)]
am
f39b1b26: merge from open-source master
The Android Open Source Project [Fri, 2 Apr 2010 18:08:51 +0000 (11:08 -0700)]
merge from open-source master
Change-Id: I87473a9657b8906b4933a7e22bf1125a65e44502
Grace Kloba [Fri, 2 Apr 2010 18:05:18 +0000 (11:05 -0700)]
Fix pluginstream delay timer as it is expecting seconds
instead of milliseconds.
While the timer is active, don't deliverData.
Fix http://b/issue?id=
2567300
Jean-Baptiste Queru [Fri, 2 Apr 2010 17:01:47 +0000 (10:01 -0700)]
Merge "Remove some oboslete code."
Patrick Scott [Fri, 2 Apr 2010 14:09:55 +0000 (07:09 -0700)]
am
9dbbb4da: On demand plugins are now per-page, not per-object.
Patrick Scott [Fri, 2 Apr 2010 13:43:08 +0000 (09:43 -0400)]
On demand plugins are now per-page, not per-object.
Traverse the frame tree and enable all plugins currently on the page. Remember
the setting for any future plugins that are created. Reset the setting in
makeRepresentation as that seems to be called for all new documents.
Bug:
2564543
Change-Id: I558f068992719ee0236ba40f76b918b10cfe0ed9
Grace Kloba [Thu, 1 Apr 2010 17:02:54 +0000 (10:02 -0700)]
am
4535cd9b: Merge "If "widget" is already existed in the HashMap when createScriptInstanceForWidget(widget) is called, we need to release the reference of the matching npObject to avoid leak." into froyo
Grace Kloba [Thu, 1 Apr 2010 16:49:56 +0000 (09:49 -0700)]
Merge "If "widget" is already existed in the HashMap when createScriptInstanceForWidget(widget) is called, we need to release the reference of the matching npObject to avoid leak." into froyo
Ben Murdoch [Thu, 1 Apr 2010 15:06:41 +0000 (08:06 -0700)]
am
0e519b92: Get the correct class name from the JVM when constructing arrays in the JNI bindings.
Ben Murdoch [Thu, 1 Apr 2010 14:01:26 +0000 (15:01 +0100)]
Get the correct class name from the JVM when constructing arrays in the JNI bindings.
Also a change in packages/apps/Browser to update the unit tests for JNI bindings.
Fix for b/
2540502
Change-Id: Ia86a1ac672bd6653427ac0a969b4d40c86141415
Grace Kloba [Thu, 1 Apr 2010 07:18:59 +0000 (00:18 -0700)]
If "widget" is already existed in the HashMap when
createScriptInstanceForWidget(widget) is called,
we need to release the reference of the matching
npObject to avoid leak.
HTMLPlugInElement::getInstance() only calls
createScriptInstanceForWidget(widget) once. But
HTMLEmbedElement is using its closest ancestor who
has objectTag to get the widget. So the same widget
can exist in the HashMap if both <object> and its
child <embed>'s getInstance() are called.
Fix http://b/issue?id=
2553266
Grace Kloba [Wed, 31 Mar 2010 21:17:40 +0000 (14:17 -0700)]
am
a622a48d: Make sure html plugin element supports focus so that plugin can call focus() on it.
Grace Kloba [Wed, 31 Mar 2010 19:07:39 +0000 (12:07 -0700)]
Make sure html plugin element supports focus so that
plugin can call focus() on it.
By default, only nodes can be tabbed through supports
focus. We make plugin element like frame element where
it always supports focus. In Android, plugin has a
focused mode, so it requires this change.
Fix http://b/issue?id=
2539608
Leon Scroggins [Wed, 31 Mar 2010 19:29:25 +0000 (15:29 -0400)]
Create a method to check to see if the focus has a following textfield.
Fixes http://b/issue?id=
2559070
Requires a change to frameworks/base.
Change-Id: I450cb8ee109e9a1f38a7290032fb3ca948dcc71a
Patrick Scott [Wed, 31 Mar 2010 18:14:38 +0000 (11:14 -0700)]
am
5a3decdc: Merge "Make sure the protocol is lower case in the redirect." into froyo
Patrick Scott [Wed, 31 Mar 2010 17:58:16 +0000 (10:58 -0700)]
Merge "Make sure the protocol is lower case in the redirect." into froyo
Patrick Scott [Wed, 31 Mar 2010 17:34:16 +0000 (13:34 -0400)]
Make sure the protocol is lower case in the redirect.
Bug:
2560217
Change-Id: I22a7c854a4e043682eac8b92ca2dece256af76b8
Ben Murdoch [Wed, 31 Mar 2010 16:55:19 +0000 (09:55 -0700)]
am
81a63d7d: Merge "If there is no find location then return early in findNext." into froyo
Nicolas Roard [Wed, 31 Mar 2010 16:49:08 +0000 (17:49 +0100)]
resolved conflicts for merge of
541a0a9a to master
Change-Id: Ic2abe87f52744e31098112505bdd14906600fc14
Ben Murdoch [Wed, 31 Mar 2010 14:31:43 +0000 (07:31 -0700)]
am
1dd519bd: Merge "Implement the V8 JNI bindings more completely." into froyo
Ben Murdoch [Wed, 31 Mar 2010 14:28:16 +0000 (07:28 -0700)]
Merge "If there is no find location then return early in findNext." into froyo
Nicolas Roard [Wed, 31 Mar 2010 14:00:25 +0000 (07:00 -0700)]
Merge "Only allows composited layers if not in iframes" into froyo
Ben Murdoch [Wed, 31 Mar 2010 13:20:01 +0000 (14:20 +0100)]
If there is no find location then return early in findNext.
Fix b/
2558960
Change-Id: I1cc723913ab1e3eccb21eb60ab2fe2a458eb420c
Ben Murdoch [Wed, 31 Mar 2010 11:26:36 +0000 (04:26 -0700)]
Merge "Implement the V8 JNI bindings more completely." into froyo
Ben Murdoch [Mon, 29 Mar 2010 15:54:12 +0000 (16:54 +0100)]
Implement the V8 JNI bindings more completely.
Change-Id: I3b3d2bff84ee4a1039424cf1881e5d3d428127f9
Grace Kloba [Wed, 31 Mar 2010 06:25:58 +0000 (23:25 -0700)]
Julien Chaffraix [Wed, 31 Mar 2010 01:52:35 +0000 (18:52 -0700)]
Remove old code that was fixed in WebKit r35902
This code was based on WebKit r30711 which has now been integrated into Android (this fix
was introduced in october 2008).
Change-Id: I1faf6e611dfe226771ca8f28ee6a9e0cd80535ae
Grace Kloba [Tue, 30 Mar 2010 17:50:04 +0000 (10:50 -0700)]
Merge "cherry-pick
74f79778892548221468d075f949acb3d4064368 to froyo" into froyo
Andrei Popescu [Tue, 30 Mar 2010 17:49:24 +0000 (10:49 -0700)]
am
e805cfbf: Fix build by removing PLATFORM macro from npapi.
Cary Clark [Tue, 30 Mar 2010 17:45:50 +0000 (10:45 -0700)]
am
300f320e: Merge "enable gifs for large memory devices" into froyo
Cary Clark [Tue, 30 Mar 2010 17:45:48 +0000 (10:45 -0700)]
am
15a662df: Merge "correct rgba order for skia" into froyo
Grace Kloba [Fri, 26 Mar 2010 06:15:06 +0000 (23:15 -0700)]
cherry-pick
74f79778892548221468d075f949acb3d4064368 to froyo
In Android, as we always remap the plugin from page
space to view space, we do want to update when the rect
in the page space changed. This should fix the bug where
the plugin is inside a fixed position. So even its
page coordinate changed when scrolling, its window
coordinate didn't change. We missed the update.
Fix http://b/issue?id=
2542934
Nicolas Roard [Tue, 30 Mar 2010 17:36:36 +0000 (18:36 +0100)]
Only allows composited layers if not in iframes
Bug:
2498776 and fix Bug:
2544493
Change-Id: I0041db690cbe7d80e8e092626a95e882a5afbe03
Andrei Popescu [Tue, 30 Mar 2010 17:28:39 +0000 (18:28 +0100)]
Fix build by removing PLATFORM macro from npapi.
Change-Id: I57d350a8933a1a4825cebb7c81d4ae944375f258
Cary Clark [Tue, 30 Mar 2010 17:25:50 +0000 (10:25 -0700)]
Merge "enable gifs for large memory devices" into froyo
Cary Clark [Tue, 30 Mar 2010 17:25:34 +0000 (10:25 -0700)]
Merge "correct rgba order for skia" into froyo
Cary Clark [Tue, 30 Mar 2010 17:18:39 +0000 (13:18 -0400)]
enable gifs for large memory devices
Change-Id: I801446e8255c113d5492935f2f91dc84b0d18164
http://b/
1745918
Andrei Popescu [Tue, 30 Mar 2010 17:16:37 +0000 (10:16 -0700)]
am
4b7d2805: Merge "Ask the plugin how long to wait before calling NPN_WriteReady() again." into froyo
Mike Reed [Fri, 26 Mar 2010 14:53:44 +0000 (10:53 -0400)]
correct rgba order for skia
Change-Id: I368def139ab2b3c5c08807919152ca7379ab9b4f
http://b/
1745918
Andrei Popescu [Tue, 30 Mar 2010 16:54:23 +0000 (09:54 -0700)]
Merge "Ask the plugin how long to wait before calling NPN_WriteReady() again." into froyo
Andrei Popescu [Tue, 30 Mar 2010 15:10:16 +0000 (16:10 +0100)]
Ask the plugin how long to wait before calling NPN_WriteReady() again.
Change-Id: I46b25a5869e91e0075913caca5e57380f72f6107
Grace Kloba [Tue, 30 Mar 2010 15:12:35 +0000 (08:12 -0700)]
Merge "In Android, as we always remap the plugin from page space to view space, we do want to update when the rect in the page space changed. This should fix the bug where the plugin is inside a fixed position. So even its page coordinate changed when scrolling, its window coordinate didn't change. We missed the update."
Nicolas Roard [Tue, 30 Mar 2010 13:04:44 +0000 (06:04 -0700)]
am
2eba8dcf: Merge "Remove ANDROID_FIXED_ELEMENTS" into froyo
Nicolas Roard [Tue, 30 Mar 2010 12:50:13 +0000 (05:50 -0700)]
Merge "Remove ANDROID_FIXED_ELEMENTS" into froyo
Nicolas Roard [Mon, 29 Mar 2010 23:56:29 +0000 (00:56 +0100)]
Remove ANDROID_FIXED_ELEMENTS
Bug:
2534420
Change-Id: Ieb93c8888a1d05dece3c817a8847e4f2c22a865a
Shimeng (Simon) Wang [Mon, 29 Mar 2010 22:23:59 +0000 (15:23 -0700)]
am
0e264b00: Add 2 pixel padding and draw 2 pixel border for flash-on-demand.
Shimeng (Simon) Wang [Mon, 29 Mar 2010 21:56:55 +0000 (14:56 -0700)]
Add 2 pixel padding and draw 2 pixel border for flash-on-demand.
Issue:
2411524
Change-Id: I04c94b8122cd85dda071a85f74a054a613b39e8c
Andrei Popescu [Mon, 29 Mar 2010 17:26:06 +0000 (10:26 -0700)]
am
526c7746: Make sure WebKit\'s page cache does not cache pages with unload handlers.
Steve Block [Mon, 29 Mar 2010 17:26:04 +0000 (10:26 -0700)]
am
e72218e3: Cherry pick from master.
Andrei Popescu [Mon, 29 Mar 2010 17:26:00 +0000 (10:26 -0700)]
am
8fecd9c9: Cherry pick patch in https://bugs.webkit.org/show_bug.cgi?id=36665 which adds V8 bindings for page cache.
Andrei Popescu [Mon, 29 Mar 2010 16:43:47 +0000 (17:43 +0100)]
Make sure WebKit's page cache does not cache pages with unload handlers.
Fix b:
2552004
Change-Id: Iac6737fbb9a1eca734ea7474f99ccf66ee916bd7
Steve Block [Fri, 26 Mar 2010 11:15:43 +0000 (11:15 +0000)]
Cherry pick from master.
Cherry-picks WebKit change 56105 to eliminate use of bzero in WebKit common code
Note that manual changes were required to JNIUtilityPrivate.cpp as this file has
changed upstreamed, but the merge will be trivial.
See http://trac.webkit.org/changeset/56105
Bug:
2535696
Change-Id: I464a4aa78b1625961724b6001caba1c315ed9f91
Andrei Popescu [Mon, 29 Mar 2010 11:08:36 +0000 (12:08 +0100)]
Cherry pick patch in https://bugs.webkit.org/show_bug.cgi?id=36665
which adds V8 bindings for page cache.
Fix b:
2533219
Change-Id: I57f067adbbef76b4f8ec6c50b9e85fb2b7fc619a
Grace Kloba [Fri, 26 Mar 2010 06:15:06 +0000 (23:15 -0700)]
In Android, as we always remap the plugin from page
space to view space, we do want to update when the rect
in the page space changed. This should fix the bug where
the plugin is inside a fixed position. So even its
page coordinate changed when scrolling, its window
coordinate didn't change. We missed the update.
Fix http://b/issue?id=
2542934
Mike Reed [Fri, 26 Mar 2010 16:05:33 +0000 (09:05 -0700)]
Merge "correct rgba order for skia"
Nicolas Roard [Fri, 26 Mar 2010 15:24:55 +0000 (08:24 -0700)]
Merge "Add checks to consider a fixed layer for compositing only if its dimensions are actually more than zero."
Mike Reed [Fri, 26 Mar 2010 14:53:44 +0000 (10:53 -0400)]
correct rgba order for skia
Change-Id: I9814bfbffe595d8c3fdd845160df33d60138d081
Nicolas Roard [Thu, 25 Mar 2010 18:45:39 +0000 (18:45 +0000)]
Add checks to consider a fixed layer for compositing only if its
dimensions are actually more than zero.
Fix Bug:
2545160
Change-Id: I08ca0c1f5a6729760dbf62084a96faee76d124f9
Steve Block [Fri, 26 Mar 2010 11:15:43 +0000 (11:15 +0000)]
Cherry-picks WebKit change 56105 to eliminate use of bzero in WebKit common code
Note that manual changes were required to JNIUtilityPrivate.cpp as this file has
changed upstreamed, but the merge will be trivial.
See http://trac.webkit.org/changeset/56105
Bug:
2535696
Change-Id: I08da8279d3af93aba38ecf21731c8a251502abae
Leon Scroggins III [Thu, 25 Mar 2010 17:01:13 +0000 (13:01 -0400)]
Remove a warning.
Change-Id: Iffd11a306df9a5140b3406e825185713d17d273e
Cary Clark [Thu, 25 Mar 2010 14:18:35 +0000 (10:18 -0400)]
don't track layer node twice
If a cache node is both in a layer and contains a layer, don't
add it the second time.
Change-Id: I45cc302e234565bfbc87649ca503f515b1f487e8
http://b/
2543736
Dan Egnor [Wed, 24 Mar 2010 22:32:36 +0000 (15:32 -0700)]
Apparently this needs to happen again (at least, it did for my build).
Change-Id: I89dbec1be74da68afb2a03b75ad5bf87426d8889
Nicolas Roard [Wed, 24 Mar 2010 20:41:14 +0000 (13:41 -0700)]
Merge "Mark positioned elements as needing a relayout when checking for hit test. This is necessary when using composited fixed layers, as the layers position may have moved UI-side, while the webkit's related position of those layers may not have been updated yet."
Nicolas Roard [Wed, 24 Mar 2010 18:27:42 +0000 (18:27 +0000)]
Mark positioned elements as needing a relayout when checking for hit test.
This is necessary when using composited fixed layers, as the layers position
may have moved UI-side, while the webkit's related position of those layers
may not have been updated yet.
Fix Bug:
2457215
Change-Id: If4f0e9c3d1a4786b29dcc7c2dc3510ba090b6a36
Kristian Monsen [Wed, 24 Mar 2010 19:35:36 +0000 (12:35 -0700)]
Merge "compile fix for V8 with debug builds"
Kristian Monsen [Wed, 24 Mar 2010 19:26:22 +0000 (19:26 +0000)]
compile fix for V8 with debug builds
Change-Id: Icffc7b0d5f9a9b2da66dca37c0c8d084c11491b7
Steve Block [Wed, 24 Mar 2010 18:28:50 +0000 (11:28 -0700)]
Merge "Fixes XHR requests to use the username and password supplied from JavaScript"
Patrick Scott [Wed, 24 Mar 2010 18:18:50 +0000 (14:18 -0400)]
Fix the background of the placeholder.
Draw a light gray 1 pixel border instead of using an asset.
Bug:
2411524
Change-Id: Ibc95148e2bf13e0dcc58d747e3733cc6993dddf6
Steve Block [Wed, 24 Mar 2010 16:27:17 +0000 (16:27 +0000)]
Fixes XHR requests to use the username and password supplied from JavaScript
Currently, the browser does not use the credentials supplied from JavaScript.
If a request returns a 401 Unauthorized, the browser always prompts the user.
This violates http://www.w3.org/TR/XMLHttpRequest/#the-send-method
Bug:
2533522
Change-Id: Ic232003a3f321167810fc7263d6ecb654eeeb5eb
Mike Reed [Wed, 24 Mar 2010 17:45:41 +0000 (10:45 -0700)]
Merge "drawRect is defined (in header) to always stroke with 1.0"
Mike Reed [Wed, 24 Mar 2010 17:33:09 +0000 (13:33 -0400)]
drawRect is defined (in header) to always stroke with 1.0
Change-Id: I95bef5b769c9b2637424ae4f22ccd19ed6e4ff9a
Nicolas Roard [Wed, 24 Mar 2010 17:22:54 +0000 (10:22 -0700)]
Merge "Renders fixed layers with the root canvas matrix. Fix some positioning issues."
Nicolas Roard [Fri, 19 Mar 2010 17:10:50 +0000 (17:10 +0000)]
Renders fixed layers with the root canvas matrix. Fix some positioning issues.
Bug:
2526966 Bug:
1818168
The current rendering code exposes some issues with the fact that we have
fixed layers in the layers hierarchy -- parents transformations are also applied
to the fixed layers, which is not what we want (fixed layers should be applied
on the original canvas, with the original transform -- e.g. toolbar present or not --
but no more).
One previously discussed solution was to move the fixed layers to their own hierarchy;
but doing so would mean to also redo all the z-index management that we already have
in the current system. The simplest way is therefore to use the original matrix (the
canvas' matrix) when we have a fixed layer. The way we do this is by inserting a new
LayerAndroid before the LayerAndroid root, setting the matrix of that new root to be
the canvas' matrix. The drawing is then unaffected, but we can ask skia to draw using
the root's matrix.
The second issue solved in the CL is some positioning troubles; layers may have
different dimensions than their render view, and the previous code was considering that
the views were always drawn at the origin in the layer. By removing the parents layers
transforms, this is not the case anymore, and we therefore need to take the render view
offset into account. Finally there is some additional debug code in LayerAndroid.
Change-Id: Id353ad3dfd9808252643f0e4f0140dde67480719
Grace Kloba [Wed, 24 Mar 2010 16:10:46 +0000 (09:10 -0700)]
Merge "Add a special case to handle "wap" style html."
Patrick Scott [Wed, 24 Mar 2010 13:50:27 +0000 (09:50 -0400)]
Do not redirect data to our placeholder.
Bug:
2539312
Change-Id: I952b854cc65c5481e9fed04d2169b0f01536d5a4
Grace Kloba [Tue, 23 Mar 2010 23:14:34 +0000 (16:14 -0700)]
Add a special case to handle "wap" style html.
If we get here, it is html mimetype, not wap mimetype.
Treat the "wap" style like "mobile" style by using
device-width as viewport width.
Fix http://b/issue?id=
2538320