[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 13:20:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 68fbdb2e2358793c897531bd992fce1b1468fd3a
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Sep 12 01:17:52 2010 +0000
Add callback mechanism for the getting the source of a frame
<rdar://problem/8364681>
https://bugs.webkit.org/show_bug.cgi?id=45604
Reviewed by Dan Bernstein.
WebKit2:
* Shared/CoreIPCSupport/WebPageMessageKinds.h:
* Shared/CoreIPCSupport/WebPageProxyMessageKinds.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageGetSourceForFrame):
(callGetSourceForFrameBlockBlockAndDispose):
(WKPageGetSourceForFrame_b):
* UIProcess/API/C/WKPage.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::getSourceForFrame):
(WebKit::WebPageProxy::didReceiveMessage):
(WebKit::WebPageProxy::didGetSourceForFrame):
(WebKit::WebPageProxy::processDidExit):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::source):
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::getSourceForFrame):
(WebKit::WebPage::didReceiveMessage):
* WebProcess/WebPage/WebPage.h:
WebKitTools:
Add ability to dump the main frame's source to the console.
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController dumpSourceToConsole:]):
* MiniBrowser/mac/MainMenu.xib:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67311 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d70976b..b5a295c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,33 @@
+2010-09-11 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Dan Bernstein.
+
+ Add callback mechanism for the getting the source of a frame
+ <rdar://problem/8364681>
+ https://bugs.webkit.org/show_bug.cgi?id=45604
+
+ * Shared/CoreIPCSupport/WebPageMessageKinds.h:
+ * Shared/CoreIPCSupport/WebPageProxyMessageKinds.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetSourceForFrame):
+ (callGetSourceForFrameBlockBlockAndDispose):
+ (WKPageGetSourceForFrame_b):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::getSourceForFrame):
+ (WebKit::WebPageProxy::didReceiveMessage):
+ (WebKit::WebPageProxy::didGetSourceForFrame):
+ (WebKit::WebPageProxy::processDidExit):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::source):
+ * WebProcess/WebPage/WebFrame.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::getSourceForFrame):
+ (WebKit::WebPage::didReceiveMessage):
+ * WebProcess/WebPage/WebPage.h:
+
2010-09-10 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Darin Adler.
diff --git a/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h b/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
index b4eb962..060da63 100644
--- a/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
+++ b/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
@@ -37,6 +37,7 @@ enum Kind {
DidReceivePolicyDecision,
DidRemoveEditCommand,
GetRenderTreeExternalRepresentation,
+ GetSourceForFrame,
GoBack,
GoForward,
GoToBackForwardItem,
diff --git a/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h b/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
index 9b0858b..1cf49ce 100644
--- a/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
+++ b/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h
@@ -56,6 +56,7 @@ enum Kind {
DidFirstLayoutForFrame,
DidFirstVisuallyNonEmptyLayoutForFrame,
DidGetRenderTreeExternalRepresentation,
+ DidGetSourceForFrame,
DidReceiveEvent,
DidReceiveServerRedirectForProvisionalLoadForFrame,
DidReceiveTitleForFrame,
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index 7d57099..26a8716 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -243,3 +243,22 @@ void WKPageRenderTreeExternalRepresentation_b(WKPageRef pageRef, WKPageRenderTre
WKPageRenderTreeExternalRepresentation(pageRef, Block_copy(block), callRenderTreeExternalRepresentationBlockAndDispose);
}
#endif
+
+void WKPageGetSourceForFrame(WKPageRef pageRef, WKFrameRef frameRef, void *context, WKPageGetSourceForFrameFunction callback)
+{
+ toWK(pageRef)->getSourceForFrame(toWK(frameRef), FrameSourceCallback::create(context, callback));
+}
+
+#ifdef __BLOCKS__
+static void callGetSourceForFrameBlockBlockAndDispose(WKStringRef resultValue, WKErrorRef error, void* context)
+{
+ WKPageGetSourceForFrameBlock block = (WKPageGetSourceForFrameBlock)context;
+ block(resultValue, error);
+ Block_release(block);
+}
+
+void WKPageGetSourceForFrame_b(WKPageRef pageRef, WKFrameRef frameRef, WKPageGetSourceForFrameBlock block)
+{
+ WKPageGetSourceForFrame(pageRef, frameRef, Block_copy(block), callGetSourceForFrameBlockBlockAndDispose);
+}
+#endif
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index fab4eac..78ac012 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -207,6 +207,13 @@ typedef void (^WKPageRunJavaScriptBlock)(WKStringRef, WKErrorRef);
WK_EXPORT void WKPageRunJavaScriptInMainFrame_b(WKPageRef page, WKStringRef script, WKPageRunJavaScriptBlock block);
#endif
+typedef void (*WKPageGetSourceForFrameFunction)(WKStringRef, WKErrorRef, void*);
+WK_EXPORT void WKPageGetSourceForFrame(WKPageRef page, WKFrameRef frame, void *context, WKPageGetSourceForFrameFunction function);
+#ifdef __BLOCKS__
+typedef void (^WKPageGetSourceForFrameBlock)(WKStringRef, WKErrorRef);
+WK_EXPORT void WKPageGetSourceForFrame_b(WKPageRef page, WKFrameRef frame, WKPageGetSourceForFrameBlock block);
+#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index ec37f41..3ce65fb 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -190,6 +190,12 @@ void WebPageProxy::close()
renderTreeExternalRepresentationCallbacks[i]->invalidate();
m_renderTreeExternalRepresentationCallbacks.clear();
+ Vector<RefPtr<FrameSourceCallback> > frameSourceCallbacks;
+ copyValuesToVector(m_frameSourceCallbacks, frameSourceCallbacks);
+ m_frameSourceCallbacks.clear();
+ for (size_t i = 0, size = frameSourceCallbacks.size(); i < size; ++i)
+ frameSourceCallbacks[i]->invalidate();
+
Vector<WebEditCommandProxy*> editCommandVector;
copyToVector(m_editCommandSet, editCommandVector);
m_editCommandSet.clear();
@@ -447,6 +453,14 @@ void WebPageProxy::getRenderTreeExternalRepresentation(PassRefPtr<RenderTreeExte
process()->send(WebPageMessage::GetRenderTreeExternalRepresentation, m_pageID, callbackID);
}
+void WebPageProxy::getSourceForFrame(WebFrameProxy* frame, PassRefPtr<FrameSourceCallback> prpCallback)
+{
+ RefPtr<FrameSourceCallback> callback = prpCallback;
+ uint64_t callbackID = callback->callbackID();
+ m_frameSourceCallbacks.set(callbackID, callback.get());
+ process()->send(WebPageMessage::GetSourceForFrame, m_pageID, CoreIPC::In(frame->frameID(), callbackID));
+}
+
void WebPageProxy::preferencesDidChange()
{
if (!isValid())
@@ -648,6 +662,14 @@ void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::M
didGetRenderTreeExternalRepresentation(resultString, callbackID);
break;
}
+ case WebPageProxyMessage::DidGetSourceForFrame: {
+ String resultString;
+ uint64_t callbackID;
+ if (!arguments->decode(CoreIPC::Out(resultString, callbackID)))
+ return;
+ didGetSourceForFrame(resultString, callbackID);
+ break;
+ }
case WebPageProxyMessage::SetToolTip: {
String toolTip;
if (!arguments->decode(toolTip))
@@ -1090,6 +1112,17 @@ void WebPageProxy::didGetRenderTreeExternalRepresentation(const String& resultSt
callback->performCallbackWithReturnValue(resultString.impl());
}
+void WebPageProxy::didGetSourceForFrame(const String& resultString, uint64_t callbackID)
+{
+ RefPtr<FrameSourceCallback> callback = m_frameSourceCallbacks.take(callbackID);
+ if (!callback) {
+ // FIXME: Log error or assert.
+ return;
+ }
+
+ callback->performCallbackWithReturnValue(resultString.impl());
+}
+
#if USE(ACCELERATED_COMPOSITING)
void WebPageProxy::didChangeAcceleratedCompositing(bool compositing)
{
@@ -1136,6 +1169,12 @@ void WebPageProxy::processDidExit()
renderTreeExternalRepresentationCallbacks[i]->invalidate();
m_renderTreeExternalRepresentationCallbacks.clear();
+ Vector<RefPtr<FrameSourceCallback> > frameSourceCallbacks;
+ copyValuesToVector(m_frameSourceCallbacks, frameSourceCallbacks);
+ m_frameSourceCallbacks.clear();
+ for (size_t i = 0, size = frameSourceCallbacks.size(); i < size; ++i)
+ frameSourceCallbacks[i]->invalidate();
+
Vector<WebEditCommandProxy*> editCommandVector;
copyToVector(m_editCommandSet, editCommandVector);
m_editCommandSet.clear();
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 0b7056a..3e52db5 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -76,6 +76,7 @@ class WebURLRequest;
class WebWheelEvent;
struct WebNavigationDataStore;
+typedef GenericCallback<WKStringRef, WTF::StringImpl*> FrameSourceCallback;
typedef GenericCallback<WKStringRef, WTF::StringImpl*> RenderTreeExternalRepresentationCallback;
typedef GenericCallback<WKStringRef, WTF::StringImpl*> ScriptReturnValueCallback;
@@ -155,6 +156,7 @@ public:
void runJavaScriptInMainFrame(const WTF::String&, PassRefPtr<ScriptReturnValueCallback>);
void getRenderTreeExternalRepresentation(PassRefPtr<RenderTreeExternalRepresentationCallback>);
+ void getSourceForFrame(WebFrameProxy*, PassRefPtr<FrameSourceCallback>);
void receivedPolicyDecision(WebCore::PolicyAction, WebFrameProxy*, uint64_t listenerID);
@@ -237,8 +239,10 @@ private:
void setCursor(const WebCore::Cursor&);
void didReceiveEvent(WebEvent::Type);
+
void didRunJavaScriptInMainFrame(const WTF::String&, uint64_t);
void didGetRenderTreeExternalRepresentation(const WTF::String&, uint64_t);
+ void didGetSourceForFrame(const String&, uint64_t);
#if USE(ACCELERATED_COMPOSITING)
void didChangeAcceleratedCompositing(bool compositing);
@@ -257,6 +261,7 @@ private:
HashMap<uint64_t, RefPtr<ScriptReturnValueCallback> > m_scriptReturnValueCallbacks;
HashMap<uint64_t, RefPtr<RenderTreeExternalRepresentationCallback> > m_renderTreeExternalRepresentationCallbacks;
+ HashMap<uint64_t, RefPtr<FrameSourceCallback> > m_frameSourceCallbacks;
HashSet<WebEditCommandProxy*> m_editCommandSet;
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index bd96db8..90ee494 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -35,12 +35,14 @@
#include <WebCore/AnimationController.h>
#include <WebCore/CSSComputedStyleDeclaration.h>
#include <WebCore/Chrome.h>
+#include <WebCore/DocumentLoader.h>
#include <WebCore/Frame.h>
-#include <WebCore/Page.h>
#include <WebCore/HTMLFrameOwnerElement.h>
#include <WebCore/JSCSSStyleDeclaration.h>
#include <WebCore/JSElement.h>
+#include <WebCore/Page.h>
#include <WebCore/RenderTreeAsText.h>
+#include <WebCore/TextResourceDecoder.h>
#ifndef NDEBUG
#include <wtf/RefCountedLeakCounter.h>
@@ -180,6 +182,25 @@ void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action
(m_coreFrame->loader()->policyChecker()->*function)(action);
}
+String WebFrame::source() const
+{
+ if (!m_coreFrame)
+ return String();
+ Document* document = m_coreFrame->document();
+ if (!document)
+ return String();
+ TextResourceDecoder* decoder = document->decoder();
+ if (!decoder)
+ return String();
+ DocumentLoader* documentLoader = m_coreFrame->loader()->activeDocumentLoader();
+ if (!documentLoader)
+ return String();
+ RefPtr<SharedBuffer> mainResourceData = documentLoader->mainResourceData();
+ if (!mainResourceData)
+ return String();
+ return decoder->encoding().decode(mainResourceData->data(), mainResourceData->size());
+}
+
bool WebFrame::isMainFrame() const
{
if (WebPage* p = page())
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.h b/WebKit2/WebProcess/WebPage/WebFrame.h
index 0ac0fc7..2497ead 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.h
+++ b/WebKit2/WebProcess/WebPage/WebFrame.h
@@ -68,6 +68,8 @@ public:
void invalidatePolicyListener();
void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction);
+ String source() const;
+
// WKBundleFrame API and SPI functions
bool isMainFrame() const;
WTF::String name() const;
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index bdfef9a..a897565 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -511,6 +511,14 @@ void WebPage::getRenderTreeExternalRepresentation(uint64_t callbackID)
WebProcess::shared().connection()->send(WebPageProxyMessage::DidGetRenderTreeExternalRepresentation, m_pageID, CoreIPC::In(resultString, callbackID));
}
+void WebPage::getSourceForFrame(WebFrame* frame, uint64_t callbackID)
+{
+ String resultString;
+ if (frame)
+ resultString = frame->source();
+ WebProcess::shared().connection()->send(WebPageProxyMessage::DidGetSourceForFrame, m_pageID, CoreIPC::In(resultString, callbackID));
+}
+
void WebPage::preferencesDidChange(const WebPreferencesStore& store)
{
WebPreferencesStore::removeTestRunnerOverrides();
@@ -738,6 +746,14 @@ void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Messag
getRenderTreeExternalRepresentation(callbackID);
return;
}
+ case WebPageMessage::GetSourceForFrame: {
+ uint64_t frameID;
+ uint64_t callbackID;
+ if (!arguments->decode(CoreIPC::Out(frameID, callbackID)))
+ return;
+ getSourceForFrame(WebProcess::shared().webFrame(frameID), callbackID);
+ return;
+ }
case WebPageMessage::Close: {
close();
return;
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index a496e0b..21261a6 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -150,6 +150,8 @@ private:
static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
bool performDefaultBehaviorForKeyEvent(const WebKeyboardEvent&);
+ String sourceForFrame(WebFrame*);
+
// Actions
void tryClose();
void loadURL(const String&);
@@ -169,6 +171,7 @@ private:
#endif
void runJavaScriptInMainFrame(const WTF::String&, uint64_t callbackID);
void getRenderTreeExternalRepresentation(uint64_t callbackID);
+ void getSourceForFrame(WebFrame*, uint64_t callbackID);
void preferencesDidChange(const WebPreferencesStore&);
void platformPreferencesDidChange(const WebPreferencesStore&);
void didReceivePolicyDecision(WebFrame*, uint64_t listenerID, WebCore::PolicyAction policyAction);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d911754..3cbe0bb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-11 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Dan Bernstein.
+
+ Add callback mechanism for the getting the source of a frame
+ <rdar://problem/8364681>
+ https://bugs.webkit.org/show_bug.cgi?id=45604
+
+ Add ability to dump the main frame's source to the console.
+
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController dumpSourceToConsole:]):
+ * MiniBrowser/mac/MainMenu.xib:
+
2010-09-11 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.h b/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
index 3b7419b..98c6bf7 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
@@ -58,4 +58,6 @@
- (IBAction)toggleZoomMode:(id)sender;
+- (IBAction)dumpSourceToConsole:(id)sender;
+
@end
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 2351a26..eb7784f 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -234,6 +234,15 @@
}
}
+- (IBAction)dumpSourceToConsole:(id)sender
+{
+ WKPageGetSourceForFrame_b(_webView.pageRef, WKPageGetMainFrame(_webView.pageRef), ^(WKStringRef result, WKErrorRef error) {
+ CFStringRef cfResult = WKStringCopyCFString(0, result);
+ LOG(@"Main frame source\n \"%@\"", (NSString *)cfResult);
+ CFRelease(cfResult);
+ });
+}
+
#pragma mark Loader Client Callbacks
static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
diff --git a/WebKitTools/MiniBrowser/mac/MainMenu.xib b/WebKitTools/MiniBrowser/mac/MainMenu.xib
index f444073..634f615 100644
--- a/WebKitTools/MiniBrowser/mac/MainMenu.xib
+++ b/WebKitTools/MiniBrowser/mac/MainMenu.xib
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="296"/>
+ <integer value="535"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -968,6 +968,24 @@
</object>
</object>
</object>
+ <object class="NSMenuItem" id="377902755">
+ <reference key="NSMenu" ref="865232259"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="35465992"/>
+ <reference key="NSMixedImage" ref="502551668"/>
+ </object>
+ <object class="NSMenuItem" id="191469404">
+ <reference key="NSMenu" ref="865232259"/>
+ <string key="NSTitle">Dump Source To Console</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="35465992"/>
+ <reference key="NSMixedImage" ref="502551668"/>
+ </object>
</object>
</object>
</object>
@@ -1464,6 +1482,14 @@
</object>
<int key="connectionID">564</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">dumpSourceToConsole:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="191469404"/>
+ </object>
+ <int key="connectionID">567</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2134,6 +2160,8 @@
<reference ref="1027125810"/>
<reference ref="864702084"/>
<reference ref="208343368"/>
+ <reference ref="377902755"/>
+ <reference ref="191469404"/>
</object>
<reference key="parent" ref="816668511"/>
</object>
@@ -2224,6 +2252,16 @@
<reference key="object" ref="138443116"/>
<reference key="parent" ref="466310130"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">565</int>
+ <reference key="object" ref="377902755"/>
+ <reference key="parent" ref="865232259"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">566</int>
+ <reference key="object" ref="191469404"/>
+ <reference key="parent" ref="865232259"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2399,6 +2437,8 @@
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
<string>562.IBPluginDependency</string>
+ <string>565.IBPluginDependency</string>
+ <string>566.IBPluginDependency</string>
<string>57.IBEditorWindowLastContentRect</string>
<string>57.IBPluginDependency</string>
<string>57.ImportedFromIB2</string>
@@ -2583,7 +2623,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{864, 698}, {246, 123}}</string>
+ <string>{{864, 668}, {260, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{1110, 678}, {154, 43}}</string>
@@ -2603,6 +2643,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{286, 129}, {275, 183}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -2653,7 +2695,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">564</int>
+ <int key="maxID">567</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2731,6 +2773,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>dumpSourceToConsole:</string>
<string>fetch:</string>
<string>forceRepaint:</string>
<string>goBack:</string>
@@ -2756,12 +2799,14 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>dumpSourceToConsole:</string>
<string>fetch:</string>
<string>forceRepaint:</string>
<string>goBack:</string>
@@ -2777,6 +2822,10 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
+ <string key="name">dumpSourceToConsole:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">fetch:</string>
<string key="candidateClassName">id</string>
</object>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list