Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 8401019: [webkit glue] Make signedPublicKeyAndChallengeString() return an empty instead of null string. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/webkitplatformsupport_impl.h" 5 #include "webkit/glue/webkitplatformsupport_impl.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <malloc.h> 8 #include <malloc.h>
9 #endif 9 #endif
10 10
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 588
589 long long WebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin( 589 long long WebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin(
590 const WebKit::WebString& origin_identifier) { 590 const WebKit::WebString& origin_identifier) {
591 return 0; 591 return 0;
592 } 592 }
593 593
594 WebKit::WebString WebKitPlatformSupportImpl::signedPublicKeyAndChallengeString( 594 WebKit::WebString WebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
595 unsigned key_size_index, 595 unsigned key_size_index,
596 const WebKit::WebString& challenge, 596 const WebKit::WebString& challenge,
597 const WebKit::WebURL& url) { 597 const WebKit::WebURL& url) {
598 NOTREACHED(); 598 return WebKit::WebString("");
599 return WebKit::WebString();
600 } 599 }
601 600
602 #if defined(OS_LINUX) 601 #if defined(OS_LINUX)
603 static size_t memoryUsageMBLinux() { 602 static size_t memoryUsageMBLinux() {
604 struct mallinfo minfo = mallinfo(); 603 struct mallinfo minfo = mallinfo();
605 uint64_t mem_usage = 604 uint64_t mem_usage =
606 #if defined(USE_TCMALLOC) 605 #if defined(USE_TCMALLOC)
607 minfo.uordblks 606 minfo.uordblks
608 #else 607 #else
609 (minfo.hblkhd + minfo.arena) 608 (minfo.hblkhd + minfo.arena)
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 } 678 }
680 679
681 // static 680 // static
682 void WebKitPlatformSupportImpl::DestroyCurrentThread(void* thread) { 681 void WebKitPlatformSupportImpl::DestroyCurrentThread(void* thread) {
683 WebThreadImplForMessageLoop* impl = 682 WebThreadImplForMessageLoop* impl =
684 static_cast<WebThreadImplForMessageLoop*>(thread); 683 static_cast<WebThreadImplForMessageLoop*>(thread);
685 delete impl; 684 delete impl;
686 } 685 }
687 686
688 } // namespace webkit_glue 687 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698