Changeset 55988 in webkit

Timestamp:

Mar 15, 2010 1:33:18 AM (14 years ago)

Author:

yuzo@google.com

Message:

2010-03-14 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Always call PrintContext.end() from PrintContext::pageNumberForElement().

Without this change, WebKit remains in printing mode after determining the page number if the specified element is found.

​https://bugs.webkit.org/show_bug.cgi?id=36049

• platform/gtk/Skipped:
• platform/mac/printing/return-from-printing-mode-expected.checksum: Added.
• platform/mac/printing/return-from-printing-mode-expected.png: Added.
• platform/mac/printing/return-from-printing-mode-expected.txt: Added.
• platform/qt/Skipped:
• platform/win/Skipped:
• printing/return-from-printing-mode.html: Added.

2010-03-14 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Always call PrintContext.end() from PrintContext::pageNumberForElement().

Without this change, WebKit remains in printing mode after determining the page number if the specified element is found.

​https://bugs.webkit.org/show_bug.cgi?id=36049

Test: printing/return-from-printing-mode.html

• page/PrintContext.cpp: (WebCore::PrintContext::pageNumberForElement):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/printing (added)
• LayoutTests/platform/mac/printing/return-from-printing-mode-expected.checksum (added)
• LayoutTests/platform/mac/printing/return-from-printing-mode-expected.png (added)
• LayoutTests/platform/mac/printing/return-from-printing-mode-expected.txt (added)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• LayoutTests/printing/return-from-printing-mode.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/PrintContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-14  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Always call PrintContext.end() from PrintContext::pageNumberForElement().
+
+        Without this change, WebKit remains in printing mode after determining the page number if the specified element is found.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36049
+
+        * platform/gtk/Skipped:
+        * platform/mac/printing/return-from-printing-mode-expected.checksum: Added.
+        * platform/mac/printing/return-from-printing-mode-expected.png: Added.
+        * platform/mac/printing/return-from-printing-mode-expected.txt: Added.
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+        * printing/return-from-printing-mode.html: Added.
+
 2010-03-14  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -3595 +3595 @@
 # Tests in printing/ directory
 #   Tests generating new results
+printing/compositing-layer-printing.html
 printing/media-queries-print.html
-printing/compositing-layer-printing.html
+printing/return-from-printing-mode.html
 
 # Tests in scrollbars/ directory

trunk/LayoutTests/platform/qt/Skipped

@@ -3680 +3680 @@
 fonts/serif.html
 plugins/embed-attributes-style.html
+printing/return-from-printing-mode.html
 scrollbars/basic-scrollbar.html
 scrollbars/disabled-scrollbar.html

trunk/LayoutTests/platform/win/Skipped

@@ -433 +433 @@
 printing/compositing-layer-printing.html
 printing/media-queries-print.html
+# Tests generating new results
+printing/return-from-printing-mode.html
 
 # No upload progress events on windows

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-14  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Always call PrintContext.end() from PrintContext::pageNumberForElement().
+
+        Without this change, WebKit remains in printing mode after determining the page number if the specified element is found.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36049
+
+        Test: printing/return-from-printing-mode.html
+
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::pageNumberForElement):
+
 2010-03-11  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/page/PrintContext.cpp

@@ -180 +180 @@
     int top = box->offsetTop();
     int left = box->offsetLeft();
-    for (int pageNumber = 0; pageNumber < printContext.pageCount(); pageNumber++) {
+    int pageNumber = 0;
+    for (; pageNumber < printContext.pageCount(); pageNumber++) {
         const IntRect& page = printContext.pageRect(pageNumber);
         if (page.x() <= left && left < page.right() && page.y() <= top && top < page.bottom())
-            return pageNumber;
+            break;
     }
     printContext.end();
-    return -1;
+    return (pageNumber < printContext.pageCount() ? pageNumber : -1);
 }