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

Side by Side Diff: Source/core/inspector/InspectorOverlay.cpp

Issue 281393002: Revert of Make all layout tests force composited (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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/Settings.in ('k') | Source/core/testing/DummyPageHolder.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
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 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 overlaySettings.genericFontFamilySettings().setSerif(settings.genericFontFam ilySettings().serif()); 700 overlaySettings.genericFontFamilySettings().setSerif(settings.genericFontFam ilySettings().serif());
701 overlaySettings.genericFontFamilySettings().setSansSerif(settings.genericFon tFamilySettings().sansSerif()); 701 overlaySettings.genericFontFamilySettings().setSansSerif(settings.genericFon tFamilySettings().sansSerif());
702 overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontF amilySettings().cursive()); 702 overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontF amilySettings().cursive());
703 overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontF amilySettings().fantasy()); 703 overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontF amilySettings().fantasy());
704 overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFo ntFamilySettings().pictograph()); 704 overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFo ntFamilySettings().pictograph());
705 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); 705 overlaySettings.setMinimumFontSize(settings.minimumFontSize());
706 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ; 706 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ;
707 overlaySettings.setScriptEnabled(true); 707 overlaySettings.setScriptEnabled(true);
708 overlaySettings.setPluginsEnabled(false); 708 overlaySettings.setPluginsEnabled(false);
709 overlaySettings.setLoadsImagesAutomatically(true); 709 overlaySettings.setLoadsImagesAutomatically(true);
710 // FIXME: http://crbug.com/363843. Inspector should probably create its
711 // own graphics layers and attach them to the tree rather than going
712 // through some non-composited paint function.
713 overlaySettings.setAcceleratedCompositingEnabled(false);
714 710
715 RefPtr<LocalFrame> frame = LocalFrame::create(dummyFrameLoaderClient, &m_ove rlayPage->frameHost(), 0); 711 RefPtr<LocalFrame> frame = LocalFrame::create(dummyFrameLoaderClient, &m_ove rlayPage->frameHost(), 0);
716 frame->setView(FrameView::create(frame.get())); 712 frame->setView(FrameView::create(frame.get()));
717 frame->init(); 713 frame->init();
718 FrameLoader& loader = frame->loader(); 714 FrameLoader& loader = frame->loader();
719 frame->view()->setCanHaveScrollbars(false); 715 frame->view()->setCanHaveScrollbars(false);
720 frame->view()->setTransparent(true); 716 frame->view()->setTransparent(true);
721 717
722 RefPtr<SharedBuffer> data = SharedBuffer::create(reinterpret_cast<const char *>(InspectorOverlayPage_html), sizeof(InspectorOverlayPage_html)); 718 RefPtr<SharedBuffer> data = SharedBuffer::create(reinterpret_cast<const char *>(InspectorOverlayPage_html), sizeof(InspectorOverlayPage_html));
723 loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html" , "UTF-8", KURL(), ForceSynchronousLoad))); 719 loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html" , "UTF-8", KURL(), ForceSynchronousLoad)));
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 hideHighlight(); 793 hideHighlight();
798 } 794 }
799 795
800 void InspectorOverlay::startedRecordingProfile() 796 void InspectorOverlay::startedRecordingProfile()
801 { 797 {
802 if (!m_activeProfilerCount++) 798 if (!m_activeProfilerCount++)
803 freePage(); 799 freePage();
804 } 800 }
805 801
806 } // namespace WebCore 802 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Settings.in ('k') | Source/core/testing/DummyPageHolder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698