Changeset 54270 in webkit

Timestamp:

Feb 2, 2010 8:20:05 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-02-02 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Dimitri Glazkov.

[Chromium] Implement WebFrameImpl::pageNumberForElementById
​https://bugs.webkit.org/show_bug.cgi?id=34471

• public/WebFrame.h:
• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::pageNumberForElementById):
• src/WebFrameImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebFrame.h (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)
• src/WebFrameImpl.h (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-02  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [Chromium] Implement WebFrameImpl::pageNumberForElementById
+        https://bugs.webkit.org/show_bug.cgi?id=34471
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::pageNumberForElementById):
+        * src/WebFrameImpl.h:
+
 2010-02-02  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebKit/chromium/public/WebFrame.h

@@ -484 +484 @@
     virtual WebString counterValueForElementById(const WebString& id) const = 0;
 
+
+    // Returns the number of page where the specified element will be put.
+    // This method is used to support layout tests.
+    virtual int pageNumberForElementById(const WebString& id,
+                                         float pageWidthInPixels,
+                                         float pageHeightInPixels) const = 0;
+
 protected:
     ~WebFrame() { }

trunk/WebKit/chromium/src/WebFrameImpl.cpp

@@ -1519 +1519 @@
 }
 
+int WebFrameImpl::pageNumberForElementById(const WebString& id,
+                                           float pageWidthInPixels,
+                                           float pageHeightInPixels) const
+{
+    if (!m_frame)
+        return -1;
+
+    Element* element = m_frame->document()->getElementById(id);
+    if (!element)
+        return -1;
+
+    FloatSize pageSize(pageWidthInPixels, pageHeightInPixels);
+    return PrintContext::pageNumberForElement(element, pageSize);
+}
+
 // WebFrameImpl public ---------------------------------------------------------
 

trunk/WebKit/chromium/src/WebFrameImpl.h

@@ -165 +165 @@
     virtual WebString renderTreeAsText() const;
     virtual WebString counterValueForElementById(const WebString& id) const;
+    virtual int pageNumberForElementById(const WebString& id,
+                                         float pageWidthInPixels,
+                                         float pageHeightInPixels) const;
 
     static PassRefPtr<WebFrameImpl> create(WebFrameClient* client);