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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 367863002: Add ScriptForbiddenScopes to style and layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blanket allow inspector scripts. Created 6 years, 5 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/dom/Document.cpp ('k') | Source/core/inspector/InspectorOverlay.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 } 827 }
828 } 828 }
829 829
830 void FrameView::layout(bool allowSubtree) 830 void FrameView::layout(bool allowSubtree)
831 { 831 {
832 // We should never layout a Document which is not in a LocalFrame. 832 // We should never layout a Document which is not in a LocalFrame.
833 ASSERT(m_frame); 833 ASSERT(m_frame);
834 ASSERT(m_frame->view() == this); 834 ASSERT(m_frame->view() == this);
835 ASSERT(m_frame->page()); 835 ASSERT(m_frame->page());
836 836
837 ScriptForbiddenScope forbidScript;
838
837 if (isInPerformLayout() || !m_frame->document()->isActive()) 839 if (isInPerformLayout() || !m_frame->document()->isActive())
838 return; 840 return;
839 841
840 TRACE_EVENT0("blink", "FrameView::layout"); 842 TRACE_EVENT0("blink", "FrameView::layout");
841 TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "Layout"); 843 TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "Layout");
842 844
843 // Protect the view from being deleted during layout (in recalcStyle) 845 // Protect the view from being deleted during layout (in recalcStyle)
844 RefPtr<FrameView> protector(this); 846 RefPtr<FrameView> protector(this);
845 847
846 // Every scroll that happens during layout is programmatic. 848 // Every scroll that happens during layout is programmatic.
(...skipping 2425 matching lines...) Expand 10 before | Expand all | Expand 10 after
3272 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3274 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3273 { 3275 {
3274 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3276 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3275 if (AXObjectCache* cache = axObjectCache()) { 3277 if (AXObjectCache* cache = axObjectCache()) {
3276 cache->remove(scrollbar); 3278 cache->remove(scrollbar);
3277 cache->handleScrollbarUpdate(this); 3279 cache->handleScrollbarUpdate(this);
3278 } 3280 }
3279 } 3281 }
3280 3282
3281 } // namespace WebCore 3283 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/inspector/InspectorOverlay.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698