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

Side by Side Diff: sky/engine/web/WebViewImpl.cpp

Issue 758233004: Remove SchemeRegistry and WebSecurityPolicy. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « sky/engine/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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "sky/engine/platform/PlatformMouseEvent.h" 69 #include "sky/engine/platform/PlatformMouseEvent.h"
70 #include "sky/engine/platform/PlatformWheelEvent.h" 70 #include "sky/engine/platform/PlatformWheelEvent.h"
71 #include "sky/engine/platform/TraceEvent.h" 71 #include "sky/engine/platform/TraceEvent.h"
72 #include "sky/engine/platform/UserGestureIndicator.h" 72 #include "sky/engine/platform/UserGestureIndicator.h"
73 #include "sky/engine/platform/exported/WebActiveGestureAnimation.h" 73 #include "sky/engine/platform/exported/WebActiveGestureAnimation.h"
74 #include "sky/engine/platform/fonts/FontCache.h" 74 #include "sky/engine/platform/fonts/FontCache.h"
75 #include "sky/engine/platform/graphics/Color.h" 75 #include "sky/engine/platform/graphics/Color.h"
76 #include "sky/engine/platform/graphics/Image.h" 76 #include "sky/engine/platform/graphics/Image.h"
77 #include "sky/engine/platform/graphics/ImageBuffer.h" 77 #include "sky/engine/platform/graphics/ImageBuffer.h"
78 #include "sky/engine/platform/scroll/Scrollbar.h" 78 #include "sky/engine/platform/scroll/Scrollbar.h"
79 #include "sky/engine/platform/weborigin/SchemeRegistry.h"
80 #include "sky/engine/public/platform/Platform.h" 79 #include "sky/engine/public/platform/Platform.h"
81 #include "sky/engine/public/platform/WebFloatPoint.h" 80 #include "sky/engine/public/platform/WebFloatPoint.h"
82 #include "sky/engine/public/platform/WebGestureCurve.h" 81 #include "sky/engine/public/platform/WebGestureCurve.h"
83 #include "sky/engine/public/platform/WebImage.h" 82 #include "sky/engine/public/platform/WebImage.h"
84 #include "sky/engine/public/platform/WebLayerTreeView.h" 83 #include "sky/engine/public/platform/WebLayerTreeView.h"
85 #include "sky/engine/public/platform/WebURLRequest.h" 84 #include "sky/engine/public/platform/WebURLRequest.h"
86 #include "sky/engine/public/platform/WebVector.h" 85 #include "sky/engine/public/platform/WebVector.h"
87 #include "sky/engine/public/web/WebActiveWheelFlingParameters.h" 86 #include "sky/engine/public/web/WebActiveWheelFlingParameters.h"
88 #include "sky/engine/public/web/WebBeginFrameArgs.h" 87 #include "sky/engine/public/web/WebBeginFrameArgs.h"
89 #include "sky/engine/public/web/WebFrameClient.h" 88 #include "sky/engine/public/web/WebFrameClient.h"
(...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 { 1347 {
1349 if (page()) 1348 if (page())
1350 page()->focusController().setActive(active); 1349 page()->focusController().setActive(active);
1351 } 1350 }
1352 1351
1353 bool WebViewImpl::isActive() const 1352 bool WebViewImpl::isActive() const
1354 { 1353 {
1355 return page() ? page()->focusController().isActive() : false; 1354 return page() ? page()->focusController().isActive() : false;
1356 } 1355 }
1357 1356
1358 void WebViewImpl::setDomainRelaxationForbidden(bool forbidden, const WebString& scheme)
1359 {
1360 SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String(s cheme));
1361 }
1362
1363 void WebViewImpl::didCommitLoad(bool isNewNavigation, bool isNavigationWithinPag e) 1357 void WebViewImpl::didCommitLoad(bool isNewNavigation, bool isNavigationWithinPag e)
1364 { 1358 {
1365 endActiveFlingAnimation(); 1359 endActiveFlingAnimation();
1366 m_userGestureObserved = false; 1360 m_userGestureObserved = false;
1367 if (!isNavigationWithinPage) 1361 if (!isNavigationWithinPage)
1368 UserGestureIndicator::clearProcessedUserGestureSinceLoad(); 1362 UserGestureIndicator::clearProcessedUserGestureSinceLoad();
1369 } 1363 }
1370 1364
1371 void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe) 1365 void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe)
1372 { 1366 {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1459 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState, 1453 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
1460 bool isInitialState) { 1454 bool isInitialState) {
1461 if (!page()) 1455 if (!page())
1462 return; 1456 return;
1463 1457
1464 ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState = = WebPageVisibilityStateHidden); 1458 ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState = = WebPageVisibilityStateHidden);
1465 m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int> (visibilityState)), isInitialState); 1459 m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int> (visibilityState)), isInitialState);
1466 } 1460 }
1467 1461
1468 } // namespace blink 1462 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698