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

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

Issue 951453003: Rename rendering/RenderScrollbar* to layout/LayoutScrollbar* (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/layout/Layer.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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "core/frame/Settings.h" 44 #include "core/frame/Settings.h"
45 #include "core/html/HTMLFrameElement.h" 45 #include "core/html/HTMLFrameElement.h"
46 #include "core/html/HTMLPlugInElement.h" 46 #include "core/html/HTMLPlugInElement.h"
47 #include "core/html/parser/TextResourceDecoder.h" 47 #include "core/html/parser/TextResourceDecoder.h"
48 #include "core/inspector/InspectorInstrumentation.h" 48 #include "core/inspector/InspectorInstrumentation.h"
49 #include "core/inspector/InspectorTraceEvents.h" 49 #include "core/inspector/InspectorTraceEvents.h"
50 #include "core/layout/Layer.h" 50 #include "core/layout/Layer.h"
51 #include "core/layout/LayoutCounter.h" 51 #include "core/layout/LayoutCounter.h"
52 #include "core/layout/LayoutEmbeddedObject.h" 52 #include "core/layout/LayoutEmbeddedObject.h"
53 #include "core/layout/LayoutPart.h" 53 #include "core/layout/LayoutPart.h"
54 #include "core/layout/LayoutScrollbar.h"
55 #include "core/layout/LayoutScrollbarPart.h"
54 #include "core/layout/LayoutTheme.h" 56 #include "core/layout/LayoutTheme.h"
55 #include "core/layout/TextAutosizer.h" 57 #include "core/layout/TextAutosizer.h"
56 #include "core/layout/compositing/CompositedLayerMapping.h" 58 #include "core/layout/compositing/CompositedLayerMapping.h"
57 #include "core/layout/compositing/CompositedSelectionBound.h" 59 #include "core/layout/compositing/CompositedSelectionBound.h"
58 #include "core/layout/compositing/LayerCompositor.h" 60 #include "core/layout/compositing/LayerCompositor.h"
59 #include "core/layout/style/LayoutStyle.h" 61 #include "core/layout/style/LayoutStyle.h"
60 #include "core/layout/svg/LayoutSVGRoot.h" 62 #include "core/layout/svg/LayoutSVGRoot.h"
61 #include "core/loader/FrameLoader.h" 63 #include "core/loader/FrameLoader.h"
62 #include "core/loader/FrameLoaderClient.h" 64 #include "core/loader/FrameLoaderClient.h"
63 #include "core/page/Chrome.h" 65 #include "core/page/Chrome.h"
64 #include "core/page/ChromeClient.h" 66 #include "core/page/ChromeClient.h"
65 #include "core/page/EventHandler.h" 67 #include "core/page/EventHandler.h"
66 #include "core/page/FocusController.h" 68 #include "core/page/FocusController.h"
67 #include "core/page/FrameTree.h" 69 #include "core/page/FrameTree.h"
68 #include "core/page/Page.h" 70 #include "core/page/Page.h"
69 #include "core/page/scrolling/ScrollingCoordinator.h" 71 #include "core/page/scrolling/ScrollingCoordinator.h"
70 #include "core/paint/FramePainter.h" 72 #include "core/paint/FramePainter.h"
71 #include "core/rendering/RenderListBox.h" 73 #include "core/rendering/RenderListBox.h"
72 #include "core/rendering/RenderScrollbar.h"
73 #include "core/rendering/RenderScrollbarPart.h"
74 #include "core/rendering/RenderView.h" 74 #include "core/rendering/RenderView.h"
75 #include "core/svg/SVGDocumentExtensions.h" 75 #include "core/svg/SVGDocumentExtensions.h"
76 #include "core/svg/SVGSVGElement.h" 76 #include "core/svg/SVGSVGElement.h"
77 #include "platform/HostWindow.h" 77 #include "platform/HostWindow.h"
78 #include "platform/RuntimeEnabledFeatures.h" 78 #include "platform/RuntimeEnabledFeatures.h"
79 #include "platform/ScriptForbiddenScope.h" 79 #include "platform/ScriptForbiddenScope.h"
80 #include "platform/TraceEvent.h" 80 #include "platform/TraceEvent.h"
81 #include "platform/fonts/FontCache.h" 81 #include "platform/fonts/FontCache.h"
82 #include "platform/geometry/FloatRect.h" 82 #include "platform/geometry/FloatRect.h"
83 #include "platform/graphics/GraphicsContext.h" 83 #include "platform/graphics/GraphicsContext.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 } 515 }
516 516
517 return false; 517 return false;
518 } 518 }
519 519
520 PassRefPtrWillBeRawPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientatio n orientation) 520 PassRefPtrWillBeRawPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientatio n orientation)
521 { 521 {
522 Element* customScrollbarElement = nullptr; 522 Element* customScrollbarElement = nullptr;
523 LocalFrame* customScrollbarFrame = nullptr; 523 LocalFrame* customScrollbarFrame = nullptr;
524 if (shouldUseCustomScrollbars(customScrollbarElement, customScrollbarFrame)) 524 if (shouldUseCustomScrollbars(customScrollbarElement, customScrollbarFrame))
525 return RenderScrollbar::createCustomScrollbar(this, orientation, customS crollbarElement, customScrollbarFrame); 525 return LayoutScrollbar::createCustomScrollbar(this, orientation, customS crollbarElement, customScrollbarFrame);
526 526
527 // Nobody set a custom style, so we just use a native scrollbar. 527 // Nobody set a custom style, so we just use a native scrollbar.
528 return Scrollbar::create(this, orientation, RegularScrollbar); 528 return Scrollbar::create(this, orientation, RegularScrollbar);
529 } 529 }
530 530
531 void FrameView::setContentsSize(const IntSize& size) 531 void FrameView::setContentsSize(const IntSize& size)
532 { 532 {
533 if (size == contentsSize()) 533 if (size == contentsSize())
534 return; 534 return;
535 535
(...skipping 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 2474
2475 if (!cornerStyle) { 2475 if (!cornerStyle) {
2476 // If we have an owning ipage/LocalFrame element, then it can set th e custom scrollbar also. 2476 // If we have an owning ipage/LocalFrame element, then it can set th e custom scrollbar also.
2477 if (LayoutPart* renderer = m_frame->ownerRenderer()) 2477 if (LayoutPart* renderer = m_frame->ownerRenderer())
2478 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleReques t(SCROLLBAR_CORNER), renderer->style()); 2478 cornerStyle = renderer->getUncachedPseudoStyle(PseudoStyleReques t(SCROLLBAR_CORNER), renderer->style());
2479 } 2479 }
2480 } 2480 }
2481 2481
2482 if (cornerStyle) { 2482 if (cornerStyle) {
2483 if (!m_scrollCorner) 2483 if (!m_scrollCorner)
2484 m_scrollCorner = RenderScrollbarPart::createAnonymous(doc); 2484 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc);
2485 m_scrollCorner->setStyle(cornerStyle.release()); 2485 m_scrollCorner->setStyle(cornerStyle.release());
2486 invalidateScrollCorner(cornerRect); 2486 invalidateScrollCorner(cornerRect);
2487 } else if (m_scrollCorner) { 2487 } else if (m_scrollCorner) {
2488 m_scrollCorner->destroy(); 2488 m_scrollCorner->destroy();
2489 m_scrollCorner = nullptr; 2489 m_scrollCorner = nullptr;
2490 } 2490 }
2491 } 2491 }
2492 2492
2493 Color FrameView::documentBackgroundColor() const 2493 Color FrameView::documentBackgroundColor() const
2494 { 2494 {
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after
4056 { 4056 {
4057 Settings* settings = frame().settings(); 4057 Settings* settings = frame().settings();
4058 if (!settings || !settings->rootLayerScrolls()) 4058 if (!settings || !settings->rootLayerScrolls())
4059 return this; 4059 return this;
4060 4060
4061 RenderView* renderView = this->renderView(); 4061 RenderView* renderView = this->renderView();
4062 return renderView ? renderView->scrollableArea() : nullptr; 4062 return renderView ? renderView->scrollableArea() : nullptr;
4063 } 4063 }
4064 4064
4065 } // namespace blink 4065 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/layout/Layer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698