[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
bdakin at apple.com
bdakin at apple.com
Sun Feb 20 22:53:37 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit fd7c5cf6da7a9c0e7e8cbab65bb0fb316966178f
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 13 01:34:01 2011 +0000
Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
Expose fixed layout through WebKit SPI
-and corresponding-
<rdar://problem/8844464>
Reviewed by Anders Carlsson.
Source/WebCore:
And now with getters!
* WebCore.exp.in:
WebKit/mac:
And now with getters!
* WebView/WebView.mm:
(-[WebView _useFixedLayout]):
(-[WebView _fixedLayoutSize]):
* WebView/WebViewPrivate.h:
WebKit2:
And now with getters!
* UIProcess/API/C/WKPage.cpp:
(WKPageUseFixedLayout):
(WKPageFixedLayoutSize):
* UIProcess/API/C/WKPage.h:
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::useFixedLayout):
(WebKit::WebPageProxy::fixedLayoutSize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75662 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index af1be07..2c1a962 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-12 Beth Dakin <bdakin at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
+ Expose fixed layout through WebKit SPI
+ -and corresponding-
+ <rdar://problem/8844464>
+
+ And now with getters!
+ * WebCore.exp.in:
+
2011-01-12 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index f58c208..e9418f0 100644
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -948,6 +948,8 @@ __ZNK7WebCore10RenderText9firstRunYEv
__ZNK7WebCore10ScrollView12contentsSizeEv
__ZNK7WebCore10ScrollView12documentViewEv
__ZNK7WebCore10ScrollView14scrollbarModesERNS_13ScrollbarModeES2_
+__ZNK7WebCore10ScrollView14useFixedLayoutEv
+__ZNK7WebCore10ScrollView15fixedLayoutSizeEv
__ZNK7WebCore10ScrollView16contentsToWindowERKNS_7IntRectE
__ZNK7WebCore10ScrollView16contentsToWindowERKNS_8IntPointE
__ZNK7WebCore10ScrollView18visibleContentRectEb
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 21b4d26..bd6acae 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -2,6 +2,21 @@
Reviewed by Anders Carlsson.
+ Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
+ Expose fixed layout through WebKit SPI
+ -and corresponding-
+ <rdar://problem/8844464>
+
+ And now with getters!
+ * WebView/WebView.mm:
+ (-[WebView _useFixedLayout]):
+ (-[WebView _fixedLayoutSize]):
+ * WebView/WebViewPrivate.h:
+
+2011-01-12 Beth Dakin <bdakin at apple.com>
+
+ Reviewed by Anders Carlsson.
+
Fix for https://bugs.webkit.org/show_bug.cgi?id=52309 Expose
fixed layout through WebKit SPI
-and corresponding-
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 143c100..638d328 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2682,6 +2682,32 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns)
view->forceLayout();
}
+- (BOOL)_useFixedLayout
+{
+ Frame* coreFrame = [self _mainCoreFrame];
+ if (!coreFrame)
+ return NO;
+
+ FrameView* view = coreFrame->view();
+ if (!view)
+ return NO;
+
+ return view->useFixedLayout();
+}
+
+- (NSSize)_fixedLayoutSize
+{
+ Frame* coreFrame = [self _mainCoreFrame];
+ if (!coreFrame)
+ return IntSize();
+
+ FrameView* view = coreFrame->view();
+ if (!view)
+ return IntSize();
+
+ return view->fixedLayoutSize();
+}
+
- (NSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(NSUInteger)limit
{
return [self countMatchesForText:string options:(caseFlag ? 0 : WebFindOptionsCaseInsensitive) highlight:highlight limit:limit markMatches:YES];
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
index 1d32b77..a9ef1cb 100644
--- a/WebKit/mac/WebView/WebViewPrivate.h
+++ b/WebKit/mac/WebView/WebViewPrivate.h
@@ -550,6 +550,9 @@ Could be worth adding to the API.
- (void)_setUseFixedLayout:(BOOL)fixed;
- (void)_setFixedLayoutSize:(NSSize)size;
+- (BOOL)_useFixedLayout;
+- (NSSize)_fixedLayoutSize;
+
// Deprecated. Use the methods in pending public above instead.
- (WebNSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(WebNSUInteger)limit;
- (WebNSUInteger)countMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(WebNSUInteger)limit markMatches:(BOOL)markMatches;
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fbc8cf7..0b8ea31 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-12 Beth Dakin <bdakin at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
+ Expose fixed layout through WebKit SPI
+ -and corresponding-
+ <rdar://problem/8844464>
+
+ And now with getters!
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageUseFixedLayout):
+ (WKPageFixedLayoutSize):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::useFixedLayout):
+ (WebKit::WebPageProxy::fixedLayoutSize):
+
2011-01-12 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index fef256f..edcbf87 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -275,6 +275,16 @@ void WKPageSetFixedLayoutSize(WKPageRef pageRef, WKSize size)
toImpl(pageRef)->setFixedLayoutSize(toIntSize(size));
}
+bool WKPageUseFixedLayout(WKPageRef pageRef)
+{
+ return toImpl(pageRef)->useFixedLayout();
+}
+
+WKSize WKPageFixedLayoutSize(WKPageRef pageRef)
+{
+ return toAPI(toImpl(pageRef)->fixedLayoutSize());
+}
+
double WKPageGetViewScaleFactor(WKPageRef pageRef)
{
return toImpl(pageRef)->viewScaleFactor();
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index ee9439a..05730e5 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -309,6 +309,8 @@ WK_EXPORT double WKPageGetViewScaleFactor(WKPageRef page);
WK_EXPORT void WKPageSetUseFixedLayout(WKPageRef page, bool fixed);
WK_EXPORT void WKPageSetFixedLayoutSize(WKPageRef page, WKSize size);
+WK_EXPORT bool WKPageUseFixedLayout(WKPageRef pageRef);
+WK_EXPORT WKSize WKPageFixedLayoutSize(WKPageRef pageRef);
WK_EXPORT void WKPageFindString(WKPageRef page, WKStringRef string, WKFindOptions findOptions, unsigned maxMatchCount);
WK_EXPORT void WKPageHideFindUI(WKPageRef page);
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 25335dc..47b8ea1 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -245,6 +245,9 @@ public:
void setUseFixedLayout(bool);
void setFixedLayoutSize(const WebCore::IntSize&);
+ bool useFixedLayout() const { return m_useFixedLayout; };
+ const WebCore::IntSize& fixedLayoutSize() const { return m_fixedLayoutSize; };
+
#if PLATFORM(MAC)
void sendAccessibilityPresenterToken(const CoreIPC::DataReference&);
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list