diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 18:45:23 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 18:45:23 +0000 |
| commit | 334257b5f1d3ca12e6a2c852a9e6cfd5f2de3f52 (patch) | |
| tree | fd69e3a05de51dfeeeb132ebceb32e5622a578a8 /ppapi/thunk | |
| parent | 33e0b4916f5ceae96cab04a744db5db4b57fc89d (diff) | |
| download | chromium_src-334257b5f1d3ca12e6a2c852a9e6cfd5f2de3f52.zip chromium_src-334257b5f1d3ca12e6a2c852a9e6cfd5f2de3f52.tar.gz chromium_src-334257b5f1d3ca12e6a2c852a9e6cfd5f2de3f52.tar.bz2 | |
Revert 189855 "Add Pepper TrueType Font resource implementations..."
See failures:
http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%283%29/builds/31751
PPAPINaClPNaClTest.TrueTypeFont:
Right after fork
Right before base::type_profiler::Controller::Stop()
Right after base::type_profiler::Controller::Stop()
Right after signal/exception handler restoration.
Right after fd_shuffle push_backs.
Right after ShuffleFileDescriptors
Right after CloseSuperfluousFds
Right before execvp
/Volumes/data/b/build/third_party/zope/__init__.py:19: UserWarning: Module twisted was already imported from /Volumes/data/b/build/third_party/twisted_10_2/twisted/__init__.pyc, but /System/Library/Frameworks/Python.framework/Versions/2.6/Extras/lib/python is being added to sys.path
import pkg_resources
/Volumes/data/b/build/third_party/zope/__init__.py:19: UserWarning: Module zope was already imported from /Volumes/data/b/build/third_party/zope/__init__.pyc, but /System/Library/Frameworks/Python.framework/Versions/2.6/Extras/lib/python is being added to sys.path
import pkg_resources
HTTP server started on 127.0.0.1:53717...
sending server_data: {"host": "127.0.0.1", "port": 53717} (36 bytes)
[4855,2953998336:11:38:54.290560] Native Client module will be loaded at base address 0x00000000382f0000
/Volumes/data/b/build/slave/cr-mac-rel/build/src/chrome/test/ppapi/ppapi_test.cc:265: Failure
Value of: handler.message().c_str()
Actual: "GetTable FAIL: Failure in tests/test_truetype_font.cc(303): (0) == (memcmp(&entire_font[kOffset], &partial_font[0], kMaxDataSize))"
Expected: "PASS"
[4851:34307:0322/113854:901117653597:INFO:nacl_process_host.cc(232)] NaCl process exited with status 0 (0x0)
> Add Pepper TrueType Font resource implementations for Win, Mac, and Linux.
> Replaces TrueTypeFont stubs with platform code.
> Adds ppapi tests for the API.
>
> BUG=79375
> TEST=browser_tests, --gtest_filter="OutOfProcessPPAPITest.TrueTypeFont*"
>
> Review URL: https://codereview.chromium.org/12764016
TBR=bbudge@chromium.org
Review URL: https://codereview.chromium.org/12771027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/enter.cc | 4 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_truetype_font_thunk.cc | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc index 965e0f1..0248eba 100644 --- a/ppapi/thunk/enter.cc +++ b/ppapi/thunk/enter.cc @@ -63,9 +63,7 @@ EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id, const PP_CompletionCallback& callback) : resource_(GetSingletonResource(instance, resource_id)), retval_(PP_OK) { - DCHECK(resource_ || !instance); - if (!resource_) - retval_ = PP_ERROR_BADARGUMENT; + DCHECK(resource_); callback_ = new TrackedCallback(resource_, callback); } diff --git a/ppapi/thunk/ppb_truetype_font_thunk.cc b/ppapi/thunk/ppb_truetype_font_thunk.cc index 4b47afb..b941c84 100644 --- a/ppapi/thunk/ppb_truetype_font_thunk.cc +++ b/ppapi/thunk/ppb_truetype_font_thunk.cc @@ -24,8 +24,7 @@ int32_t GetFontFamilies(PP_Instance instance, EnterInstanceAPI<PPB_TrueTypeFont_Singleton_API> enter(instance, callback); if (enter.failed()) return PP_ERROR_FAILED; - return enter.SetResult( - enter.functions()->GetFontFamilies(instance, output, enter.callback())); + return enter.functions()->GetFontFamilies(instance, output, enter.callback()); } PP_Resource Create(PP_Instance instance, |