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

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

Issue 14362015: WIP enum / V8PerContextData solution (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Crash during GC Created 7 years, 8 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
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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 overlaySettings->setScriptEnabled(true); 441 overlaySettings->setScriptEnabled(true);
442 overlaySettings->setPluginsEnabled(false); 442 overlaySettings->setPluginsEnabled(false);
443 443
444 RefPtr<Frame> frame = Frame::create(m_overlayPage.get(), 0, dummyFrameLoader Client); 444 RefPtr<Frame> frame = Frame::create(m_overlayPage.get(), 0, dummyFrameLoader Client);
445 frame->setView(FrameView::create(frame.get())); 445 frame->setView(FrameView::create(frame.get()));
446 frame->init(); 446 frame->init();
447 FrameLoader* loader = frame->loader(); 447 FrameLoader* loader = frame->loader();
448 frame->view()->setCanHaveScrollbars(false); 448 frame->view()->setCanHaveScrollbars(false);
449 frame->view()->setTransparent(true); 449 frame->view()->setTransparent(true);
450 ASSERT(loader->activeDocumentLoader()); 450 ASSERT(loader->activeDocumentLoader());
451
452 // When we add the page data, we will compile with no setting for the v8 Con text debug id.
453
451 loader->activeDocumentLoader()->writer()->setMIMEType("text/html"); 454 loader->activeDocumentLoader()->writer()->setMIMEType("text/html");
452 loader->activeDocumentLoader()->writer()->begin(); 455 loader->activeDocumentLoader()->writer()->begin();
453 loader->activeDocumentLoader()->writer()->addData(reinterpret_cast<const cha r*>(InspectorOverlayPage_html), sizeof(InspectorOverlayPage_html)); 456 loader->activeDocumentLoader()->writer()->addData(reinterpret_cast<const cha r*>(InspectorOverlayPage_html), sizeof(InspectorOverlayPage_html));
454 loader->activeDocumentLoader()->writer()->end(); 457 loader->activeDocumentLoader()->writer()->end();
455 458
456 #if OS(WINDOWS) 459 #if OS(WINDOWS)
457 evaluateInOverlay("setPlatform", "windows"); 460 evaluateInOverlay("setPlatform", "windows");
458 #elif OS(MAC_OS_X) 461 #elif OS(MAC_OS_X)
459 evaluateInOverlay("setPlatform", "mac"); 462 evaluateInOverlay("setPlatform", "mac");
460 #elif OS(UNIX) 463 #elif OS(UNIX)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 info.addMember(m_size, "size"); 506 info.addMember(m_size, "size");
504 } 507 }
505 508
506 void InspectorOverlay::freePage() 509 void InspectorOverlay::freePage()
507 { 510 {
508 m_overlayPage.clear(); 511 m_overlayPage.clear();
509 } 512 }
510 513
511 } // namespace WebCore 514 } // namespace WebCore
512 515
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698