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

Side by Side Diff: Source/core/page/Frame.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
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 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 VisiblePosition next = position.next(); 452 VisiblePosition next = position.next();
453 if (RefPtr<Range> nextCharacterRange = makeRange(position, next)) { 453 if (RefPtr<Range> nextCharacterRange = makeRange(position, next)) {
454 LayoutRect rect = editor().firstRectForRange(nextCharacterRange.get()); 454 LayoutRect rect = editor().firstRectForRange(nextCharacterRange.get());
455 if (rect.contains(framePoint)) 455 if (rect.contains(framePoint))
456 return nextCharacterRange.release(); 456 return nextCharacterRange.release();
457 } 457 }
458 458
459 return 0; 459 return 0;
460 } 460 }
461 461
462 void Frame::createView(const IntSize& viewportSize, const StyleColor& background Color, bool transparent, 462 void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor , bool transparent,
463 const IntSize& fixedLayoutSize, bool useFixedLayout, ScrollbarMode horizonta lScrollbarMode, bool horizontalLock, 463 const IntSize& fixedLayoutSize, bool useFixedLayout, ScrollbarMode horizonta lScrollbarMode, bool horizontalLock,
464 ScrollbarMode verticalScrollbarMode, bool verticalLock) 464 ScrollbarMode verticalScrollbarMode, bool verticalLock)
465 { 465 {
466 ASSERT(this); 466 ASSERT(this);
467 ASSERT(m_page); 467 ASSERT(m_page);
468 468
469 bool isMainFrame = this == m_page->mainFrame(); 469 bool isMainFrame = this == m_page->mainFrame();
470 470
471 if (isMainFrame && view()) 471 if (isMainFrame && view())
472 view()->setParentVisible(false); 472 view()->setParentVisible(false);
473 473
474 setView(0); 474 setView(0);
475 475
476 RefPtr<FrameView> frameView; 476 RefPtr<FrameView> frameView;
477 if (isMainFrame) { 477 if (isMainFrame) {
478 frameView = FrameView::create(this, viewportSize); 478 frameView = FrameView::create(this, viewportSize);
479 frameView->setFixedLayoutSize(fixedLayoutSize); 479 frameView->setFixedLayoutSize(fixedLayoutSize);
480 frameView->setUseFixedLayout(useFixedLayout); 480 frameView->setUseFixedLayout(useFixedLayout);
481 } else 481 } else
482 frameView = FrameView::create(this); 482 frameView = FrameView::create(this);
483 483
484 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock); 484 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
485 485
486 setView(frameView); 486 setView(frameView);
487 487
488 if (backgroundColor.isValid()) 488 if (backgroundColor.isValid())
489 frameView->updateBackgroundRecursively(backgroundColor.color(), transpar ent); 489 frameView->updateBackgroundRecursively(backgroundColor, transparent);
490 490
491 if (isMainFrame) 491 if (isMainFrame)
492 frameView->setParentVisible(true); 492 frameView->setParentVisible(true);
493 493
494 if (ownerRenderer()) 494 if (ownerRenderer())
495 ownerRenderer()->setWidget(frameView); 495 ownerRenderer()->setWidget(frameView);
496 496
497 if (HTMLFrameOwnerElement* owner = ownerElement()) 497 if (HTMLFrameOwnerElement* owner = ownerElement())
498 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 498 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
499 } 499 }
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 if (!m_page) 708 if (!m_page)
709 return 0; 709 return 0;
710 710
711 double ratio = m_page->deviceScaleFactor(); 711 double ratio = m_page->deviceScaleFactor();
712 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 712 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
713 ratio *= pageZoomFactor(); 713 ratio *= pageZoomFactor();
714 return ratio; 714 return ratio;
715 } 715 }
716 716
717 } // namespace WebCore 717 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698