OSDN Git Service
Ben Murdoch [Tue, 24 May 2011 15:06:24 +0000 (16:06 +0100)]
Merge WebKit at r80534: Fix Java Bridge.
Fix conflicts and reflect the upstream changes made in
http://trac.webkit.org/changeset/80467.
Note that our JNIUtilityPrivate.cpp is significantly forked from
upstream.
Change-Id: I390f1089d861fa29b6c15118638d029dea4356d8
Ben Murdoch [Tue, 24 May 2011 14:08:28 +0000 (15:08 +0100)]
Merge WebKit at r80534: Fix ImageSourceAndroid.cpp
SharedBuffer::buffer now private, we should use SharedBuffer::data()
instead.
See http://trac.webkit.org/changeset/78548
Add implementation of bytesDecodedToDetermineProperties.
See http://trac.webkit.org/changeset/78652
Change-Id: Ic113f711f3b8d553e35ba98246fd6bd9093fdb06
Ben Murdoch [Tue, 24 May 2011 13:37:08 +0000 (14:37 +0100)]
Merge WebKit at r80534: Update uses of PLATFORM(SKIA).
PLATFORM(SKIA) is replaced with USE(SKIA), see
http://trac.webkit.org/changeset/79578
Fix conflicts and update our code to reflect this.
Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
Ben Murdoch [Tue, 24 May 2011 13:28:54 +0000 (14:28 +0100)]
Merge WebKit at r80534: Fix uses of rounding hacks.
Font rounding hacks have been removed upstream, so there
is no need for our local code anymore. Remove all uses
of the ANDROID_DISABLE_ROUNDING_HACKS macro.
Note that this brings our behavior in line with upstream -
Android will see a change in behavior to before the merge
as we did not disable rounding hacks in all cases.
- SVGInlineTextBox::SVGInlineTextBox() - we don't pass a value for
disableRoundingHacks, so we don't disable hacks, so this behaviour will
change as rounding hacks are disabled now.
- RenderText::createTextBox() - We pass a value for
disableRoundingHacks, true if any parent is a text control.
So we will change behavior in any case where the parent is not
a text control.
Note that although we may see a change in behavior, that change is
consistent with the upstream codebase.
See http://trac.webkit.org/changeset/78846
Change-Id: I5d4d7298083acc519199c4c38ab5acdef5bdc537
Ben Murdoch [Tue, 24 May 2011 13:09:24 +0000 (14:09 +0100)]
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles.
See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.
Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).
Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
Ben Murdoch [Wed, 1 Jun 2011 15:59:03 +0000 (16:59 +0100)]
Merge WebKit at r80534: Fix conflicts.
Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223
Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978
Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367
HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.
HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.
CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.
MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.
FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.
NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.
PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988
RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.
Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
Ben Murdoch [Tue, 24 May 2011 10:24:40 +0000 (11:24 +0100)]
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Glenn Kasten [Wed, 1 Jun 2011 22:22:21 +0000 (15:22 -0700)]
Merge "Revert "Use AudioTrack::event_type not int in callback""
Glenn Kasten [Wed, 1 Jun 2011 22:20:03 +0000 (15:20 -0700)]
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit
8d0d3a015e5f96c7eb2101fba5abcdf76958ff41
Glenn Kasten [Wed, 1 Jun 2011 21:40:39 +0000 (14:40 -0700)]
Merge "Use AudioTrack::event_type not int in callback"
Glenn Kasten [Wed, 4 May 2011 22:35:53 +0000 (15:35 -0700)]
Use AudioTrack::event_type not int in callback
Change-Id: I451b5a7560ca21d07a5b71e9a4c0eb4c15aab7a9
Teng-Hui Zhu [Tue, 31 May 2011 22:24:42 +0000 (15:24 -0700)]
Support the screen shot while the video is paused.
Basically, the GL textures generated for the surface texture will be used
for showing the screenshot.
Surface texture will be recycled every time a new video starts.
But GL textures will be recycled either when running out of memory bound,
or when the mediaplayer is deleted.
1. Add the VideoLayerManager as a static instance to manage the info of textures
allocated for the screenshot. The basic info will be added into the manager
while the video is played and prepared. During the draw time, the matirx info
will be updated, too.
2. When there are too many screenshots are created, then we will discard the
oldest one and just show the grey static rectangle to replace the screenshot.
The corresponding framework change is 112501.
Change-Id: Ifea60c96532500f9c93062cc97f7c4ef978046b0
Bart Sears [Tue, 31 May 2011 17:34:50 +0000 (10:34 -0700)]
Merge "Add a MODULE_LICENSE file for external/webkit"
Kristian Monsen [Tue, 31 May 2011 16:58:14 +0000 (17:58 +0100)]
Fix reboot loop on master ToT
Change-Id: I34534273f70c1fe32b83f994808de03616c85922
Kristian Monsen [Tue, 31 May 2011 13:40:01 +0000 (14:40 +0100)]
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
Passing the extra string argument, blacklist, to the proxy in
chromium.
Need CL in frameworks/base:
https://android-git.corp.google.com/g/#change,112400
And external/chromium:
https://android-git.corp.google.com/g/#change,111832
Change-Id: Ie8ca84b5ebf9701391dbd8a5097638e24ac2cb85
Bart Sears [Sat, 28 May 2011 01:04:53 +0000 (18:04 -0700)]
Add a MODULE_LICENSE file for external/webkit
Change-Id: Ib823fdc445409d58e638f368390ff0f515b4ee49
Russell Brenner [Thu, 26 May 2011 22:59:02 +0000 (15:59 -0700)]
Merge "merge from honeycomb mr2"
Russell Brenner [Thu, 26 May 2011 22:45:39 +0000 (15:45 -0700)]
merge from honeycomb mr2
Update isFallbackFamily() with missing fonts
Skia maps numerous fonts to the standard system fonts. Only a few of
these were matched by isFallbackFamily(). This brings them to parity,
adding standards like arial, times, courier, and more.
Bug:
4499169
Change-Id: I8fdcb804f8ad4c9b34a8a4ea88ce39c49b364ccc
Shimeng (Simon) Wang [Thu, 26 May 2011 18:36:25 +0000 (11:36 -0700)]
Merge "Fix more compilation error when nav_debug_ui is on."
Shimeng (Simon) Wang [Thu, 26 May 2011 18:29:29 +0000 (11:29 -0700)]
Fix more compilation error when nav_debug_ui is on.
Change-Id: I0e28ab1afcd98f01723730e84b51d43811baacc4
Shimeng (Simon) Wang [Thu, 26 May 2011 17:57:09 +0000 (10:57 -0700)]
Merge "Fix compilation error when debug_nav_ui is turned on."
Russell Brenner [Thu, 26 May 2011 04:28:04 +0000 (21:28 -0700)]
am
06295b42: (-s ours) am
4ce956cc: am
3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
* commit '
06295b42c1937e8da9932a105dbb47d75977a6f6':
DO NOT MERGE-Move check for pending style recalc
Shimeng (Simon) Wang [Thu, 26 May 2011 00:59:48 +0000 (17:59 -0700)]
Fix compilation error when debug_nav_ui is turned on.
Change-Id: I554f12a3d1ee2baa04288467e6fd46b1cdce9f9c
Nicolas Roard [Wed, 25 May 2011 19:39:36 +0000 (12:39 -0700)]
Merge "Fix the way we maintain the list of Pictures in PictureSet. This improves drawing performances on the base surface by a decent amount."
Kristian Monsen [Wed, 25 May 2011 19:09:51 +0000 (12:09 -0700)]
Merge "Merge chromium at 10.0.634.0: Compile fixes"
Russell Brenner [Wed, 25 May 2011 18:04:21 +0000 (11:04 -0700)]
Merge "merge from honeycomb mr2"
Steve Block [Wed, 25 May 2011 17:56:53 +0000 (18:56 +0100)]
Fix a typo in the LayoutTest directory list
Change-Id: I8d933bd411b6e95f0a095db58d92318a5d2786a6
Russell Brenner [Wed, 25 May 2011 16:54:35 +0000 (09:54 -0700)]
merge from honeycomb mr2
Move check for pending style recalc
The previous implementation had no way to notify the caller as to
whether or not the recording was successful. Now, recordContent
detects the pending recalc and returns null to indicate that no
recording was done.
bug:
4474358
Change-Id: I511d6f1118c0a122ee893167311f3cc82f2cbf7e
Russell Brenner [Wed, 25 May 2011 16:17:06 +0000 (09:17 -0700)]
am
4ce956cc: am
3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
* commit '
4ce956cc43762bec0962eae9707369b235c354a2':
DO NOT MERGE-Move check for pending style recalc
Russell Brenner [Wed, 25 May 2011 16:06:02 +0000 (09:06 -0700)]
am
3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
* commit '
3d487c65ee7e11672335cae6240879d3421abf24':
DO NOT MERGE-Move check for pending style recalc
Russell Brenner [Wed, 25 May 2011 16:00:16 +0000 (09:00 -0700)]
Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
Kristian Monsen [Wed, 25 May 2011 11:07:14 +0000 (12:07 +0100)]
Merge chromium at 10.0.634.0: Compile fixes
base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/
6028009
base/condition_variable.h base/lock.h moved to base/synchronization
and classes added to base namespace:
http://codereview.chromium.org/
6018013
Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c
Steve Block [Wed, 25 May 2011 15:15:24 +0000 (08:15 -0700)]
Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f
* changes:
Merge WebKit at r78450: Update ThirdPartyProject.prop
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
Merge WebKit at r78450: FrameLoader::url() removed
Merge WebKit at r78450: HTMLParserQuirks removed
Merge WebKit at r78450: TextRun::padding() renamed
Merge WebKit at r78450: Use new FontMetrics
Merge WebKit at r78450: GraphicsContext current path removed
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
Merge WebKit at r78450: IntRect::bottom()/right() renamed
Merge WebKit at r78450: Fix remaining conflicts
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
Merge WebKit at r78450: Fix conflicts in media controls
Merge WebKit at r78450: Fix Makefiles
Merge WebKit at r78450: Initial merge by git.
Steve Block [Wed, 18 May 2011 12:45:36 +0000 (13:45 +0100)]
Merge WebKit at r78450: Update ThirdPartyProject.prop
Change-Id: I78ff6a852bc093d3ceca4fd51a05782dfcf27fe3
Steve Block [Thu, 19 May 2011 16:38:10 +0000 (17:38 +0100)]
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
See http://trac.webkit.org/changeset/76743
Change-Id: Ic85c640534b133883a03e0c0b71ac8987e6913e7
Steve Block [Thu, 19 May 2011 14:59:45 +0000 (15:59 +0100)]
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
See http://trac.webkit.org/changeset/76983
Change-Id: Ibf903baa41bc599ef99edb6ea26e3f62e9133c35
Steve Block [Thu, 19 May 2011 14:56:03 +0000 (15:56 +0100)]
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
See http://trac.webkit.org/changeset/77602
Change-Id: I3a0459dba328a57688a9a2a0ae6a8d7a9121e240
Steve Block [Thu, 19 May 2011 14:54:00 +0000 (15:54 +0100)]
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
See http://trac.webkit.org/changeset/78261
Change-Id: I3514038557683146ace616982a0706b6c0fb1f95
Steve Block [Thu, 19 May 2011 14:53:15 +0000 (15:53 +0100)]
Merge WebKit at r78450: FrameLoader::url() removed
See http://trac.webkit.org/changeset/76872
Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
Steve Block [Thu, 19 May 2011 14:42:53 +0000 (15:42 +0100)]
Merge WebKit at r78450: HTMLParserQuirks removed
See http://trac.webkit.org/changeset/77963
Change-Id: I6bfe5d2412d99d2a187cc83f565a8eba6fe01267
Steve Block [Thu, 19 May 2011 13:17:46 +0000 (14:17 +0100)]
Merge WebKit at r78450: TextRun::padding() renamed
See http://trac.webkit.org/changeset/76743
Change-Id: Ia9f39b83ea6e9a97e271f5545c3cc36ed5c65800
Steve Block [Thu, 19 May 2011 12:21:16 +0000 (13:21 +0100)]
Merge WebKit at r78450: Use new FontMetrics
See http://trac.webkit.org/changeset/76442
Note that this change also switches from integer to floating point precision for font metrics.
This is a TODO on other platforms.
Change-Id: I5bcecd5abbe1be8e138aaf25102487b73c936b77
Steve Block [Thu, 19 May 2011 11:30:26 +0000 (12:30 +0100)]
Merge WebKit at r78450: GraphicsContext current path removed
See http://trac.webkit.org/changeset/76688
Change-Id: I1de96683ffe1805f710ac8161579d3a399065f4d
Steve Block [Thu, 19 May 2011 10:11:13 +0000 (11:11 +0100)]
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
See http://trac.webkit.org/changeset/76537
Change-Id: I543c68101d4ee83d190f643e54e4f3fec1fdf238
Steve Block [Wed, 18 May 2011 18:06:54 +0000 (19:06 +0100)]
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
See http://trac.webkit.org/changeset/77153
Change-Id: I8a5b0878803b88ff0ebac3539a6d62f94cc10f89
Steve Block [Wed, 18 May 2011 17:46:52 +0000 (18:46 +0100)]
Merge WebKit at r78450: IntRect::bottom()/right() renamed
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
Steve Block [Wed, 18 May 2011 13:41:47 +0000 (14:41 +0100)]
Merge WebKit at r78450: Fix remaining conflicts
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
Steve Block [Wed, 18 May 2011 13:44:04 +0000 (14:44 +0100)]
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
This replaces, and therefore conflicts with, Android's existing
ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the
upstream guard in WebCore, updates WebKit to use the new guard, and
enables this guard on Android.
See http://trac.webkit.org/changeset/78439
See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp
Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
Steve Block [Wed, 18 May 2011 15:43:59 +0000 (16:43 +0100)]
Merge WebKit at r78450: Fix conflicts in media controls
Conflict due to Android modifications to handle touch events.
See http://trac.webkit.org/changeset/76950
Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
Kristian Monsen [Wed, 25 May 2011 02:54:46 +0000 (19:54 -0700)]
am
891974e8: (-s ours) am
19d88459: am
f18b71fe: Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '
891974e8053115e15fdcf669bd052cbaaf372003':
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Russell Brenner [Tue, 24 May 2011 20:25:21 +0000 (13:25 -0700)]
DO NOT MERGE-Move check for pending style recalc
The previous implementation had no way to notify the caller as to
whether or not the recording was successful. Now, recordContent
detects the pending recalc and returns null to indicate that no
recording was done.
bug:
4474358
Change-Id: I5d54fc606a059203a96270eae5dc78dc21e39a53
Nicolas Roard [Tue, 24 May 2011 21:28:44 +0000 (14:28 -0700)]
Fix the way we maintain the list of Pictures in PictureSet.
This improves drawing performances on the base surface by
a decent amount.
Change-Id: I59b63c0e5748eed2c729024c11a5da390faefda7
Shimeng (Simon) Wang [Tue, 24 May 2011 22:28:03 +0000 (15:28 -0700)]
Merge "Don't change website's content width."
Shimeng (Simon) Wang [Tue, 24 May 2011 22:22:24 +0000 (15:22 -0700)]
Don't change website's content width.
This code is not needed since now fixed viewport is used for
all devices including phone.
issue:
4343683
Change-Id: I885eae15d30fc5f3f8f3855febc1d98cf6554c93
Teng-Hui Zhu [Tue, 24 May 2011 19:56:13 +0000 (12:56 -0700)]
am
2f7dd354: (-s ours) am
49fd7191: am
e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.
* commit '
2f7dd35491b3ac2609b72503a0522f5128849156':
DO NOT MERGE: The clip should be effective even if it is empty.
Kristian Monsen [Tue, 24 May 2011 18:25:09 +0000 (11:25 -0700)]
am
19d88459: am
f18b71fe: Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '
19d88459b21f666ef99b72db249b9f3329c28c5e':
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Kristian Monsen [Tue, 24 May 2011 18:19:11 +0000 (11:19 -0700)]
am
f18b71fe: Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '
f18b71fe96d66428ffbf90961f13f81b248f9157':
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Kristian Monsen [Tue, 24 May 2011 18:16:45 +0000 (11:16 -0700)]
Merge "Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
Kristian Monsen [Mon, 23 May 2011 14:14:04 +0000 (15:14 +0100)]
Fix for bug
4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Passing the extra string argument, blacklist, to the proxy in
chromium.
Need CL in frameworks/base:
https://android-git.corp.google.com/g/#change,111109
And external/chromium:
https://android-git.corp.google.com/g/#change,111107
Change-Id: I09e70c7f201dbee2823d9cbbd394b2bab9a76f06
Steve Block [Tue, 24 May 2011 17:56:53 +0000 (10:56 -0700)]
Merge "In DRT2, correctly handle a non-existent path"
Steve Block [Mon, 23 May 2011 11:39:35 +0000 (12:39 +0100)]
In DRT2, correctly handle a non-existent path
Currently, if the path is not found, the script proceeds as if the
root had been specified.
Bug:
3291382
Change-Id: I1aea78eb66392c2f883148a895ec5ecca20d3ad9
Steve Block [Tue, 24 May 2011 17:19:30 +0000 (10:19 -0700)]
Merge "Use the correct type for the new quota for HTML5 Database and AppCache"
Steve Block [Tue, 24 May 2011 17:14:43 +0000 (10:14 -0700)]
Merge "Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()"
Teng-Hui Zhu [Tue, 24 May 2011 15:41:54 +0000 (08:41 -0700)]
am
712ed50f: (-s ours) am
f69d55a8: am
635861a9: DO NOT MERGE:Fix position update
* commit '
712ed50fe05a3a450c7cba5c2904621e02213631':
DO NOT MERGE:Fix position update
Steve Block [Mon, 23 May 2011 17:46:16 +0000 (18:46 +0100)]
Use the correct type for the new quota for HTML5 Database and AppCache
The WebCore DatabaseTracker uses 'unsigned long long' for quotas. We
receive the new quota from Java as a jlong, which is 64bit signed.
This change ...
- Fixes the JNI methods to use 'long long'
- Updates m_newQuota to use 'unsigned long long' to avoid ugly casts
- Uses a boolean to track whether the new quota has been set yet,
which is neater than a magic value and avoids deadlock if a value of
-1 is set
Change-Id: Ieab200164baf8c1647a2d47da759d3c31f0369f8
Steve Block [Wed, 18 May 2011 13:31:09 +0000 (14:31 +0100)]
Merge WebKit at r78450: Fix Makefiles
PCRE switched for YARR - http://trac.webkit.org/changeset/78042
Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
Steve Block [Wed, 18 May 2011 12:36:51 +0000 (13:36 +0100)]
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Steve Block [Tue, 24 May 2011 14:30:29 +0000 (15:30 +0100)]
Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()
Bug:
4461705
Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
Steve Block [Tue, 24 May 2011 13:15:31 +0000 (06:15 -0700)]
Merge "Add LayoutTests/fast/dom/HTMLLinkElement at r76408"
Steve Block [Fri, 20 May 2011 15:21:44 +0000 (16:21 +0100)]
Add LayoutTests/fast/dom/HTMLLinkElement at r76408
Bug:
2268353
Change-Id: I3c351413cb223af72621b9b9f0336fc66a3d4fbc
Teng-Hui Zhu [Mon, 23 May 2011 22:46:55 +0000 (15:46 -0700)]
Improve the layer dump to include clipRect
Change-Id: I4719283468ee78b7b57093147aec964ad8d90b99
Teng-Hui Zhu [Mon, 23 May 2011 23:17:09 +0000 (16:17 -0700)]
am
49fd7191: am
e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.
* commit '
49fd7191e899fca66e2b63b8b3055efad4a47ad8':
DO NOT MERGE: The clip should be effective even if it is empty.
Teng-Hui Zhu [Mon, 23 May 2011 23:07:53 +0000 (16:07 -0700)]
am
e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.
* commit '
e17c8aeecb722a98f9cac8556cf7d49d7247a83a':
DO NOT MERGE: The clip should be effective even if it is empty.
Teng-Hui Zhu [Mon, 23 May 2011 22:02:14 +0000 (15:02 -0700)]
DO NOT MERGE: The clip should be effective even if it is empty.
bug:
4473188
Change-Id: Ib38b31074dbd7f4905cf8bbd6539673678669638
Teng-Hui Zhu [Mon, 23 May 2011 20:53:06 +0000 (13:53 -0700)]
The clip should be effective even if it is empty.
bug:
4473188
Change-Id: Idc34c3132d1f9eba23c6e4944c843c9c19c4dbb8
Teng-Hui Zhu [Mon, 23 May 2011 19:55:51 +0000 (12:55 -0700)]
am
f69d55a8: am
635861a9: DO NOT MERGE:Fix position update
* commit '
f69d55a820e0b7b57af6a843880f5338a220b27c':
DO NOT MERGE:Fix position update
Teng-Hui Zhu [Mon, 23 May 2011 19:11:57 +0000 (12:11 -0700)]
am
635861a9: DO NOT MERGE:Fix position update
* commit '
635861a90dfb699f7c81038576ad7d993d2a9972':
DO NOT MERGE:Fix position update
Ben Murdoch [Tue, 17 May 2011 16:51:44 +0000 (17:51 +0100)]
Merge WebKit at r76408: Update ThirdPartyProject.prop
Update merge revisions.
Change-Id: I1ffb3ef0f49409fd2a815c1eb06de57889a83820
Ben Murdoch [Fri, 20 May 2011 15:48:45 +0000 (16:48 +0100)]
Merge WebKit at r76408: Fix Bridge.h
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
Ben Murdoch [Tue, 17 May 2011 13:14:01 +0000 (14:14 +0100)]
Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()
As of http://trac.webkit.org/changeset/76291 RenderLayer::scrollToOffset
only takes two parameters (the x and y offset). Update our callsites to
reflect this. It seems safe to disregard the booleans.
Change-Id: I63bc103e4fc961968055770792aead82be82435a
Ben Murdoch [Tue, 17 May 2011 13:04:11 +0000 (14:04 +0100)]
Merge WebKit at r76408: Fix EventHandlerAndroid.cpp
See http://trac.webkit.org/changeset/76248 which introduced
an include of Clipboard.h, causing the real definition of
WebCore::Clipboard to be included in EventHandlerAndroid.cpp. Remove
the stub that was there.
Change-Id: I5bc04bf573aa1da19cbdd282d3611f571e46c6fa
Ben Murdoch [Tue, 17 May 2011 13:09:28 +0000 (14:09 +0100)]
Merge WebKit at r76408: Fix FontAndroid.cpp
TextRun.h was removed as an include from Font.h. This
is where FontAndroid was picking it up from. Add it into
FontAndroid.cpp.
See http://trac.webkit.org/changeset/76170
Change-Id: I2d1306fde1742a2e75cb7b47c2a0ad132939258c
Ben Murdoch [Tue, 17 May 2011 13:49:09 +0000 (14:49 +0100)]
Merge WebKit at r76408: Rename syncCompositingStateRecursive()
FrameView::syncCompositingStateRecursive() was rename
to FrameVuew::syncCompositingStateIncludingSubframes()
See http://trac.webkit.org/changeset/76196
Change-Id: I615cc9cccee03ac5259079aea47494746b586b25
Ben Murdoch [Mon, 16 May 2011 17:01:30 +0000 (18:01 +0100)]
Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBase
Upstream now uses macros rather than inheritance for classes
declard Noncopyable or Fast Allocated.
Note that in the case of PluginTimer and ClipboardAndroid we
now need to explicitly declare them fast allocated. This is
because previously they got the fast allocated methods through
a common superclass (FastAllocBase) but now both parents provide
implementations, so there is an ambiguity the compiler cannot
resolve.
See http://trac.webkit.org/changeset/76248
Change-Id: I186e3fd36bde2074d34f453983d48e8fc223f420
Ben Murdoch [Fri, 20 May 2011 15:53:45 +0000 (16:53 +0100)]
Merge WebKit at r76408: Fix ImageBufferAndroid.
Implement missing dataSize function introduced in
http://trac.webkit.org/changeset/76371 (JSC only)
Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
Ben Murdoch [Mon, 16 May 2011 15:35:58 +0000 (16:35 +0100)]
Merge WebKit at r76408: Fix conflicts.
Android.jscbindings.mk
Conflict due to local addition of EntrySyncCustom.cpp and http://trac.webkit.org/changeset/76216
V8NPUtils.cpp
Conflict due to local cherry pick of http://trac.webkit.org/changeset/78994 and
merge of http://trac.webkit.org/changeset/76264
FrameView.h
Conflict due to local addition of updatePositionedObjects() and http://trac.webkit.org/changeset/76278
RangeInputType.cpp
SliderThumbElement.cpp
Conflicts due to Android addition of touch handling code in slider code.
See http://trac.webkit.org/changeset/76147
.gitignore - keep ours
Change-Id: I38aeb361a37e7939f805c6689d7cc8fc720b3e52
Ben Murdoch [Tue, 17 May 2011 13:00:19 +0000 (14:00 +0100)]
Merge WebKit at r76408: Fix Makefiles.
Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
Ben Murdoch [Mon, 16 May 2011 15:25:10 +0000 (16:25 +0100)]
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Teng-Hui Zhu [Fri, 20 May 2011 22:03:54 +0000 (15:03 -0700)]
Fix position update
We fixed two issues here.
First, when fixed left/right both undefined, the renderlayer position already
took the fix margin into consideration, so we don't need to compute that again.
Second, for compute the fix element's ViewRect, we just need the normal width,
not the overflow one.
bug:
4440999
Change-Id: I664c64688a89579f0023288185772c61b01c7cc8
Teng-Hui Zhu [Fri, 20 May 2011 22:03:54 +0000 (15:03 -0700)]
DO NOT MERGE:Fix position update
We fixed two issues here.
First, when fixed left/right both undefined, the renderlayer position already
took the fix margin into consideration, so we don't need to compute that again.
Second, for compute the fix element's ViewRect, we just need the normal width,
not the overflow one.
bug:
4440999
Change-Id: Ie3f9b0d4d87de576ce852e7a4898d57a80add7a9
The Android Open Source Project [Fri, 20 May 2011 20:24:40 +0000 (13:24 -0700)]
Reconcile with honeycomb-release honeycomb-mr1-release
Change-Id: Ib6fbd07827ffba629ed5a560c58e5d005f4d4c75
Steve Block [Fri, 20 May 2011 16:10:52 +0000 (09:10 -0700)]
Merge changes Ib103214e,Ibc8ca754,I6adc6f64,I4c5fde48,I81552b1b
* changes:
Do not process Inspector.idl using the V8 or JSC code generator
Remove some superfluous ARCHIVE enable guards
Fix WebArchiveAndroid logging
Fix some compiler warnings
Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtr
Kristian Monsen [Fri, 13 May 2011 15:51:49 +0000 (16:51 +0100)]
Merge Chromium at 10.0.621.0: Compile fixes
URLRequest moved to the net namespace:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request.h?view=diff&r1=67496&r2=67497
Later a typedef was removed here:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request.h?r1=67674&r2=67762
Created a scoped ref ptr of net::X509Certificate before using
it in a RunnableMethod as that is now required.
http://src.chromium.org/viewvc/chrome/trunk/src/base/task.h?r1=67342&r2=69237
This was updated several times later.
Change-Id: I162c95f7fcbff7d374f8e9d8d6d253ddfd11ddc1
Kristian Monsen [Fri, 13 May 2011 15:50:35 +0000 (16:50 +0100)]
Merge Chromium at 10.0.621.0: New argument in the Cache CTOR
Create a default one as it will crash if set to NULL.
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: Ic22277a95f3cbdb1fa0b6ac65b01f835fb4a407e
Kristian Monsen [Fri, 13 May 2011 15:49:46 +0000 (16:49 +0100)]
Merge Chromium at 10.0.621.0: profile.h moved to profiles/profile.h
Upstream:
http://codereview.chromium.org/
5606002
Change-Id: Ia714f1a1abaca9bef00442f98476d0e8f43eb3e7
Kristian Monsen [Fri, 13 May 2011 15:48:45 +0000 (16:48 +0100)]
Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonster
Upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
Steve Block [Fri, 20 May 2011 10:51:35 +0000 (11:51 +0100)]
Do not process Inspector.idl using the V8 or JSC code generator
Unlike the other Inspector IDL files, Inspector.idl should not be
processed using the V8 or JSC code generator. Instead, it should use
the Inspector code generator.
See http://trac.webkit.org/changeset/62549, which introduced
CodeGeneratorInspector.pm. This change added InspectorFrontend2.idl,
which was later renamed to Inspector.idl.
In fact, we do not require V8/JSCInspector.cpp/h, so we can simply
remove Inspector.idl from our build.
Using the V8 or JSC code generator with Inspector.idl causes incorrect
output. Currently, this does not break our build as the generated
header is not required. However, from
http://trac.webkit.org/changeset/78212 onwards, a side-effect of this
incorrect output is that other, valid, generated files are overridden
with empty files, thus breaking the build.
Change-Id: Ib103214e65cfe43fba8dbf7befb6dcd5e7c81434
Steve Block [Thu, 19 May 2011 17:45:53 +0000 (18:45 +0100)]
Remove some superfluous ARCHIVE enable guards
A new WEB_ARCHIVE enable guard will be added upstream in
http://trac.webkit.org/changeset/78439, replacing our downstream
ARCHIVE guard.
This patch removes a couple of instances of the downstream guard that
are not required and hence will not be replaced by the upstream guard.
Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
Steve Block [Thu, 19 May 2011 15:11:11 +0000 (16:11 +0100)]
Fix WebArchiveAndroid logging
Change-Id: I6adc6f64f3833d3bc5016da929ffd1e95930d5c5
Steve Block [Thu, 19 May 2011 17:44:56 +0000 (10:44 -0700)]
Merge "ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check supportsAlpha()"