Title: [138434] trunk/Source/WebKit2
- Revision
- 138434
- Author
- [email protected]
- Date
- 2012-12-23 22:10:17 -0800 (Sun, 23 Dec 2012)
Log Message
Fix the incorrect use of preprocessor statement in API header
https://bugs.webkit.org/show_bug.cgi?id=105675
Patch by Seokju Kwon <[email protected]> on 2012-12-23
Reviewed by Sam Weinig.
Remove a preprocessor statement in WKBundlePage.h
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageGetInspector):
* WebProcess/InjectedBundle/API/c/WKBundlePage.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138433 => 138434)
--- trunk/Source/WebKit2/ChangeLog 2012-12-24 05:45:05 UTC (rev 138433)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-24 06:10:17 UTC (rev 138434)
@@ -1,3 +1,16 @@
+2012-12-23 Seokju Kwon <[email protected]>
+
+ Fix the incorrect use of preprocessor statement in API header
+ https://bugs.webkit.org/show_bug.cgi?id=105675
+
+ Reviewed by Sam Weinig.
+
+ Remove a preprocessor statement in WKBundlePage.h
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageGetInspector):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+
2012-12-23 Sam Weinig <[email protected]>
Switch WebCookieManager and AuthenticationManager to use the ChildProcess rather than holding on to a Connection
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (138433 => 138434)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2012-12-24 05:45:05 UTC (rev 138433)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2012-12-24 06:10:17 UTC (rev 138434)
@@ -52,6 +52,7 @@
#include <WebCore/KURL.h>
#include <WebCore/MIMETypeRegistry.h>
#include <WebCore/Page.h>
+#include <wtf/UnusedParam.h>
#if ENABLE(WEB_INTENTS)
#include "InjectedBundleIntent.h"
@@ -355,12 +356,15 @@
#endif
}
-#if defined(ENABLE_INSPECTOR) && ENABLE_INSPECTOR
WKBundleInspectorRef WKBundlePageGetInspector(WKBundlePageRef pageRef)
{
+#if ENABLE(INSPECTOR)
return toAPI(toImpl(pageRef)->inspector());
+#else
+ UNUSED_PARAM(pageRef);
+ return 0;
+#endif
}
-#endif
void WKBundlePageForceRepaint(WKBundlePageRef page)
{
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (138433 => 138434)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2012-12-24 05:45:05 UTC (rev 138433)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2012-12-24 06:10:17 UTC (rev 138434)
@@ -434,9 +434,7 @@
WK_EXPORT void WKBundlePageDeliverIntentToFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleIntentRef intent);
-#if defined(ENABLE_INSPECTOR) && ENABLE_INSPECTOR
WK_EXPORT WKBundleInspectorRef WKBundlePageGetInspector(WKBundlePageRef page);
-#endif
#ifdef __cplusplus
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
