Source/core/inspector/InspectorOverlay.cpp - Issue 169363004: Remove the mediaEnabled setting

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

Issue 169363004: Remove the mediaEnabled setting (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase 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/html/HTMLMediaElement.cpp ('k') | Source/core/svg/graphics/SVGImage.cpp » ('j') | no next file with comments »

OLD	NEW
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 580 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
591 Settings& overlaySettings = m_overlayPage->settings();	591 Settings& overlaySettings = m_overlayPage->settings();

592	592

593 overlaySettings.genericFontFamilySettings().setStandard(settings.genericFont FamilySettings().standard());	593 overlaySettings.genericFontFamilySettings().setStandard(settings.genericFont FamilySettings().standard());

594 overlaySettings.genericFontFamilySettings().setSerif(settings.genericFontFam ilySettings().serif());	594 overlaySettings.genericFontFamilySettings().setSerif(settings.genericFontFam ilySettings().serif());

595 overlaySettings.genericFontFamilySettings().setSansSerif(settings.genericFon tFamilySettings().sansSerif());	595 overlaySettings.genericFontFamilySettings().setSansSerif(settings.genericFon tFamilySettings().sansSerif());

596 overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontF amilySettings().cursive());	596 overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontF amilySettings().cursive());

597 overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontF amilySettings().fantasy());	597 overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontF amilySettings().fantasy());

598 overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFo ntFamilySettings().pictograph());	598 overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFo ntFamilySettings().pictograph());

599 overlaySettings.setMinimumFontSize(settings.minimumFontSize());	599 overlaySettings.setMinimumFontSize(settings.minimumFontSize());

600 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ;	600 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ;

601 overlaySettings.setMediaEnabled(false);

602 overlaySettings.setScriptEnabled(true);	601 overlaySettings.setScriptEnabled(true);

603 overlaySettings.setPluginsEnabled(false);	602 overlaySettings.setPluginsEnabled(false);

604 overlaySettings.setLoadsImagesAutomatically(true);	603 overlaySettings.setLoadsImagesAutomatically(true);

605	604

606 RefPtr<Frame> frame = Frame::create(FrameInit::create(0, &m_overlayPage->fra meHost(), dummyFrameLoaderClient));	605 RefPtr<Frame> frame = Frame::create(FrameInit::create(0, &m_overlayPage->fra meHost(), dummyFrameLoaderClient));

607 frame->setView(FrameView::create(frame.get()));	606 frame->setView(FrameView::create(frame.get()));

608 frame->init();	607 frame->init();

609 FrameLoader& loader = frame->loader();	608 FrameLoader& loader = frame->loader();

610 frame->view()->setCanHaveScrollbars(false);	609 frame->view()->setCanHaveScrollbars(false);

611 frame->view()->setTransparent(true);	610 frame->view()->setTransparent(true);

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
684 m_timer.stop();	683 m_timer.stop();

685 }	684 }

686	685

687 void InspectorOverlay::startedRecordingProfile()	686 void InspectorOverlay::startedRecordingProfile()

688 {	687 {

689 if (!m_activeProfilerCount++)	688 if (!m_activeProfilerCount++)

690 freePage();	689 freePage();

691 }	690 }

692	691

693 } // namespace WebCore	692 } // namespace WebCore

OLD	NEW