| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "core/rendering/RenderRemote.h" | 7 #include "core/rendering/RenderIFrame.h" |
| 8 | 8 |
| 9 #include "core/editing/FrameSelection.h" | 9 #include "core/editing/FrameSelection.h" |
| 10 #include "core/html/HTMLIFrameElement.h" | 10 #include "core/html/HTMLIFrameElement.h" |
| 11 #include "core/loader/FrameLoaderClient.h" | 11 #include "core/loader/FrameLoaderClient.h" |
| 12 #include "core/rendering/PaintInfo.h" | 12 #include "core/rendering/PaintInfo.h" |
| 13 #include "platform/geometry/LayoutPoint.h" | 13 #include "platform/geometry/LayoutPoint.h" |
| 14 | 14 |
| 15 namespace blink { | 15 namespace blink { |
| 16 | 16 |
| 17 RenderRemote::RenderRemote(HTMLIFrameElement* iframe) | 17 RenderIFrame::RenderIFrame(HTMLIFrameElement* iframe) |
| 18 : RenderReplaced(iframe) | 18 : RenderReplaced(iframe) |
| 19 { | 19 { |
| 20 } | 20 } |
| 21 | 21 |
| 22 RenderRemote::~RenderRemote() | 22 RenderIFrame::~RenderIFrame() |
| 23 { | 23 { |
| 24 } | 24 } |
| 25 | 25 |
| 26 void RenderRemote::layout() | 26 void RenderIFrame::layout() |
| 27 { | 27 { |
| 28 RenderReplaced::layout(); | 28 RenderReplaced::layout(); |
| 29 | 29 |
| 30 // TODO(mpcomplete): This will generate extra SetBounds calls in some cases | 30 // TODO(mpcomplete): This will generate extra SetBounds calls in some cases |
| 31 // because some layout modules involve multiple passes (e.g., flexbox). | 31 // because some layout modules involve multiple passes (e.g., flexbox). |
| 32 // Instead, we'll need to defer the work to later in the pipeline. | 32 // Instead, we'll need to defer the work to later in the pipeline. |
| 33 mojo::View* contentView = toHTMLIFrameElement(node())->contentView(); | 33 mojo::View* contentView = toHTMLIFrameElement(node())->contentView(); |
| 34 if (!contentView) | 34 if (!contentView) |
| 35 return; | 35 return; |
| 36 | 36 |
| 37 IntRect bounds = pixelSnappedIntRect(frameRect()); | 37 IntRect bounds = pixelSnappedIntRect(frameRect()); |
| 38 mojo::Rect mojo_bounds; | 38 mojo::Rect mojo_bounds; |
| 39 mojo_bounds.x = bounds.x(); | 39 mojo_bounds.x = bounds.x(); |
| 40 mojo_bounds.y = bounds.y(); | 40 mojo_bounds.y = bounds.y(); |
| 41 mojo_bounds.width = bounds.width(); | 41 mojo_bounds.width = bounds.width(); |
| 42 mojo_bounds.height = bounds.height(); | 42 mojo_bounds.height = bounds.height(); |
| 43 contentView->SetBounds(mojo_bounds); | 43 contentView->SetBounds(mojo_bounds); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void RenderRemote::paintReplaced(PaintInfo& paintInfo, | 46 void RenderIFrame::paintReplaced(PaintInfo& paintInfo, |
| 47 const LayoutPoint& paintOffset) | 47 const LayoutPoint& paintOffset) |
| 48 { | 48 { |
| 49 // Draw a gray background. This should be painted over by the actual | 49 // Draw a gray background. This should be painted over by the actual |
| 50 // content. | 50 // content. |
| 51 // TODO(mpcomplete): figure out what we should actually do here. | 51 // TODO(mpcomplete): figure out what we should actually do here. |
| 52 GraphicsContext* context = paintInfo.context; | 52 GraphicsContext* context = paintInfo.context; |
| 53 | 53 |
| 54 IntRect paintRect = pixelSnappedIntRect(LayoutRect( | 54 IntRect paintRect = pixelSnappedIntRect(LayoutRect( |
| 55 paintOffset.x(), paintOffset.y(), contentWidth(), contentHeight())); | 55 paintOffset.x(), paintOffset.y(), contentWidth(), contentHeight())); |
| 56 context->setStrokeStyle(SolidStroke); | 56 context->setStrokeStyle(SolidStroke); |
| 57 context->setStrokeColor(Color::lightGray); | 57 context->setStrokeColor(Color::lightGray); |
| 58 context->setFillColor(Color::darkGray); | 58 context->setFillColor(Color::darkGray); |
| 59 context->drawRect(paintRect); | 59 context->drawRect(paintRect); |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace blink | 62 } // namespace blink |
| OLD | NEW |