| 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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 overlaySettings.genericFontFamilySettings().updateSerif( | 524 overlaySettings.genericFontFamilySettings().updateSerif( |
| 525 settings.genericFontFamilySettings().serif()); | 525 settings.genericFontFamilySettings().serif()); |
| 526 overlaySettings.genericFontFamilySettings().updateSansSerif( | 526 overlaySettings.genericFontFamilySettings().updateSansSerif( |
| 527 settings.genericFontFamilySettings().sansSerif()); | 527 settings.genericFontFamilySettings().sansSerif()); |
| 528 overlaySettings.genericFontFamilySettings().updateCursive( | 528 overlaySettings.genericFontFamilySettings().updateCursive( |
| 529 settings.genericFontFamilySettings().cursive()); | 529 settings.genericFontFamilySettings().cursive()); |
| 530 overlaySettings.genericFontFamilySettings().updateFantasy( | 530 overlaySettings.genericFontFamilySettings().updateFantasy( |
| 531 settings.genericFontFamilySettings().fantasy()); | 531 settings.genericFontFamilySettings().fantasy()); |
| 532 overlaySettings.genericFontFamilySettings().updatePictograph( | 532 overlaySettings.genericFontFamilySettings().updatePictograph( |
| 533 settings.genericFontFamilySettings().pictograph()); | 533 settings.genericFontFamilySettings().pictograph()); |
| 534 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); | 534 overlaySettings.setMinimumFontSize(settings.getMinimumFontSize()); |
| 535 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()); | 535 overlaySettings.setMinimumLogicalFontSize( |
| 536 settings.getMinimumLogicalFontSize()); |
| 536 overlaySettings.setScriptEnabled(true); | 537 overlaySettings.setScriptEnabled(true); |
| 537 overlaySettings.setPluginsEnabled(false); | 538 overlaySettings.setPluginsEnabled(false); |
| 538 overlaySettings.setLoadsImagesAutomatically(true); | 539 overlaySettings.setLoadsImagesAutomatically(true); |
| 539 // FIXME: http://crbug.com/363843. Inspector should probably create its | 540 // FIXME: http://crbug.com/363843. Inspector should probably create its |
| 540 // own graphics layers and attach them to the tree rather than going | 541 // own graphics layers and attach them to the tree rather than going |
| 541 // through some non-composited paint function. | 542 // through some non-composited paint function. |
| 542 overlaySettings.setAcceleratedCompositingEnabled(false); | 543 overlaySettings.setAcceleratedCompositingEnabled(false); |
| 543 | 544 |
| 544 LocalFrame* frame = LocalFrame::create(&dummyFrameLoaderClient, | 545 LocalFrame* frame = LocalFrame::create(&dummyFrameLoaderClient, |
| 545 &m_overlayPage->frameHost(), 0); | 546 &m_overlayPage->frameHost(), 0); |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 bool InspectorOverlay::shouldSearchForNode() { | 786 bool InspectorOverlay::shouldSearchForNode() { |
| 786 return m_inspectMode != InspectorDOMAgent::NotSearching; | 787 return m_inspectMode != InspectorDOMAgent::NotSearching; |
| 787 } | 788 } |
| 788 | 789 |
| 789 void InspectorOverlay::inspect(Node* node) { | 790 void InspectorOverlay::inspect(Node* node) { |
| 790 if (m_domAgent) | 791 if (m_domAgent) |
| 791 m_domAgent->inspect(node); | 792 m_domAgent->inspect(node); |
| 792 } | 793 } |
| 793 | 794 |
| 794 } // namespace blink | 795 } // namespace blink |
| OLD | NEW |