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

Side by Side Diff: third_party/WebKit/Source/core/frame/Location.cpp

Issue 2704303002: Simplify conditionals for blink::Location::isActive(). (Closed)
Patch Set: Delete redundant check Created 3 years, 10 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 | « third_party/WebKit/Source/core/frame/Location.h ('k') | no next file » | 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) 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2010 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 *currentWindow->document(), completedURL, 279 *currentWindow->document(), completedURL,
280 setLocationPolicy == SetLocationPolicy::ReplaceThisFrame, 280 setLocationPolicy == SetLocationPolicy::ReplaceThisFrame,
281 UserGestureStatus::None); 281 UserGestureStatus::None);
282 } 282 }
283 283
284 Document* Location::document() const { 284 Document* Location::document() const {
285 return toLocalDOMWindow(m_domWindow)->document(); 285 return toLocalDOMWindow(m_domWindow)->document();
286 } 286 }
287 287
288 bool Location::isAttached() const { 288 bool Location::isAttached() const {
289 return m_domWindow->frame() && m_domWindow->frame()->host(); 289 return m_domWindow->frame();
290 } 290 }
291 291
292 } // namespace blink 292 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Location.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698