[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[beidson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4ed289bfdeb3cd5081a5eba21a52cfa03f4c52b7
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 20:47:27 2010 +0000

    Expose WebPDFView's underlying PDFDocument.
    
    Patch by Andy Estes <aestes at apple.com> on 2010-03-12
    Reviewed by Brady Eidson.
    
    https://bugs.webkit.org/show_bug.cgi?id=36045
    
    * WebView/WebDocumentPrivate.h: Create a new protocol called
    WebDocumentPDF.
    * WebView/WebPDFView.h: Have WebPDFView implement said protocol.
    * WebView/WebPDFView.mm:
    (-[WebPDFView PDFDocument]): Expose WebPDFView's underlying
    PDFDocument by implementing -(PDFDocument*)PDFDocument from
    WebDocumentPDF.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55931 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index fce5d52..72247ee 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Brady Eidson.
 
+        Expose WebPDFView's underlying PDFDocument.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36045
+
+        * WebView/WebDocumentPrivate.h: Create a new protocol called
+        WebDocumentPDF.
+        * WebView/WebPDFView.h: Have WebPDFView implement said protocol.
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView PDFDocument]): Expose WebPDFView's underlying
+        PDFDocument by implementing -(PDFDocument*)PDFDocument from
+        WebDocumentPDF.
+
+2010-03-12  Andy Estes  <aestes at apple.com>
+
+        Reviewed by Brady Eidson.
+
         Remove an unused method.
 
         https://bugs.webkit.org/show_bug.cgi?id=35940
diff --git a/WebKit/mac/WebView/WebDocumentPrivate.h b/WebKit/mac/WebView/WebDocumentPrivate.h
index f09d3bd..a495e4b 100644
--- a/WebKit/mac/WebView/WebDocumentPrivate.h
+++ b/WebKit/mac/WebView/WebDocumentPrivate.h
@@ -30,6 +30,7 @@
 #import <WebKit/WebHTMLView.h>
 
 @class DOMDocument;
+ at class PDFDocument;
 
 @protocol WebDocumentImage <NSObject>
 - (NSImage *)image;
@@ -64,6 +65,10 @@
 - (NSView *)selectionView;
 @end
 
+ at protocol WebDocumentPDF <WebDocumentText>
+- (PDFDocument *)PDFDocument;
+ at end
+
 @protocol WebDocumentIncrementalSearching
 /*!
 @method searchFor:direction:caseSensitive:wrap:startInSelection:
diff --git a/WebKit/mac/WebView/WebPDFView.h b/WebKit/mac/WebView/WebPDFView.h
index bdd2a6e..e480a1b 100644
--- a/WebKit/mac/WebView/WebPDFView.h
+++ b/WebKit/mac/WebView/WebPDFView.h
@@ -32,7 +32,7 @@
 @class PDFView;
 @class WebDataSource;
 
- at interface WebPDFView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, _WebDocumentViewState, _WebDocumentZooming>
+ at interface WebPDFView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
 {
     NSView *previewView;
     PDFView *PDFSubview;
@@ -51,5 +51,6 @@
 + (NSBundle *)PDFKitBundle;
 
 - (void)setPDFDocument:(PDFDocument *)doc;
+- (PDFDocument *)PDFDocument;
 
 @end
diff --git a/WebKit/mac/WebView/WebPDFView.mm b/WebKit/mac/WebView/WebPDFView.mm
index a38412e..1be3033 100644
--- a/WebKit/mac/WebView/WebPDFView.mm
+++ b/WebKit/mac/WebView/WebPDFView.mm
@@ -182,6 +182,11 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
     _ignoreScaleAndDisplayModeAndPageNotifications = NO;
 }
 
+- (PDFDocument *)PDFDocument
+{
+    return [PDFSubview document];
+}
+
 #pragma mark NSObject OVERRIDES
 
 - (void)dealloc

-- 
WebKit Debian packaging