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

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

Issue 1112953003: Oilpan: fix webkit unit tests after r194688. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | 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) 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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 } 511 }
512 512
513 void WebPluginContainerImpl::zoomLevelChanged(double zoomLevel) 513 void WebPluginContainerImpl::zoomLevelChanged(double zoomLevel)
514 { 514 {
515 WebViewImpl* view = WebViewImpl::fromPage(m_element->document().frame()->pag e()); 515 WebViewImpl* view = WebViewImpl::fromPage(m_element->document().frame()->pag e());
516 view->fullFramePluginZoomLevelChanged(zoomLevel); 516 view->fullFramePluginZoomLevelChanged(zoomLevel);
517 } 517 }
518 518
519 bool WebPluginContainerImpl::isRectTopmost(const WebRect& rect) 519 bool WebPluginContainerImpl::isRectTopmost(const WebRect& rect)
520 { 520 {
521 if (m_element->document().isDetached()) 521 if (!m_element || m_element->document().isDetached())
522 return false; 522 return false;
523 523
524 LocalFrame* frame = m_element->document().frame(); 524 LocalFrame* frame = m_element->document().frame();
525 if (!frame) 525 if (!frame)
526 return false; 526 return false;
527 527
528 // hitTestResultAtPoint() takes a padding rectangle. 528 // hitTestResultAtPoint() takes a padding rectangle.
529 // FIXME: We'll be off by 1 when the width or height is even. 529 // FIXME: We'll be off by 1 when the width or height is even.
530 IntRect documentRect(x() + rect.x, y() + rect.y, rect.width, rect.height); 530 IntRect documentRect(x() + rect.x, y() + rect.y, rect.width, rect.height);
531 LayoutPoint center = documentRect.center(); 531 LayoutPoint center = documentRect.center();
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 for (size_t i = 0; i < cutOutRects.size(); i++) 1014 for (size_t i = 0; i < cutOutRects.size(); i++)
1015 cutOutRects[i].move(-frameRect().x(), -frameRect().y()); 1015 cutOutRects[i].move(-frameRect().x(), -frameRect().y());
1016 } 1016 }
1017 1017
1018 bool WebPluginContainerImpl::pluginShouldPersist() const 1018 bool WebPluginContainerImpl::pluginShouldPersist() const
1019 { 1019 {
1020 return m_webPlugin->shouldPersist(); 1020 return m_webPlugin->shouldPersist();
1021 } 1021 }
1022 1022
1023 } // namespace blink 1023 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698