summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-233-3/+3
| | | | | | | | 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-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 WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2396-450/+2074
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* 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-16204-0/+48905
| | | | Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161818-0/+609519
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
generated by cgit v1.1 at 2024-09-17 19:59:53 +0000