| 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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); | 726 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); |
| 727 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize())
; | 727 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize())
; |
| 728 overlaySettings.setScriptEnabled(true); | 728 overlaySettings.setScriptEnabled(true); |
| 729 overlaySettings.setPluginsEnabled(false); | 729 overlaySettings.setPluginsEnabled(false); |
| 730 overlaySettings.setLoadsImagesAutomatically(true); | 730 overlaySettings.setLoadsImagesAutomatically(true); |
| 731 // FIXME: http://crbug.com/363843. Inspector should probably create its | 731 // FIXME: http://crbug.com/363843. Inspector should probably create its |
| 732 // own graphics layers and attach them to the tree rather than going | 732 // own graphics layers and attach them to the tree rather than going |
| 733 // through some non-composited paint function. | 733 // through some non-composited paint function. |
| 734 overlaySettings.setAcceleratedCompositingEnabled(false); | 734 overlaySettings.setAcceleratedCompositingEnabled(false); |
| 735 | 735 |
| 736 RefPtr<LocalFrame> frame = LocalFrame::create(dummyFrameLoaderClient, &m_ove
rlayPage->frameHost(), 0); | 736 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(dummyFrameLoaderCl
ient, &m_overlayPage->frameHost(), 0); |
| 737 frame->setView(FrameView::create(frame.get())); | 737 frame->setView(FrameView::create(frame.get())); |
| 738 frame->init(); | 738 frame->init(); |
| 739 FrameLoader& loader = frame->loader(); | 739 FrameLoader& loader = frame->loader(); |
| 740 frame->view()->setCanHaveScrollbars(false); | 740 frame->view()->setCanHaveScrollbars(false); |
| 741 frame->view()->setTransparent(true); | 741 frame->view()->setTransparent(true); |
| 742 | 742 |
| 743 const blink::WebData& overlayPageHTMLResource = blink::Platform::current()->
loadResource("InspectorOverlayPage.html"); | 743 const blink::WebData& overlayPageHTMLResource = blink::Platform::current()->
loadResource("InspectorOverlayPage.html"); |
| 744 RefPtr<SharedBuffer> data = SharedBuffer::create(overlayPageHTMLResource.dat
a(), overlayPageHTMLResource.size()); | 744 RefPtr<SharedBuffer> data = SharedBuffer::create(overlayPageHTMLResource.dat
a(), overlayPageHTMLResource.size()); |
| 745 loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html"
, "UTF-8", KURL(), ForceSynchronousLoad))); | 745 loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html"
, "UTF-8", KURL(), ForceSynchronousLoad))); |
| 746 v8::Isolate* isolate = toIsolate(frame.get()); | 746 v8::Isolate* isolate = toIsolate(frame.get()); |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 hideHighlight(); | 846 hideHighlight(); |
| 847 } | 847 } |
| 848 | 848 |
| 849 void InspectorOverlay::startedRecordingProfile() | 849 void InspectorOverlay::startedRecordingProfile() |
| 850 { | 850 { |
| 851 if (!m_activeProfilerCount++) | 851 if (!m_activeProfilerCount++) |
| 852 freePage(); | 852 freePage(); |
| 853 } | 853 } |
| 854 | 854 |
| 855 } // namespace blink | 855 } // namespace blink |
| OLD | NEW |