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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2668753006: Special-case LocalDOMWindow for same-origin access in bindings. (Closed)
Patch Set: Rebase and address comments. 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 if (!m_isNavigationHandledByClient) 1369 if (!m_isNavigationHandledByClient)
1370 m_frame->navigationScheduler().cancel(); 1370 m_frame->navigationScheduler().cancel();
1371 1371
1372 m_frame->editor().clearLastEditCommand(); 1372 m_frame->editor().clearLastEditCommand();
1373 1373
1374 // If we are still in the process of initializing an empty document then its 1374 // If we are still in the process of initializing an empty document then its
1375 // frame is not in a consistent state for rendering, so avoid 1375 // frame is not in a consistent state for rendering, so avoid
1376 // setJSStatusBarText since it may cause clients to attempt to render the 1376 // setJSStatusBarText since it may cause clients to attempt to render the
1377 // frame. 1377 // frame.
1378 if (!m_stateMachine.creatingInitialEmptyDocument()) { 1378 if (!m_stateMachine.creatingInitialEmptyDocument()) {
1379 DOMWindow* window = m_frame->domWindow(); 1379 LocalDOMWindow* window = m_frame->domWindow();
1380 window->setStatus(String()); 1380 window->setStatus(String());
1381 window->setDefaultStatus(String()); 1381 window->setDefaultStatus(String());
1382 } 1382 }
1383 } 1383 }
1384 1384
1385 bool FrameLoader::isLoadingMainFrame() const { 1385 bool FrameLoader::isLoadingMainFrame() const {
1386 return m_frame->isMainFrame(); 1386 return m_frame->isMainFrame();
1387 } 1387 }
1388 1388
1389 void FrameLoader::restoreScrollPositionAndViewState() { 1389 void FrameLoader::restoreScrollPositionAndViewState() {
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1957 m_documentLoader ? m_documentLoader->url() : String()); 1957 m_documentLoader ? m_documentLoader->url() : String());
1958 return tracedValue; 1958 return tracedValue;
1959 } 1959 }
1960 1960
1961 inline void FrameLoader::takeObjectSnapshot() const { 1961 inline void FrameLoader::takeObjectSnapshot() const {
1962 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1962 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1963 toTracedValue()); 1963 toTracedValue());
1964 } 1964 }
1965 1965
1966 } // namespace blink 1966 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/RemoteDOMWindow.cpp ('k') | third_party/WebKit/Source/core/timing/Performance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698