summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-02169-2199/+4552
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Support the screen shot while the video is paused.Teng-Hui Zhu2011-06-016-16/+370
| | | | | | | | | | | | | | | | | | | | 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
* 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
* Merge changes ↵Steve Block2011-05-25228-1969/+6325
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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-254-8/+8
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
| * Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-24216-1839/+6266
| | | | | | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* | 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-231-1/+1
| | | | | | | | 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-231-2/+2
| | | | | | | | 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 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: Update Uses of Noncopyable/FastAllocBaseBen Murdoch2011-05-231-1/+2
| | | | | | | | | | | | | | | | 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: Initial merge by git.Ben Murdoch2011-05-23132-610/+1492
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| | | | | | | | | | | | 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
* Merge changes Ib103214e,Ibc8ca754,I6adc6f64,I4c5fde48,I81552b1bSteve Block2011-05-204-17/+17
|\ | | | | | | | | | | | | | | | | * 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
| * Fix some compiler warningsSteve Block2011-05-192-7/+4
| | | | | | | | Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
| * Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtrSteve Block2011-05-192-10/+13
| | | | | | | | | | | | | | | | | | | | | | We should not be using OwnPtr/OwnArrayPtr::set() - see LOOSE_OWN_PTR and LOOSE_OWN_ARRAY_PTR in OwnPtr.h and OwnArrayPtr.h. LOOSE_OWN_ARRAY_PTR will be removed in http://trac.webkit.org/changeset/77785 so fixing now to avoid later problems. Change-Id: I81552b1bc5e1555a3d46e0db1f9916c68878c751
* | Merge "ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need ↵Steve Block2011-05-192-5/+2
|\ \ | |/ | | | | to check supportsAlpha()"
| * ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check ↵Steve Block2011-05-192-5/+2
| | | | | | | | | | | | | | | | | | | | supportsAlpha() GIFImageDecoder::supportsAlpha() always returns true and this method will be removed in http://trac.webkit.org/changeset/77427, so updating our code now to avoid problems later. Change-Id: I2a6500608eb661ee50a7ed315e7ece49508d0f82
* | Merge "Partially revert change from 96777"Teng-Hui Zhu2011-05-181-12/+2
|\ \ | |/ |/|
| * Partially revert change from 96777Teng-Hui Zhu2011-05-181-12/+2
| | | | | | | | | | | | | | | | | | By reverting this part, the preview is scrolling fine now. The old bug 3416512 is kept fixed. This is manually integrated from MR2 change 110435 bug:4440227 Change-Id: I98d4286cb2dfa2649b172751270e1ae7c43d0887
* | Basic performance monitor for tilesJohn Reck2011-05-164-2/+199
| | | | | | | | Change-Id: Ic67a5093a7c09b870ec34160ae0c999162dddcfc
* | Merge WebKit at r75993: Fix ImageSourceAndroid.cppBen Murdoch2011-05-161-8/+8
| | | | | | | | | | | | | | | | RGBA32Buffer is now named ImageFrame. See http://trac.webkit.org/changeset/75748 Change-Id: Id469057d2caa05c49f59ec489b39285dc3bf7763
* | Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-1676-1443/+655
|/ | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Fix ImageBufferSteve Block2011-05-131-11/+9
| | | | | | See http://trac.webkit.org/changeset/74868 Change-Id: Iacb6ca5dd044a7bf08eb43012457b92f3a6beccd
* Merge WebKit at r75315: Fix conflictsSteve Block2011-05-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - HTMLInputElement.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS See http://trac.webkit.org/changeset/74895 - HTMLInputElement.cpp and RangeInputType.cpp Conflict due to refactoring of event handling on input elements See http://trac.webkit.org/changeset/74549 - DOMWindow.cpp Conflict due to DOMWindow::clearDOMStorage() See http://trac.webkit.org/changeset/74800 - EventHandler.cpp Conflict due to longpress and doubletap vs touch event refactoring See http://trac.webkit.org/changeset/74553 - History.cpp Trivial conflict due to cherry-pick See http://trac.webkit.org/changeset/74853 - GraphicsContext.cpp Conflict due to PLATFORM(ANDROID) guard See http://trac.webkit.org/changeset/74662 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/74971 Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-1276-0/+16879
| | | | | | | | | | | | | This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12653-0/+129109
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-08-20 13:19:43 +0000