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

Side by Side Diff: webkit/glue/webplugin_impl.cc

Issue 16617: Chrome side of webkit merge to 40124.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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 | « webkit/glue/webframe_impl.cc ('k') | webkit/port/bindings/v8/CanvasPixelArray.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 MSVC_PUSH_WARNING_LEVEL(0); 10 MSVC_PUSH_WARNING_LEVEL(0);
(...skipping 15 matching lines...) Expand all
26 #include "HTMLNames.h" 26 #include "HTMLNames.h"
27 #include "HTMLPlugInElement.h" 27 #include "HTMLPlugInElement.h"
28 #include "IntRect.h" 28 #include "IntRect.h"
29 #include "KURL.h" 29 #include "KURL.h"
30 #include "KeyboardEvent.h" 30 #include "KeyboardEvent.h"
31 #include "MouseEvent.h" 31 #include "MouseEvent.h"
32 #include "Page.h" 32 #include "Page.h"
33 #include "PlatformContextSkia.h" 33 #include "PlatformContextSkia.h"
34 #include "PlatformMouseEvent.h" 34 #include "PlatformMouseEvent.h"
35 #include "PlatformString.h" 35 #include "PlatformString.h"
36 #include "RenderBox.h"
36 #include "ResourceHandle.h" 37 #include "ResourceHandle.h"
37 #include "ResourceHandleClient.h" 38 #include "ResourceHandleClient.h"
38 #include "ResourceResponse.h" 39 #include "ResourceResponse.h"
39 #include "ScriptController.h" 40 #include "ScriptController.h"
40 #include "ScriptValue.h" 41 #include "ScriptValue.h"
41 #include "ScrollView.h" 42 #include "ScrollView.h"
42 #include "Widget.h" 43 #include "Widget.h"
43 MSVC_POP_WARNING(); 44 MSVC_POP_WARNING();
44 #undef LOG 45 #undef LOG
45 46
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 while (WebCore::RenderObject* ro = iterator.Next()) { 627 while (WebCore::RenderObject* ro = iterator.Next()) {
627 if (ro == plugin_node) { 628 if (ro == plugin_node) {
628 // All nodes after this one are higher than plugin. 629 // All nodes after this one are higher than plugin.
629 higher = true; 630 higher = true;
630 } else if (higher) { 631 } else if (higher) {
631 // Is this a visible iframe? 632 // Is this a visible iframe?
632 WebCore::Node* n = ro->node(); 633 WebCore::Node* n = ro->node();
633 if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) { 634 if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) {
634 if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) { 635 if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) {
635 WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute()); 636 WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute());
636 WebCore::IntSize size(ro->width(), ro->height()); 637 WebCore::RenderBox* rbox = WebCore::RenderBox::toRenderBox(ro);
638 WebCore::IntSize size(rbox->width(), rbox->height());
637 cutouts->append(WebCore::IntRect(point, size)); 639 cutouts->append(WebCore::IntRect(point, size));
638 } 640 }
639 } 641 }
640 } 642 }
641 } 643 }
642 } 644 }
643 645
644 void WebPluginImpl::setFrameRect(const WebCore::IntRect& rect) { 646 void WebPluginImpl::setFrameRect(const WebCore::IntRect& rect) {
645 if (!parent()) 647 if (!parent())
646 return; 648 return;
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 client_index = clients_.erase(client_index); 1411 client_index = clients_.erase(client_index);
1410 if (resource_client) 1412 if (resource_client)
1411 resource_client->DidFail(); 1413 resource_client->DidFail();
1412 } 1414 }
1413 1415
1414 // This needs to be called now and not in the destructor since the 1416 // This needs to be called now and not in the destructor since the
1415 // webframe_ might not be valid anymore. 1417 // webframe_ might not be valid anymore.
1416 webframe_->set_plugin_delegate(NULL); 1418 webframe_->set_plugin_delegate(NULL);
1417 webframe_ = NULL; 1419 webframe_ = NULL;
1418 } 1420 }
OLDNEW
« no previous file with comments | « webkit/glue/webframe_impl.cc ('k') | webkit/port/bindings/v8/CanvasPixelArray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698