Title: [163233] trunk/Source/WebCore
- Revision
- 163233
- Author
- [email protected]
- Date
- 2014-01-31 20:58:12 -0800 (Fri, 31 Jan 2014)
Log Message
Debug build fix after r163232. Call hasEditableStyle() instead of isContentEditable() which
can trigger a layout synchronously inside paintCaret. This matches the code before r163232.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintCaret):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163232 => 163233)
--- trunk/Source/WebCore/ChangeLog 2014-02-01 04:10:43 UTC (rev 163232)
+++ trunk/Source/WebCore/ChangeLog 2014-02-01 04:58:12 UTC (rev 163233)
@@ -1,5 +1,13 @@
2014-01-31 Ryosuke Niwa <[email protected]>
+ Debug build fix after r163232. Call hasEditableStyle() instead of isContentEditable() which
+ can trigger a layout synchronously inside paintCaret. This matches the code before r163232.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintCaret):
+
+2014-01-31 Ryosuke Niwa <[email protected]>
+
Remove inline member functions of FrameSelection that access m_selection
https://bugs.webkit.org/show_bug.cgi?id=127986
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (163232 => 163233)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-01 04:10:43 UTC (rev 163232)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-01 04:58:12 UTC (rev 163233)
@@ -2444,7 +2444,7 @@
bool isContentEditable;
if (type == CursorCaret) {
caretPainter = frame().selection().caretRenderer();
- isContentEditable = frame().selection().selection().isContentEditable();
+ isContentEditable = frame().selection().selection().hasEditableStyle();
} else {
caretPainter = frame().page()->dragCaretController().caretRenderer();
isContentEditable = frame().page()->dragCaretController().isContentEditable();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
