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

Side by Side Diff: third_party/WebKit/Source/web/WebPluginContainerImpl.cpp

Issue 2724543002: Renamed deviceScaleFactor() to deviceScaleFactorDeprecated() in Page (Closed)
Patch Set: Rebase Created 3 years, 9 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 m_element->resetInstance(); 268 m_element->resetInstance();
269 m_webPlugin = plugin; 269 m_webPlugin = plugin;
270 m_isDisposed = false; 270 m_isDisposed = false;
271 } 271 }
272 272
273 float WebPluginContainerImpl::deviceScaleFactor() { 273 float WebPluginContainerImpl::deviceScaleFactor() {
274 Page* page = m_element->document().page(); 274 Page* page = m_element->document().page();
275 if (!page) 275 if (!page)
276 return 1.0; 276 return 1.0;
277 return page->deviceScaleFactor(); 277 return page->deviceScaleFactorDeprecated();
278 } 278 }
279 279
280 float WebPluginContainerImpl::pageScaleFactor() { 280 float WebPluginContainerImpl::pageScaleFactor() {
281 Page* page = m_element->document().page(); 281 Page* page = m_element->document().page();
282 if (!page) 282 if (!page)
283 return 1.0; 283 return 1.0;
284 return page->pageScaleFactor(); 284 return page->pageScaleFactor();
285 } 285 }
286 286
287 float WebPluginContainerImpl::pageZoomFactor() { 287 float WebPluginContainerImpl::pageZoomFactor() {
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 // frame view. 985 // frame view.
986 computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRect); 986 computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRect);
987 } 987 }
988 getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects); 988 getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects);
989 // Convert to the plugin position. 989 // Convert to the plugin position.
990 for (size_t i = 0; i < cutOutRects.size(); i++) 990 for (size_t i = 0; i < cutOutRects.size(); i++)
991 cutOutRects[i].move(-frameRect().x(), -frameRect().y()); 991 cutOutRects[i].move(-frameRect().x(), -frameRect().y());
992 } 992 }
993 993
994 } // namespace blink 994 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698