summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-011-1/+1
|\
| * Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-011-1/+1
| | | | | | | | Change-Id: I451b5a7560ca21d07a5b71e9a4c0eb4c15aab7a9
* | Support the screen shot while the video is paused.Teng-Hui Zhu2011-06-018-16/+375
|/ | | | | | | | | | | | | | | | | | | | 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
* Fix reboot loop on master ToTKristian Monsen2011-05-311-1/+1
| | | | Change-Id: I34534273f70c1fe32b83f994808de03616c85922
* Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't ↵Kristian Monsen2011-05-311-4/+5
| | | | | | | | | | | | | | | 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
* Merge "merge from honeycomb mr2"Russell Brenner2011-05-261-1/+15
|\
| * merge from honeycomb mr2Russell Brenner2011-05-261-1/+15
| | | | | | | | | | | | | | | | | | | | | | 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
* | Fix more compilation error when nav_debug_ui is on.Shimeng (Simon) Wang2011-05-262-20/+20
| | | | | | | | Change-Id: I0e28ab1afcd98f01723730e84b51d43811baacc4
* | Fix compilation error when debug_nav_ui is turned on.Shimeng (Simon) Wang2011-05-251-0/+2
|/ | | | Change-Id: I554f12a3d1ee2baa04288467e6fd46b1cdce9f9c
* Merge "Fix the way we maintain the list of Pictures in PictureSet. This ↵Nicolas Roard2011-05-253-106/+195
|\ | | | | | | improves drawing performances on the base surface by a decent amount."
| * Fix the way we maintain the list of Pictures in PictureSet.Nicolas Roard2011-05-243-106/+195
| | | | | | | | | | | | | | This improves drawing performances on the base surface by a decent amount. Change-Id: I59b63c0e5748eed2c729024c11a5da390faefda7
* | Merge "Merge chromium at 10.0.634.0: Compile fixes"Kristian Monsen2011-05-254-11/+11
|\ \
| * | Merge chromium at 10.0.634.0: Compile fixesKristian Monsen2011-05-254-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "merge from honeycomb mr2"Russell Brenner2011-05-251-5/+5
|\ \ \
| * | | merge from honeycomb mr2Russell Brenner2011-05-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge changes ↵Steve Block2011-05-252508-40042/+88907
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()Steve Block2011-05-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76743 Change-Id: Ic85c640534b133883a03e0c0b71ac8987e6913e7
| * | | Merge WebKit at r78450: Add new ↵Steve Block2011-05-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeClient::selectItemAlignmentFollowsMenuWritingDirection() See http://trac.webkit.org/changeset/76983 Change-Id: Ibf903baa41bc599ef99edb6ea26e3f62e9133c35
| * | | Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature ↵Steve Block2011-05-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed See http://trac.webkit.org/changeset/77602 Change-Id: I3a0459dba328a57688a9a2a0ae6a8d7a9121e240
| * | | Merge WebKit at r78450: HTMLAreaElement::getRect() renamedSteve Block2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/78261 Change-Id: I3514038557683146ace616982a0706b6c0fb1f95
| * | | Merge WebKit at r78450: FrameLoader::url() removedSteve Block2011-05-252-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76872 Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
| * | | Merge WebKit at r78450: HTMLParserQuirks removedSteve Block2011-05-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77963 Change-Id: I6bfe5d2412d99d2a187cc83f565a8eba6fe01267
| * | | Merge WebKit at r78450: TextRun::padding() renamedSteve Block2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76743 Change-Id: Ia9f39b83ea6e9a97e271f5545c3cc36ed5c65800
| * | | Merge WebKit at r78450: Use new FontMetricsSteve Block2011-05-251-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge WebKit at r78450: GraphicsContext current path removedSteve Block2011-05-252-79/+12
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76688 Change-Id: I1de96683ffe1805f710ac8161579d3a399065f4d
| * | | Merge WebKit at r78450: TransformationMatrix multiply methods renamed and ↵Steve Block2011-05-252-26/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meaning changed See http://trac.webkit.org/changeset/76537 Change-Id: I543c68101d4ee83d190f643e54e4f3fec1fdf238
| * | | Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature ↵Steve Block2011-05-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed See http://trac.webkit.org/changeset/77153 Change-Id: I8a5b0878803b88ff0ebac3539a6d62f94cc10f89
| * | | Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-2513-126/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
| * | | Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-2512-101/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-259-120/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge WebKit at r78450: Fix conflicts in media controlsSteve Block2011-05-255-421/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflict due to Android modifications to handle touch events. See http://trac.webkit.org/changeset/76950 Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
| * | | Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-246-626/+15
| | | | | | | | | | | | | | | | | | | | | | | | PCRE switched for YARR - http://trac.webkit.org/changeset/78042 Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
| * | | Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-242480-39280/+89356
| | | | | | | | | | | | | | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* | | | Merge "Don't change website's content width."Shimeng (Simon) Wang2011-05-241-4/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't change website's content width.Shimeng (Simon) Wang2011-05-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is not needed since now fixed viewport is used for all devices including phone. issue: 4343683 Change-Id: I885eae15d30fc5f3f8f3855febc1d98cf6554c93
* | | | Merge "Use the correct type for the new quota for HTML5 Database and AppCache"Steve Block2011-05-242-15/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Use the correct type for the new quota for HTML5 Database and AppCacheSteve Block2011-05-242-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Check that the view is not null in ↵Steve Block2011-05-241-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | GraphicsLayerAndroid::updateFixedPosition()"
| * | | Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()Steve Block2011-05-241-1/+4
| |/ / | | | | | | | | | | | | Bug: 4461705 Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
* | | Improve the layer dump to include clipRectTeng-Hui Zhu2011-05-231-0/+1
| | | | | | | | | | | | Change-Id: I4719283468ee78b7b57093147aec964ad8d90b99
* | | The clip should be effective even if it is empty.Teng-Hui Zhu2011-05-231-3/+0
|/ / | | | | | | | | bug:4473188 Change-Id: Idc34c3132d1f9eba23c6e4944c843c9c19c4dbb8
* | Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-2341-42/+42
| | | | | | | | | | | | | | | | Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
* | Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-233-5/+5
| | | | | | | | | | | | | | | | 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
* | Merge WebKit at r76408: Fix EventHandlerAndroid.cppBen Murdoch2011-05-231-3/+0
| | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r76408: Fix FontAndroid.cppBen Murdoch2011-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r76408: Rename syncCompositingStateRecursive()Ben Murdoch2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | FrameView::syncCompositingStateRecursive() was rename to FrameVuew::syncCompositingStateIncludingSubframes() See http://trac.webkit.org/changeset/76196 Change-Id: I615cc9cccee03ac5259079aea47494746b586b25
* | Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBaseBen Murdoch2011-05-237-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r76408: Fix ImageBufferAndroid.Ben Murdoch2011-05-231-0/+5
| | | | | | | | | | | | | | Implement missing dataSize function introduced in http://trac.webkit.org/changeset/76371 (JSC only) Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
* | Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-2312-94/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r76408: Fix Makefiles.Ben Murdoch2011-05-234-2/+4
| | | | | | | | Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
generated by cgit v1.1 at 2025-05-30 03:58:48 +0000