OSDN Git Service
Steve Block [Thu, 2 Jun 2011 17:49:50 +0000 (18:49 +0100)]
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
Each platform's version of this file is being merged upstream.
See http://trac.webkit.org/changeset/81977 (and its follow-up build
fixes r81982, r81988, r81990, r82018).
Change-Id: I1a4c17b5784de436ecd57e7e429837dd6c3dabb6
Steve Block [Thu, 2 Jun 2011 17:44:31 +0000 (18:44 +0100)]
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
See http://trac.webkit.org/changeset/80582
Change-Id: I2c4ecc1abd1b639aa10affc04b5549a8a2fb2ab7
Steve Block [Tue, 7 Jun 2011 14:53:15 +0000 (15:53 +0100)]
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
- JavaNPObjectV8.cpp
Due to new JavaInstance::getField()
http://trac.webkit.org/changeset/80653
- JNIUtilityPrivate.cpp
- Android has a number of local modifications to convert numeric
NPVariant values to a JNI jstring, using toString() via JNI.
However, after the upstream refactoring, we no longer convert
NPVariant directly to jvalue. Instead, we go via a new JavaValue
type, which represents strings as JavaTypeString using
WTF::String.
This patch updates the Android modifications to set the JavaValue
using WTF::String methods, without using JNI. Note that the spec
for these conversions - http://jdk6.java.net/plugin2/liveconnect -
does not require the use of toString(), so this is OK.
- Android also adds handling for converting arrays from NPVariant to
jvalue. However, the intermediate JavaValue type does not yet have
support for arrays. We get around this with an ugly hack, where we
continue to create a jarray and set this as the object field of
the JavaValue. When converting from a JavaValue to a jvalue, we
add handling for arrays.
http://trac.webkit.org/changeset/82194
Steve Block [Wed, 8 Jun 2011 13:29:18 +0000 (06:29 -0700)]
Merge "Remove a FIXME from JavaNPObjectV8 that was forking us from upstream"
Steve Block [Wed, 8 Jun 2011 09:42:33 +0000 (10:42 +0100)]
Merge WebKit at r82507: Fix conflicts due to new StorageTracker
- FileSystemAndroid.cpp, FileSystemPOSIX.cpp
Use new common version of listDirectory(), which is identical to the
existing Android version.
- StorageNamespace.h, StorageNamespaceImpl.h
Conflict due to Android's clearPage()
- PageGroup.cpp
Conflict due to Android's clearDomStorage()
See http://trac.webkit.org/changeset/80892
Change-Id: Ifac131155f5019959de8761438cd0372547b0e6c
Steve Block [Wed, 8 Jun 2011 09:42:08 +0000 (10:42 +0100)]
Merge WebKit at r82507: Fix conflicts
- RenderLayerBacking.cpp
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81715
- Document.cpp
Due to domTreeVersion and ANDROID_STYLE_VERSION
http://trac.webkit.org/changeset/80797
- CachedResourceLoader.cpp
Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
http://trac.webkit.org/changeset/80695
- Settings.cpp/h
http://trac.webkit.org/changeset/81289
http://trac.webkit.org/changeset/81635
- MediaPlayer.cpp
Whitespace only
http://trac.webkit.org/changeset/80874
- RenderBox.cpp
Due to isHorizontalWritingMode
http://trac.webkit.org/changeset/81716
- RenderLayer.cpp/h
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81981
- CSSStyleSelector.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/80993
http://trac.webkit.org/changeset/80998
http://trac.webkit.org/changeset/81684
http://trac.webkit.org/changeset/82378
- CSSParser.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/81684
- StyleElement.cpp
Due to cherry pick of http://trac.webkit.org/changeset/80787
http://trac.webkit.org/changeset/82054
- EventHandler.cpp
Due to ANDROID_PLUGINS
http://trac.webkit.org/changeset/81618
http://trac.webkit.org/changeset/81835
- SliderThumbElement.cpp
Due to touch events
http://trac.webkit.org/changeset/81216
- MediaControls.cpp
Due to touch events
http://trac.webkit.org/changeset/80857
Note that the WebKit history for this file is confusing as it was
renamed in http://trac.webkit.org/changeset/83545 and then re-added in
http://trac.webkit.org/changeset/84222 but trac is not smart enough to
track history backwards from http://trac.webkit.org/changeset/84222.
Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
Steve Block [Tue, 7 Jun 2011 14:47:53 +0000 (15:47 +0100)]
Merge WebKit at r82507: Fix makefiles
Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
Steve Block [Wed, 25 May 2011 18:08:45 +0000 (19:08 +0100)]
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Steve Block [Wed, 8 Jun 2011 12:37:27 +0000 (13:37 +0100)]
Remove a FIXME from JavaNPObjectV8 that was forking us from upstream
Filed https://bugs.webkit.org/show_bug.cgi?id=62275 to track this
issue upstream.
This will reduce future merge conflicts.
Change-Id: I22c0826c218bb81f58fb60609849b41b456e6e4c
Steve Block [Wed, 8 Jun 2011 11:41:18 +0000 (04:41 -0700)]
Merge "Fix a whitespace diff with upstream to avoid a future merge conflict"
Steve Block [Wed, 8 Jun 2011 11:35:22 +0000 (12:35 +0100)]
Fix a whitespace diff with upstream to avoid a future merge conflict
Change-Id: Ia6d9bd8b0a8cd99a569599034b6138e29d89b24d
Steve Block [Wed, 8 Jun 2011 11:19:03 +0000 (04:19 -0700)]
Merge "Fix some include guards in Android files"
Steve Block [Wed, 8 Jun 2011 10:55:45 +0000 (11:55 +0100)]
Fix some include guards in Android files
This will become relevant after we merge beyond
http://trac.webkit.org/changeset/81977 (and its follow-up build fixes
r81982, r81988, r81990, r82018) which relies on all platforms'
instances of FontPlatformData.h using the correct include guard.
Change-Id: I58ec4c8ee23698c41d86794333d603b95f303764
Steve Block [Wed, 8 Jun 2011 09:30:00 +0000 (02:30 -0700)]
Merge "Remove all contents of Source/ThirdParty other than ANGLE"
Steve Block [Wed, 8 Jun 2011 09:19:41 +0000 (10:19 +0100)]
Remove all contents of Source/ThirdParty other than ANGLE
When ANGLE was moved to Source/ThirdParty as part of the merge to WebKit
r75315, it was the only item in that directory, so we took all of
Source/ThirdParty.
Since then, other items have been added upstream to Source/ThirdParty
which we don't need or want in our tree, eg
http://trac.webkit.org/changeset/81709/trunk/Source/ThirdParty/gyp
With this change we remove all contents of Source/ThirdParty other than
ANGLE. Future merges will merge only ANGLE from this directory.
Change-Id: I1eac0e2824de7f78610d0439e30dc6ba51b1d32d
John Reck [Tue, 7 Jun 2011 00:31:38 +0000 (17:31 -0700)]
Serialize LayerAndroid
For now skip other layer types
Doesn't support animtations
Change-Id: Id1ff75f3d4d213f56561fc5d9c01f7ffee05cc79
Teng-Hui Zhu [Tue, 7 Jun 2011 17:56:28 +0000 (10:56 -0700)]
Merge "refactor the TextureInfo out from SharedTexture, no functional change"
Steve Block [Tue, 7 Jun 2011 17:11:45 +0000 (18:11 +0100)]
Update PlatformTouchEvent for Android to reflect upstreamed version
See http://trac.webkit.org/changeset/81685
Change-Id: Ibc6c1336b696e39f27fd88d9b4e90fe6918ceba8
Teng-Hui Zhu [Tue, 7 Jun 2011 00:12:56 +0000 (17:12 -0700)]
refactor the TextureInfo out from SharedTexture, no functional change
Change-Id: I9018a8079da1df2fd55c94aacd4ae96227ad2bd2
Steve Block [Tue, 7 Jun 2011 15:28:27 +0000 (16:28 +0100)]
Move all Android modification to Settings to the end of the relevant block
This will ease future merges
Change-Id: I7203cfb0cdc52140802a11cd35c64a9cfd502d30
John Reck [Sat, 4 Jun 2011 07:48:50 +0000 (00:48 -0700)]
Fix issues with setting viewstate before initializing
Allow drawing without a CachedRoot (just skip drawing extras in that case)
Initialize PictureSet correctly when using the SkPicture ctor
If delay-setting a layer on glWebViewState, set isAfterFirstLayout to
true to force the baseLayer update.
Change-Id: I9b24fd2e8450acf0138433edce8700c9ec227e52
Teng-Hui Zhu [Sat, 4 Jun 2011 00:11:23 +0000 (17:11 -0700)]
Merge "Fix the trailing pixels by inflate the invalidate screen rect"
Teng-Hui Zhu [Fri, 3 Jun 2011 23:57:07 +0000 (16:57 -0700)]
Fix the trailing pixels by inflate the invalidate screen rect
bug:
4313230
Change-Id: I364f418c8e04219d985c4ff7a27328d4e0dbfbd2
John Reck [Fri, 3 Jun 2011 22:21:11 +0000 (15:21 -0700)]
Merge "Initial support for serializing the view state"
John Reck [Thu, 2 Jun 2011 23:04:42 +0000 (16:04 -0700)]
Initial support for serializing the view state
Serializes only the base layer currently
Change-Id: I5cff216a4fc1b08efe3a7955c616b91114f6bf0b
Derek Sollenberger [Fri, 3 Jun 2011 18:22:56 +0000 (11:22 -0700)]
Merge "Revert "Fix for antialiased text with shadows.""
Shimeng (Simon) Wang [Fri, 3 Jun 2011 16:24:40 +0000 (09:24 -0700)]
Merge "Add image/webp to the mimeType list."
Derek Sollenberger [Fri, 3 Jun 2011 15:07:32 +0000 (08:07 -0700)]
Revert "Fix for antialiased text with shadows."
This breaks master-gpl. We can resubmit this after updating the version of skia in master-gpl.
This reverts commit
a3d968a2da0ae3463991e973e38af6795ad36c2e
Derek Sollenberger [Fri, 3 Jun 2011 12:50:01 +0000 (05:50 -0700)]
Merge "Add API to allow plugins to lock their orientation in full-screen mode."
Derek Sollenberger [Fri, 3 Jun 2011 12:48:42 +0000 (05:48 -0700)]
Merge "Fix for antialiased text with shadows."
Derek Sollenberger [Fri, 3 Jun 2011 12:02:52 +0000 (08:02 -0400)]
Fix for antialiased text with shadows.
bug:
4502715
Change-Id: I5301526da2ff4962e7d1fda2b0ad39c407013e05
Shimeng (Simon) Wang [Fri, 3 Jun 2011 00:42:17 +0000 (17:42 -0700)]
Add image/webp to the mimeType list.
This will let a webp image url be displayed directly inside browser.
issue:
3291572
Change-Id: I6870c5461c5d746d11457b7afba26cb277b25bbb
Jean-Baptiste Queru [Thu, 2 Jun 2011 20:58:15 +0000 (13:58 -0700)]
am
3ae2cf5e: (-s ours) Merge from honeycomb-LTE - do not merge
* commit '
3ae2cf5eef8df00445146297df2bef1f74537dbf':
Update isFallbackFamily() with missing fonts
Steve Block [Thu, 2 Jun 2011 17:24:54 +0000 (18:24 +0100)]
Update RenderLayer.cpp with upstreamed version of crash fix
See https://bugs.webkit.org/show_bug.cgi?id=56107
Bug:
4026385
Change-Id: I381b0d1ee115cd6eda92136d150b8cf7e33558ac
Steve Block [Thu, 2 Jun 2011 16:22:44 +0000 (17:22 +0100)]
Fix a whitespace diff in SubresourceLoader.cpp
This will avoid future merge conflicts
Change-Id: I5d4cc4665ed096b86a7f6dc892bd44ff4c590e65
Steve Block [Thu, 2 Jun 2011 15:39:50 +0000 (08:39 -0700)]
Merge "Remove Android guard EMULATE_JSC_BINDINGS"
Steve Block [Thu, 2 Jun 2011 15:17:03 +0000 (16:17 +0100)]
Remove Android guard EMULATE_JSC_BINDINGS
This flag is always set to true and will not be upstreamed, so should
be removed, along with code for the 'else' case.
Also clean up Android modifications to minimise diff and add guards.
Change-Id: I7d3b7bab2fef772bffdf3a402cc318dbea5f5865
Ben Murdoch [Thu, 2 Jun 2011 14:30:42 +0000 (07:30 -0700)]
Merge "Fix master-gpl build."
Steve Block [Thu, 2 Jun 2011 14:14:56 +0000 (07:14 -0700)]
Merge "Fix compiler warning in CachedResourceLoader"
Steve Block [Thu, 2 Jun 2011 12:24:01 +0000 (13:24 +0100)]
Fix compiler warning in CachedResourceLoader
Make sure initializer list is in same order as members in header.
Change-Id: I93dfd1c6bba851b8fb8fb839d2b5b1c226a78dcd
Ben Murdoch [Thu, 2 Jun 2011 13:18:15 +0000 (14:18 +0100)]
Fix master-gpl build.
Turn off prelinking of libwebcore. This has no effect in the master
branch where the prelinker no longer exists, but will disable
prelinking in the master-gpl branch and fix the build as libwebcore
has grown in size with the last merge (to r80534).
Change-Id: Id42fca910b4c6604fe127904c7e8704cc62cd768
Derek Sollenberger [Wed, 1 Jun 2011 17:57:34 +0000 (13:57 -0400)]
Add API to allow plugins to lock their orientation in full-screen mode.
This CL has companion changes in the framework and browser.
bug:
3398386
Change-Id: I3427e61e47b66f4142581fb043eeebc613d71b51
Steve Block [Thu, 12 May 2011 11:48:14 +0000 (12:48 +0100)]
Always check weak global references before using them
We hold weak references to Java objects from native code in several
places to avoid circular reference problems. These objects may become
weakly reachable at any time, after which the GC could null our weak
reference, so we have to null-check at every use.
Note that weak references are nulled before the referent is finalized,
so we can't rely on doing work in the finalizer to wait for the
currently executing message to complete and to remove other messages
from the queue.
This effectively reverts
https://android-git.corp.google.com/g/#change,30955
Bug:
4336862
Change-Id: I431fcac11220cb406c26e31aacb9bda7ea22776e
Steve Block [Thu, 2 Jun 2011 11:01:03 +0000 (04:01 -0700)]
Merge "JavaScriptCore/config.h should not include WebCore/config.h"
Ben Murdoch [Fri, 27 May 2011 11:26:57 +0000 (12:26 +0100)]
Merge WebKit at r80534: Update ThirdPartyProject.prop
Change-Id: I6fd3f707dbb4d5f0e6c3dcd5f33a79d22a480ec8
Ben Murdoch [Tue, 31 May 2011 13:52:35 +0000 (14:52 +0100)]
Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cpp
Update our uses of CSSPrimitiveValue following
http://trac.webkit.org/changeset/80463
Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
Ben Murdoch [Thu, 26 May 2011 16:14:57 +0000 (17:14 +0100)]
Merge WebKit at r80534: Fix JSNavigatorCustom.cpp
InternalFunction::info has been renamed InternalFunction::s_info
so update our code to reflect this.
See http://trac.webkit.org/changeset/79132
Change-Id: I8118b513fcee8b1e8e9e53241e1b0507cf3df68b
Ben Murdoch [Tue, 24 May 2011 19:00:38 +0000 (20:00 +0100)]
Merge WebKit at r80534: Fix GraphicsContextAndroid.cpp
Need to provide an Android implementation of new setCTM()
function.
See http://trac.webkit.org/changeset/78704
Change-Id: Iefd0225495bec6f4945f02660a450018e4270593
Ben Murdoch [Tue, 24 May 2011 17:31:28 +0000 (18:31 +0100)]
Merge WebKit at r80534: Fix EditorClientAndroid
Make EditorClientAndroid inherit from TextCheckerClient.
See http://trac.webkit.org/changeset/78533
Add EditorClient callbacks. See http://trac.webkit.org/changeset/78532
Change-Id: Ia0f68e2047306415502d5ff1d40cd384c5db91e3
Ben Murdoch [Tue, 24 May 2011 15:57:26 +0000 (16:57 +0100)]
Merge WebKit to r80534: Fix ChromeClientAndroid
tabsToLinks() has been removed and keyboardUIMode() has
been added. See http://trac.webkit.org/changeset/80279
Change-Id: Idd92678728737fa313cfababff4d9aadee83be76
Ben Murdoch [Tue, 24 May 2011 15:28:55 +0000 (16:28 +0100)]
Merge WebKit at r80534: Fix MediaPlayerPrivateAndroid.cpp
Update for MedaEngineRegistrar change.
See http://trac.webkit.org/changeset/80473
Change-Id: I3931805339b8b66b371db01f3823daba2cedf56f
Ben Murdoch [Tue, 24 May 2011 15:15:42 +0000 (16:15 +0100)]
Merge WebKit at r80534: Fix FrameLoaderClientAndroid.
Add new shouldStopLoadingForHistoryItem() stub.
See http://trac.webkit.org/changeset/79107
Rename FrameLoaderClient::decidePolicyForMIMEType to
decidePolicyForResponse. See http://trac.webkit.org/changeset/80475
Change-Id: If094cc923b5d3b56c25a79847961bb11790f50d1
Ben Murdoch [Tue, 24 May 2011 15:12:30 +0000 (16:12 +0100)]
Merge WebKit at r80534: Fix IconDatabase uses.
WebCore::iconDatabase() now returns a reference rather than a
pointer. Update our calls to reflect this.
See http://trac.webkit.org/changeset/80299
Change-Id: Iebf2f199fd8913e227572753cee2cf3a2e380985
Ben Murdoch [Tue, 24 May 2011 15:08:20 +0000 (16:08 +0100)]
Merge WebKit at r80534: Fix JavaMethod.cpp
Partial cherry pick of http://trac.webkit.org/changeset/81040
Need to add the JSC guard (it was added unguraded
in http://trac.webkit.org/changeset/79904)
Change-Id: I880e241e2369ee4ffc616286d195989655e18cc2
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
Steve Block [Wed, 1 Jun 2011 17:41:18 +0000 (18:41 +0100)]
JavaScriptCore/config.h should not include WebCore/config.h
All WebKit ports other than Chromium use a separate set of include
paths for building JSC vs WebCore, so source files pick up the
appropriate version of config.h.
Android uses a single set of include paths, so gets aroud this problem
by adding WebCore/ to the include path first and including
JavaScriptCore/config.h from WebCore/config.h. This is ugly and will
cause problems in an upcoming merge due to new macros being defined in
both files.
The two files are very similar. JavaScriptCore/config.h adds only the
following two defines ...
- HAVE_STDINT_H - This is not used on Android
- WTF_CHANGES
This patch removes the include of JavaScriptCore/config.h from
WebCore/config.h and adds WTF_CHANGES for Android.
Note that Chromium uses only WebCore/config.h and adds WTF_CHANGES in
a similar way.
Change-Id: Ib9c93eda0023096aa40dde947b5a476c207542e0
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
Jean-Baptiste Queru [Thu, 26 May 2011 22:24:48 +0000 (15:24 -0700)]
Merge from honeycomb-LTE - do not merge
Change-Id: Ic966b478eb67830bfe44fbf4d3b7984508300c66
Russell Brenner [Thu, 26 May 2011 22:18:52 +0000 (15:18 -0700)]
am
0da3e5e1: Update isFallbackFamily() with missing fonts
* commit '
0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a':
Update isFallbackFamily() with missing fonts
Russell Brenner [Thu, 26 May 2011 21:05:45 +0000 (14:05 -0700)]
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: I02a1816501c61f59ebaddb487bb0ff24cc5c1cca
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