summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 29.0.1541.229.0.1541.2gitdeps2014-04-072-621/+500
|
* Incrementing VERSION to 29.0.1541.2chrome-release@google.com2013-06-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1541/src@207000 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 29.0.1541.1chrome-release@google.com2013-06-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1541/src@206894 0039d316-1c4b-4281-b951-d872f2087c98
* Branching for 1541 @206856chrome-release@google.com2013-06-180-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1541/src@206892 0039d316-1c4b-4281-b951-d872f2087c98
* [Memory Sheriff] Suppress leaks.groby@chromium.org2013-06-181-0/+40
| | | | | | | | | | TBR=thestig@chromium.org, earthdok@chromium.org NOTRY=true BUG=251004 Review URL: https://chromiumcodereview.appspot.com/17159003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206856 0039d316-1c4b-4281-b951-d872f2087c98
* Separate NaCl messages from the rest of chrome messages and create a new ↵yael.aharon@intel.com2013-06-1816-180/+319
| | | | | | | | | | message filter. This is part of an effort to componentize NaCl code. BUG=244791 Review URL: https://chromiumcodereview.appspot.com/15906013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206855 0039d316-1c4b-4281-b951-d872f2087c98
* Fix test case table in HistoryURLProviderTest for C++11caio.de.oliveira.filho@intel.com2013-06-181-24/+24
| | | | | | | | | | | | | | | | C++11 narrowing rules do not accept converting signed literals (-1) to unsigned types (size_t), so the table for SuggestExactInput test breaks compilation when using G++ 4.7.2. This patch uses a localized version of std::string::npos instead of the literal -1. BUG=237284 TEST=unit_tests --gtest_filter="*SuggestExactInput" Review URL: https://chromiumcodereview.appspot.com/16972007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206854 0039d316-1c4b-4281-b951-d872f2087c98
* Convert PDF to use SimpleImageData resource.bbudge@chromium.org2013-06-184-46/+16
| | | | | | | | BUG= Review URL: https://chromiumcodereview.appspot.com/16663010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206853 0039d316-1c4b-4281-b951-d872f2087c98
* Support png wallpapersbshe@chromium.org2013-06-186-45/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a weaker (from security perspective) image decode here in order to support png wallpapers. The weaker image decoder will only used after user logged in. So if it somehow exploited, the damage stays in one user's profile. (Actually, we use image decoder that webkit use. So it is as safe/dangeous as user open the png wallpaper in a browser window) After decoded the png wallpaper, we will reencode it to jpeg. And thereafter, a robust jpeg decoder is used to decode the saved jpegs to guarantee we can safely display wallpaper pre login stage. BUG=237416 TEST= 1. have a png image ready 2. open wallpaper picker, navigate to custom tab 3. change wallpaper to the png file expected: the png file should set as wallpaper 4. logout 5. verify the wallpaper persist Review URL: https://chromiumcodereview.appspot.com/16634016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206852 0039d316-1c4b-4281-b951-d872f2087c98
* [SPDY] Avoid crash when an active stream closes another when it is closedakalin@chromium.org2013-06-181-4/+8
| | | | | | | | | | | | This CL is as small as possible as it might need to be merged to other branches. Tests will come in a future CL. BUG=250841 R=rch@chromium.org Review URL: https://codereview.chromium.org/17066005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206851 0039d316-1c4b-4281-b951-d872f2087c98
* Set max disk cache size correctly.dsinclair@chromium.org2013-06-174-11/+5
| | | | | | | | | | | | | | Currently we set the max shader cache size too late. The disk cache will be created with a cache size of 0, and the max_cache_size will have no effect. This CL changes the default from 0 to the desired gpu::kDefaultMaxProgramCacheMemoryBytes so we always create the disk cache with the correct size to match the memory cache (currently set to 6MiB). BUG=248511 Review URL: https://chromiumcodereview.appspot.com/17283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206849 0039d316-1c4b-4281-b951-d872f2087c98
* Set ColorChooserWin::current_color_chooser_ properlyyoshinori.sano@gmail.com2013-06-171-3/+3
| | | | | | | | | | | | | ColorChooserWin::current_color_chooser_ stays NULL, so ColorChooserWin::Open() always creates new ColorChooserWin instance. In addition to this, the DCHECK() at ColorChooserWin::OnColorChooserDialogClosed() that checks current_color_chooser_ always fails. BUG=none Review URL: https://chromiumcodereview.appspot.com/17174002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206848 0039d316-1c4b-4281-b951-d872f2087c98
* Set AllowOverlappingViews on dev tools WebContentssail@chromium.org2013-06-173-2/+37
| | | | | | | | | | | This CL sets AllowOverlappingViews on dev tools WebContents. This allows dev tools to overlap the find bar and other views. BUG=249718, 236460 Review URL: https://chromiumcodereview.appspot.com/17101006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206847 0039d316-1c4b-4281-b951-d872f2087c98
* Move appcache_dispatcher and appcache_backend_proxy to content/child.michaeln@google.com2013-06-1710-116/+116
| | | | | | | | | BUG=239107 R=jamesr@chromium.org Review URL: https://codereview.chromium.org/17327002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206846 0039d316-1c4b-4281-b951-d872f2087c98
* New assets for touch selection handles.varunjain@chromium.org2013-06-173-1/+1
| | | | | | | | | BUG=239097 R=oshima@chromium.org Review URL: https://codereview.chromium.org/17335002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206845 0039d316-1c4b-4281-b951-d872f2087c98
* X509Certificate::GetDefaultNickname should handle a user certificatewtc@chromium.org2013-06-174-3/+136
| | | | | | | | | | | | | | | | whose Subject field doesn't have a common name (but has an email address). This was previously https://codereview.chromium.org/10341005/ R=rsleevi@chromium.org BUG=126023 TEST=new unit test X509CertificateTest.GetDefaultNickname, only if USE_NSS is defined. Review URL: https://chromiumcodereview.appspot.com/17093010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206844 0039d316-1c4b-4281-b951-d872f2087c98
* Remove --with-tools-extra option from clang update scriptdcheng@chromium.org2013-06-171-14/+0
| | | | | | | | | | | | This is no longer needed now that clang-format is in the main clang repository. BUG=none R=thakis@chromium.org Review URL: https://codereview.chromium.org/17329002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206841 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 206826 "[Memory Sheriff] Leak suppressions"felt@chromium.org2013-06-171-20/+0
| | | | | | | | | | | | | | | | | | dbabic landed r206834 right after, which should fix the issue. removing suppressions to see if the fix works > [Memory Sheriff] Leak suppressions > > NOTRY=true > TBR=thestig@chromium.org, dbabic@chromium.org > BUG=251018 > > Review URL: https://chromiumcodereview.appspot.com/17328003 TBR=groby@chromium.org,mpcomplete@chromium.org Review URL: https://codereview.chromium.org/17341002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206840 0039d316-1c4b-4281-b951-d872f2087c98
* InstantExtended: Remove local ntp suggestion code.jered@chromium.org2013-06-174-988/+15
| | | | | | | | | | | | If we want this, we can revive it from source control. Meanwhile, we're wasting memory and load time with a lot of iframes, and IMO shipping dead code like this would waste us more time than it may save. BUG=249883 Review URL: https://chromiumcodereview.appspot.com/17087007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206839 0039d316-1c4b-4281-b951-d872f2087c98
* Tear out ENABLED_HIDPI (use --high-dpi-support=1 instead)girard@chromium.org2013-06-175-38/+30
| | | | | | | | BUG=243445 Review URL: https://chromiumcodereview.appspot.com/17084010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206838 0039d316-1c4b-4281-b951-d872f2087c98
* Fix wrong header guards found by clang's new Wheader-guard.thakis@chromium.org2013-06-177-7/+7
| | | | | | | | | | | | | | | | | | | | | Example diagnostic: In file included from ../../ppapi/tests/test_flash_file.cc:5: ../../ppapi/tests/test_flash_file.h:5:9: error: 'PAPPI_TESTS_TEST_FLASH_FILE_H_' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../ppapi/tests/test_flash_file.h:6:9: note: 'PPAPI_TESTS_TEST_FLASH_FILE_H_' is defined here; did you mean 'PAPPI_TESTS_TEST_FLASH_FILE_H_'? ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PAPPI_TESTS_TEST_FLASH_FILE_H_ 1 error generated. BUG=none R=ben@chromium.org Review URL: https://codereview.chromium.org/17321002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206837 0039d316-1c4b-4281-b951-d872f2087c98
* [Memory Sheriff] Leak suppressiongroby@chromium.org2013-06-171-0/+55
| | | | | | | | | | | | | | Might be that we need to suppress all of OSMesaMakeCurrentFn, but I didn't want the suppressions too wide on the first try. Keeping an eye. NOTRY=true TBR=thestig@chromium.org, senorblanco@chromium.org, apatrick@chromium.org BUG=251034 Review URL: https://chromiumcodereview.appspot.com/16989004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206836 0039d316-1c4b-4281-b951-d872f2087c98
* * Force token minting based on the oauth2.auto_approve settingfgorski@chromium.org2013-06-176-51/+170
| | | | | | | | | | * Verify that the oauth2.auto_approve flag is allowed to be set in the manifest (based on whitelisting) BUG=155963 Review URL: https://chromiumcodereview.appspot.com/16638006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206835 0039d316-1c4b-4281-b951-d872f2087c98
* One line fix for the uninitialized testing_mode_ flag.dbabic@chromium.org2013-06-171-0/+1
| | | | | | | | | BUG=251018 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/17066004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206834 0039d316-1c4b-4281-b951-d872f2087c98
* New UndoService for multiple level undo and redo of bookmarks.tom.cassiotis@gmail.com2013-06-176-0/+182
| | | | | | | | | | | | | | | | This is a staged commit of a larger feature to allow multi-level undo, redo functionality for bookmarks. This introduces an |UndoService| that is a |BrowserContextKeyedService|. Currently this service does not do anything, but will do so in subsequent commit. BUG=126092 R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/16947008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206833 0039d316-1c4b-4281-b951-d872f2087c98
* Restart Chrome if per session flags have been specified on ChromeOS.pastarmovj@chromium.org2013-06-1711-4/+137
| | | | | | | | | | | | | | | | After the profile is loaded we verify if the user has specfied any flags or if there were flags specified per policy that differ from the user specfied flags and in either case restart Chrome with the desired flags. This allows non-owners to use the about:flags page and prevents policy set flags from leaking inside user sessions. BUG=221352 TEST=unit_tests & Manually by specifying flags in non-owner session and observing them respected. Review URL: https://chromiumcodereview.appspot.com/16770002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206832 0039d316-1c4b-4281-b951-d872f2087c98
* Skip raster if MapImage failsboliu@chromium.org2013-06-175-57/+114
| | | | | | | | | | | | | | | | | MapImage should never fail with proper memory management. Android WebView currently lacks memory management and this patch avoids a crash in production (with DCHECK turned off) when MapImage fails. Also add a test for this case for both pixel buffer and image worker pools. BUG=247983 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/16093038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206831 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-06-171-2/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206830 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 206804 "Pull ANGLE from new git repository."apatrick@google.com2013-06-172-8/+2
| | | | | | | | | | | | | | | | | > Pull ANGLE from new git repository. > > Switch references to ANGLE repository to use the new directory in third_party. > > BUG=247158 > R=kbr@chromium.org > > Review URL: https://codereview.chromium.org/16123033 TBR=apatrick@chromium.org Review URL: https://codereview.chromium.org/17337002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206828 0039d316-1c4b-4281-b951-d872f2087c98
* Miscellaneous cleanup of TLS 1.2 code.wtc@chromium.org2013-06-177-199/+1064
| | | | | | | | | | | | | | | | | | | | | 1. Support TLS 1.2 in PKCS #11 bypass mode. 2. Delay the creation of handshake hash contexts until we have established the handshake hash functions. 3. Buffer handshake messages until the handshake hash contexts have been created. 4. Fix the double ssl3_RestartHandshakeHashes calls, by removing the ssl3_RestartHandshakeHashes call in ssl3_NewHandshakeHashes. 5. Remove redundant ssl3_InitState calls. 6. Remove NSS_SURVIVE_DOUBLE_BYPASS_FAILURE support, so that ss->ssl3.hs.messages is used for only one purpose. R=agl@chromium.org BUG=90392 TEST=none Review URL: https://chromiumcodereview.appspot.com/17109007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206827 0039d316-1c4b-4281-b951-d872f2087c98
* [Memory Sheriff] Leak suppressionsgroby@chromium.org2013-06-171-0/+20
| | | | | | | | | | NOTRY=true TBR=thestig@chromium.org, dbabic@chromium.org BUG=251018 Review URL: https://chromiumcodereview.appspot.com/17328003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206826 0039d316-1c4b-4281-b951-d872f2087c98
* [NaCl SDK] Add create_html support for common.mk.sbc@chromium.org2013-06-179-84/+121
| | | | | | | | | | | | | | | | | Add CREATE_HTML macro to common.mk that allows developers to automaticlly create html and nmf files for thier binaries. Also add nexe targets to 'all' so that nexe's will get built in all cases, not only when nmf/html target depends on them. Also, cleanup some whitespace in .mk files and generated Makefiles. R=binji@chromium.org Review URL: https://codereview.chromium.org/17130002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206825 0039d316-1c4b-4281-b951-d872f2087c98
* Add experimental.identity to _api_features.json.kalman@chromium.org2013-06-171-0/+4
| | | | | | | | | BUG=250721 R=yoz@chromium.org Review URL: https://chromiumcodereview.appspot.com/16818025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206824 0039d316-1c4b-4281-b951-d872f2087c98
* Make notification close button not animate when being hovered overjianli@chromium.org2013-06-171-0/+2
| | | | | | | | | | | Also no animation for hovering over expand button. BUG=249113 TEST=Manual test by hovering over close button Review URL: https://chromiumcodereview.appspot.com/17283004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206823 0039d316-1c4b-4281-b951-d872f2087c98
* Revert SVN r177818, stop generating bitcode hashes in NMF for PNaCl.jvoung@chromium.org2013-06-172-9/+9
| | | | | | | | | | | | | SVN rev 206797 removed the need for a bitcode hash in the NMF to cache PNaCl bitcode->native translations. Instead, cache signals from the HTTP response headers are used (last modified, and etags). BUG=http://code.google.com/p/nativeclient/issues/detail?id=2992 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/16882003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206822 0039d316-1c4b-4281-b951-d872f2087c98
* Enable low latency mode for audio playback on Androidwjia@chromium.org2013-06-172-5/+7
| | | | | | | | | | | | | On Android, in order to use low latency mode for audio playback, it's required to use exact sampling rate and buffer size queried from the device. This patch uses 2048 frames for IPC buffer and native size (queried from device) for buffer sent to the device. BUG=243506 TEST=run https://apprtc.appspot.com/?debug=loopback on Google Android devices, e.g., Galaxy Nexus, Nexus4. The audio quality is much better than the exisiting setup. R=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/17209003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206821 0039d316-1c4b-4281-b951-d872f2087c98
* Fix right-clicking on "Learn more" and "Sign in now" links.pam@chromium.org2013-06-172-5/+9
| | | | | | | | | | | | | | Convert the internal links in the limited-user-creation strings to link-buttons, so the context menu doesn't allow "open in new tab", which didn't work properly anyway (it opened the Settings page instead). BUG=249674 TEST=manual Review URL: https://chromiumcodereview.appspot.com/17250005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206819 0039d316-1c4b-4281-b951-d872f2087c98
* Don't set AllowOverlappingViews for Instant Extendedsail@chromium.org2013-06-171-4/+2
| | | | | | | | | | | Instant now uses a native omnibox popup and no longer has overlapping views. BUG=236460 Review URL: https://chromiumcodereview.appspot.com/17142002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206818 0039d316-1c4b-4281-b951-d872f2087c98
* Per dcblack, change to using the same font in the dropdown as the omnibox.pkasting@chromium.org2013-06-171-10/+1
| | | | | | | | | | | | | | I thought this was just a bug from my font change, but we've actually had this behavior intentionally forever on Win, probably in order to fit more text in the dropdown, especially when matching text is bold. BUG=249445 TEST=Type in omnibox; dropdown font is the same R=brettw@chromium.org Review URL: https://codereview.chromium.org/17124002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206817 0039d316-1c4b-4281-b951-d872f2087c98
* Remove suppressions for EventSender.tkent@chromium.org2013-06-171-21/+0
| | | | | | | | | | | | | They have never been used after October 2012. http://chromium-build-logs.appspot.com/suppression_query?suppression_query=bug_138510 http://chromium-build-logs.appspot.com/suppression_query?suppression_query=bug_146500 BUG=138510,146500 R=timurrrr@chromium.org Review URL: https://codereview.chromium.org/17214002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206816 0039d316-1c4b-4281-b951-d872f2087c98
* Port database identifier <-> origin conversions to chromiumjamesr@chromium.org2013-06-175-0/+417
| | | | | | | | | | | | | | This ports the logic to convert between database identifiers and origins to chromium to avoid depending on the blink DLL and WTF's string tables being initialized. This code is intended to be a bug-for-bug clone of the code in third_party/WebKit/Source/weborigin/ including unit tests. BUG=243095 TBR=jochen for content_tests.gypi change Review URL: https://chromiumcodereview.appspot.com/17037002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206815 0039d316-1c4b-4281-b951-d872f2087c98
* Optimize public suffix list implementationnyquist@chromium.org2013-06-179-22504/+22190
| | | | | | | | | | | | | | | | | | * Changes the datastructure used for each DomainRule to only have a char* and an int, instead of also including a bool. The int is then used as a flag to indicate exception, wildcard and/or private. * Flipped the order of operations for checking whether this is a private domain and whether private domains should be included, since most callers do not include private domains. * Use -m 10 instead of -m 5 flag when running gperf to further optimize the size of the lookup table. BUG=245442 R=pam@chromium.org Review URL: https://codereview.chromium.org/17155003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206813 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-06-171-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206812 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebRTC to r4236niklase@chromium.org2013-06-171-1/+1
| | | | | | | | R=ronghuawu@chromium.org, wjia@chromium.org Review URL: https://codereview.chromium.org/17302004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206811 0039d316-1c4b-4281-b951-d872f2087c98
* Media Galleries API: Picasa import - Make PicasaFileUtil/DataProvider async.tommycli@chromium.org2013-06-175-38/+96
| | | | | | | | | | Basically modelled after vandebo's design on ITunes*. BUG=151701 Review URL: https://chromiumcodereview.appspot.com/15724025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206807 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-06-171-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206806 0039d316-1c4b-4281-b951-d872f2087c98
* Add support using EXPECT_EQ with NullableString16 objects.darin@chromium.org2013-06-175-1/+70
| | | | | | | | | | Change the default constructor to set is_null_ to true. This makes NullableString16 act more like a WebKit::WebString, which is really the reason NullableString16 exists at all. R=brettw@chromium.org Review URL: https://codereview.chromium.org/17289005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206805 0039d316-1c4b-4281-b951-d872f2087c98
* Pull ANGLE from new git repository.apatrick@chromium.org2013-06-172-2/+8
| | | | | | | | | | | Switch references to ANGLE repository to use the new directory in third_party. BUG=247158 R=kbr@chromium.org Review URL: https://codereview.chromium.org/16123033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206804 0039d316-1c4b-4281-b951-d872f2087c98
* Revert impl-side painting setting for GoogleTVjinsukkim@chromium.org2013-06-171-6/+1
| | | | | | | | | | Disabling impl-side painting in general on GoogleTV (https://codereview.chromium.org/14190008) is causing a problem loading pages. This CL reverts the change. Review URL: https://chromiumcodereview.appspot.com/16879005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206803 0039d316-1c4b-4281-b951-d872f2087c98
* Fix snippet margin to align with favicon when searching history.dwankri@chromium.org2013-06-171-1/+1
| | | | | | | | BUG=248469 Review URL: https://chromiumcodereview.appspot.com/16645009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206802 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-13 23:33:25 +0000