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

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

Issue 342513003: Don't allow direct const char* trace value (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Subset Created 6 years, 6 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/bindings/v8/V8ScriptRunner.cpp ('k') | Source/platform/PlatformInstrumentation.h » ('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 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 // let the compositor pick which to actually draw. 1046 // let the compositor pick which to actually draw.
1047 // See http://crbug.com/306706 1047 // See http://crbug.com/306706
1048 void FrameView::invalidateTree(RenderObject* root) 1048 void FrameView::invalidateTree(RenderObject* root)
1049 { 1049 {
1050 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); 1050 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled());
1051 ASSERT(!root->needsLayout()); 1051 ASSERT(!root->needsLayout());
1052 // We should only invalidate paints for the outer most layout. This works as 1052 // We should only invalidate paints for the outer most layout. This works as
1053 // we continue to track paint invalidation rects until this function is call ed. 1053 // we continue to track paint invalidation rects until this function is call ed.
1054 ASSERT(!m_nestedLayoutCount); 1054 ASSERT(!m_nestedLayoutCount);
1055 1055
1056 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", TRACE_STR_COPY(ro ot->debugName().ascii().data())); 1056 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", root->debugName() .ascii());
1057 1057
1058 // FIXME: really, we're in the paint invalidation phase here, and the compos iting queries are legal. 1058 // FIXME: really, we're in the paint invalidation phase here, and the compos iting queries are legal.
1059 // Until those states are fully fledged, I'll just disable the ASSERTS. 1059 // Until those states are fully fledged, I'll just disable the ASSERTS.
1060 DisableCompositingQueryAsserts compositingQueryAssertsDisabler; 1060 DisableCompositingQueryAsserts compositingQueryAssertsDisabler;
1061 1061
1062 RootLayoutStateScope rootLayoutStateScope(*root); 1062 RootLayoutStateScope rootLayoutStateScope(*root);
1063 1063
1064 root->invalidateTreeAfterLayout(*root->containerForPaintInvalidation()); 1064 root->invalidateTreeAfterLayout(*root->containerForPaintInvalidation());
1065 1065
1066 // Invalidate the paint of the frameviews scrollbars if needed 1066 // Invalidate the paint of the frameviews scrollbars if needed
(...skipping 2228 matching lines...) Expand 10 before | Expand all | Expand 10 after
3295 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3295 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3296 { 3296 {
3297 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3297 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3298 if (AXObjectCache* cache = axObjectCache()) { 3298 if (AXObjectCache* cache = axObjectCache()) {
3299 cache->remove(scrollbar); 3299 cache->remove(scrollbar);
3300 cache->handleScrollbarUpdate(this); 3300 cache->handleScrollbarUpdate(this);
3301 } 3301 }
3302 } 3302 }
3303 3303
3304 } // namespace WebCore 3304 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8ScriptRunner.cpp ('k') | Source/platform/PlatformInstrumentation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698