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

Side by Side Diff: sky/engine/core/rendering/RenderIFrame.cpp

Issue 730253002: Sky: Change iframe positioning to use absoluteContentBox for the View's (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: oops Created 6 years, 1 month 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
« no previous file with comments | « no previous file | sky/tests/lowlevel/iframe.sky » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/RenderIFrame.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"
(...skipping 15 matching lines...) Expand all
26 if (view()) 26 if (view())
27 view()->removeIFrame(this); 27 view()->removeIFrame(this);
28 } 28 }
29 29
30 void RenderIFrame::updateWidgetBounds() 30 void RenderIFrame::updateWidgetBounds()
31 { 31 {
32 mojo::View* contentView = toHTMLIFrameElement(node())->contentView(); 32 mojo::View* contentView = toHTMLIFrameElement(node())->contentView();
33 if (!contentView) 33 if (!contentView)
34 return; 34 return;
35 35
36 IntRect bounds = pixelSnappedIntRect(frameRect()); 36 IntRect bounds = absoluteContentBox();
37 mojo::Rect mojoBounds; 37 mojo::Rect mojoBounds;
38 mojoBounds.x = bounds.x(); 38 mojoBounds.x = bounds.x();
39 mojoBounds.y = bounds.y(); 39 mojoBounds.y = bounds.y();
40 mojoBounds.width = bounds.width(); 40 mojoBounds.width = bounds.width();
41 mojoBounds.height = bounds.height(); 41 mojoBounds.height = bounds.height();
42 contentView->SetBounds(mojoBounds); 42 contentView->SetBounds(mojoBounds);
43 } 43 }
44 44
45 void RenderIFrame::paintReplaced(PaintInfo& paintInfo, 45 void RenderIFrame::paintReplaced(PaintInfo& paintInfo,
46 const LayoutPoint& paintOffset) 46 const LayoutPoint& paintOffset)
47 { 47 {
48 // Draw a gray background. This should be painted over by the actual 48 // Draw a gray background. This should be painted over by the actual
49 // content. 49 // content.
50 // TODO(mpcomplete): figure out what we should actually do here. 50 // TODO(mpcomplete): figure out what we should actually do here.
51 GraphicsContext* context = paintInfo.context; 51 GraphicsContext* context = paintInfo.context;
52 52
53 IntRect paintRect = pixelSnappedIntRect(LayoutRect( 53 IntRect paintRect = pixelSnappedIntRect(LayoutRect(
54 paintOffset.x(), paintOffset.y(), contentWidth(), contentHeight())); 54 paintOffset.x(), paintOffset.y(), contentWidth(), contentHeight()));
55 context->setStrokeStyle(SolidStroke); 55 context->setStrokeStyle(SolidStroke);
56 context->setStrokeColor(Color::lightGray); 56 context->setStrokeColor(Color::lightGray);
57 context->setFillColor(Color::darkGray); 57 context->setFillColor(Color::darkGray);
58 context->drawRect(paintRect); 58 context->drawRect(paintRect);
59 } 59 }
60 60
61 } // namespace blink 61 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/tests/lowlevel/iframe.sky » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698