Source/web/WebNode.cpp - Issue 200723002: Use new is*Element() helper functions more in web/ code

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/web/WebNode.cpp

Issue 200723002: Use new is*Element() helper functions more in web/ code (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Use same assertion as in operator->() Created 6 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:

Index: Source/web/WebNode.cpp

diff --git a/Source/web/WebNode.cpp b/Source/web/WebNode.cpp

index db64b165c3a6b2b9cf9fd0634afd3ed7ea9a156b..eb3f9e9b6c07cfd9b93754349f610af24d333a70 100644

--- a/Source/web/WebNode.cpp

+++ b/Source/web/WebNode.cpp

@@ -50,6 +50,7 @@

#include "core/editing/markup.h"

#include "core/events/Event.h"

#include "core/html/HTMLCollection.h"

+#include "core/html/HTMLElement.h"

#include "core/rendering/RenderObject.h"

#include "core/rendering/RenderWidget.h"

#include "platform/Widget.h"

@@ -236,9 +237,9 @@ WebPluginContainer* WebNode::pluginContainer() const

{

if (isNull())

return 0;

- const Node* coreNode = constUnwrap<Node>();

- if (coreNode->hasTagName(HTMLNames::objectTag) || coreNode->hasTagName(HTMLNames::embedTag)) {

- RenderObject* object = coreNode->renderer();

+ const Node& coreNode = *constUnwrap<Node>();

+ if (isHTMLObjectElement(coreNode) || isHTMLEmbedElement(coreNode)) {

+ RenderObject* object = coreNode.renderer();

if (object && object->isWidget()) {

Widget* widget = WebCore::toRenderWidget(object)->widget();

if (widget && widget->isPluginContainer())

« no previous file with comments | « Source/web/WebInputElement.cpp ('k') | Source/web/WebPageSerializer.cpp » ('j') | no next file with comments »