1 files changed, 19 insertions, 10 deletions
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index bb1f6ce..c5fa1fe 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -472,9 +472,9 @@ WebString WebFrameImpl::name() const
     return m_frame->tree()->name();
 }
 
-void WebFrameImpl::clearName()
+void WebFrameImpl::setName(const WebString& name)
 {
-    m_frame->tree()->clearName();
+    m_frame->tree()->setName(name);
 }
 
 WebURL WebFrameImpl::url() const
@@ -1279,6 +1279,21 @@ void WebFrameImpl::printEnd()
     m_printContext.clear();
 }
 
+bool WebFrameImpl::isPageBoxVisible(int pageIndex)
+{
+    return frame()->document()->isPageBoxVisible(pageIndex);
+}
+
+WebRect WebFrameImpl::pageAreaRectInPixels(int pageIndex)
+{
+    return frame()->document()->pageAreaRectInPixels(pageIndex);
+}
+
+WebSize WebFrameImpl::preferredPageSizeInPixels(int pageIndex)
+{
+    return frame()->document()->preferredPageSizeInPixels(pageIndex);
+}
+
 bool WebFrameImpl::find(int identifier,
                         const WebString& searchText,
                         const WebFindOptions& options,
@@ -2135,14 +2150,8 @@ void WebFrameImpl::loadJavaScriptURL(const KURL& url)
     if (!result.getString(scriptResult))
         return;
 
-    SecurityOrigin* securityOrigin = m_frame->document()->securityOrigin();
-
-    if (!m_frame->redirectScheduler()->locationChangePending()) {
-        m_frame->loader()->stopAllLoaders();
-        m_frame->loader()->writer()->begin(m_frame->loader()->url(), true, securityOrigin);
-        m_frame->loader()->writer()->addData(scriptResult);
-        m_frame->loader()->writer()->end();
-    }
+    if (!m_frame->redirectScheduler()->locationChangePending())
+        m_frame->loader()->writer()->replaceDocument(scriptResult);
 }
 
 } // namespace WebKit