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/WebViewImpl.cpp

Issue 669013002: Remove BackForwardClient, cleanup starting a history navigation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 1 month 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') | Source/web/web.gypi » ('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, 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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 366
367 WebViewImpl::WebViewImpl(WebViewClient* client) 367 WebViewImpl::WebViewImpl(WebViewClient* client)
368 : m_client(client) 368 : m_client(client)
369 , m_autofillClient(0) 369 , m_autofillClient(0)
370 , m_spellCheckClient(0) 370 , m_spellCheckClient(0)
371 , m_chromeClientImpl(this) 371 , m_chromeClientImpl(this)
372 , m_contextMenuClientImpl(this) 372 , m_contextMenuClientImpl(this)
373 , m_dragClientImpl(this) 373 , m_dragClientImpl(this)
374 , m_editorClientImpl(this) 374 , m_editorClientImpl(this)
375 , m_inspectorClientImpl(this) 375 , m_inspectorClientImpl(this)
376 , m_backForwardClientImpl(this)
377 , m_spellCheckerClientImpl(this) 376 , m_spellCheckerClientImpl(this)
378 , m_storageClientImpl(this) 377 , m_storageClientImpl(this)
379 , m_shouldAutoResize(false) 378 , m_shouldAutoResize(false)
380 , m_zoomLevel(0) 379 , m_zoomLevel(0)
381 , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier)) 380 , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
382 , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier)) 381 , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
383 , m_doubleTapZoomPageScaleFactor(0) 382 , m_doubleTapZoomPageScaleFactor(0)
384 , m_doubleTapZoomPending(false) 383 , m_doubleTapZoomPending(false)
385 , m_enableFakePageScaleAnimationForTesting(false) 384 , m_enableFakePageScaleAnimationForTesting(false)
386 , m_fakePageScaleAnimationPageScaleFactor(0) 385 , m_fakePageScaleAnimationPageScaleFactor(0)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 , m_userGestureObserved(false) 419 , m_userGestureObserved(false)
421 , m_topControlsContentOffset(0) 420 , m_topControlsContentOffset(0)
422 , m_topControlsLayoutHeight(0) 421 , m_topControlsLayoutHeight(0)
423 { 422 {
424 Page::PageClients pageClients; 423 Page::PageClients pageClients;
425 pageClients.chromeClient = &m_chromeClientImpl; 424 pageClients.chromeClient = &m_chromeClientImpl;
426 pageClients.contextMenuClient = &m_contextMenuClientImpl; 425 pageClients.contextMenuClient = &m_contextMenuClientImpl;
427 pageClients.editorClient = &m_editorClientImpl; 426 pageClients.editorClient = &m_editorClientImpl;
428 pageClients.dragClient = &m_dragClientImpl; 427 pageClients.dragClient = &m_dragClientImpl;
429 pageClients.inspectorClient = &m_inspectorClientImpl; 428 pageClients.inspectorClient = &m_inspectorClientImpl;
430 pageClients.backForwardClient = &m_backForwardClientImpl;
431 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; 429 pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
432 pageClients.storageClient = &m_storageClientImpl; 430 pageClients.storageClient = &m_storageClientImpl;
433 431
434 m_page = adoptPtrWillBeNoop(new Page(pageClients)); 432 m_page = adoptPtrWillBeNoop(new Page(pageClients));
435 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); 433 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
436 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0)); 434 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0));
437 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this)); 435 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this));
438 436
439 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); 437 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create());
440 DeviceOrientationInspectorAgent::provideTo(*m_page); 438 DeviceOrientationInspectorAgent::provideTo(*m_page);
(...skipping 4037 matching lines...) Expand 10 before | Expand all | Expand 10 after
4478 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4476 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4479 4477
4480 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4478 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4481 return false; 4479 return false;
4482 4480
4483 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4481 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4484 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4482 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4485 } 4483 }
4486 4484
4487 } // namespace blink 4485 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698