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

Side by Side Diff: Source/platform/weborigin/KURL.cpp

Issue 234853002: Fix KURL::copy such that it also copies m_innerURL when available (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | Source/platform/weborigin/KURLTest.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) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. 3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
4 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. 4 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 return *this; 252 return *this;
253 } 253 }
254 254
255 KURL KURL::copy() const 255 KURL KURL::copy() const
256 { 256 {
257 KURL result; 257 KURL result;
258 result.m_isValid = m_isValid; 258 result.m_isValid = m_isValid;
259 result.m_protocolIsInHTTPFamily = m_protocolIsInHTTPFamily; 259 result.m_protocolIsInHTTPFamily = m_protocolIsInHTTPFamily;
260 result.m_parsed = m_parsed; 260 result.m_parsed = m_parsed;
261 result.m_string = m_string.isolatedCopy(); 261 result.m_string = m_string.isolatedCopy();
262 if (result.m_innerURL) 262 if (m_innerURL)
abarth-chromium 2014/04/11 18:40:02 O_o
ericu 2014/04/14 17:31:55 Ouch. Thanks for the fix.
263 result.m_innerURL = adoptPtr(new KURL(m_innerURL->copy())); 263 result.m_innerURL = adoptPtr(new KURL(m_innerURL->copy()));
264 return result; 264 return result;
265 } 265 }
266 266
267 bool KURL::isNull() const 267 bool KURL::isNull() const
268 { 268 {
269 return m_string.isNull(); 269 return m_string.isNull();
270 } 270 }
271 271
272 bool KURL::isEmpty() const 272 bool KURL::isEmpty() const
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 m_string = AtomicString::fromUTF8(output.data(), output.length()); 879 m_string = AtomicString::fromUTF8(output.data(), output.length());
880 } 880 }
881 881
882 bool KURL::isSafeToSendToAnotherThread() const 882 bool KURL::isSafeToSendToAnotherThread() const
883 { 883 {
884 return m_string.isSafeToSendToAnotherThread() 884 return m_string.isSafeToSendToAnotherThread()
885 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread()); 885 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread());
886 } 886 }
887 887
888 } // namespace WebCore 888 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/platform/weborigin/KURLTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698