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

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 595713002: Move local frame-only methods out of WebFrame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index 7ebb33a7e731cabca0d0df1e763a80dc5b17293f..2567c35cc855670c3064215766d5bb6b9f986906 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -887,28 +887,6 @@ void WebLocalFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseUR
loadData(data, WebString::fromUTF8("text/html"), WebString::fromUTF8("UTF-8"), baseURL, unreachableURL, replace);
}
-void WebLocalFrameImpl::sendPings(const WebNode& linkNode, const WebURL& destinationURL)
-{
- ASSERT(frame());
- const Node* node = linkNode.constUnwrap<Node>();
- if (isHTMLAnchorElement(node))
- toHTMLAnchorElement(node)->sendPings(destinationURL);
-}
-
-bool WebLocalFrameImpl::isLoading() const
-{
- if (!frame() || !frame()->document())
- return false;
- return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || !frame()->document()->loadEventFinished();
-}
-
-bool WebLocalFrameImpl::isResourceLoadInProgress() const
-{
- if (!frame() || !frame()->document())
- return false;
- return frame()->document()->fetcher()->requestCount();
-}
-
void WebLocalFrameImpl::stopLoading()
{
if (!frame())
@@ -1238,13 +1216,6 @@ void WebLocalFrameImpl::extendSelectionAndDelete(int before, int after)
frame()->inputMethodController().extendSelectionAndDelete(before, after);
}
-void WebLocalFrameImpl::navigateToSandboxedMarkup(const WebData& markup)
-{
- ASSERT(document().securityOrigin().isUnique());
- frame()->loader().forceSandboxFlags(SandboxAll);
- loadHTMLString(markup, document().url(), WebURL(), true);
-}
-
void WebLocalFrameImpl::setCaretVisible(bool visible)
{
frame()->selection().setCaretVisible(visible);
@@ -1410,20 +1381,6 @@ void WebLocalFrameImpl::resetMatchCount()
ensureTextFinder().resetMatchCount();
}
-void WebLocalFrameImpl::sendOrientationChangeEvent()
-{
- if (!frame())
- return;
-
- // Screen Orientation API
- if (ScreenOrientationController::from(*frame()))
- ScreenOrientationController::from(*frame())->notifyOrientationChanged();
-
- // Legacy window.orientation API.
- if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow())
- frame()->domWindow()->dispatchEvent(Event::create(EventTypeNames::orientationchange));
-}
-
void WebLocalFrameImpl::dispatchMessageEventWithOriginCheck(const WebSecurityOrigin& intendedTargetOrigin, const WebDOMEvent& event)
{
ASSERT(!event.isNull());
@@ -1863,6 +1820,59 @@ void WebLocalFrameImpl::addStyleSheetByURL(const WebString& url)
frame()->document()->head()->appendChild(styleElement.release(), IGNORE_EXCEPTION);
}
+void WebLocalFrameImpl::navigateToSandboxedMarkup(const WebData& markup)
+{
+ ASSERT(document().securityOrigin().isUnique());
+ frame()->loader().forceSandboxFlags(SandboxAll);
+ loadHTMLString(markup, document().url(), WebURL(), true);
+}
+
+void WebLocalFrameImpl::sendPings(const WebNode& linkNode, const WebURL& destinationURL)
+{
+ ASSERT(frame());
+ const Node* node = linkNode.constUnwrap<Node>();
+ if (isHTMLAnchorElement(node))
+ toHTMLAnchorElement(node)->sendPings(destinationURL);
+}
+
+bool WebLocalFrameImpl::isLoading() const
+{
+ if (!frame() || !frame()->document())
+ return false;
+ return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || !frame()->document()->loadEventFinished();
+}
+
+bool WebLocalFrameImpl::isResourceLoadInProgress() const
+{
+ if (!frame() || !frame()->document())
+ return false;
+ return frame()->document()->fetcher()->requestCount();
+}
+
+void WebLocalFrameImpl::sendOrientationChangeEvent()
+{
+ if (!frame())
+ return;
+
+ // Screen Orientation API
+ if (ScreenOrientationController::from(*frame()))
+ ScreenOrientationController::from(*frame())->notifyOrientationChanged();
+
+ // Legacy window.orientation API.
+ if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow())
+ frame()->domWindow()->dispatchEvent(Event::create(EventTypeNames::orientationchange));
+}
+
+v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValueForTests(const WebScriptSource& source)
+{
+ // FIXME: This fake UserGestureIndicator is required for a bunch of browser
+ // tests to pass. We should update the tests to simulate input and get rid
+ // of this.
+ // http://code.google.com/p/chromium/issues/detail?id=86397
+ UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+ return executeScriptAndReturnValue(source);
+}
+
void WebLocalFrameImpl::willDetachParent()
{
// Do not expect string scoping results from any frames that got detached

Powered by Google App Engine
This is Rietveld 408576698