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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/iterators/TextIterator.cpp ('k') | Source/core/frame/SmartClip.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "core/layout/LayoutListBox.h" 53 #include "core/layout/LayoutListBox.h"
54 #include "core/layout/LayoutPart.h" 54 #include "core/layout/LayoutPart.h"
55 #include "core/layout/LayoutScrollbar.h" 55 #include "core/layout/LayoutScrollbar.h"
56 #include "core/layout/LayoutScrollbarPart.h" 56 #include "core/layout/LayoutScrollbarPart.h"
57 #include "core/layout/LayoutTheme.h" 57 #include "core/layout/LayoutTheme.h"
58 #include "core/layout/LayoutView.h" 58 #include "core/layout/LayoutView.h"
59 #include "core/layout/TextAutosizer.h" 59 #include "core/layout/TextAutosizer.h"
60 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" 60 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
61 #include "core/layout/compositing/CompositedSelectionBound.h" 61 #include "core/layout/compositing/CompositedSelectionBound.h"
62 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 62 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
63 #include "core/layout/style/LayoutStyle.h" 63 #include "core/layout/style/ComputedStyle.h"
64 #include "core/layout/svg/LayoutSVGRoot.h" 64 #include "core/layout/svg/LayoutSVGRoot.h"
65 #include "core/loader/FrameLoader.h" 65 #include "core/loader/FrameLoader.h"
66 #include "core/loader/FrameLoaderClient.h" 66 #include "core/loader/FrameLoaderClient.h"
67 #include "core/page/Chrome.h" 67 #include "core/page/Chrome.h"
68 #include "core/page/ChromeClient.h" 68 #include "core/page/ChromeClient.h"
69 #include "core/page/EventHandler.h" 69 #include "core/page/EventHandler.h"
70 #include "core/page/FocusController.h" 70 #include "core/page/FocusController.h"
71 #include "core/page/FrameTree.h" 71 #include "core/page/FrameTree.h"
72 #include "core/page/Page.h" 72 #include "core/page/Page.h"
73 #include "core/page/scrolling/ScrollingCoordinator.h" 73 #include "core/page/scrolling/ScrollingCoordinator.h"
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 return viewportRect; 1292 return viewportRect;
1293 } 1293 }
1294 1294
1295 void FrameView::viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool heightChanged) 1295 void FrameView::viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool heightChanged)
1296 { 1296 {
1297 if (!hasViewportConstrainedObjects()) 1297 if (!hasViewportConstrainedObjects())
1298 return; 1298 return;
1299 1299
1300 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { 1300 for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
1301 LayoutObject* renderer = viewportConstrainedObject; 1301 LayoutObject* renderer = viewportConstrainedObject;
1302 const LayoutStyle& style = renderer->styleRef(); 1302 const ComputedStyle& style = renderer->styleRef();
1303 if (widthChanged) { 1303 if (widthChanged) {
1304 if (style.width().isFixed() && (style.left().isAuto() || style.right ().isAuto())) 1304 if (style.width().isFixed() && (style.left().isAuto() || style.right ().isAuto()))
1305 renderer->setNeedsPositionedMovementLayout(); 1305 renderer->setNeedsPositionedMovementLayout();
1306 else 1306 else
1307 renderer->setNeedsLayoutAndFullPaintInvalidation(); 1307 renderer->setNeedsLayoutAndFullPaintInvalidation();
1308 } 1308 }
1309 if (heightChanged) { 1309 if (heightChanged) {
1310 if (style.height().isFixed() && (style.top().isAuto() || style.botto m().isAuto())) 1310 if (style.height().isFixed() && (style.top().isAuto() || style.botto m().isAuto()))
1311 renderer->setNeedsPositionedMovementLayout(); 1311 renderer->setNeedsPositionedMovementLayout();
1312 else 1312 else
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after
2412 document->layoutBox()->collectAnnotatedRegions(newRegions); 2412 document->layoutBox()->collectAnnotatedRegions(newRegions);
2413 if (newRegions == document->annotatedRegions()) 2413 if (newRegions == document->annotatedRegions())
2414 return; 2414 return;
2415 document->setAnnotatedRegions(newRegions); 2415 document->setAnnotatedRegions(newRegions);
2416 if (Page* page = m_frame->page()) 2416 if (Page* page = m_frame->page())
2417 page->chrome().client().annotatedRegionsChanged(); 2417 page->chrome().client().annotatedRegionsChanged();
2418 } 2418 }
2419 2419
2420 void FrameView::updateScrollCorner() 2420 void FrameView::updateScrollCorner()
2421 { 2421 {
2422 RefPtr<LayoutStyle> cornerStyle; 2422 RefPtr<ComputedStyle> cornerStyle;
2423 IntRect cornerRect = scrollCornerRect(); 2423 IntRect cornerRect = scrollCornerRect();
2424 Document* doc = m_frame->document(); 2424 Document* doc = m_frame->document();
2425 2425
2426 if (doc && !cornerRect.isEmpty()) { 2426 if (doc && !cornerRect.isEmpty()) {
2427 // Try the <body> element first as a scroll corner source. 2427 // Try the <body> element first as a scroll corner source.
2428 if (Element* body = doc->body()) { 2428 if (Element* body = doc->body()) {
2429 if (LayoutObject* renderer = body->layoutObject()) 2429 if (LayoutObject* renderer = body->layoutObject())
2430 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleReques t(SCROLLBAR_CORNER), renderer->style()); 2430 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleReques t(SCROLLBAR_CORNER), renderer->style());
2431 } 2431 }
2432 2432
(...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after
4069 { 4069 {
4070 Settings* settings = frame().settings(); 4070 Settings* settings = frame().settings();
4071 if (!settings || !settings->rootLayerScrolls()) 4071 if (!settings || !settings->rootLayerScrolls())
4072 return this; 4072 return this;
4073 4073
4074 LayoutView* layoutView = this->layoutView(); 4074 LayoutView* layoutView = this->layoutView();
4075 return layoutView ? layoutView->scrollableArea() : nullptr; 4075 return layoutView ? layoutView->scrollableArea() : nullptr;
4076 } 4076 }
4077 4077
4078 } // namespace blink 4078 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/iterators/TextIterator.cpp ('k') | Source/core/frame/SmartClip.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698