diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-16 14:22:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-16 14:22:54 -0700 |
| commit | a7281fa549b2afc28ba6e4b5d72d4e04cfe5c53e (patch) | |
| tree | 2f5e40e54a8c312327fbd976384f12c55347644a | |
| parent | defff152de87e5edeb45659bcedee9365af2df2c (diff) | |
| parent | 3ca42cd5be017b0bda805abd247fa7e7b2a168d9 (diff) | |
| download | external_webkit-a7281fa549b2afc28ba6e4b5d72d4e04cfe5c53e.zip external_webkit-a7281fa549b2afc28ba6e4b5d72d4e04cfe5c53e.tar.gz external_webkit-a7281fa549b2afc28ba6e4b5d72d4e04cfe5c53e.tar.bz2 | |
Merge change 218
* changes:
Temporary fix bug 1792567.
| -rw-r--r-- | WebCore/dom/RangeBoundaryPoint.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/dom/RangeBoundaryPoint.h b/WebCore/dom/RangeBoundaryPoint.h index e39454e..65abfcf 100644 --- a/WebCore/dom/RangeBoundaryPoint.h +++ b/WebCore/dom/RangeBoundaryPoint.h @@ -140,7 +140,18 @@ inline void RangeBoundaryPoint::setToEnd(PassRefPtr<Node> container) { ASSERT(container); if (container->offsetInCharacters()) { +#ifdef ANDROID_FIX + // Temporary fix of a crash where container becomes empty after + // assigning it to the first parameter of Position::moveToPosition, + // evaluating the second parameter expression, + // container->maxCharacterOffset(), causes NULL-pointer exception. + // This change can be removed after merge to a webkit revision + // after r42264. + int offset = container->maxCharacterOffset(); + m_position.moveToPosition(container, offset); +#else m_position.moveToPosition(container, container->maxCharacterOffset()); +#endif m_childBefore = 0; } else { m_childBefore = container->lastChild(); |