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

Side by Side Diff: Source/core/inspector/InspectorFileSystemAgent.cpp

Issue 124943003: Remove 'String::append' from some of the blink source. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 { 483 {
484 RefPtr<ArrayBuffer> buffer = m_reader->arrayBufferResult(); 484 RefPtr<ArrayBuffer> buffer = m_reader->arrayBufferResult();
485 485
486 if (!m_readAsText) { 486 if (!m_readAsText) {
487 String result = base64Encode(static_cast<char*>(buffer->data()), buffer- >byteLength()); 487 String result = base64Encode(static_cast<char*>(buffer->data()), buffer- >byteLength());
488 reportResult(static_cast<FileError::ErrorCode>(0), &result, 0); 488 reportResult(static_cast<FileError::ErrorCode>(0), &result, 0);
489 return; 489 return;
490 } 490 }
491 491
492 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType , m_charset, true); 492 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType , m_charset, true);
493 String result = decoder->decode(static_cast<char*>(buffer->data()), buffer-> byteLength()); 493 String result = decoder->decode(static_cast<char*>(buffer->data()), buffer-> byteLength()) + decoder->flush();
494 result.append(decoder->flush());
495 m_charset = decoder->encoding().name(); 494 m_charset = decoder->encoding().name();
496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset); 495 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset);
497 } 496 }
498 497
499 class DeleteEntryRequest : public RefCounted<DeleteEntryRequest> { 498 class DeleteEntryRequest : public RefCounted<DeleteEntryRequest> {
500 public: 499 public:
501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url) 500 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url)
502 { 501 {
503 return adoptRef(new DeleteEntryRequest(requestCallback, url)); 502 return adoptRef(new DeleteEntryRequest(requestCallback, url));
504 } 503 }
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().t raverseNext()) { 719 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().t raverseNext()) {
721 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin)) 720 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin))
722 return frame->document(); 721 return frame->document();
723 } 722 }
724 723
725 *error = "No frame is available for the request"; 724 *error = "No frame is available for the request";
726 return 0; 725 return 0;
727 } 726 }
728 727
729 } // namespace WebCore 728 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698