equal
deleted
inserted
replaced
160 if (m_frame) |
160 if (m_frame) |
161 encoding = m_frame->loader()->documentLoader()->overrideEncoding(); |
161 encoding = m_frame->loader()->documentLoader()->overrideEncoding(); |
162 bool userChosen = !encoding.isNull() && !encoding.isEmpty(); |
162 bool userChosen = !encoding.isNull() && !encoding.isEmpty(); |
163 if (encoding.isNull()||encoding.isEmpty()) |
163 if (encoding.isNull()||encoding.isEmpty()) |
164 encoding = textEncodingName; |
164 encoding = textEncodingName; |
165 m_frame->loader()->setEncoding(encoding, userChosen); |
165 if (m_frame && m_frame->loader()) |
|
166 m_frame->loader()->setEncoding(encoding, userChosen); |
166 addData(data, length); |
167 addData(data, length); |
167 } |
168 } |
168 |
169 |
169 |
170 |
170 void WebCoreFrameBridge::clearFrame() |
171 void WebCoreFrameBridge::clearFrame() |