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

Side by Side Diff: sky/engine/core/frame/LocalFrame.cpp

Issue 691453002: Remove a lot of Widget APIs. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
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 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 return nullptr; 300 return nullptr;
301 } 301 }
302 302
303 void LocalFrame::createView(const IntSize& viewportSize, const Color& background Color, bool transparent, 303 void LocalFrame::createView(const IntSize& viewportSize, const Color& background Color, bool transparent,
304 ScrollbarMode horizontalScrollbarMode, bool horizontalLock, 304 ScrollbarMode horizontalScrollbarMode, bool horizontalLock,
305 ScrollbarMode verticalScrollbarMode, bool verticalLock) 305 ScrollbarMode verticalScrollbarMode, bool verticalLock)
306 { 306 {
307 ASSERT(this); 307 ASSERT(this);
308 ASSERT(page()); 308 ASSERT(page());
309 309
310 if (view())
311 view()->setParentVisible(false);
312
313 setView(nullptr); 310 setView(nullptr);
314 311
315 RefPtr<FrameView> frameView; 312 RefPtr<FrameView> frameView;
316 frameView = FrameView::create(this, viewportSize); 313 frameView = FrameView::create(this, viewportSize);
317 314
318 // The layout size is set by WebViewImpl to support @viewport 315 // The layout size is set by WebViewImpl to support @viewport
319 frameView->setLayoutSizeFixedToFrameSize(false); 316 frameView->setLayoutSizeFixedToFrameSize(false);
320 317
321 setView(frameView); 318 setView(frameView);
322 319
323 frameView->updateBackgroundRecursively(backgroundColor, transparent); 320 frameView->updateBackgroundRecursively(backgroundColor, transparent);
324
325 frameView->setParentVisible(true);
326 } 321 }
327 322
328 323
329 void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigne d& totalObjects, bool& isPartial) 324 void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigne d& totalObjects, bool& isPartial)
330 { 325 {
331 RenderObject* root = view()->layoutRoot(); 326 RenderObject* root = view()->layoutRoot();
332 isPartial = true; 327 isPartial = true;
333 if (!root) { 328 if (!root) {
334 isPartial = false; 329 isPartial = false;
335 root = contentRenderer(); 330 root = contentRenderer();
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 { 416 {
422 if (!m_host) 417 if (!m_host)
423 return 0; 418 return 0;
424 419
425 double ratio = m_host->deviceScaleFactor(); 420 double ratio = m_host->deviceScaleFactor();
426 ratio *= pageZoomFactor(); 421 ratio *= pageZoomFactor();
427 return ratio; 422 return ratio;
428 } 423 }
429 424
430 } // namespace blink 425 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698