Title: [132761] trunk/Source/WebKit2
- Revision
- 132761
- Author
- [email protected]
- Date
- 2012-10-28 22:13:51 -0700 (Sun, 28 Oct 2012)
Log Message
[WK2] Fix the incorrect use of preprocessor statement in API header.
https://bugs.webkit.org/show_bug.cgi?id=100610
Patch by Byungwoo Lee <[email protected]> on 2012-10-28
Reviewed by Timothy Hatcher.
Remove the preprocessor statement to check 'ENABLE_INSPECTOR' feature
from the WKPage.h.
* UIProcess/API/C/WKPage.cpp:
(WKPageGetInspector):
* UIProcess/API/C/WKPage.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (132760 => 132761)
--- trunk/Source/WebKit2/ChangeLog 2012-10-29 04:08:03 UTC (rev 132760)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-29 05:13:51 UTC (rev 132761)
@@ -1,3 +1,17 @@
+2012-10-28 Byungwoo Lee <[email protected]>
+
+ [WK2] Fix the incorrect use of preprocessor statement in API header.
+ https://bugs.webkit.org/show_bug.cgi?id=100610
+
+ Reviewed by Timothy Hatcher.
+
+ Remove the preprocessor statement to check 'ENABLE_INSPECTOR' feature
+ from the WKPage.h.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetInspector):
+ * UIProcess/API/C/WKPage.h:
+
2012-10-28 Yael Aharon <[email protected]>
[EFL][WK2][AC] Viewport size does not change when the window size changes
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (132760 => 132761)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2012-10-29 04:08:03 UTC (rev 132760)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2012-10-29 05:13:51 UTC (rev 132761)
@@ -182,12 +182,14 @@
return toImpl(page)->renderTreeSize();
}
-#if defined(ENABLE_INSPECTOR) && ENABLE_INSPECTOR
WKInspectorRef WKPageGetInspector(WKPageRef pageRef)
{
+#if defined(ENABLE_INSPECTOR) && ENABLE_INSPECTOR
return toAPI(toImpl(pageRef)->inspector());
+#else
+ return 0;
+#endif
}
-#endif
double WKPageGetEstimatedProgress(WKPageRef pageRef)
{
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (132760 => 132761)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2012-10-29 04:08:03 UTC (rev 132760)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2012-10-29 05:13:51 UTC (rev 132761)
@@ -387,9 +387,7 @@
WK_EXPORT void WKPageSetMemoryCacheClientCallsEnabled(WKPageRef page, bool memoryCacheClientCallsEnabled);
-#if defined(ENABLE_INSPECTOR) && ENABLE_INSPECTOR
WK_EXPORT WKInspectorRef WKPageGetInspector(WKPageRef page);
-#endif
WK_EXPORT WKStringRef WKPageCopyUserAgent(WKPageRef page);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
