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

Side by Side Diff: Source/web/InspectorOverlayImpl.cpp

Issue 1306793003: Oilpan: Move FrameLoaderClient class hierarchy into Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/FrameLoaderClientImpl.cpp ('k') | Source/web/RemoteFrameClientImpl.h » ('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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 evaluateInOverlay("drawViewSize", m_drawViewSizeWithGrid ? "true" : "fal se"); 392 evaluateInOverlay("drawViewSize", m_drawViewSizeWithGrid ? "true" : "fal se");
393 } 393 }
394 394
395 Page* InspectorOverlayImpl::overlayPage() 395 Page* InspectorOverlayImpl::overlayPage()
396 { 396 {
397 if (m_overlayPage) 397 if (m_overlayPage)
398 return m_overlayPage.get(); 398 return m_overlayPage.get();
399 399
400 ScriptForbiddenScope::AllowUserAgentScript allowScript; 400 ScriptForbiddenScope::AllowUserAgentScript allowScript;
401 401
402 static FrameLoaderClient* dummyFrameLoaderClient = new EmptyFrameLoaderClie nt; 402 DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<FrameLoaderClient>, dummyFrameLoa derClient, (EmptyFrameLoaderClient::create()));
403 Page::PageClients pageClients; 403 Page::PageClients pageClients;
404 fillWithEmptyClients(pageClients); 404 fillWithEmptyClients(pageClients);
405 ASSERT(!m_overlayChromeClient); 405 ASSERT(!m_overlayChromeClient);
406 m_overlayChromeClient = InspectorOverlayChromeClient::create(m_webViewImpl-> page()->chromeClient(), *this); 406 m_overlayChromeClient = InspectorOverlayChromeClient::create(m_webViewImpl-> page()->chromeClient(), *this);
407 pageClients.chromeClient = m_overlayChromeClient.get(); 407 pageClients.chromeClient = m_overlayChromeClient.get();
408 m_overlayPage = adoptPtrWillBeNoop(new Page(pageClients)); 408 m_overlayPage = adoptPtrWillBeNoop(new Page(pageClients));
409 409
410 Settings& settings = m_webViewImpl->page()->settings(); 410 Settings& settings = m_webViewImpl->page()->settings();
411 Settings& overlaySettings = m_overlayPage->settings(); 411 Settings& overlaySettings = m_overlayPage->settings();
412 412
413 overlaySettings.genericFontFamilySettings().updateStandard(settings.genericF ontFamilySettings().standard()); 413 overlaySettings.genericFontFamilySettings().updateStandard(settings.genericF ontFamilySettings().standard());
414 overlaySettings.genericFontFamilySettings().updateSerif(settings.genericFont FamilySettings().serif()); 414 overlaySettings.genericFontFamilySettings().updateSerif(settings.genericFont FamilySettings().serif());
415 overlaySettings.genericFontFamilySettings().updateSansSerif(settings.generic FontFamilySettings().sansSerif()); 415 overlaySettings.genericFontFamilySettings().updateSansSerif(settings.generic FontFamilySettings().sansSerif());
416 overlaySettings.genericFontFamilySettings().updateCursive(settings.genericFo ntFamilySettings().cursive()); 416 overlaySettings.genericFontFamilySettings().updateCursive(settings.genericFo ntFamilySettings().cursive());
417 overlaySettings.genericFontFamilySettings().updateFantasy(settings.genericFo ntFamilySettings().fantasy()); 417 overlaySettings.genericFontFamilySettings().updateFantasy(settings.genericFo ntFamilySettings().fantasy());
418 overlaySettings.genericFontFamilySettings().updatePictograph(settings.generi cFontFamilySettings().pictograph()); 418 overlaySettings.genericFontFamilySettings().updatePictograph(settings.generi cFontFamilySettings().pictograph());
419 overlaySettings.setMinimumFontSize(settings.minimumFontSize()); 419 overlaySettings.setMinimumFontSize(settings.minimumFontSize());
420 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ; 420 overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize()) ;
421 overlaySettings.setScriptEnabled(true); 421 overlaySettings.setScriptEnabled(true);
422 overlaySettings.setPluginsEnabled(false); 422 overlaySettings.setPluginsEnabled(false);
423 overlaySettings.setLoadsImagesAutomatically(true); 423 overlaySettings.setLoadsImagesAutomatically(true);
424 // FIXME: http://crbug.com/363843. Inspector should probably create its 424 // FIXME: http://crbug.com/363843. Inspector should probably create its
425 // own graphics layers and attach them to the tree rather than going 425 // own graphics layers and attach them to the tree rather than going
426 // through some non-composited paint function. 426 // through some non-composited paint function.
427 overlaySettings.setAcceleratedCompositingEnabled(false); 427 overlaySettings.setAcceleratedCompositingEnabled(false);
428 428
429 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(dummyFrameLoaderCl ient, &m_overlayPage->frameHost(), 0); 429 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(dummyFrameLoaderCl ient.get(), &m_overlayPage->frameHost(), 0);
430 frame->setView(FrameView::create(frame.get())); 430 frame->setView(FrameView::create(frame.get()));
431 frame->init(); 431 frame->init();
432 FrameLoader& loader = frame->loader(); 432 FrameLoader& loader = frame->loader();
433 frame->view()->setCanHaveScrollbars(false); 433 frame->view()->setCanHaveScrollbars(false);
434 frame->view()->setTransparent(true); 434 frame->view()->setTransparent(true);
435 435
436 const WebData& overlayPageHTMLResource = Platform::current()->loadResource(" InspectorOverlayPage.html"); 436 const WebData& overlayPageHTMLResource = Platform::current()->loadResource(" InspectorOverlayPage.html");
437 RefPtr<SharedBuffer> data = SharedBuffer::create(overlayPageHTMLResource.dat a(), overlayPageHTMLResource.size()); 437 RefPtr<SharedBuffer> data = SharedBuffer::create(overlayPageHTMLResource.dat a(), overlayPageHTMLResource.size());
438 loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html" , "UTF-8", KURL(), ForceSynchronousLoad))); 438 loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html" , "UTF-8", KURL(), ForceSynchronousLoad)));
439 v8::Isolate* isolate = toIsolate(frame.get()); 439 v8::Isolate* isolate = toIsolate(frame.get());
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 --m_suspendCount; 533 --m_suspendCount;
534 } 534 }
535 535
536 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor) 536 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor)
537 { 537 {
538 m_layoutEditor = layoutEditor; 538 m_layoutEditor = layoutEditor;
539 m_overlayHost->setLayoutEditorListener(m_layoutEditor.get()); 539 m_overlayHost->setLayoutEditorListener(m_layoutEditor.get());
540 } 540 }
541 541
542 } // namespace blink 542 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/FrameLoaderClientImpl.cpp ('k') | Source/web/RemoteFrameClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698