summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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-2514-136/+147
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵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: IntRect::bottom()/right() renamedSteve Block2011-05-258-117/+127
| | | | | | | | | | | | | | | | | | | | | 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-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-251-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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 WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-232-3/+3
| | | | | | | | | | | | | | | | 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: 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-234-3/+9
|/ | | | | | | | | | | | | | | | 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 Chromium at 10.0.621.0: Compile fixesKristian Monsen2011-05-204-16/+17
| | | | | | | | | | | | | | | | 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
* Merge Chromium at 10.0.621.0: New argument in the Cache CTORKristian Monsen2011-05-202-0/+2
| | | | | | | | | 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
* Merge Chromium at 10.0.621.0: profile.h moved to profiles/profile.hKristian Monsen2011-05-201-1/+1
| | | | | | | Upstream: http://codereview.chromium.org/5606002 Change-Id: Ia714f1a1abaca9bef00442f98476d0e8f43eb3e7
* Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonsterKristian Monsen2011-05-201-2/+2
| | | | | | | Upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414 Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
* Fix build when WEBARCHIVE is disabledSteve Block2011-05-181-1/+1
| | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* Merge WebKit at r75993: Fix uses of cache() functionBen Murdoch2011-05-162-7/+7
| | | | | | | WebCore::cache() is renamed to WebCore::memoryCache() See http://trac.webkit.org/changeset/75857 Change-Id: Id102b534c784191461a4d077058e5c25d5741d57
* Merge WebKit at r75993: Move WebKit/android files to SourceBen Murdoch2011-05-16203-0/+48773
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
generated by cgit v1.1 at 2024-09-22 22:28:34 +0000