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

Side by Side Diff: WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

Issue 5523003: Part 1 of merges for Chromium bug #64589... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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
« no previous file with comments | « WebKit/qt/WebCoreSupport/ChromeClientQt.h ('k') | no next file » | 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 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * 5 *
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 platformPageClient()->markForSync(false); 610 platformPageClient()->markForSync(false);
611 } 611 }
612 612
613 void ChromeClientQt::scheduleCompositingLayerSync() 613 void ChromeClientQt::scheduleCompositingLayerSync()
614 { 614 {
615 // we want the layers to synchronize ASAP 615 // we want the layers to synchronize ASAP
616 if (platformPageClient()) 616 if (platformPageClient())
617 platformPageClient()->markForSync(true); 617 platformPageClient()->markForSync(true);
618 } 618 }
619 619
620 bool ChromeClientQt::allowsAcceleratedCompositing() const 620 ChromeClient::CompositingTriggerFlags ChromeClientQt::allowedCompositingTriggers () const
621 { 621 {
622 return (platformPageClient() && platformPageClient()->allowsAcceleratedCompo siting()); 622 if (platformPageClient() && platformPageClient()->allowsAcceleratedCompositi ng())
623 return AllTriggers;
624
625 return 0;
623 } 626 }
624 627
625 #endif 628 #endif
626 629
627 #if ENABLE(TILED_BACKING_STORE) 630 #if ENABLE(TILED_BACKING_STORE)
628 IntRect ChromeClientQt::visibleRectForTiledBackingStore() const 631 IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
629 { 632 {
630 if (!platformPageClient() || !m_webPage) 633 if (!platformPageClient() || !m_webPage)
631 return IntRect(); 634 return IntRect();
632 635
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 { 679 {
677 // We don't need to do anything here because history is tied to QWebPage rat her than stored 680 // We don't need to do anything here because history is tied to QWebPage rat her than stored
678 // in a separate database 681 // in a separate database
679 if (dumpVisitedLinksCallbacks) { 682 if (dumpVisitedLinksCallbacks) {
680 printf("Asked to populate visited links for WebView \"%s\"\n", 683 printf("Asked to populate visited links for WebView \"%s\"\n",
681 qPrintable(m_webPage->mainFrame()->url().toString())); 684 qPrintable(m_webPage->mainFrame()->url().toString()));
682 } 685 }
683 } 686 }
684 687
685 } // namespace WebCore 688 } // namespace WebCore
OLDNEW
« no previous file with comments | « WebKit/qt/WebCoreSupport/ChromeClientQt.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698