| OLD | NEW | 
|    1 // Copyright 2014 The Chromium Authors. All rights reserved. |    1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #include "core/paint/FramePainter.h" |    5 #include "core/paint/FramePainter.h" | 
|    6  |    6  | 
|    7 #include "core/editing/markers/DocumentMarkerController.h" |    7 #include "core/editing/markers/DocumentMarkerController.h" | 
|    8 #include "core/frame/FrameView.h" |    8 #include "core/frame/FrameView.h" | 
|    9 #include "core/inspector/InspectorInstrumentation.h" |    9 #include "core/inspector/InspectorInstrumentation.h" | 
|   10 #include "core/inspector/InspectorTraceEvents.h" |   10 #include "core/inspector/InspectorTraceEvents.h" | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   58         PaintChunkProperties properties( |   58         PaintChunkProperties properties( | 
|   59             context.getPaintController().currentPaintChunkProperties()); |   59             context.getPaintController().currentPaintChunkProperties()); | 
|   60         properties.propertyTreeState = *contentsState; |   60         properties.propertyTreeState = *contentsState; | 
|   61         scopedPaintChunkProperties.emplace(context.getPaintController(), |   61         scopedPaintChunkProperties.emplace(context.getPaintController(), | 
|   62                                            *frameView().layoutView(), |   62                                            *frameView().layoutView(), | 
|   63                                            properties); |   63                                            properties); | 
|   64       } |   64       } | 
|   65     } |   65     } | 
|   66  |   66  | 
|   67     TransformRecorder transformRecorder( |   67     TransformRecorder transformRecorder( | 
|   68         context, *frameView().layoutView(), |   68         context, | 
|   69         AffineTransform::translation(frameView().x() - frameView().scrollX(), |   69         AffineTransform::translation(frameView().x() - frameView().scrollX(), | 
|   70                                      frameView().y() - frameView().scrollY())); |   70                                      frameView().y() - frameView().scrollY()), | 
 |   71         frameView().layoutView()->visualRect(), | 
 |   72         frameView().layoutView()->debugName(), | 
 |   73         frameView() | 
 |   74             .layoutView() | 
 |   75             ->paintedOutputOfObjectHasNoEffectRegardlessOfSize()); | 
|   71  |   76  | 
|   72     if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { |   77     if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { | 
|   73       paintContents(context, globalPaintFlags, documentDirtyRect); |   78       paintContents(context, globalPaintFlags, documentDirtyRect); | 
|   74     } else { |   79     } else { | 
|   75       ClipRecorder clipRecorder(context, *frameView().layoutView(), |   80       ClipRecorder clipRecorder(context, *frameView().layoutView(), | 
|   76                                 DisplayItem::kClipFrameToVisibleContentRect, |   81                                 DisplayItem::kClipFrameToVisibleContentRect, | 
|   77                                 frameView().visibleContentRect()); |   82                                 frameView().visibleContentRect()); | 
|   78  |   83  | 
|   79       paintContents(context, globalPaintFlags, documentDirtyRect); |   84       paintContents(context, globalPaintFlags, documentDirtyRect); | 
|   80     } |   85     } | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
|  103         properties.propertyTreeState.setClip( |  108         properties.propertyTreeState.setClip( | 
|  104             m_frameView->contentClip()->parent()); |  109             m_frameView->contentClip()->parent()); | 
|  105         properties.propertyTreeState.setEffect(contentsState->effect()); |  110         properties.propertyTreeState.setEffect(contentsState->effect()); | 
|  106         scopedPaintChunkProperties.emplace(context.getPaintController(), |  111         scopedPaintChunkProperties.emplace(context.getPaintController(), | 
|  107                                            *frameView().layoutView(), |  112                                            *frameView().layoutView(), | 
|  108                                            properties); |  113                                            properties); | 
|  109       } |  114       } | 
|  110     } |  115     } | 
|  111  |  116  | 
|  112     TransformRecorder transformRecorder( |  117     TransformRecorder transformRecorder( | 
|  113         context, *frameView().layoutView(), |  118         context, AffineTransform::translation(frameView().x(), frameView().y()), | 
|  114         AffineTransform::translation(frameView().x(), frameView().y())); |  119         frameView().layoutView()->visualRect(), | 
 |  120         frameView().layoutView()->debugName(), | 
 |  121         frameView() | 
 |  122             .layoutView() | 
 |  123             ->paintedOutputOfObjectHasNoEffectRegardlessOfSize()); | 
|  115  |  124  | 
|  116     ClipRecorder recorder( |  125     ClipRecorder recorder( | 
|  117         context, *frameView().layoutView(), DisplayItem::kClipFrameScrollbars, |  126         context, *frameView().layoutView(), DisplayItem::kClipFrameScrollbars, | 
|  118         IntRect(IntPoint(), visibleAreaWithScrollbars.size())); |  127         IntRect(IntPoint(), visibleAreaWithScrollbars.size())); | 
|  119  |  128  | 
|  120     paintScrollbars(context, scrollViewDirtyRect); |  129     paintScrollbars(context, scrollViewDirtyRect); | 
|  121   } |  130   } | 
|  122 } |  131 } | 
|  123  |  132  | 
|  124 void FramePainter::paintContents(GraphicsContext& context, |  133 void FramePainter::paintContents(GraphicsContext& context, | 
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  246  |  255  | 
|  247   bar.paint(context, CullRect(rect)); |  256   bar.paint(context, CullRect(rect)); | 
|  248 } |  257 } | 
|  249  |  258  | 
|  250 const FrameView& FramePainter::frameView() { |  259 const FrameView& FramePainter::frameView() { | 
|  251   DCHECK(m_frameView); |  260   DCHECK(m_frameView); | 
|  252   return *m_frameView; |  261   return *m_frameView; | 
|  253 } |  262 } | 
|  254  |  263  | 
|  255 }  // namespace blink |  264 }  // namespace blink | 
| OLD | NEW |