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

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

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 VisiblePosition next = position.next(); 445 VisiblePosition next = position.next();
446 if (RefPtr<Range> nextCharacterRange = makeRange(position, next)) { 446 if (RefPtr<Range> nextCharacterRange = makeRange(position, next)) {
447 LayoutRect rect = editor()->firstRectForRange(nextCharacterRange.get()); 447 LayoutRect rect = editor()->firstRectForRange(nextCharacterRange.get());
448 if (rect.contains(framePoint)) 448 if (rect.contains(framePoint))
449 return nextCharacterRange.release(); 449 return nextCharacterRange.release();
450 } 450 }
451 451
452 return 0; 452 return 0;
453 } 453 }
454 454
455 void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor , bool transparent, 455 void Frame::createView(const IntSize& viewportSize, const StyleColor& background Color, bool transparent,
456 const IntSize& fixedLayoutSize, bool useFixedLayout, ScrollbarMode horizonta lScrollbarMode, bool horizontalLock, 456 const IntSize& fixedLayoutSize, bool useFixedLayout, ScrollbarMode horizonta lScrollbarMode, bool horizontalLock,
457 ScrollbarMode verticalScrollbarMode, bool verticalLock) 457 ScrollbarMode verticalScrollbarMode, bool verticalLock)
458 { 458 {
459 ASSERT(this); 459 ASSERT(this);
460 ASSERT(m_page); 460 ASSERT(m_page);
461 461
462 bool isMainFrame = this == m_page->mainFrame(); 462 bool isMainFrame = this == m_page->mainFrame();
463 463
464 if (isMainFrame && view()) 464 if (isMainFrame && view())
465 view()->setParentVisible(false); 465 view()->setParentVisible(false);
466 466
467 setView(0); 467 setView(0);
468 468
469 RefPtr<FrameView> frameView; 469 RefPtr<FrameView> frameView;
470 if (isMainFrame) { 470 if (isMainFrame) {
471 frameView = FrameView::create(this, viewportSize); 471 frameView = FrameView::create(this, viewportSize);
472 frameView->setFixedLayoutSize(fixedLayoutSize); 472 frameView->setFixedLayoutSize(fixedLayoutSize);
473 frameView->setUseFixedLayout(useFixedLayout); 473 frameView->setUseFixedLayout(useFixedLayout);
474 } else 474 } else
475 frameView = FrameView::create(this); 475 frameView = FrameView::create(this);
476 476
477 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock); 477 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
478 478
479 setView(frameView); 479 setView(frameView);
480 480
481 if (backgroundColor.isValid()) 481 if (backgroundColor.isValid())
482 frameView->updateBackgroundRecursively(backgroundColor, transparent); 482 frameView->updateBackgroundRecursively(backgroundColor.color(), transpar ent);
483 483
484 if (isMainFrame) 484 if (isMainFrame)
485 frameView->setParentVisible(true); 485 frameView->setParentVisible(true);
486 486
487 if (ownerRenderer()) 487 if (ownerRenderer())
488 ownerRenderer()->setWidget(frameView); 488 ownerRenderer()->setWidget(frameView);
489 489
490 if (HTMLFrameOwnerElement* owner = ownerElement()) 490 if (HTMLFrameOwnerElement* owner = ownerElement())
491 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 491 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
492 } 492 }
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 buffer->context()->translate(-paintingRect.x(), -paintingRect.y()); 690 buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
691 buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.ma xY())); 691 buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.ma xY()));
692 692
693 m_view->paintContents(buffer->context(), paintingRect); 693 m_view->paintContents(buffer->context(), paintingRect);
694 694
695 RefPtr<Image> image = buffer->copyImage(); 695 RefPtr<Image> image = buffer->copyImage();
696 return DragImage::create(image.get()); 696 return DragImage::create(image.get());
697 } 697 }
698 698
699 } // namespace WebCore 699 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698