summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup BaseTile and BackedDoubleBufferedTexture classes.Derek Sollenberger2010-10-198-152/+155
| | | | | | | | The cleanup consists of: 1. removing unused variables and functions 2. refactoring the backed texture to reduce number of exposed variables Change-Id: I8a36725f61c5ecd77b7a215ec75a7b8129bf56af
* Fix potential deadlock when acquiring a textureNicolas Roard2010-10-151-1/+2
| | | | Change-Id: Ie24613c69fd048b14003f7cbc3ad0c86ba4e295e
* Fix a crash when deleting GraphicsContextPlatformPrivateSteve Block2010-10-151-3/+3
| | | | | | | | Make sure PlatformGraphicsContext::mCanvas is still around when we call restore(). Bug: 3071206 Change-Id: I5b3bc40448e1d891a47f214d18daf345d55d9284
* Rename to_string() to jstringToWtfString() for greater claritySteve Block2010-10-151-1/+1
| | | | Change-Id: I8516c4f39a38e236d0bff38a91fe8657cfcf8ad4
* Fix PictureSet update crashNicolas Roard2010-10-142-0/+16
| | | | Change-Id: I5fec3f1ce421831b3fecae4030d63a29fe75fa1c
* Cleanup TiledPage class.Derek Sollenberger2010-10-145-68/+87
| | | | | | | | | | | The cleanup consists of: 1. renaming m_baseTextures to m_baseTiles 2. caching the inverse scale to speed up the draw calls 3. removing currentPictureMethod as it is available through GLWebViewState 4. adding comments to the public methods 5. some small source code optimizations Change-Id: I831500da335a3afac7232524b74e63436ea65efb
* Merge "Cleanup the TileSet class."Derek Sollenberger2010-10-147-70/+66
|\
| * Cleanup the TileSet class.Derek Sollenberger2010-10-147-70/+66
| | | | | | | | | | | | | | | | | | The cleanup consisted of three pieces: 1. rename the class to TileSet since a set implies multiple tiles. 2. removed unused variables and uncessary methods. 3. cleaned up coding style and added comments. Change-Id: I605fce367e4d1e8cb795f1e9bfab0ce0999dc7e3
* | Fix crash bug when calling WebView::clearView()Nicolas Roard2010-10-141-3/+5
|/ | | | | Bug:3097149 Change-Id: I280c0ca0e534d46570d758267c1e78c561a5b955
* GL rendering (without layers)Nicolas Roard2010-10-1318-42/+2337
| | | | | | This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,64863 Change-Id: I40fcf3b7b6d28b887b101219c973070aeefbb777
* Remove unnecessary mutex locks from texture sharing codeDerek Sollenberger2010-10-121-4/+0
| | | | | | | | | | | | The DoubleBufferedTexture currently uses a mutex to protect access to m_frontTexture on the producer functions. This mutex is not needed in the producerLock/producerRelease functions as they will always be called by the thread that sets m_frontTexture. Additionally, this data will be initialized before calls to those funtions as the thread must always call aquireContext() before calling these functions. Change-Id: I110ad357c5eed4c0f5501761174e0da4b872af5d http://b/3089605
* Merge "style cleanup on GraphicsContextAndroid.cpp"Teng-Hui Zhu2010-10-111-459/+468
|\
| * style cleanup on GraphicsContextAndroid.cppTeng-Hui Zhu2010-10-081-459/+468
| | | | | | | | | | | | | | | | | | | | | | | | Reduce the style check error from 118 to 1. Mostly are one space for end of line comment, underscore in function name, NULL Vs 0, comparing with 0 etc... Only one function name android_gc2canvas still contain underscore and chaning that need to touch multiple files. That will be fixed when we come to clean up the whole directory. Change-Id: Ibcbc4d368452943825a4b3421315732eb03c292c http://b/3003023
* | Fix WebCore/WebKit layering violation.Ben Murdoch2010-10-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | Move the call to WebViewCore::updateTextfield() to the PlatformBridge so that WebCore code does not depend on WebKit code to compile. In addition to being a layering violation, the inclusion of WebViewCore.h includes WebCoreJni.h, which in a future change causes LOG to get #undefined when using the chromium net stack. Change-Id: Id88d332624323e03ce82120ef55db200cbabe63b
* | Fix a WebCore/WebKit layering violationBen Murdoch2010-10-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Move the call to WebViewCore::updateViewport() from HTMLBodyElement and HTMLMetaElement to the PlatformBridge so that WebCore code does not depend on WebKit code to compile. In addition to being a layering violation, the inclusion of WebViewCore.h includes WebCoreJni.h, which in a future change causes LOG to get #undefined when using the chromium net stack. Change-Id: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb
* | Remove dependency of WebCore ScreenAndroid on platform APISteve Block2010-10-082-31/+15
| | | | | | | | | | | | | | | | | | | | Note that this change forks two WebCore files, but both files are already forked and are unlikely to be changed upstream by non-Android contributors. All changes to both files will be upstreamed at a later date. Bug: 2439218 Change-Id: I1e56ee12cec17df38a1404ab06c8897c22f2fd19
* | Revert "Prohibit scrolling not initiated by the user."Leon Scroggins2010-10-072-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3067265 This reverts commit f116b073399a3c3f644d6e6aeb2521ef9d2c9e9b. Conflicts: WebCore/platform/android/PlatformBridge.h WebKit/android/WebCoreSupport/PlatformBridge.cpp Change-Id: I358ce936a8c6f99717b976cfa07e7fe26014760a
* | Merge WebKit at r68651 : Use the Android version of release/retainPlatformWidgetKristian Monsen2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Empty declarations for these were added in the header file, probably safest to keep the Android ones around. In the Fix conflicts merge these were removed from Widget.cpp, so this should match the old behaviour. Webkit CL: http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.h Change-Id: Ifdc0ad47816e03a7d424eb7130f2f7c1a61f7067
* | Merge Webkit at r68651 : Fix conflicts.Kristian Monsen2010-10-074-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeClient.h: Conflict due to ANDROID_INSTALLABLE_WEB_APPS http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h CSSParser.cpp: Conflict due to ANDROID_INSTRUMENT http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp Node.cpp: Conflict due to ANDROID_DOM_LOGGING http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp npapi.h: Conflicts due to various #ifdef ANDROID http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h PlatformTouchEvent.h: PlatformTouchEventAndroid.cpp: PlatformTouchPoint.h: Conflicts due to new BREWMP code next to changed Android code Initial webkit CL: http://trac.webkit.org/changeset/68499 Later fix after merge revision, so cherry-picked: http://trac.webkit.org/changeset/69034 RenderBox.cpp: Several changes, conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68238#file2 http://trac.webkit.org/changeset/68239#file3 http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp The correct resolution here is unclear. A closer investiagtion by somebdoy more familiar with the code is tracked with b/3071198 RenderBox.h: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h RenderIFrame.cpp: Conflicts due to ANDROID_FLATTEN_IFRAME http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp RenderTable.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp RenderView.cpp: Conflicts due to ANDROID_LAYOUT http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp Settings.cpp: Settings.h: Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL http://trac.webkit.org/changeset/68166 Widget.cpp: http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
* | Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-07234-2336/+9964
| | | | | | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* | Implement supportsType in MediaPlayerPrivateAndroid.Shimeng (Simon) Wang2010-10-061-3/+1
|/ | | | | | | Use Java API to obtain this info. issue: 2816278 Change-Id: Ia525cc84f9a18ad2f9868d9f13d3671da527e5e0
* b/3039749 resolving the conflicts for WebKit.Huahui Wu2010-10-044-5/+0
| | | | Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5
* Add AA to the border radiusTeng-Hui Zhu2010-10-041-14/+75
| | | | | | | In order to enable AA for the border radius, add an extra layer for drawing and then clearing by using AA paint. The reason why clipping can't show AA is that it is 1-bit clip. Change-Id: Ic9fa99915fb908e502dcb90cfe1428bb4d8e136b http://b/3003023
* Merge "Bug2811469 - wide space in RTL layout"claireho2010-10-011-9/+135
|\
| * Bug2811469 - wide space in RTL layoutclaireho2010-09-291-9/+135
| | | | | | | | | | | | | | 1. Fixed extra wide space in RTL pages. 2. Removed the tailing space in FontAndroid.cpp. Change-Id: I73b6cd7a7bed7a92929d3c4ef8af3b2c84020d0f
* | Fix the compiler error while disabling overflow scroll.Shimeng (Simon) Wang2010-09-301-0/+2
| | | | | | | | Change-Id: I4d74ac00a6d348ce00b551572da6ceb5f2793b1f
* | Merge WebKit at r67908: ResourceLoader now makes use of NetworkingContextSteve Block2010-09-292-15/+18
| | | | | | | | | | | | See http://trac.webkit.org/changeset/67291 Change-Id: I620cba25ea40451830b86df90631a2c88792ce16
* | Merge WebKit at r67908: Remove ↵Steve Block2010-09-291-5/+0
| | | | | | | | | | | | | | | | GraphicsLayer::compositingCoordinatesOrientation() See http://trac.webkit.org/changeset/67576 Change-Id: I2f212e6591b4d7c1a48cae5be9e8e4911d9c3a50
* | Merge WebKit at r67908: Remove call to ↵Steve Block2010-09-291-0/+8
| | | | | | | | | | | | | | | | SharedGraphicsContext3D::removeTexturesFor() See http://trac.webkit.org/changeset/67412 Change-Id: I327df5aa81770a4eab885933ac6339ae26aca62a
* | Merge WebKit at r67908: Fix conflictsSteve Block2010-09-291-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace difference in config.h - http://trac.webkit.org/changeset/67323 - WebCore/config.h Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882 - WebCore/css/CSSComputedStyleDeclaration.cpp Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704 - WebCore/css/CSSParser.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667 - WebCore/css/CSSParser.cpp - WebCore/css/CSSStyleSelector.cpp Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292 - WebCore/dom/Document.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903 - WebCore/html/HTMLInputElement.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198 - WebCore/loader/DocumentLoader.cpp - WebCore/loader/FrameLoader.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253 - WebCore/loader/FrameLoader.cpp Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762 - WebCore/page/DOMWindow.cpp Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890 - WebCore/page/Settings.cpp - WebCore/page/Settings.h Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375 - WebCore/platform/MIMETypeRegistry.cpp Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325 - WebCore/plugins/PluginView.cpp Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBox.h - WebCore/rendering/RenderTable.cpp Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862 - WebCore/rendering/RenderTableCell.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667 - WebCore/rendering/style/RenderStyle.h Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c fix conflicts Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
* | Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-29188-3547/+4990
|/ | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge "Bug: 2372180"Huahui Wu2010-09-274-6/+13
|\
| * Bug: 2372180Huahui Wu2010-09-274-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds support to pass multi-touch event from browser to webkit. PlatformTouchEvent.h and PlatformTouchEventAndroid.cpp: changed the android constructor to take multiple touch points. PlatformTouchPoint.h and PlatformTouchPointAndroid.cpp: changed the android constructor to take a touch point ID. WebViewCore.h and WebViewCore.cpp: 1. Updated handleTouchEvent(), HandleTouchEvent(), and jni interface to take multiple points. 2. Added support of action MotionEvent.ACTION_POINTER_DOWN & MotionEvent.ACTION_POINTER_UP. Change-Id: I79cffdba12a60ced9a571b4c1fd5b520a0fb6074
* | Double Buffered Texture Support for WebKit.Derek Sollenberger2010-09-276-11/+570
|/ | | | | | | | This CL adds support for the DoubleBufferedTexture class which can be used to pass textures between threads. Bug-Id: 3034088 Change-Id: Idf4a5d367c02eae0cedb08f2167b9af370173851
* Merge "GL utilities"Nicolas Roard2010-09-214-0/+633
|\
| * GL utilitiesNicolas Roard2010-09-214-0/+633
| | | | | | | | Change-Id: I5b4a008c51f409639059d2e47d5c8624c96b2981
* | Merge WebKit at r67178 : Fix AndroidAnimation.Iain Merrick2010-09-162-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | TimingFunction was previously a simple struct with an enum to select different behaviors. It's now an abstract class with a different subclass for each behavior. Fixing AndroidAnimation so that it holds a RefPtr to the timing function rather than trying to store its value directly. See http://trac.webkit.org/changeset/67032 Change-Id: Icb7f2911aea341975531c95594ab1c30ac48cd87
* | Merge WebKit at r67178 : Fix conflicts.Iain Merrick2010-09-161-6/+0
| | | | | | | | | | | | | | | | | | | | | | V8DOMWindowShell::initContextIfNeeded now has a return value: http://trac.webkit.org/changeset/66840 DocLoader renamed to CachedResourceLoader. This affects loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp http://trac.webkit.org/changeset/66963 Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45
* | Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-16163-1103/+7944
| | | | | | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* | Merge Webkit at r66666 : Renamed function in GraphicsContext.h.Kristian Monsen2010-09-111-1/+2
| | | | | | | | | | | | | | Webkit CL: http://trac.webkit.org/changeset/66643 Change-Id: Ia17bde54d46e1792cfe309f19e229abe513ed52c
* | Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-11142-1752/+5030
|/ | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Revert "Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/.""Steve Block2010-09-041-7/+0
| | | | | | | | This change broke LayoutTest fast/url/ipv4.html This reverts commit ff93a851c578d0b570c84b3a83a41a4930e7107c. Change-Id: Ic27602be9fdd855fbc1517deed9e7e9737f5b9b5
* Merge "Update to Merge WebKit at r61871: Floating-point support for text ↵Kristian Monsen2010-09-021-2/+2
|\ | | | | | | selection."
| * Update to Merge WebKit at r61871: Floating-point support for text selection.Kristian Monsen2010-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The last CL only fixed when SUPPORT_COMPLEX_SCRIPTS was defined, this is the same fix for when it is not defined. The previous CL: https://android-git.corp.google.com/g/#change,56256 Webkit CL: http://trac.webkit.org/changeset/61253 Change-Id: I9300786525fd6ec0ea2fc304c5d33e3ee00ccd3e
* | Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha ↵Steve Block2010-09-021-2/+4
| | | | | | | | | | | | | | | | argument See http://trac.webkit.org/changeset/66039 Change-Id: I4961f5610c3061c90edf8cc32b83e4a6b8be12d1
* | Merge WebKit at r66079 : Fix conflictsSteve Block2010-09-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - WebCore/dom/Document.cpp Conflict due to Android guards around m_axObjectCache See http://trac.webkit.org/changeset/65787 - WebCore/dom/Document.h Conflict due to Android guards around m_axObjectCache whitespace diff See http://trac.webkit.org/changeset/65787 and http://trac.webkit.org/changeset/66037 - WebCore/html/HTMLDocumentParser.cpp Conflict due to ANDROID_INSTRUMENT See http://trac.webkit.org/changeset/65692 - WebCore/platform/image-decoders/ImageDecoder.cpp Conflict due to Android not implementing ImageDecoder::create() See http://trac.webkit.org/changeset/66039 - WebCore/plugins/PluginView.h Conflict due to PLUGIN_SCHEDULE_TIMER See http://trac.webkit.org/changeset/65697 Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
* | Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-02142-1768/+4029
|/ | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* am cd011297: am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that ↵Melanie Clements2010-08-311-0/+7
|\ | | | | | | | | | | | | | | | | starts with "/." Merge commit 'cd011297fda5b6f6093453d59c2624aaf878e2fb' * commit 'cd011297fda5b6f6093453d59c2624aaf878e2fb': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| * am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-311-0/+7
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp * commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| | * Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android browser inserts "/." at the beginning of the URL path when processing an <img> in an HTML document with a <base> tag. This does not cause any errors but should be fixed to comply with RFC 3986 section 5.4. This only happens at the first pass of the URL parsing, at the second pass where the base and path are parsed together this is dealt with correctly. I am therefore fixing it by modifying the parse() method in KURL to check for a trailing '.' at the end of the base segment. Change-Id: I0d641c8619e00aa2b08a33e271ef863cee5ed7ad
generated by cgit v1.1 at 2024-09-10 16:57:30 +0000