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

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

Issue 170803010: Revert of Fix compositing chicken and egg problem in updateControlTints. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/web/PageWidgetDelegate.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nuanti Ltd. 3 * Copyright (C) 2008 Nuanti Ltd.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 return true; 667 return true;
668 } 668 }
669 669
670 void FocusController::setActive(bool active) 670 void FocusController::setActive(bool active)
671 { 671 {
672 if (m_isActive == active) 672 if (m_isActive == active)
673 return; 673 return;
674 674
675 m_isActive = active; 675 m_isActive = active;
676 676
677 if (FrameView* view = m_page->mainFrame()->view()) 677 if (FrameView* view = m_page->mainFrame()->view()) {
678 view->updateLayoutAndStyleIfNeededRecursive();
679 // https://code.google.com/p/chromium/issues/detail?id=343758
680 DisableCompositingQueryAsserts disabler;
678 view->updateControlTints(); 681 view->updateControlTints();
682 }
679 683
680 focusedOrMainFrame()->selection().pageActivationChanged(); 684 focusedOrMainFrame()->selection().pageActivationChanged();
681 } 685 }
682 686
683 static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didSho w) 687 static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didSho w)
684 { 688 {
685 if (didShow) 689 if (didShow)
686 scrollableArea->contentAreaDidShow(); 690 scrollableArea->contentAreaDidShow();
687 else 691 else
688 scrollableArea->contentAreaDidHide(); 692 scrollableArea->contentAreaDidHide();
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b order */); 904 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b order */);
901 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(type, container); 905 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(type, container);
902 if (container && container->isDocumentNode()) 906 if (container && container->isDocumentNode())
903 toDocument(container)->updateLayoutIgnorePendingStylesheets(); 907 toDocument(container)->updateLayoutIgnorePendingStylesheets();
904 } while (!consumed && container); 908 } while (!consumed && container);
905 909
906 return consumed; 910 return consumed;
907 } 911 }
908 912
909 } // namespace WebCore 913 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/web/PageWidgetDelegate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698