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

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

Issue 1291903003: Oilpan: Move ChromeClient classes into Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix a raw reference in InspectorOverlayImpl.cpp. 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/WebViewImpl.h ('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, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 // static 405 // static
406 HashSet<WebViewImpl*>& WebViewImpl::allInstances() 406 HashSet<WebViewImpl*>& WebViewImpl::allInstances()
407 { 407 {
408 DEFINE_STATIC_LOCAL(HashSet<WebViewImpl*>, allInstances, ()); 408 DEFINE_STATIC_LOCAL(HashSet<WebViewImpl*>, allInstances, ());
409 return allInstances; 409 return allInstances;
410 } 410 }
411 411
412 WebViewImpl::WebViewImpl(WebViewClient* client) 412 WebViewImpl::WebViewImpl(WebViewClient* client)
413 : m_client(client) 413 : m_client(client)
414 , m_spellCheckClient(0) 414 , m_spellCheckClient(0)
415 , m_chromeClientImpl(this) 415 , m_chromeClientImpl(ChromeClientImpl::create(this))
416 , m_contextMenuClientImpl(this) 416 , m_contextMenuClientImpl(this)
417 , m_dragClientImpl(this) 417 , m_dragClientImpl(this)
418 , m_editorClientImpl(this) 418 , m_editorClientImpl(this)
419 , m_spellCheckerClientImpl(this) 419 , m_spellCheckerClientImpl(this)
420 , m_storageClientImpl(this) 420 , m_storageClientImpl(this)
421 , m_shouldAutoResize(false) 421 , m_shouldAutoResize(false)
422 , m_zoomLevel(0) 422 , m_zoomLevel(0)
423 , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier)) 423 , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
424 , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier)) 424 , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
425 , m_maximumLegibleScale(1) 425 , m_maximumLegibleScale(1)
(...skipping 27 matching lines...) Expand all
453 , m_showFPSCounter(false) 453 , m_showFPSCounter(false)
454 , m_continuousPaintingEnabled(false) 454 , m_continuousPaintingEnabled(false)
455 , m_baseBackgroundColor(Color::white) 455 , m_baseBackgroundColor(Color::white)
456 , m_backgroundColorOverride(Color::transparent) 456 , m_backgroundColorOverride(Color::transparent)
457 , m_zoomFactorOverride(0) 457 , m_zoomFactorOverride(0)
458 , m_userGestureObserved(false) 458 , m_userGestureObserved(false)
459 , m_displayMode(WebDisplayModeBrowser) 459 , m_displayMode(WebDisplayModeBrowser)
460 , m_elasticOverscroll(FloatSize()) 460 , m_elasticOverscroll(FloatSize())
461 { 461 {
462 Page::PageClients pageClients; 462 Page::PageClients pageClients;
463 pageClients.chromeClient = &m_chromeClientImpl; 463 pageClients.chromeClient = m_chromeClientImpl.get();
464 pageClients.contextMenuClient = &m_contextMenuClientImpl; 464 pageClients.contextMenuClient = &m_contextMenuClientImpl;
465 pageClients.editorClient = &m_editorClientImpl; 465 pageClients.editorClient = &m_editorClientImpl;
466 pageClients.dragClient = &m_dragClientImpl; 466 pageClients.dragClient = &m_dragClientImpl;
467 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; 467 pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
468 468
469 m_page = adoptPtrWillBeNoop(new Page(pageClients)); 469 m_page = adoptPtrWillBeNoop(new Page(pageClients));
470 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); 470 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
471 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0)); 471 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0));
472 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); 472 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create());
473 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); 473 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create());
(...skipping 4027 matching lines...) Expand 10 before | Expand all | Expand 10 after
4501 if (m_pageColorOverlay) 4501 if (m_pageColorOverlay)
4502 m_pageColorOverlay->update(); 4502 m_pageColorOverlay->update();
4503 if (m_inspectorOverlay) { 4503 if (m_inspectorOverlay) {
4504 PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay(); 4504 PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay();
4505 if (inspectorPageOverlay) 4505 if (inspectorPageOverlay)
4506 inspectorPageOverlay->update(); 4506 inspectorPageOverlay->update();
4507 } 4507 }
4508 } 4508 }
4509 4509
4510 } // namespace blink 4510 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698