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

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

Issue 115293005: Add a layer of indirection between Frame and Page (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Make GCC happy Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameHost.cpp ('k') | Source/core/loader/FrameLoader.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 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontF amilySettings().cursive()); 603 overlaySettings.genericFontFamilySettings().setCursive(settings.genericFontF amilySettings().cursive());
604 overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontF amilySettings().fantasy()); 604 overlaySettings.genericFontFamilySettings().setFantasy(settings.genericFontF amilySettings().fantasy());
605 overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFo ntFamilySettings().pictograph()); 605 overlaySettings.genericFontFamilySettings().setPictograph(settings.genericFo ntFamilySettings().pictograph());
606 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); 606 overlaySettings.setMinimumFontSize(settings.minimumFontSize());
607 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ; 607 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ;
608 overlaySettings.setMediaEnabled(false); 608 overlaySettings.setMediaEnabled(false);
609 overlaySettings.setScriptEnabled(true); 609 overlaySettings.setScriptEnabled(true);
610 overlaySettings.setPluginsEnabled(false); 610 overlaySettings.setPluginsEnabled(false);
611 overlaySettings.setLoadsImagesAutomatically(true); 611 overlaySettings.setLoadsImagesAutomatically(true);
612 612
613 RefPtr<Frame> frame = Frame::create(FrameInit::create(0, m_overlayPage.get() , dummyFrameLoaderClient)); 613 RefPtr<Frame> frame = Frame::create(FrameInit::create(0, &m_overlayPage->fra meHost(), dummyFrameLoaderClient));
614 frame->setView(FrameView::create(frame.get())); 614 frame->setView(FrameView::create(frame.get()));
615 frame->init(); 615 frame->init();
616 FrameLoader& loader = frame->loader(); 616 FrameLoader& loader = frame->loader();
617 frame->view()->setCanHaveScrollbars(false); 617 frame->view()->setCanHaveScrollbars(false);
618 frame->view()->setTransparent(true); 618 frame->view()->setTransparent(true);
619 ASSERT(loader.activeDocumentLoader()); 619 ASSERT(loader.activeDocumentLoader());
620 DocumentWriter* writer = loader.activeDocumentLoader()->beginWriting("text/h tml", "UTF-8"); 620 DocumentWriter* writer = loader.activeDocumentLoader()->beginWriting("text/h tml", "UTF-8");
621 writer->addData(reinterpret_cast<const char*>(InspectorOverlayPage_html), si zeof(InspectorOverlayPage_html)); 621 writer->addData(reinterpret_cast<const char*>(InspectorOverlayPage_html), si zeof(InspectorOverlayPage_html));
622 loader.activeDocumentLoader()->endWriting(writer); 622 loader.activeDocumentLoader()->endWriting(writer);
623 v8::Isolate* isolate = toIsolate(frame.get()); 623 v8::Isolate* isolate = toIsolate(frame.get());
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 m_timer.stop(); 686 m_timer.stop();
687 } 687 }
688 688
689 void InspectorOverlay::startedRecordingProfile() 689 void InspectorOverlay::startedRecordingProfile()
690 { 690 {
691 if (!m_activeProfilerCount++) 691 if (!m_activeProfilerCount++)
692 freePage(); 692 freePage();
693 } 693 }
694 694
695 } // namespace WebCore 695 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/FrameHost.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698