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

Side by Side Diff: third_party/WebKit/Source/web/InspectorOverlay.cpp

Issue 2709263003: Removed FrameHost::settings() (Closed)
Patch Set: Switched if statement to use page Created 3 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp ('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) 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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 DEFINE_STATIC_LOCAL(FrameLoaderClient, dummyFrameLoaderClient, 505 DEFINE_STATIC_LOCAL(FrameLoaderClient, dummyFrameLoaderClient,
506 (EmptyFrameLoaderClient::create())); 506 (EmptyFrameLoaderClient::create()));
507 Page::PageClients pageClients; 507 Page::PageClients pageClients;
508 fillWithEmptyClients(pageClients); 508 fillWithEmptyClients(pageClients);
509 DCHECK(!m_overlayChromeClient); 509 DCHECK(!m_overlayChromeClient);
510 m_overlayChromeClient = InspectorOverlayChromeClient::create( 510 m_overlayChromeClient = InspectorOverlayChromeClient::create(
511 m_frameImpl->frame()->host()->chromeClient(), *this); 511 m_frameImpl->frame()->host()->chromeClient(), *this);
512 pageClients.chromeClient = m_overlayChromeClient.get(); 512 pageClients.chromeClient = m_overlayChromeClient.get();
513 m_overlayPage = Page::create(pageClients); 513 m_overlayPage = Page::create(pageClients);
514 514
515 Settings& settings = m_frameImpl->frame()->host()->settings(); 515 Settings& settings = m_frameImpl->frame()->page()->settings();
516 Settings& overlaySettings = m_overlayPage->settings(); 516 Settings& overlaySettings = m_overlayPage->settings();
517 517
518 overlaySettings.genericFontFamilySettings().updateStandard( 518 overlaySettings.genericFontFamilySettings().updateStandard(
519 settings.genericFontFamilySettings().standard()); 519 settings.genericFontFamilySettings().standard());
520 overlaySettings.genericFontFamilySettings().updateSerif( 520 overlaySettings.genericFontFamilySettings().updateSerif(
521 settings.genericFontFamilySettings().serif()); 521 settings.genericFontFamilySettings().serif());
522 overlaySettings.genericFontFamilySettings().updateSansSerif( 522 overlaySettings.genericFontFamilySettings().updateSansSerif(
523 settings.genericFontFamilySettings().sansSerif()); 523 settings.genericFontFamilySettings().sansSerif());
524 overlaySettings.genericFontFamilySettings().updateCursive( 524 overlaySettings.genericFontFamilySettings().updateCursive(
525 settings.genericFontFamilySettings().cursive()); 525 settings.genericFontFamilySettings().cursive());
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 bool InspectorOverlay::shouldSearchForNode() { 785 bool InspectorOverlay::shouldSearchForNode() {
786 return m_inspectMode != InspectorDOMAgent::NotSearching; 786 return m_inspectMode != InspectorDOMAgent::NotSearching;
787 } 787 }
788 788
789 void InspectorOverlay::inspect(Node* node) { 789 void InspectorOverlay::inspect(Node* node) {
790 if (m_domAgent) 790 if (m_domAgent)
791 m_domAgent->inspect(node); 791 m_domAgent->inspect(node);
792 } 792 }
793 793
794 } // namespace blink 794 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698