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

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

Issue 168193002: 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
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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 return true; 669 return true;
670 } 670 }
671 671
672 void FocusController::setActive(bool active) 672 void FocusController::setActive(bool active)
673 { 673 {
674 if (m_isActive == active) 674 if (m_isActive == active)
675 return; 675 return;
676 676
677 m_isActive = active; 677 m_isActive = active;
678 678
679 if (FrameView* view = m_page->mainFrame()->view()) { 679 if (FrameView* view = m_page->mainFrame()->view())
680 view->updateLayoutAndStyleIfNeededRecursive();
681 // https://code.google.com/p/chromium/issues/detail?id=343758
682 DisableCompositingQueryAsserts disabler;
683 view->updateControlTints(); 680 view->updateControlTints();
684 }
685 681
686 focusedOrMainFrame()->selection().pageActivationChanged(); 682 focusedOrMainFrame()->selection().pageActivationChanged();
687 } 683 }
688 684
689 static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didSho w) 685 static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didSho w)
690 { 686 {
691 if (didShow) 687 if (didShow)
692 scrollableArea->contentAreaDidShow(); 688 scrollableArea->contentAreaDidShow();
693 else 689 else
694 scrollableArea->contentAreaDidHide(); 690 scrollableArea->contentAreaDidHide();
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b order */); 902 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b order */);
907 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(direct ion, container); 903 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(direct ion, container);
908 if (container && container->isDocumentNode()) 904 if (container && container->isDocumentNode())
909 toDocument(container)->updateLayoutIgnorePendingStylesheets(); 905 toDocument(container)->updateLayoutIgnorePendingStylesheets();
910 } while (!consumed && container); 906 } while (!consumed && container);
911 907
912 return consumed; 908 return consumed;
913 } 909 }
914 910
915 } // namespace WebCore 911 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698