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

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

Issue 26184004: Revert 158972 "Canonical name change: windows-949 => EUC-KR" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « trunk/Source/core/dom/Document.cpp ('k') | trunk/Source/wtf/text/TextCodecICU.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType , m_charset, true); 492 RefPtr<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());
494 result.append(decoder->flush()); 494 result.append(decoder->flush());
495 m_charset = decoder->encoding().name(); 495 m_charset = decoder->encoding().domName();
496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset); 496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset);
497 } 497 }
498 498
499 class DeleteEntryRequest : public VoidCallback { 499 class DeleteEntryRequest : public VoidCallback {
500 public: 500 public:
501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url) 501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url)
502 { 502 {
503 return adoptRef(new DeleteEntryRequest(requestCallback, url)); 503 return adoptRef(new DeleteEntryRequest(requestCallback, url));
504 } 504 }
505 505
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree()-> traverseNext()) { 705 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree()-> traverseNext()) {
706 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin)) 706 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin))
707 return frame->document(); 707 return frame->document();
708 } 708 }
709 709
710 *error = "No frame is available for the request"; 710 *error = "No frame is available for the request";
711 return 0; 711 return 0;
712 } 712 }
713 713
714 } // namespace WebCore 714 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/dom/Document.cpp ('k') | trunk/Source/wtf/text/TextCodecICU.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698