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

Unified Diff: Source/core/html/HTMLAppletElement.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLAnchorElement.cpp ('k') | Source/core/html/HTMLAreaElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLAppletElement.cpp
diff --git a/Source/core/html/HTMLAppletElement.cpp b/Source/core/html/HTMLAppletElement.cpp
index 3cb47572c5f79aeabece3136ebab6589a8f2b4da..3e15d3b3757b0b7919db885d2a15125474577fd0 100644
--- a/Source/core/html/HTMLAppletElement.cpp
+++ b/Source/core/html/HTMLAppletElement.cpp
@@ -104,7 +104,7 @@ void HTMLAppletElement::updateWidget(PluginCreationOption)
RenderEmbeddedObject* renderer = renderEmbeddedObject();
- Frame* frame = document()->frame();
+ Frame* frame = document().frame();
ASSERT(frame);
LayoutUnit contentWidth = renderer->style()->width().isFixed() ? LayoutUnit(renderer->style()->width().value()) :
@@ -120,20 +120,20 @@ void HTMLAppletElement::updateWidget(PluginCreationOption)
const AtomicString& codeBase = getAttribute(codebaseAttr);
if (!codeBase.isNull()) {
- KURL codeBaseURL = document()->completeURL(codeBase);
- if (!document()->securityOrigin()->canDisplay(codeBaseURL)) {
+ KURL codeBaseURL = document().completeURL(codeBase);
+ if (!document().securityOrigin()->canDisplay(codeBaseURL)) {
FrameLoader::reportLocalLoadFailed(frame, codeBaseURL.string());
return;
}
const char javaAppletMimeType[] = "application/x-java-applet";
- if (!document()->contentSecurityPolicy()->allowObjectFromSource(codeBaseURL)
- || !document()->contentSecurityPolicy()->allowPluginType(javaAppletMimeType, javaAppletMimeType, codeBaseURL))
+ if (!document().contentSecurityPolicy()->allowObjectFromSource(codeBaseURL)
+ || !document().contentSecurityPolicy()->allowPluginType(javaAppletMimeType, javaAppletMimeType, codeBaseURL))
return;
paramNames.append("codeBase");
paramValues.append(codeBase.string());
}
- const AtomicString& name = document()->isHTMLDocument() ? getNameAttribute() : getIdAttribute();
+ const AtomicString& name = document().isHTMLDocument() ? getNameAttribute() : getIdAttribute();
if (!name.isNull()) {
paramNames.append("name");
paramValues.append(name.string());
@@ -146,7 +146,7 @@ void HTMLAppletElement::updateWidget(PluginCreationOption)
}
paramNames.append("baseURL");
- KURL baseURL = document()->baseURL();
+ KURL baseURL = document().baseURL();
paramValues.append(baseURL.string());
const AtomicString& mayScript = getAttribute(mayscriptAttr);
@@ -182,10 +182,10 @@ void HTMLAppletElement::updateWidget(PluginCreationOption)
bool HTMLAppletElement::canEmbedJava() const
{
- if (document()->isSandboxed(SandboxPlugins))
+ if (document().isSandboxed(SandboxPlugins))
return false;
- Settings* settings = document()->settings();
+ Settings* settings = document().settings();
if (!settings)
return false;
« no previous file with comments | « Source/core/html/HTMLAnchorElement.cpp ('k') | Source/core/html/HTMLAreaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698