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

Side by Side Diff: Source/core/loader/TextResourceDecoderBuilder.cpp

Issue 33353003: Have Frame::tree() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master 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 | « Source/core/loader/ProgressTracker.cpp ('k') | Source/core/page/Chrome.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (Settings* settings = frame->settings()) 62 if (Settings* settings = frame->settings())
63 return TextResourceDecoder::create(m_mimeType, settings->defaultText EncodingName(), settings->usesEncodingDetector()); 63 return TextResourceDecoder::create(m_mimeType, settings->defaultText EncodingName(), settings->usesEncodingDetector());
64 } 64 }
65 65
66 return TextResourceDecoder::create(m_mimeType, String()); 66 return TextResourceDecoder::create(m_mimeType, String());
67 } 67 }
68 68
69 inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod er, Document* document) 69 inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod er, Document* document)
70 { 70 {
71 Frame* frame = document->frame(); 71 Frame* frame = document->frame();
72 Frame* parentFrame = frame ? frame->tree()->parent() : 0; 72 Frame* parentFrame = frame ? frame->tree().parent() : 0;
73 73
74 if (!m_encoding.isEmpty()) 74 if (!m_encoding.isEmpty())
75 decoder->setEncoding(m_encoding, m_encodingWasChosenByUser ? TextResourc eDecoder::UserChosenEncoding : TextResourceDecoder::EncodingFromHTTPHeader); 75 decoder->setEncoding(m_encoding, m_encodingWasChosenByUser ? TextResourc eDecoder::UserChosenEncoding : TextResourceDecoder::EncodingFromHTTPHeader);
76 76
77 // Set the hint encoding to the parent frame encoding only if 77 // Set the hint encoding to the parent frame encoding only if
78 // the parent and the current frames share the security origin. 78 // the parent and the current frames share the security origin.
79 // We impose this condition because somebody can make a child frameg63 79 // We impose this condition because somebody can make a child frameg63
80 // containing a carefully crafted html/javascript in one encoding 80 // containing a carefully crafted html/javascript in one encoding
81 // that can be mistaken for hintEncoding (or related encoding) by 81 // that can be mistaken for hintEncoding (or related encoding) by
82 // an auto detector. When interpreted in the latter, it could be 82 // an auto detector. When interpreted in the latter, it could be
(...skipping 15 matching lines...) Expand all
98 return decoder.release(); 98 return decoder.release();
99 } 99 }
100 100
101 void TextResourceDecoderBuilder::clear() 101 void TextResourceDecoderBuilder::clear()
102 { 102 {
103 if (!m_encodingWasChosenByUser) 103 if (!m_encodingWasChosenByUser)
104 m_encoding = String(); 104 m_encoding = String();
105 } 105 }
106 106
107 } 107 }
OLDNEW
« no previous file with comments | « Source/core/loader/ProgressTracker.cpp ('k') | Source/core/page/Chrome.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698