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

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

Issue 46783003: Add a unique frame id and save it on HistoryItem. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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/history/HistoryItem.cpp ('k') | Source/core/loader/HistoryController.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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 overlaySettings.setCursiveFontFamily(settings.cursiveFontFamily()); 599 overlaySettings.setCursiveFontFamily(settings.cursiveFontFamily());
600 overlaySettings.setFantasyFontFamily(settings.fantasyFontFamily()); 600 overlaySettings.setFantasyFontFamily(settings.fantasyFontFamily());
601 overlaySettings.setPictographFontFamily(settings.pictographFontFamily()); 601 overlaySettings.setPictographFontFamily(settings.pictographFontFamily());
602 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); 602 overlaySettings.setMinimumFontSize(settings.minimumFontSize());
603 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ; 603 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ;
604 overlaySettings.setMediaEnabled(false); 604 overlaySettings.setMediaEnabled(false);
605 overlaySettings.setScriptEnabled(true); 605 overlaySettings.setScriptEnabled(true);
606 overlaySettings.setPluginsEnabled(false); 606 overlaySettings.setPluginsEnabled(false);
607 overlaySettings.setLoadsImagesAutomatically(true); 607 overlaySettings.setLoadsImagesAutomatically(true);
608 608
609 RefPtr<Frame> frame = Frame::create(m_overlayPage.get(), 0, dummyFrameLoader Client); 609 RefPtr<Frame> frame = Frame::create(FrameInit::create(0, m_overlayPage.get() , dummyFrameLoaderClient));
610 frame->setView(FrameView::create(frame.get())); 610 frame->setView(FrameView::create(frame.get()));
611 frame->init(); 611 frame->init();
612 FrameLoader& loader = frame->loader(); 612 FrameLoader& loader = frame->loader();
613 frame->view()->setCanHaveScrollbars(false); 613 frame->view()->setCanHaveScrollbars(false);
614 frame->view()->setTransparent(true); 614 frame->view()->setTransparent(true);
615 ASSERT(loader.activeDocumentLoader()); 615 ASSERT(loader.activeDocumentLoader());
616 DocumentWriter* writer = loader.activeDocumentLoader()->beginWriting("text/h tml", "UTF-8"); 616 DocumentWriter* writer = loader.activeDocumentLoader()->beginWriting("text/h tml", "UTF-8");
617 writer->addData(reinterpret_cast<const char*>(InspectorOverlayPage_html), si zeof(InspectorOverlayPage_html)); 617 writer->addData(reinterpret_cast<const char*>(InspectorOverlayPage_html), si zeof(InspectorOverlayPage_html));
618 loader.activeDocumentLoader()->endWriting(writer); 618 loader.activeDocumentLoader()->endWriting(writer);
619 v8::Isolate* isolate = toIsolate(frame.get()); 619 v8::Isolate* isolate = toIsolate(frame.get());
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 } 676 }
677 677
678 void InspectorOverlay::freePage() 678 void InspectorOverlay::freePage()
679 { 679 {
680 m_overlayPage.clear(); 680 m_overlayPage.clear();
681 m_overlayChromeClient.clear(); 681 m_overlayChromeClient.clear();
682 m_timer.stop(); 682 m_timer.stop();
683 } 683 }
684 684
685 } // namespace WebCore 685 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/history/HistoryItem.cpp ('k') | Source/core/loader/HistoryController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698